Use full qualifier sycl::device to fix compilation error

Added ifdefs around changes needed to work with both newer
OS compiler and current oneAPI DPC++

Author: oleksandr-pavlyk

libsyclinterface/tests/test_helper.cpp

@@ -45,9 +45,12 @@ TEST_F(TestHelperFns, ChkDeviceTypeToStr)
         res = DPCTL_DeviceTypeToStr(sycl::info::device_type::gpu));
     ASSERT_TRUE(res == "gpu");
 
+#if __SYCL_COMPILER_VERSION < __SYCL_COMPILER_2023_SWITCHOVER
     EXPECT_NO_FATAL_FAILURE(
         res = DPCTL_DeviceTypeToStr(sycl::info::device_type::host));
+    // since host device is being deprecated in SYCL 2020, accept unknown
     ASSERT_TRUE(res == "host");
+#endif
 
     EXPECT_NO_FATAL_FAILURE(
         res = DPCTL_DeviceTypeToStr(sycl::info::device_type::custom));
@@ -72,8 +75,10 @@ TEST_F(TestHelperFns, ChkStrToDeviceType)
     EXPECT_NO_FATAL_FAILURE(dev_type = DPCTL_StrToDeviceType("gpu"));
     ASSERT_TRUE(dev_type == sycl::info::device_type::gpu);
 
+#if __SYCL_COMPILER_VERSION < __SYCL_COMPILER_2023_SWITCHOVER
     EXPECT_NO_FATAL_FAILURE(dev_type = DPCTL_StrToDeviceType("host"));
     ASSERT_TRUE(dev_type == sycl::info::device_type::host);
+#endif
 
     EXPECT_NO_FATAL_FAILURE(dev_type = DPCTL_StrToDeviceType("accelerator"));
     ASSERT_TRUE(dev_type == sycl::info::device_type::accelerator);
@@ -92,9 +97,11 @@ TEST_F(TestHelperFns, ChkDPCTLBackendTypeToSyclBackend)
                                 DPCTLSyclBackendType::DPCTL_CUDA));
     ASSERT_TRUE(res == sycl::backend::ext_oneapi_cuda);
 
+#if __SYCL_COMPILER_VERSION < __SYCL_COMPILER_2023_SWITCHOVER
     EXPECT_NO_FATAL_FAILURE(res = DPCTL_DPCTLBackendTypeToSyclBackend(
                                 DPCTLSyclBackendType::DPCTL_HOST));
     ASSERT_TRUE(res == sycl::backend::host);
+#endif
 
     EXPECT_NO_FATAL_FAILURE(res = DPCTL_DPCTLBackendTypeToSyclBackend(
                                 DPCTLSyclBackendType::DPCTL_OPENCL));
@@ -121,9 +128,11 @@ TEST_F(TestHelperFns, ChkSyclBackendToDPCTLBackendType)
         DTy = DPCTL_SyclBackendToDPCTLBackendType(sycl::backend::opencl));
     ASSERT_TRUE(DTy == DPCTLSyclBackendType::DPCTL_OPENCL);
 
+#if __SYCL_COMPILER_VERSION < __SYCL_COMPILER_2023_SWITCHOVER
     EXPECT_NO_FATAL_FAILURE(
         DTy = DPCTL_SyclBackendToDPCTLBackendType(sycl::backend::host));
     ASSERT_TRUE(DTy == DPCTLSyclBackendType::DPCTL_HOST);
+#endif
 
     EXPECT_NO_FATAL_FAILURE(DTy = DPCTL_SyclBackendToDPCTLBackendType(
                                 sycl::backend::ext_oneapi_cuda));
@@ -154,9 +163,11 @@ TEST_F(TestHelperFns, ChkDPCTLDeviceTypeToSyclDeviceType)
                                 DPCTLSyclDeviceType::DPCTL_CUSTOM));
     ASSERT_TRUE(dev_type == sycl::info::device_type::custom);
 
+#if __SYCL_COMPILER_VERSION < __SYCL_COMPILER_2023_SWITCHOVER
     EXPECT_NO_FATAL_FAILURE(dev_type = DPCTL_DPCTLDeviceTypeToSyclDeviceType(
                                 DPCTLSyclDeviceType::DPCTL_HOST_DEVICE));
     ASSERT_TRUE(dev_type == sycl::info::device_type::host);
