Merge pull request KhronosGroup#930 from jiezzhang/main-20241209

main 20241209

Author: jiezzhang

CMakeLists.txt

@@ -106,6 +106,10 @@ add_cts_option(SYCL_CTS_ENABLE_EXT_ONEAPI_ENQUEUE_FUNCTIONS_TESTS
     "Enable extension oneAPI enqueue_functions tests" OFF
     FORCE_ON ${SYCL_CTS_ENABLE_EXT_ONEAPI_TESTS})
 
+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_KHR_DEFAULT_CONTEXT_TESTS
     "Enable extension Khronos default_context tests" OFF
     FORCE_ON ${SYCL_CTS_ENABLE_KHR_TESTS})

cmake/AddSYCLExecutable.cmake

@@ -1,8 +1,8 @@
-set (KNOWN_SYCL_IMPLEMENTATIONS "Intel_SYCL;DPCPP;hipSYCL")
-if (NOT ${SYCL_IMPLEMENTATION} IN_LIST KNOWN_SYCL_IMPLEMENTATIONS)
+set (KNOWN_SYCL_IMPLEMENTATIONS "DPCPP;hipSYCL")
+if ("${SYCL_IMPLEMENTATION}" STREQUAL "" OR NOT ${SYCL_IMPLEMENTATION} IN_LIST KNOWN_SYCL_IMPLEMENTATIONS)
     message(FATAL_ERROR
         "The SYCL CTS requires specifying a SYCL implementation with "
-        "-DSYCL_IMPLEMENTATION=[Intel_SYCL,DPCPP;hipSYCL]")
+        "-DSYCL_IMPLEMENTATION=[DPCPP;hipSYCL]")
 endif()
 
 if(NOT TARGET OpenCL_Proxy)
@@ -13,11 +13,7 @@ if(NOT TARGET OpenCL_Proxy)
     )
 endif()
 
-if(${SYCL_IMPLEMENTATION} STREQUAL "Intel_SYCL")
-    set(CANONICAL_SYCL_IMPLEMENTATION "DPCPP")
-else()
-    string(TOUPPER ${SYCL_IMPLEMENTATION} CANONICAL_SYCL_IMPLEMENTATION)
-endif()
+string(TOUPPER ${SYCL_IMPLEMENTATION} CANONICAL_SYCL_IMPLEMENTATION)
 
 find_package(${SYCL_IMPLEMENTATION} REQUIRED)
 find_file(SYCL_IMPLEMENTATION_ADAPTER

cmake/FindIntel_SYCL.cmake

@@ -827,6 +827,12 @@
       "folder": "buffer",
       "source": "buffer_storage_fp64"
    },
+   "constant_evaluation": {
+      "binary": "test_language",
+      "catch2": 1,
+      "folder": "language",
+      "source": "constant_evaluation"
+   },
    "context_api": {
       "binary": "test_context",
       "catch2": 0,
@@ -6449,6 +6455,12 @@
       "folder": "extension/oneapi_kernel_compiler_spirv",
       "source": "kernel_compiler_spirv"
    },
+   "oneapi_local_memory-local_memory": {
+      "binary": "test_oneapi_local_memory",
+      "catch2": 1,
+      "folder": "extension/oneapi_local_memory",
+      "source": "local_memory"
+   },
    "oneapi_memcpy2d-memcpy2d_handler_core": {
       "binary": "test_oneapi_memcpy2d",
       "catch2": 1,

intel_test_drivers/case.json

@@ -0,0 +1,10 @@
+<?xml version="1.0" ?>
+<test driverID="sycl_cts" name="TEMPLATE">
+  <description>WARNING: DON'T UPDATE THIS FILE MANUALLY!!!
+      This is auto-generated accessors configuration file which affects all tests in ported gcc suites
+      If you have any issue with this file please contact Compiler QA team</description>
+  <files>
+    <file path="tests/language" dst="tests/language"/>
+  </files>
+  <rules/>
+</test>

intel_test_drivers/config/TEMPLATE_language.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" ?>
+<test driverID="sycl_cts" name="TEMPLATE">
+  <description>WARNING: DON'T UPDATE THIS FILE MANUALLY!!!
+      This is auto-generated accessors configuration file which affects all tests in ported gcc suites
+      If you have any issue with this file please contact Compiler QA team</description>
+  <files>
+    <file path="tests/extension" dst="tests/extension"/>
+  </files>
+  <rules/>
+</test>