fix namespace in esimd_sycl_util.hpp and 2 tests

Signed-off-by: kbobrovs <[email protected]>

Author: kbobrovs

sycl/include/CL/sycl/INTEL/esimd/detail/esimd_sycl_util.hpp

@@ -15,8 +15,10 @@
 
 __SYCL_INLINE_NAMESPACE(cl) {
 namespace sycl {
-namespace INTEL {
-namespace gpu {
+namespace ext {
+namespace intel {
+namespace experimental {
+namespace esimd {
 namespace detail {
 
 // Checks that given type is a SYCL accessor type. Sets its static field
@@ -80,7 +82,9 @@ using EnableIfAccessor = sycl::detail::enable_if_t<
     detail::is_sycl_accessor_with<T, Capability, AccessTarget>::value, RetT>;
 
 } // namespace detail
-} // namespace gpu
-} // namespace INTEL
+} // namespace esimd
+} // namespace experimental
+} // namespace intel
+} // namespace ext
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)

sycl/test/esimd/block_load_store.cpp

@@ -13,21 +13,21 @@ SYCL_EXTERNAL void kernel1(
         &buf) SYCL_ESIMD_FUNCTION {
   simd<int, 32> v1(0, 1);
   // expected-warning@+2 {{deprecated}}
-  // expected-note@CL/sycl/INTEL/esimd/esimd_memory.hpp:188 {{}}
+  // expected-note@CL/sycl/INTEL/esimd/esimd_memory.hpp:190 {{}}
   auto v0 = block_load<int, 32>(buf, 0);
   v0 = v0 + v1;
   // expected-warning@+2 {{deprecated}}
-  // expected-note@CL/sycl/INTEL/esimd/esimd_memory.hpp:220 {{}}
+  // expected-note@CL/sycl/INTEL/esimd/esimd_memory.hpp:222 {{}}
   block_store<int, 32>(buf, 0, v0);
 }
 
 SYCL_EXTERNAL void kernel2(int *ptr) SYCL_ESIMD_FUNCTION {
   simd<int, 32> v1(0, 1);
   // expected-warning@+2 {{deprecated}}
-  // expected-note@CL/sycl/INTEL/esimd/esimd_memory.hpp:169 {{}}
+  // expected-note@CL/sycl/INTEL/esimd/esimd_memory.hpp:171 {{}}
   auto v0 = block_load<int, 32>(ptr);
   v0 = v0 + v1;
   // expected-warning@+2 {{deprecated}}
-  // expected-note@CL/sycl/INTEL/esimd/esimd_memory.hpp:201 {{}}
+  // expected-note@CL/sycl/INTEL/esimd/esimd_memory.hpp:203 {{}}
   block_store<int, 32>(ptr, v0);
 }

sycl/test/esimd/simd_copy_to_copy_from.cpp

@@ -10,7 +10,7 @@
 #include <limits>
 #include <utility>
 
-using namespace sycl::INTEL::gpu;
+using namespace sycl::ext::intel::experimental::esimd;
 using namespace cl::sycl;
 
 // --- Postive tests.
@@ -42,13 +42,13 @@ kernel3(accessor<int, 1, access::mode::read_write, access::target::local> &buf)
   simd<int, 32> v1(0, 1);
   simd<int, 32> v0;
   // expected-error@+3 {{no matching member function for call to 'copy_from'}}
-  // expected-note@CL/sycl/INTEL/esimd/esimd.hpp:514 {{}}
-  // expected-note@CL/sycl/INTEL/esimd/esimd.hpp:509 {{}}
+  // expected-note@CL/sycl/INTEL/esimd/esimd.hpp:499 {{}}
+  // expected-note@CL/sycl/INTEL/esimd/esimd.hpp:511 {{}}
   v0.copy_from(buf, 0);
   v0 = v0 + v1;
   // expected-error@+3 {{no matching member function for call to 'copy_to'}}
-  // expected-note@CL/sycl/INTEL/esimd/esimd.hpp:497 {{}}
-  // expected-note@CL/sycl/INTEL/esimd/esimd.hpp:525 {{}}
+  // expected-note@CL/sycl/INTEL/esimd/esimd.hpp:516 {{}}
+  // expected-note@CL/sycl/INTEL/esimd/esimd.hpp:527 {{}}
   v0.copy_to(buf, 0);
 }
 
@@ -58,8 +58,8 @@ SYCL_EXTERNAL void kernel4(
     SYCL_ESIMD_FUNCTION {
   simd<int, 32> v;
   // expected-error@+3 {{no matching member function for call to 'copy_from'}}
-  // expected-note@CL/sycl/INTEL/esimd/esimd.hpp:514 {{}}
-  // expected-note@CL/sycl/INTEL/esimd/esimd.hpp:509 {{}}
+  // expected-note@CL/sycl/INTEL/esimd/esimd.hpp:499 {{}}
+  // expected-note@CL/sycl/INTEL/esimd/esimd.hpp:511 {{}}
   v.copy_from(buf, 0);
 }
 
@@ -69,7 +69,7 @@ SYCL_EXTERNAL void kernel5(
     SYCL_ESIMD_FUNCTION {
   simd<int, 32> v(0, 1);
   // expected-error@+3 {{no matching member function for call to 'copy_to'}}
-  // expected-note@CL/sycl/INTEL/esimd/esimd.hpp:497 {{}}
-  // expected-note@CL/sycl/INTEL/esimd/esimd.hpp:525 {{}}
+  // expected-note@CL/sycl/INTEL/esimd/esimd.hpp:516 {{}}
+  // expected-note@CL/sycl/INTEL/esimd/esimd.hpp:527 {{}}
   v.copy_to(buf, 0);
 }