Fix Windows SYCL linking and ccache

Author: allnes

.github/workflows/sycl-ci.yml

@@ -121,9 +121,10 @@ jobs:
       uses: seanmiddleditch/gha-setup-ninja@v6
 
     - name: Setup ccache
-      uses: Chocobo1/setup-ccache-action@v1
+      uses: hendrikmuhs/ccache-action@v1.2
       with:
-        windows_compile_environment: msvc
+        key: ccache-${{ github.job }}-${{ matrix.build_type }}
+        max-size: 2G
 
     - name: Setup MSVC environment
       uses: ilammy/msvc-dev-cmd@v1

CMakeLists.txt

@@ -14,6 +14,8 @@ set(ITLABAI_SYCL_TARGETS "" CACHE STRING
     "Optional SYCL targets; forwarded to AdaptiveCpp as ACPP_TARGETS or IntelLLVM as -fsycl-targets")
 set(ITLABAI_SYCL_ROOT "" CACHE PATH
     "Optional root directory of the SYCL toolchain; used to expose SYCL headers to host-only sources")
+set(ITLABAI_SYCL_LIBRARY "" CACHE FILEPATH
+    "Optional Intel SYCL runtime import library; used for Windows host linking")
 
 option(ENABLE_STATISTIC_TENSORS "Enable statistic tensors" OFF)
 

app/SYCL/CMakeLists.txt

@@ -11,7 +11,7 @@ elseif(ITLABAI_SYCL_IMPLEMENTATION STREQUAL "IntelLLVM"
     target_include_directories(SYCL_Example PRIVATE "${ITLABAI_SYCL_ROOT}/include")
 endif()
 
-if(ITLABAI_SYCL_IMPLEMENTATION STREQUAL "IntelLLVM")
+if(ITLABAI_SYCL_IMPLEMENTATION STREQUAL "IntelLLVM" AND NOT WIN32)
     target_link_options(SYCL_Example PRIVATE -fsycl)
     if(ITLABAI_SYCL_TARGETS)
         target_link_options(SYCL_Example PRIVATE
@@ -30,6 +30,11 @@ if(WIN32 AND ITLABAI_SYCL_IMPLEMENTATION STREQUAL "IntelLLVM")
         message(FATAL_ERROR
             "Windows IntelLLVM SYCL build requires clang++.exe under ITLABAI_SYCL_ROOT")
     endif()
+    if(NOT ITLABAI_SYCL_LIBRARY OR NOT EXISTS "${ITLABAI_SYCL_LIBRARY}")
+        message(FATAL_ERROR
+            "Windows IntelLLVM SYCL build requires ITLABAI_SYCL_LIBRARY "
+            "to point to the runtime import library")
+    endif()
 
     set(SYCL_EXAMPLE_KERNEL_OBJECT
         "${CMAKE_CURRENT_BINARY_DIR}/SYCL_Example.sycl_kernel.obj")
@@ -61,6 +66,7 @@ if(WIN32 AND ITLABAI_SYCL_IMPLEMENTATION STREQUAL "IntelLLVM")
         EXTERNAL_OBJECT TRUE
         GENERATED TRUE
     )
+    target_link_libraries(SYCL_Example PRIVATE "${ITLABAI_SYCL_LIBRARY}")
 else()
     add_library(SYCL_Example_kernel OBJECT sycl_kernel.cpp)
     itlabai_add_sycl_to_target(TARGET SYCL_Example_kernel SOURCES

scripts/ci/sycl_configure.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import os
+import shutil
 import sys
 
 from common import main_error, require_env, run
@@ -15,7 +16,7 @@ def main() -> None:
     build_type, opencv_apps = sys.argv[1:]
 
     cmake_args = []
-    if require_env("RUNNER_OS") != "Windows":
+    if shutil.which("ccache"):
         cmake_args.extend(
             [
                 "-DCMAKE_C_COMPILER_LAUNCHER=ccache",
@@ -58,6 +59,9 @@ def main() -> None:
     itlabai_sycl_root = os.environ.get("SYCL_ROOT", "")
     if itlabai_sycl_root:
         cmake_args.append(f"-DITLABAI_SYCL_ROOT={itlabai_sycl_root}")
+    itlabai_sycl_library = os.environ.get("ITLABAI_SYCL_LIBRARY", "")
+    if itlabai_sycl_library:
+        cmake_args.append(f"-DITLABAI_SYCL_LIBRARY={itlabai_sycl_library}")
 
     c_flags = os.environ.get("ITLABAI_C_FLAGS", "")
     cxx_flags = os.environ.get("ITLABAI_CXX_FLAGS", "")

scripts/ci/sycl_x86_setup.py

@@ -228,10 +228,17 @@ def setup_windows_compilers(sycl_root: Path) -> None:
             sycl_root / "bin" / "clang++.exe",
         ]
     )
+    sycl_library = find_first_existing(
+        [
+            sycl_root / "lib" / "sycl8.lib",
+            sycl_root / "lib" / "sycl.lib",
+        ]
+    )
 
     write_env("ITLABAI_CC", cygpath("m", cc_path))
     write_env("ITLABAI_CXX", cygpath("m", cxx_path))
     write_env("ITLABAI_CMAKE_PREFIX_PATH", cygpath("m", sycl_root))
+    write_env("ITLABAI_SYCL_LIBRARY", cygpath("m", sycl_library))
     append_path(cygpath("m", sycl_root / "bin"))