Generalize AsyncTest to work with buffers too

Author: joeatodd

sycl/test-e2e/syclcompat/memory/memory_async.cpp

@@ -32,6 +32,8 @@
 
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
+// RUN: %{build} -DCOMPAT_USM_LEVEL_NONE -o %t.out
+// RUN: %{run} %t.out
 // Tests for the sycl::events returned from syclcompat::*Async API calls
 
 #include <stdio.h>
@@ -187,6 +189,11 @@ void test_combine_events() {
 }
 
 int main() {
+#ifdef COMPAT_USM_LEVEL_NONE
+  std::cout << "Running COMPAT_USM_LEVEL_NONE tests" << std::endl;
+#else
+  std::cout << "Running USM tests" << std::endl;
+#endif
   test_free_async();
 
   test_memcpy_async1();

sycl/test-e2e/syclcompat/memory/memory_fixt.hpp

@@ -37,25 +37,39 @@ class AsyncTest {
   AsyncTest()
       : q_{syclcompat::get_default_queue()}, grid_{NUM_WG}, thread_{WG_SIZE},
         size_{WG_SIZE * NUM_WG} {
-    d_A_ = sycl::malloc_device<float>(size_, q_);
-    d_B_ = sycl::malloc_device<float>(size_, q_);
-    d_C_ = sycl::malloc_device<float>(size_, q_);
+    d_A_ = syclcompat::malloc<float>(size_, q_);
+    d_B_ = syclcompat::malloc<float>(size_, q_);
+    d_C_ = syclcompat::malloc<float>(size_, q_);
   }
 
   ~AsyncTest() {
-    sycl::free(d_A_, q_);
-    sycl::free(d_B_, q_);
-    sycl::free(d_C_, q_);
+    syclcompat::free(d_A_, q_);
+    syclcompat::free(d_B_, q_);
+    syclcompat::free(d_C_, q_);
   }
   sycl::event launch_kernel() {
     auto &dd_A = d_A_;
     auto &dd_B = d_B_;
     auto &dd_C = d_C_;
+#ifdef COMPAT_USM_LEVEL_NONE
+    syclcompat::buffer_t buffer_A = syclcompat::get_buffer(d_A_);
+    syclcompat::buffer_t buffer_B = syclcompat::get_buffer(d_B_);
+    syclcompat::buffer_t buffer_C = syclcompat::get_buffer(d_C_);
+#endif
     return q_.submit([&](sycl::handler &cgh) {
+#ifdef COMPAT_USM_LEVEL_NONE
+      auto A = buffer_A.get_access<sycl::access::mode::read_write>(cgh);
+      auto B = buffer_B.get_access<sycl::access::mode::read_write>(cgh);
+      auto C = buffer_C.get_access<sycl::access::mode::read_write>(cgh);
+#else
+      auto A = dd_A;
+      auto B = dd_B;
+      auto C = dd_C;
+#endif
       cgh.parallel_for(size_, [=](sycl::id<1> id) {
-        dd_A[id] = static_cast<float>(id) + 1.0f;
-        dd_B[id] = static_cast<float>(id) + 1.0f;
-        dd_C[id] = dd_A[id] + dd_B[id];
+        A[id] = static_cast<float>(id) + 1.0f;
+        B[id] = static_cast<float>(id) + 1.0f;
+        C[id] = A[id] + B[id];
       });
     });
   }