Add support for SimSYCL as a SYCL implementation

CMakeLists.txt

@@ -1,7 +1,12 @@
 cmake_minimum_required(VERSION 3.15)
 project(sycl_cts LANGUAGES CXX)
 
-set(CMAKE_CXX_STANDARD 17)
+if(SYCL_IMPLEMENTATION STREQUAL SimSYCL)
+    set(CMAKE_CXX_STANDARD 20)
+else()
+    set(CMAKE_CXX_STANDARD 17)
+endif()
+
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS ON) # Required for hex floats in C++11 mode on gcc 6+
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")

ci/generate_exclude_filter.py

@@ -42,7 +42,7 @@ def parse_arguments():
         configuration-time test category filters for all failing targets.""")
 
     parser.add_argument('sycl_implementation', metavar="SYCL-Implementation",
-                        choices=['DPCPP', 'hipSYCL'], type=str,
+                        choices=['DPCPP', 'hipSYCL', 'SimSYCL'], type=str,
                         help="The SYCL implementation to use")
     parser.add_argument('--cmake-args', type=str,
                         help="Arguments to pass on to CMake during configuration")

ci/simsycl.filter

@@ -0,0 +1,20 @@
+accessor_legacy
+atomic
+atomic_ref_stress
+buffer
+device
+exception_handling
+handler
+image
+image_accessor
+invoke
+kernel
+kernel_args
+kernel_bundle
+math_builtin_api
+multi_ptr
+queue
+reduction
+sampler
+spec_constants
+stream

cmake/AdaptSimSYCL.cmake

@@ -0,0 +1,45 @@
+add_library(SYCL::SYCL INTERFACE IMPORTED GLOBAL)
+target_link_libraries(SYCL::SYCL INTERFACE SimSYCL::simsycl)
+# add_sycl_executable_implementation function
+# Builds a SYCL program, compiling multiple SYCL test case source files into a
+# test executable, invoking a single-source/device compiler
+# Parameters are:
+#   - NAME             Name of the test executable
+#   - OBJECT_LIBRARY   Name of the object library of all the compiled test cases
+#   - TESTS            List of SYCL test case source files to be built into the
+# test executable
+function(add_sycl_executable_implementation)
+    cmake_parse_arguments(args "" "NAME;OBJECT_LIBRARY" "TESTS" ${ARGN})
+    set(exe_name            ${args_NAME})
+    set(object_lib_name     ${args_OBJECT_LIBRARY})
+    set(test_cases_list     ${args_TESTS})
+
+    add_library(${object_lib_name} OBJECT ${test_cases_list})
+    add_executable(${exe_name} $<TARGET_OBJECTS:${object_lib_name}>)
+
+    # hipSYCL needs the macro to be called on both the object library (to
+    # override the compiler) and the executable (to override the linker).
+    add_sycl_to_target(TARGET ${object_lib_name} SOURCES ${test_cases_list})
+    add_sycl_to_target(TARGET ${exe_name})
+
+    set_target_properties(${object_lib_name} PROPERTIES
+        INCLUDE_DIRECTORIES $<TARGET_PROPERTY:${exe_name},INCLUDE_DIRECTORIES>
+        COMPILE_DEFINITIONS $<TARGET_PROPERTY:${exe_name},COMPILE_DEFINITIONS>
+        COMPILE_OPTIONS     $<TARGET_PROPERTY:${exe_name},COMPILE_OPTIONS>
+        COMPILE_FEATURES    $<TARGET_PROPERTY:${exe_name},COMPILE_FEATURES>
+        POSITION_INDEPENDENT_CODE ON)
+endfunction()
+
+function(add_sycl_to_target)
+    set(options)
+    set(one_value_keywords TARGET)
+    set(multi_value_keywords SOURCES)
+    cmake_parse_arguments(ADD_SYCL
+      "${options}"
+      "${one_value_keywords}"
+      "${multi_value_keywords}"
+      ${ARGN}
+    )
+
+    target_link_libraries(${ADD_SYCL_TARGET} PUBLIC SimSYCL::simsycl)
+endfunction()

cmake/AddSYCLExecutable.cmake

@@ -1,8 +1,8 @@
-set (KNOWN_SYCL_IMPLEMENTATIONS "Intel_SYCL;DPCPP;hipSYCL")
+set (KNOWN_SYCL_IMPLEMENTATIONS "Intel_SYCL;DPCPP;hipSYCL;SimSYCL")
 if (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=[Intel_SYCL,DPCPP;hipSYCL;SimSYCL]")
 endif()
 
 if(NOT TARGET OpenCL_Proxy)

tests/common/common.h

@@ -413,8 +413,8 @@ namespace pixel_tag {
   struct upper: generic {};
 };
 
-// hipSYCL does not yet support images
-#if !SYCL_CTS_COMPILING_WITH_HIPSYCL
+// hipSYCL and SimSYCL do not yet support images
+#if !SYCL_CTS_COMPILING_WITH_HIPSYCL && !SYCL_CTS_COMPILING_WITH_SIMSYCL
 
 /**
  * @brief Helps with retrieving the right access type for reading/writing

tests/common/disabled_for_test_case.h

@@ -53,6 +53,8 @@
 #define INTERNAL_CTS_SYCL_IMPL_DPCPP ()
 #elif SYCL_CTS_COMPILING_WITH_HIPSYCL
 #define INTERNAL_CTS_SYCL_IMPL_hipSYCL ()
+#elif SYCL_CTS_COMPILING_WITH_SIMSYCL
+#define INTERNAL_CTS_SYCL_IMPL_SimSYCL ()
 #else
 #error Unknown SYCL implementation
 #endif

tests/event/event.cpp

@@ -74,6 +74,10 @@ TEST_CASE("event::get_backend returns the associated backend", "[event]") {
 
 TEST_CASE("event::get_wait_list returns a list of all direct dependencies",
           "[event]") {
+#if SYCL_CTS_COMPILING_WITH_SIMSYCL
+    SKIP("SimSYCL does not implement asynchronous execution.");
+#endif
+
   resolvable_host_event e_a;
   resolvable_host_event e_b{{e_a.get_sycl_event()}};
   resolvable_host_event e_c;
@@ -117,6 +121,10 @@ class delayed_host_event : public resolvable_host_event {
 };
 
 TEST_CASE("event can be waited upon", "[event]") {
+#if SYCL_CTS_COMPILING_WITH_SIMSYCL
+    SKIP("SimSYCL does not implement asynchronous execution.");
+#endif
+
   // Give main thread some time to fail the did_resolve check
   delayed_host_event dhe{std::chrono::milliseconds(100)};
 
@@ -138,6 +146,10 @@ TEST_CASE("event can be waited upon", "[event]") {
 }
 
 TEST_CASE("multiple events can be waited upon simultaneously", "[event]") {
+#if SYCL_CTS_COMPILING_WITH_SIMSYCL
+    SKIP("SimSYCL does not implement asynchronous execution.");
+#endif
+
   // Give main thread some time to fail the did_resolve check
   delayed_host_event dhe1{std::chrono::milliseconds(100)};
   delayed_host_event dhe2{std::chrono::milliseconds(100)};
@@ -302,6 +314,10 @@ TEST_CASE("event::get_info returns correct command execution status",
                        sycl::info::event_command_status>(make_device_event());
 
   SECTION("for host_task event") {
+#if SYCL_CTS_COMPILING_WITH_SIMSYCL
+      SKIP("SimSYCL does not implement asynchronous execution.");
+#endif
+
     resolvable_host_event rhe;
     auto& event = rhe.get_sycl_event();
 

tests/event/event_semantics.cpp

@@ -43,6 +43,10 @@ TEST_CASE("event common reference semantics", "[event]") {
 }
 
 TEST_CASE("event common reference semantics, mutation", "[event]") {
+#if SYCL_CTS_COMPILING_WITH_SIMSYCL
+    SKIP("SimSYCL does not implement asynchronous execution.");
+#endif
+
   resolvable_host_event dependent_event;
   resolvable_host_event rhe_t0{{dependent_event.get_sycl_event()}};
 

tests/usm/CMakeLists.txt

@@ -1,3 +1,9 @@
 file(GLOB test_cases_list *.cpp)
 
+if(SYCL_IMPLEMENTATION STREQUAL SimSYCL)
+  message(WARNING "SimSYCL does not provide true concurrency between host and device, disabling USM atomic tests")
+  list(FILTER test_cases_list EXCLUDE REGEX usm_atomic_access_.*\\.cpp$)
+endif()
+
+
 add_cts_test(${test_cases_list})

util/sycl_exceptions.h

@@ -38,6 +38,15 @@
 #define SYCL_CTS_SUPPORT_HAS_EXCEPTION_CATEGORY 1
 #define SYCL_CTS_SUPPORT_HAS_MAKE_ERROR_CODE 0
 
+#elif SYCL_CTS_COMPILING_WITH_SIMSYCL
+// Feature flags for SimSYCL
+
+#define SYCL_CTS_SUPPORT_HAS_EXCEPTION_CODE 1
+#define SYCL_CTS_SUPPORT_HAS_EXCEPTION_CATEGORY 1
+#define SYCL_CTS_SUPPORT_HAS_ERRC_FOR 0
+#define SYCL_CTS_SUPPORT_HAS_ERROR_CATEGORY_FOR 0
+#define SYCL_CTS_SUPPORT_HAS_MAKE_ERROR_CODE 1
+
 #else
 
 #define SYCL_CTS_SUPPORT_HAS_EXCEPTION_CODE 1