rebase

Signed-off-by: Sergey V Maslov <[email protected]>

Author: smaslov-intel

sycl/include/sycl/ext/oneapi/backend/level_zero.hpp

@@ -60,35 +60,39 @@ struct interop<backend::level_zero,
   using type = ze_image_handle_t;
 };
 
+namespace ext {
+namespace oneapi {
 namespace level_zero {
 // Since Level-Zero is not doing any reference counting itself, we have to
 // be explicit about the ownership of the native handles used in the
 // interop functions below.
 //
 enum class ownership { transfer, keep };
 } // namespace level_zero
+} // namespace oneapi
+} // namespace ext
 
 namespace detail {
 
 template <> struct BackendInput<backend::level_zero, context> {
   using type = struct {
     interop<backend::level_zero, context>::type NativeHandle;
     std::vector<device> DeviceList;
-    level_zero::ownership Ownership;
+    ext::oneapi::level_zero::ownership Ownership;
   };
 };
 
 template <> struct BackendInput<backend::level_zero, queue> {
   using type = struct {
     interop<backend::level_zero, queue>::type NativeHandle;
-    level_zero::ownership Ownership;
+    ext::oneapi::level_zero::ownership Ownership;
   };
 };
 
 template <> struct BackendInput<backend::level_zero, event> {
   using type = struct {
     interop<backend::level_zero, event>::type NativeHandle;
-    level_zero::ownership Ownership;
+    ext::oneapi::level_zero::ownership Ownership;
   };
 };
 
@@ -118,6 +122,8 @@ template <> struct InteropFeatureSupportMap<backend::level_zero> {
 };
 } // namespace detail
 
+namespace ext {
+namespace oneapi {
 namespace level_zero {
 // Implementation of various "make" functions resides in libsycl.so and thus
 // their interface needs to be backend agnostic.
@@ -204,38 +210,40 @@ T make(const context &Context,
                     Ownership == ownership::keep);
 }
 } // namespace level_zero
+} // namespace oneapi
+} // namespace ext
 
 // Specialization of sycl::make_context for Level-Zero backend.
 template <>
 context make_context<backend::level_zero>(
     const backend_input_t<backend::level_zero, context> &BackendObject,
     const async_handler &Handler) {
-  return level_zero::make_context(
+  return ext::oneapi::level_zero::make_context(
       BackendObject.DeviceList,
       detail::pi::cast<pi_native_handle>(BackendObject.NativeHandle),
-      BackendObject.Ownership == level_zero::ownership::keep);
+      BackendObject.Ownership == ext::oneapi::level_zero::ownership::keep);
 }
 
 // Specialization of sycl::make_queue for Level-Zero backend.
 template <>
 queue make_queue<backend::level_zero>(
     const backend_input_t<backend::level_zero, queue> &BackendObject,
     const context &TargetContext, const async_handler Handler) {
-  return level_zero::make_queue(
+  return ext::oneapi::level_zero::make_queue(
       TargetContext,
       detail::pi::cast<pi_native_handle>(BackendObject.NativeHandle),
-      BackendObject.Ownership == level_zero::ownership::keep);
+      BackendObject.Ownership == ext::oneapi::level_zero::ownership::keep);
 }
 
 // Specialization of sycl::make_event for Level-Zero backend.
 template <>
 event make_event<backend::level_zero>(
     const backend_input_t<backend::level_zero, event> &BackendObject,
     const context &TargetContext) {
-  return level_zero::make_event(
+  return ext::oneapi::level_zero::make_event(
       TargetContext,
       detail::pi::cast<pi_native_handle>(BackendObject.NativeHandle),
-      BackendObject.Ownership == level_zero::ownership::keep);
+      BackendObject.Ownership == ext::oneapi::level_zero::ownership::keep);
 }
 
 // TODO: remove this specialization when generic is changed to call

sycl/test/basic_tests/interop-level-zero-2020.cpp

@@ -94,8 +94,8 @@ int main() {
   // expected-warning@+2 {{'get_native' is deprecated: Use SYCL 2020 sycl::get_native free function}}
   // expected-warning@+1 {{'get_native<sycl::backend::ext_oneapi_level_zero>' is deprecated: Use SYCL 2020 sycl::get_native free function}}
   ZeProgram = Program.get_native<backend::ext_oneapi_level_zero>();
-  // expected-warning@+2 {{'get_native' is deprecated: Use SYCL 2020 sycl::get_native free function}}
-  // expected-warning@+1 {{'get_native<sycl::backend::ext_oneapi_level_zero>' is deprecated: Use SYCL 2020 sycl::get_native free function}}
+  // expected-warning@+3 {{'get_native' is deprecated: Use SYCL 2020 sycl::get_native free function}}
+  // expected-warning@+2 {{'get_native<sycl::backend::ext_oneapi_level_zero>' is deprecated: Use SYCL 2020 sycl::get_native free function}}
   /*ZeKernelBundle*/ (
       void)KernelBundle.get_native<backend::ext_oneapi_level_zero>();
 
@@ -127,36 +127,37 @@ int main() {
 
   backend_input_t<backend::ext_oneapi_level_zero, context> InteropContextInput{
       ZeContext, std::vector<device>(1, InteropDevice),
-      level_zero::ownership::keep};
+      ext::oneapi::level_zero::ownership::keep};
   context InteropContext =
       make_context<backend::ext_oneapi_level_zero>(InteropContextInput);
 
   queue InteropQueue = make_queue<backend::ext_oneapi_level_zero>(
-      {ZeQueue, level_zero::ownership::keep}, Context);
+      {ZeQueue, ext::oneapi::level_zero::ownership::keep}, Context);
   event InteropEvent = make_event<backend::ext_oneapi_level_zero>(
-      {ZeEvent, level_zero::ownership::keep}, Context);
+      {ZeEvent, ext::oneapi::level_zero::ownership::keep}, Context);
   kernel_bundle<bundle_state::executable> InteropKernelBundle =
       make_kernel_bundle<backend::ext_oneapi_level_zero,
                          bundle_state::executable>(ZeKernelBundle.front(),
                                                    Context);
 
   // Check deprecated
   // expected-warning@+1 {{'make<sycl::platform, nullptr>' is deprecated: Use SYCL 2020 sycl::make_platform free function}}
-  auto P = level_zero::make<platform>(ZeDriver);
+  auto P = ext::oneapi::level_zero::make<platform>(ZeDriver);
   // expected-warning@+1 {{'make<sycl::device, nullptr>' is deprecated: Use SYCL 2020 sycl::make_device free function}}
-  auto D = level_zero::make<device>(P, ZeDevice);
+  auto D = ext::oneapi::level_zero::make<device>(P, ZeDevice);
   // expected-warning@+1 {{'make<sycl::context, nullptr>' is deprecated: Use SYCL 2020 sycl::make_context free function}}
-  auto C = level_zero::make<context>(std::vector<device>(1, D), ZeContext,
-                                     level_zero::ownership::keep);
-  // expected-warning@+2 {{'make<sycl::queue, nullptr>' is deprecated: Use SYCL 2020 sycl::make_queue free function}}
-  auto Q =
-      level_zero::make<queue>(Context, ZeQueue, level_zero::ownership::keep);
-  // expected-warning@+2 {{'make<sycl::event, nullptr>' is deprecated: Use SYCL 2020 sycl::make_event free function}}
-  auto E =
-      level_zero::make<event>(Context, ZeEvent, level_zero::ownership::keep);
+  auto C = ext::oneapi::level_zero::make<context>(
+      std::vector<device>(1, D), ZeContext,
+      ext::oneapi::level_zero::ownership::keep);
+  // expected-warning@+1 {{'make<sycl::queue, nullptr>' is deprecated: Use SYCL 2020 sycl::make_queue free function}}
+  auto Q = ext::oneapi::level_zero::make<queue>(
+      Context, ZeQueue, ext::oneapi::level_zero::ownership::keep);
+  // expected-warning@+1 {{'make<sycl::event, nullptr>' is deprecated: Use SYCL 2020 sycl::make_event free function}}
+  auto E = ext::oneapi::level_zero::make<event>(
+      Context, ZeEvent, ext::oneapi::level_zero::ownership::keep);
   // expected-warning@+2 {{'program' is deprecated: program class is deprecated, use kernel_bundle instead}}
   // expected-warning@+1 {{'make<sycl::program, nullptr>' is deprecated: Use SYCL 2020 sycl::make_kernel_bundle free function}}
-  auto PR = level_zero::make<program>(Context, ZeProgram);
+  auto PR = ext::oneapi::level_zero::make<program>(Context, ZeProgram);
 
   return 0;
 }