s/COMPAT_USM_LEVEL_NONE/SYCLCOMPAT_USM_LEVEL_NONE/

Author: joeatodd

sycl/doc/syclcompat/README.md

@@ -852,18 +852,18 @@ public:
 
 Although SYCLcompat is primarily designed around the Unified Shared Memory
 model, there is (limited) support for the buffer/accessor model. This can be
-enabled by setting the compiler define `COMPAT_USM_LEVEL_NONE`. This macro
+enabled by setting the compiler define `SYCLCOMPAT_USM_LEVEL_NONE`. This macro
 instructs SYCLcompat to effectively provide emulated USM pointers via a Memory
 Manager singleton.
 
-Note that in `COMPAT_USM_LEVEL_NONE` mode, the pointers returned by e.g.
+Note that in `SYCLCOMPAT_USM_LEVEL_NONE` mode, the pointers returned by e.g.
 `syclcompat::malloc`, and passed to `syclcompat::memcpy` can *only* interact
 with `syclcompat` APIs. It is legal to perform pointer arithmetic on these
 virtual pointers, but attempting to dereference them, passing them to `sycl`
 APIs, or passing them into kernels will result in an error.
 
 The SYCLcompat tests with the suffix `_usmnone.cpp` provide examples of how to
-use `COMPAT_USM_LEVEL_NONE`.
+use `SYCLCOMPAT_USM_LEVEL_NONE`.
 
 ### ptr_to_int
 

sycl/test-e2e/syclcompat/atomic/atomics_verification_usmnone.cpp

@@ -10,7 +10,7 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-#define COMPAT_USM_LEVEL_NONE
+#define SYCLCOMPAT_USM_LEVEL_NONE
 #include <sycl/detail/core.hpp>
 #include <cstdio>
 #include <ctime>

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

@@ -9,7 +9,7 @@
 
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
-#define COMPAT_USM_LEVEL_NONE
+#define SYCLCOMPAT_USM_LEVEL_NONE
 #include <sycl/detail/core.hpp>
 #include <syclcompat/syclcompat.hpp>
 

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

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

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

@@ -51,13 +51,13 @@ class AsyncTest {
     auto &dd_A = d_A_;
     auto &dd_B = d_B_;
     auto &dd_C = d_C_;
-#ifdef COMPAT_USM_LEVEL_NONE
+#ifdef SYCLCOMPAT_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
+#ifdef SYCLCOMPAT_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);

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

@@ -10,7 +10,7 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-#define COMPAT_USM_LEVEL_NONE
+#define SYCLCOMPAT_USM_LEVEL_NONE
 #include <sycl/detail/core.hpp>
 #include <syclcompat/syclcompat.hpp>
 

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

@@ -10,7 +10,7 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-#define COMPAT_USM_LEVEL_NONE
+#define SYCLCOMPAT_USM_LEVEL_NONE
 #include <sycl/detail/core.hpp>
 #include <syclcompat/memory.hpp>
 #include "memory_common.hpp"

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

@@ -9,7 +9,7 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-#define COMPAT_USM_LEVEL_NONE
+#define SYCLCOMPAT_USM_LEVEL_NONE
 #include <sycl/detail/core.hpp>
 #include <syclcompat/memory.hpp>
 #include "memory_common.hpp"

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

@@ -11,7 +11,7 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-#define COMPAT_USM_LEVEL_NONE
+#define SYCLCOMPAT_USM_LEVEL_NONE
 #include <sycl/detail/core.hpp>
 #include <syclcompat/memory.hpp>
 #include "memory_common.hpp"

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

@@ -9,7 +9,7 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-#define COMPAT_USM_LEVEL_NONE
+#define SYCLCOMPAT_USM_LEVEL_NONE
 #include <sycl/detail/core.hpp>
 #include <syclcompat/syclcompat.hpp>
 #include <stdio.h>