Use compiler-driven Intel SYCL flow

Author: allnes

CMakeLists.txt

@@ -7,11 +7,11 @@ option(ITLABAI_ENABLE_SYCL "Build SYCL example and helper targets" OFF)
 option(ITLABAI_ENABLE_OPENCV_APPS "Build OpenCV-dependent apps" ON)
 option(ITLABAI_BUILD_TESTS "Build unit tests" ON)
 set(ITLABAI_SYCL_IMPLEMENTATION "" CACHE STRING
-    "SYCL implementation package to use: IntelSYCL or AdaptiveCpp")
+    "SYCL implementation to use: IntelLLVM or AdaptiveCpp")
 set_property(CACHE ITLABAI_SYCL_IMPLEMENTATION PROPERTY STRINGS
-    IntelSYCL AdaptiveCpp)
+    IntelLLVM AdaptiveCpp)
 set(ITLABAI_SYCL_TARGETS "" CACHE STRING
-    "Optional SYCL targets; forwarded to AdaptiveCpp as ACPP_TARGETS")
+    "Optional SYCL targets; forwarded to AdaptiveCpp as ACPP_TARGETS or IntelLLVM as -fsycl-targets")
 
 option(ENABLE_STATISTIC_TENSORS "Enable statistic tensors" OFF)
 
@@ -54,7 +54,7 @@ if(ITLABAI_ENABLE_SYCL)
     if(NOT ITLABAI_SYCL_IMPLEMENTATION)
         message(FATAL_ERROR
             "ITLABAI_ENABLE_SYCL=ON requires ITLABAI_SYCL_IMPLEMENTATION "
-            "to be set to IntelSYCL or AdaptiveCpp")
+            "to be set to IntelLLVM or AdaptiveCpp")
     endif()
 
     if(ITLABAI_SYCL_IMPLEMENTATION STREQUAL "AdaptiveCpp")
@@ -63,8 +63,39 @@ if(ITLABAI_ENABLE_SYCL)
                 "AdaptiveCpp targets" FORCE)
         endif()
         find_package(AdaptiveCpp CONFIG REQUIRED)
-    elseif(ITLABAI_SYCL_IMPLEMENTATION STREQUAL "IntelSYCL")
-        find_package(IntelSYCL CONFIG REQUIRED)
+        function(itlabai_add_sycl_to_target)
+            add_sycl_to_target(${ARGN})
+        endfunction()
+    elseif(ITLABAI_SYCL_IMPLEMENTATION STREQUAL "IntelLLVM")
+        function(itlabai_add_sycl_to_target)
+            set(options)
+            set(one_value_keywords TARGET)
+            set(multi_value_keywords SOURCES)
+            cmake_parse_arguments(ITLABAI_SYCL
+                "${options}"
+                "${one_value_keywords}"
+                "${multi_value_keywords}"
+                ${ARGN}
+            )
+
+            if(NOT ITLABAI_SYCL_TARGET)
+                message(FATAL_ERROR "itlabai_add_sycl_to_target requires TARGET")
+            endif()
+
+            target_compile_options(${ITLABAI_SYCL_TARGET} PRIVATE
+                $<$<COMPILE_LANGUAGE:CXX>:-fsycl>
+            )
+            target_link_options(${ITLABAI_SYCL_TARGET} PRIVATE -fsycl)
+
+            if(ITLABAI_SYCL_TARGETS)
+                target_compile_options(${ITLABAI_SYCL_TARGET} PRIVATE
+                    $<$<COMPILE_LANGUAGE:CXX>:-fsycl-targets=${ITLABAI_SYCL_TARGETS}>
+                )
+                target_link_options(${ITLABAI_SYCL_TARGET} PRIVATE
+                    -fsycl-targets=${ITLABAI_SYCL_TARGETS}
+                )
+            endif()
+        endfunction()
     else()
         message(FATAL_ERROR
             "Unsupported ITLABAI_SYCL_IMPLEMENTATION="

app/SYCL/CMakeLists.txt

@@ -3,7 +3,7 @@ add_executable(SYCL_Example
     sycl_kernel.cpp
 )
 target_link_libraries(SYCL_Example PRIVATE layers_lib)
-add_sycl_to_target(TARGET SYCL_Example SOURCES
+itlabai_add_sycl_to_target(TARGET SYCL_Example SOURCES
     sycl_example.cpp
     sycl_kernel.cpp
 )

scripts/ci/sycl_configure.py

@@ -44,6 +44,10 @@ def main() -> None:
     if acpp_targets:
         cmake_args.append(f"-DACPP_TARGETS={acpp_targets}")
 
+    itlabai_sycl_targets = os.environ.get("ITLABAI_SYCL_TARGETS", "")
+    if itlabai_sycl_targets:
+        cmake_args.append(f"-DITLABAI_SYCL_TARGETS={itlabai_sycl_targets}")
+
     run(
         [
             "cmake",

scripts/ci/sycl_x86_setup.py

@@ -41,7 +41,8 @@ def configure_platform(platform: str) -> None:
     write_env("TOOLCHAIN_ASSET", settings["toolchain_asset"])
     write_env("DEVICE_SELECTOR", settings["device_selector"])
     write_env("ITLABAI_ENABLE_OPENCV_APPS", settings["opencv_apps"])
-    write_env("ITLABAI_SYCL_IMPLEMENTATION", "IntelSYCL")
+    write_env("ITLABAI_SYCL_IMPLEMENTATION", "IntelLLVM")
+    write_env("ITLABAI_SYCL_TARGETS", "spir64")
 
 
 def setup_linux_runtime() -> None: