backend::level_zero -> backend::ext_oneapi_level_zero

Author: oleksandr-pavlyk

libsyclinterface/helper/source/dpctl_utils_helper.cpp

@@ -93,7 +93,7 @@ backend DPCTL_DPCTLBackendTypeToSyclBackend(DPCTLSyclBackendType BeTy)
     case DPCTLSyclBackendType::DPCTL_HOST:
         return backend::host;
     case DPCTLSyclBackendType::DPCTL_LEVEL_ZERO:
-        return backend::level_zero;
+        return backend::ext_oneapi_level_zero;
     case DPCTLSyclBackendType::DPCTL_OPENCL:
         return backend::opencl;
     case DPCTLSyclBackendType::DPCTL_ALL_BACKENDS:
@@ -110,7 +110,7 @@ DPCTLSyclBackendType DPCTL_SyclBackendToDPCTLBackendType(backend B)
         return DPCTLSyclBackendType::DPCTL_CUDA;
     case backend::host:
         return DPCTLSyclBackendType::DPCTL_HOST;
-    case backend::level_zero:
+    case backend::ext_oneapi_level_zero:
         return DPCTLSyclBackendType::DPCTL_LEVEL_ZERO;
     case backend::opencl:
         return DPCTLSyclBackendType::DPCTL_OPENCL;

libsyclinterface/source/dpctl_sycl_context_interface.cpp

@@ -194,7 +194,7 @@ DPCTLContext_GetBackend(__dpctl_keep const DPCTLSyclContextRef CtxRef)
         return DPCTL_HOST;
     case backend::opencl:
         return DPCTL_OPENCL;
-    case backend::level_zero:
+    case backend::ext_oneapi_level_zero:
         return DPCTL_LEVEL_ZERO;
     case backend::cuda:
         return DPCTL_CUDA;

libsyclinterface/source/dpctl_sycl_program_interface.cpp

@@ -146,7 +146,7 @@ createLevelZeroInterOpProgram(const context &SyclCtx,
                               size_t length,
                               const char *CompileOpts)
 {
-    auto ZeCtx = get_native<backend::level_zero>(SyclCtx);
+    auto ZeCtx = get_native<backend::ext_oneapi_level_zero>(SyclCtx);
     auto SyclDevices = SyclCtx.get_devices();
     if (SyclDevices.size() > 1) {
         error_handler("Level zero program can be created for only one device.",
@@ -168,7 +168,7 @@ createLevelZeroInterOpProgram(const context &SyclCtx,
     ZeModuleDesc.pBuildFlags = CompileOpts;
     ZeModuleDesc.pConstants = &ZeSpecConstants;
 
-    auto ZeDevice = get_native<backend::level_zero>(SyclDevices[0]);
+    auto ZeDevice = get_native<backend::ext_oneapi_level_zero>(SyclDevices[0]);
     ze_module_handle_t ZeModule;
 
     auto stZeModuleCreateF = getZeModuleCreateFn();
@@ -189,8 +189,9 @@ createLevelZeroInterOpProgram(const context &SyclCtx,
 
     // Create the Sycl program from the ZeModule
     try {
-        auto ZeProgram = new program(sycl::level_zero::make_program(
-            SyclCtx, reinterpret_cast<uintptr_t>(ZeModule)));
+        auto ZeProgram =
+            new program(sycl::ext::oneapi::level_zero::make_program(
+                SyclCtx, reinterpret_cast<uintptr_t>(ZeModule)));
         return wrap(ZeProgram);
     } catch (std::exception const &e) {
         error_handler(e, __FILE__, __func__, __LINE__);

libsyclinterface/tests/test_helper.cpp

@@ -86,7 +86,7 @@ TEST_F(TestHelperFns, ChkStrToDeviceType)
 
 TEST_F(TestHelperFns, ChkDPCTLBackendTypeToSyclBackend)
 {
-    sycl::backend res = sycl::backend::level_zero;
+    sycl::backend res = sycl::backend::ext_oneapi_level_zero;
 
     EXPECT_NO_FATAL_FAILURE(res = DPCTL_DPCTLBackendTypeToSyclBackend(
                                 DPCTLSyclBackendType::DPCTL_CUDA));
@@ -102,7 +102,7 @@ TEST_F(TestHelperFns, ChkDPCTLBackendTypeToSyclBackend)
 
     EXPECT_NO_FATAL_FAILURE(res = DPCTL_DPCTLBackendTypeToSyclBackend(
                                 DPCTLSyclBackendType::DPCTL_LEVEL_ZERO));
-    ASSERT_TRUE(res == sycl::backend::level_zero);
+    ASSERT_TRUE(res == sycl::backend::ext_oneapi_level_zero);
 
     EXPECT_THROW(DPCTL_DPCTLBackendTypeToSyclBackend(
                      DPCTLSyclBackendType::DPCTL_UNKNOWN_BACKEND),
@@ -113,8 +113,8 @@ TEST_F(TestHelperFns, ChkSyclBackendToDPCTLBackendType)
 {
     DPCTLSyclBackendType DTy = DPCTLSyclBackendType::DPCTL_UNKNOWN_BACKEND;
 
-    EXPECT_NO_FATAL_FAILURE(
-        DTy = DPCTL_SyclBackendToDPCTLBackendType(sycl::backend::level_zero));
+    EXPECT_NO_FATAL_FAILURE(DTy = DPCTL_SyclBackendToDPCTLBackendType(
+                                sycl::backend::ext_oneapi_level_zero));
     ASSERT_TRUE(DTy == DPCTLSyclBackendType::DPCTL_LEVEL_ZERO);
 
     EXPECT_NO_FATAL_FAILURE(

libsyclinterface/tests/test_sycl_queue_interface.cpp

@@ -358,7 +358,7 @@ TEST_P(TestDPCTLQueueMemberFunctions, CheckGetBackend)
         EXPECT_TRUE(Backend == backend::host);
         break;
     case DPCTL_LEVEL_ZERO:
-        EXPECT_TRUE(Backend == backend::level_zero);
+        EXPECT_TRUE(Backend == backend::ext_oneapi_level_zero);
         break;
     case DPCTL_OPENCL:
         EXPECT_TRUE(Backend == backend::opencl);