Merge branch 'main' into khr_queue_flush

Author: TApplencourt

CMakeLists.txt

@@ -88,10 +88,6 @@ add_cts_option(SYCL_CTS_ENABLE_EXT_ONEAPI_QUEUE_EMPTY
     "Enable extension oneAPI queue_empty tests" OFF
     FORCE_ON ${SYCL_CTS_ENABLE_EXT_ONEAPI_TESTS})
 
-add_cts_option(SYCL_CTS_ENABLE_EXT_ONEAPI_DISCARD_QUEUE_EVENTS_TESTS
-    "Enable extension oneAPI discard_queue_events tests" OFF
-    FORCE_ON ${SYCL_CTS_ENABLE_EXT_ONEAPI_TESTS})
-
 add_cts_option(SYCL_CTS_ENABLE_EXT_ONEAPI_BFLOAT16_TESTS
     "Enable extension oneAPI bfloat16 tests" OFF
     FORCE_ON ${SYCL_CTS_ENABLE_EXT_ONEAPI_TESTS})
@@ -148,8 +144,17 @@ add_cts_option(SYCL_CTS_ENABLE_KHR_QUEUE_EMPTY_QUERY_TESTS
     "Enable extension Khronos queue_empty_query tests" OFF
     FORCE_ON ${SYCL_CTS_ENABLE_KHR_TESTS})
 
+<<<<<<< khr_queue_flush
 add_cts_option(SYCL_CTS_ENABLE_KHR_QUEUE_FLUSH_TESTS
     "Enable extension Khronos queue_flush tests" OFF
+=======
+add_cts_option(SYCL_CTS_ENABLE_KHR_MAX_WORK_GROUP_QUERIES_TESTS
+    "Enable extension Khronos max_work_group_query tests" OFF
+    FORCE_ON ${SYCL_CTS_ENABLE_KHR_TESTS})
+    
+add_cts_option(SYCL_CTS_ENABLE_KHR_WORK_ITEM_QUERIES_TESTS
+    "Enable extension Khronos work_item_queries tests" OFF
+>>>>>>> main
     FORCE_ON ${SYCL_CTS_ENABLE_KHR_TESTS})
 
 # TODO: Deprecated - remove

test_plans/khr/sycl_khr_work_item_queries.asciidoc

@@ -0,0 +1,57 @@
+:sectnums:
+:xrefstyle: short
+
+= Test plan for SYCL extension KHR work item queries
+
+This is a test plan for an extension that defines a new interface for groups
+described in
+https://github.com/KhronosGroup/SYCL-Docs/blob/f972f91ef7676c1423eb8402974e1682411903eb/adoc/extensions/sycl_khr_work_item_queries.adoc[sycl_khr_work_item_queries].
+
+== Testing scope
+
+=== Device coverage
+
+All of the tests described below are performed only on the default device that
+is selected on the CTS command line.
+
+=== Feature test macro
+
+The tests should statically check that the `SYCL_KHR_WORK_ITEM_QUERIES` macro is
+defined.
+
+== Tests
+
+The test cases should test the interface of each of the free functions defined
+in the extension:
+
+* `sycl::khr::this_nd_item`
+* `sycl::khr::this_group`
+* `sycl::khr::work_item<sycl::khr::sub_group>`
+
+Each test case should run ND-range kernels with `Dimensions` equal to 1, 2,
+and 3.
+
+=== Test description
+
+In the following tests, `Dimensions` is the number of dimensions of the kernel
+being tested. Equality checks in the kernels should set a value in a buffer or
+USM allocation that is then checked on the host.
+
+==== `sycl::khr::this_nd_item` function
+
+In the kernel scope, the test should call
+`sycl::khr::this_nd_item<Dimensions>()` to get an `nd_item<Dimensions>` and
+check that it's equal to the one passed as a parameter to the kernel.
+
+==== `sycl::khr::this_group` function
+
+In the kernel scope, the test should call `sycl::khr::this_group<Dimensions>()`
+to get an `nd_item<Dimensions>` and check that it's equal to the one obtained
+from the kernel's `nd_item` using the `nd_item::get_group` member function.
+
+==== `sycl::khr::this_sub_group` class
+
+In the kernel scope, the test should use function to get a `sub_group` and check
+that it's equal to the one obtained from the kernel's `nd_item` using the
+`nd_item::get_sub_group` member function.
+

test_plans/oneapi/discard_queue_events.asciidoc

@@ -68,6 +68,7 @@ endfunction()
 function(get_no_vec_alias_type OUT_LIST)
   set(NO_VEC_ALIAS_LIST "")
   list(APPEND NO_VEC_ALIAS_LIST sycl::byte)
+  list(APPEND NO_VEC_ALIAS_LIST std::byte)
 
   set(${OUT_LIST} ${${OUT_LIST}} ${NO_VEC_ALIAS_LIST} PARENT_SCOPE)
 endfunction()

tests/CMakeLists.txt

@@ -328,8 +328,8 @@ struct check_local_accessor_api_dim<generic_path_t> {
     // Do not run atomic64 checks
 #if SYCL_CTS_ENABLE_VERBOSE_LOG
     constexpr auto mode = sycl::access_mode::atomic;
-    log_accessor<T, kernelName, dims, mode, target>(
-        "skip_local_accessor_atomic64", typeName, log);
+    log_accessor<T, dims, mode, target>("skip_local_accessor_atomic64",
+                                        typeName, log);
 #else
     static_cast<void>(log);
     static_cast<void>(typeName);

tests/accessor_legacy/accessor_api_local_common.h

@@ -9,7 +9,6 @@
 #define TEST_NAME address_space_fp16
 
 #include "../common/common.h"
-#include "./../../util/extensions.h"
 #include "address_space_common.h"
 
 namespace TEST_NAMESPACE {
@@ -24,9 +23,12 @@ class TEST_NAME : public sycl_cts::util::test_base {
   void run(util::logger &log) override {
     auto queue = util::get_cts_object::queue();
 
-    using availability =
-        util::extensions::availability<util::extensions::tag::fp16>;
-    if (!availability::check(queue, log)) return;
+    if (!queue.get_device().has(sycl::aspect::fp16)) {
+      WARN(
+          "Device doesn't support half precision floating point data type - "
+          "skipping the test");
+      return;
+    }
 
     test_types<sycl::half>(log);
   }

tests/address_space/address_space_fp16.cpp

@@ -9,7 +9,6 @@
 #define TEST_NAME address_space_fp64
 
 #include "../common/common.h"
-#include "./../../util/extensions.h"
 #include "address_space_common.h"
 
 namespace TEST_NAMESPACE {
@@ -24,9 +23,12 @@ class TEST_NAME : public sycl_cts::util::test_base {
   void run(util::logger &log) override {
     auto queue = util::get_cts_object::queue();
 
-    using availability =
-        util::extensions::availability<util::extensions::tag::fp64>;
-    if (!availability::check(queue, log)) return;
+    if (!queue.get_device().has(sycl::aspect::fp64)) {
+      WARN(
+          "Device doesn't support double precision floating point data type - "
+          "skipping the test");
+      return;
+    }
 
     test_types<double>(log);
   }