From ba2bb24b76a15025cee9beaec77911aba18a77b5 Mon Sep 17 00:00:00 2001
From: intwanghao <hao3.wang@intel.com>
Date: Mon, 31 Mar 2025 11:37:43 +0800
Subject: [PATCH 1/2] fix

Signed-off-by: intwanghao <hao3.wang@intel.com>
---
 sycl/test-e2e/syclcompat/group_utils/exchange.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/sycl/test-e2e/syclcompat/group_utils/exchange.cpp b/sycl/test-e2e/syclcompat/group_utils/exchange.cpp
index ff2ed27f8605e..d8bfb1df577d2 100644
--- a/sycl/test-e2e/syclcompat/group_utils/exchange.cpp
+++ b/sycl/test-e2e/syclcompat/group_utils/exchange.cpp
@@ -38,6 +38,7 @@
 
 #include <syclcompat/device.hpp>
 #include <syclcompat/group_utils.hpp>
+#include <syclcompat/memory.hpp>
 
 void StripedToBlockedKernel(int *d_data, const sycl::nd_item<3> &item_ct1,
                             uint8_t *load_temp_storage,
@@ -138,10 +139,11 @@ bool test_striped_to_blocked() {
       std::ostream_iterator<int> Iter(std::cout, ", ");
       std::copy(d_data, d_data + 512, Iter);
       std::cout << std::endl;
+      syclcompat::wait_and_free(d_data, q_ct1);
       return false;
     }
   }
-
+  syclcompat::wait_and_free(d_data, q_ct1);
   std::cout << "test_striped_to_blocked pass\n";
   return true;
 }
@@ -181,9 +183,11 @@ bool test_blocked_to_striped() {
       std::ostream_iterator<int> Iter(std::cout, ", ");
       std::copy(d_data, d_data + 512, Iter);
       std::cout << std::endl;
+      syclcompat::wait_and_free(d_data, q_ct1);
       return false;
     }
   }
+  syclcompat::wait_and_free(d_data, q_ct1);
   std::cout << "test_blocked_to_striped pass\n";
   return true;
 }
@@ -226,10 +230,13 @@ bool test_scatter_to_blocked() {
       std::ostream_iterator<int> Iter(std::cout, ", ");
       std::copy(d_data, d_data + 512, Iter);
       std::cout << std::endl;
+      syclcompat::wait_and_free(d_data, q_ct1);
+      syclcompat::wait_and_free(d_rank, q_ct1);
       return false;
     }
   }
-
+  syclcompat::wait_and_free(d_data, q_ct1);
+  syclcompat::wait_and_free(d_rank, q_ct1);
   std::cout << "test_scatter_to_blocked pass\n";
   return true;
 }
@@ -282,9 +289,13 @@ bool test_scatter_to_striped() {
       std::ostream_iterator<int> Iter(std::cout, ", ");
       std::copy(d_data, d_data + 512, Iter);
       std::cout << std::endl;
+      syclcompat::wait_and_free(d_data, q_ct1);
+      syclcompat::wait_and_free(d_rank, q_ct1);
       return false;
     }
   }
+  syclcompat::wait_and_free(d_data, q_ct1);
+  syclcompat::wait_and_free(d_rank, q_ct1);
   std::cout << "test_blocked_to_striped pass\n";
   return true;
 }

From a5f2e5e31c712d17e428c1986b44cdda54e7623c Mon Sep 17 00:00:00 2001
From: intwanghao <hao3.wang@intel.com>
Date: Mon, 31 Mar 2025 16:28:25 +0800
Subject: [PATCH 2/2] fix

Signed-off-by: intwanghao <hao3.wang@intel.com>
---
 .../syclcompat/group_utils/exchange.cpp       | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/sycl/test-e2e/syclcompat/group_utils/exchange.cpp b/sycl/test-e2e/syclcompat/group_utils/exchange.cpp
index d8bfb1df577d2..430dc4e3a2c8f 100644
--- a/sycl/test-e2e/syclcompat/group_utils/exchange.cpp
+++ b/sycl/test-e2e/syclcompat/group_utils/exchange.cpp
@@ -38,7 +38,6 @@
 
 #include <syclcompat/device.hpp>
 #include <syclcompat/group_utils.hpp>
-#include <syclcompat/memory.hpp>
 
 void StripedToBlockedKernel(int *d_data, const sycl::nd_item<3> &item_ct1,
                             uint8_t *load_temp_storage,
@@ -139,11 +138,11 @@ bool test_striped_to_blocked() {
       std::ostream_iterator<int> Iter(std::cout, ", ");
       std::copy(d_data, d_data + 512, Iter);
       std::cout << std::endl;
-      syclcompat::wait_and_free(d_data, q_ct1);
+      sycl::free(d_data, q_ct1);
       return false;
     }
   }
-  syclcompat::wait_and_free(d_data, q_ct1);
+  sycl::free(d_data, q_ct1);
   std::cout << "test_striped_to_blocked pass\n";
   return true;
 }
@@ -183,11 +182,11 @@ bool test_blocked_to_striped() {
       std::ostream_iterator<int> Iter(std::cout, ", ");
       std::copy(d_data, d_data + 512, Iter);
       std::cout << std::endl;
-      syclcompat::wait_and_free(d_data, q_ct1);
+      sycl::free(d_data, q_ct1);
       return false;
     }
   }
-  syclcompat::wait_and_free(d_data, q_ct1);
+  sycl::free(d_data, q_ct1);
   std::cout << "test_blocked_to_striped pass\n";
   return true;
 }
@@ -230,13 +229,13 @@ bool test_scatter_to_blocked() {
       std::ostream_iterator<int> Iter(std::cout, ", ");
       std::copy(d_data, d_data + 512, Iter);
       std::cout << std::endl;
-      syclcompat::wait_and_free(d_data, q_ct1);
-      syclcompat::wait_and_free(d_rank, q_ct1);
+      sycl::free(d_data, q_ct1);
+      sycl::free(d_rank, q_ct1);
       return false;
     }
   }
-  syclcompat::wait_and_free(d_data, q_ct1);
-  syclcompat::wait_and_free(d_rank, q_ct1);
+  sycl::free(d_data, q_ct1);
+  sycl::free(d_rank, q_ct1);
   std::cout << "test_scatter_to_blocked pass\n";
   return true;
 }
@@ -289,13 +288,13 @@ bool test_scatter_to_striped() {
       std::ostream_iterator<int> Iter(std::cout, ", ");
       std::copy(d_data, d_data + 512, Iter);
       std::cout << std::endl;
-      syclcompat::wait_and_free(d_data, q_ct1);
-      syclcompat::wait_and_free(d_rank, q_ct1);
+      sycl::free(d_data, q_ct1);
+      sycl::free(d_rank, q_ct1);
       return false;
     }
   }
-  syclcompat::wait_and_free(d_data, q_ct1);
-  syclcompat::wait_and_free(d_rank, q_ct1);
+  sycl::free(d_data, q_ct1);
+  sycl::free(d_rank, q_ct1);
   std::cout << "test_blocked_to_striped pass\n";
   return true;
 }