+#endif
 
     EXPECT_NO_FATAL_FAILURE(dev_type = DPCTL_DPCTLDeviceTypeToSyclDeviceType(
                                 DPCTLSyclDeviceType::DPCTL_AUTOMATIC));
@@ -179,9 +190,11 @@ TEST_F(TestHelperFns, SyclDeviceTypeToDPCTLDeviceType)
                                 sycl::info::device_type::gpu));
     ASSERT_TRUE(DTy == DPCTLSyclDeviceType::DPCTL_GPU);
 
+#if __SYCL_COMPILER_VERSION < __SYCL_COMPILER_2023_SWITCHOVER
     EXPECT_NO_FATAL_FAILURE(DTy = DPCTL_SyclDeviceTypeToDPCTLDeviceType(
                                 sycl::info::device_type::host));
     ASSERT_TRUE(DTy == DPCTLSyclDeviceType::DPCTL_HOST_DEVICE);
+#endif
 
     EXPECT_NO_FATAL_FAILURE(DTy = DPCTL_SyclDeviceTypeToDPCTLDeviceType(
                                 sycl::info::device_type::accelerator));

libsyclinterface/tests/test_sycl_device_aspects.cpp

@@ -163,7 +163,7 @@ struct TestDPCTLSyclDeviceInterfaceAspects
         EXPECT_NO_FATAL_FAILURE(DRef = DPCTLDevice_CreateFromSelector(DSRef));
         if (!DRef)
             GTEST_SKIP_("Device not found");
-        auto D = unwrap<device>(DRef);
+        auto D = unwrap<sycl::device>(DRef);
         auto syclAspect = GetParam().second.second;
         try {
             hasAspect = D->has(syclAspect);

libsyclinterface/tests/test_sycl_device_manager.cpp

@@ -24,6 +24,7 @@
 ///
 //===----------------------------------------------------------------------===//
 
+#include "dpctl_device_selection.hpp"
 #include "dpctl_sycl_device_interface.h"
 #include "dpctl_sycl_device_manager.h"
 #include "dpctl_sycl_device_selector_interface.h"
@@ -32,6 +33,8 @@
 #include <gtest/gtest.h>
 #include <string>
 
+using dpctl::syclinterface::dpctl_default_selector;
+
 struct TestDPCTLDeviceManager : public ::testing::TestWithParam<const char *>
 {
     DPCTLSyclDeviceSelectorRef DSRef = nullptr;

libsyclinterface/tests/test_sycl_event_interface.cpp

@@ -24,6 +24,7 @@
 ///
 //===----------------------------------------------------------------------===//
 
+#include "Config/dpctl_config.h"
 #include "dpctl_sycl_event_interface.h"
 #include "dpctl_sycl_types.h"
 #include <CL/sycl.hpp>
@@ -156,7 +157,12 @@ TEST_F(TestDPCTLSyclEventInterface, ChkGetCommandExecutionStatus)
 TEST_F(TestDPCTLSyclEventInterface, CheckGetProfiling)
 {
     property_list propList{property::queue::enable_profiling()};
+
+#if __SYCL_COMPILER_VERSION >= __SYCL_COMPILER_2023_SWITCHOVER
+    queue Q(cpu_selector_v, propList);
+#else
     queue Q(cpu_selector(), propList);
+#endif
     auto eA = Q.submit(
         [&](handler &h) { h.parallel_for(1000, [=](id<1>) { /*...*/ }); });
     DPCTLSyclEventRef ERef = reinterpret_cast<DPCTLSyclEventRef>(&eA);

libsyclinterface/tests/test_sycl_queue_interface.cpp

@@ -24,6 +24,7 @@
 ///
 //===----------------------------------------------------------------------===//
 
+#include "Config/dpctl_config.h"
 #include "dpctl_sycl_context_interface.h"
 #include "dpctl_sycl_device_interface.h"
 #include "dpctl_sycl_device_manager.h"
@@ -355,9 +356,11 @@ TEST_P(TestDPCTLQueueMemberFunctions, CheckGetBackend)
     case DPCTL_CUDA:
         EXPECT_TRUE(Backend == backend::ext_oneapi_cuda);
         break;
+#if __SYCL_COMPILER_VERSION < __SYCL_COMPILER_2023_SWITCHOVER
     case DPCTL_HOST:
         EXPECT_TRUE(Backend == backend::host);
         break;
+#endif
     case DPCTL_LEVEL_ZERO:
         EXPECT_TRUE(Backend == backend::ext_oneapi_level_zero);
         break;