Merge pull request #1064 from dklochkov-emb/current-device-tests

Add tests for sycl_ext_oneapi_current_device

Author: bader

CMakeLists.txt

@@ -122,6 +122,10 @@ add_cts_option(SYCL_CTS_ENABLE_EXT_ONEAPI_LOCAL_MEMORY_TESTS
     "Enable extension oneAPI local_memory tests" OFF
     FORCE_ON ${SYCL_CTS_ENABLE_EXT_ONEAPI_TESTS})
 
+add_cts_option(SYCL_CTS_ENABLE_EXT_ONEAPI_CURRENT_DEVICE_TESTS
+    "Enable extension oneAPI current_device tests" OFF
+    FORCE_ON ${SYCL_CTS_ENABLE_EXT_ONEAPI_TESTS})
+
 add_cts_option(SYCL_CTS_ENABLE_KHR_DEFAULT_CONTEXT_TESTS
     "Enable extension Khronos default_context tests" OFF
     FORCE_ON ${SYCL_CTS_ENABLE_KHR_TESTS})

tests/extension/oneapi_current_device/CMakeLists.txt

@@ -0,0 +1,5 @@
+if(SYCL_CTS_ENABLE_EXT_ONEAPI_CURRENT_DEVICE_TESTS)
+    file(GLOB test_cases_list *.cpp)
+
+    add_cts_test(${test_cases_list})
+endif()

tests/extension/oneapi_current_device/current_device.cpp

@@ -0,0 +1,113 @@
+/*******************************************************************************
+//
+//  SYCL 2020 Conformance Test Suite
+//
+//  Copyright (c) 2025 The Khronos Group Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+*******************************************************************************/
+
+#include "../../common/common.h"
+#include <thread>
+
+namespace current_device::tests {
+
+TEST_CASE(
+    "Test for \"get_current_device\" gets default device, calls function and "
+    "compares devices") {
+#ifndef SYCL_EXT_ONEAPI_CURRENT_DEVICE
+  SKIP(
+      "The sycl_ext_oneapi_current_device extension is not supported "
+      "by this implementation");
+#else
+  if (sycl::device::get_devices().size() < 1) {
+    SKIP("Test requires at least one device");
+  }
+  const sycl::device default_device{sycl::default_selector_v};
+  const auto current_device =
+      sycl::ext::oneapi::experimental::this_thread::get_current_device();
+  CHECK(
+      std::is_same_v<std::remove_cv_t<decltype(current_device)>, sycl::device>);
+  CHECK(default_device == current_device);
+#endif
+}
+
+TEST_CASE(
+    "Test for \"set_current_device and get_current_device\" checks that "
+    "get_current_device function returns the device set by "
+    "set_current_device function") {
+#ifndef SYCL_EXT_ONEAPI_CURRENT_DEVICE
+  SKIP(
+      "The sycl_ext_oneapi_current_device extension is not supported by this "
+      "implementation");
+#else
+  for (const auto& device : sycl::device::get_devices()) {
+    sycl::ext::oneapi::experimental::this_thread::set_current_device(device);
+    const auto current_device =
+        sycl::ext::oneapi::experimental::this_thread::get_current_device();
+    CHECK(std::is_same_v<std::remove_cv_t<decltype(current_device)>,
+                         sycl::device>);
+    CHECK(device == current_device);
+  }
+#endif
+}
+
+void thread_callback(const sycl::device& device_to_set,
+                     sycl::device& current_device) {
+  sycl::ext::oneapi::experimental::this_thread::set_current_device(
+      device_to_set);
+  current_device =
+      sycl::ext::oneapi::experimental::this_thread::get_current_device();
+}
+
+TEST_CASE(
+    "Test for calling \"set_current_device and get_current_device in "
+    "different threads\", checks that each thread has its own current device") {
+#ifndef SYCL_EXT_ONEAPI_CURRENT_DEVICE
+  SKIP(
+      "The sycl_ext_oneapi_current_device extension is not supported "
+      "by this implementation");
+#else
+  const auto devices = sycl::device::get_devices();
+  if (devices.size() < 2) {
+    SKIP("Test requires at least two devices");
+  }
+  const auto t1_device_to_set = devices[0];
+  const auto t2_device_to_set = devices[1];
+  sycl::device t1_current_device;
+  sycl::device t2_current_device;
+
+  std::thread t1([&t1_device_to_set, &t1_current_device]() {
+    sycl::ext::oneapi::experimental::this_thread::set_current_device(
+        t1_device_to_set);
+    t1_current_device =
+        sycl::ext::oneapi::experimental::this_thread::get_current_device();
+  });
+  std::thread t2([&t2_device_to_set, &t2_current_device]() {
+    sycl::ext::oneapi::experimental::this_thread::set_current_device(
+        t2_device_to_set);
+    t2_current_device =
+        sycl::ext::oneapi::experimental::this_thread::get_current_device();
+  });
+
+  t1.join();
+  t2.join();
+
+  CHECK(t1_current_device == t1_device_to_set);
+  CHECK(t2_current_device == t2_device_to_set);
+  CHECK(t1_current_device != t2_current_device);
+
+#endif
+}
+}  // namespace current_device::tests