Fix Intel SYCL CI toolchain wiring

Author: allnes

CMakeLists.txt

@@ -12,6 +12,8 @@ set_property(CACHE ITLABAI_SYCL_IMPLEMENTATION PROPERTY STRINGS
     IntelLLVM AdaptiveCpp)
 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")
 
 option(ENABLE_STATISTIC_TENSORS "Enable statistic tensors" OFF)
 
@@ -67,6 +69,10 @@ if(ITLABAI_ENABLE_SYCL)
             add_sycl_to_target(${ARGN})
         endfunction()
     elseif(ITLABAI_SYCL_IMPLEMENTATION STREQUAL "IntelLLVM")
+        set(ITLABAI_INTEL_SYCL_INCLUDE_DIRS "")
+        if(ITLABAI_SYCL_ROOT AND EXISTS "${ITLABAI_SYCL_ROOT}/include")
+            list(APPEND ITLABAI_INTEL_SYCL_INCLUDE_DIRS "${ITLABAI_SYCL_ROOT}/include")
+        endif()
         function(itlabai_add_sycl_to_target)
             set(options)
             set(one_value_keywords TARGET)
@@ -82,6 +88,12 @@ if(ITLABAI_ENABLE_SYCL)
                 message(FATAL_ERROR "itlabai_add_sycl_to_target requires TARGET")
             endif()
 
+            if(ITLABAI_INTEL_SYCL_INCLUDE_DIRS)
+                target_include_directories(${ITLABAI_SYCL_TARGET} PRIVATE
+                    ${ITLABAI_INTEL_SYCL_INCLUDE_DIRS}
+                )
+            endif()
+
             target_link_options(${ITLABAI_SYCL_TARGET} PRIVATE -fsycl)
 
             if(ITLABAI_SYCL_SOURCES)

scripts/ci/sycl_configure.py

@@ -55,6 +55,10 @@ def main() -> None:
     if itlabai_sycl_targets:
         cmake_args.append(f"-DITLABAI_SYCL_TARGETS={itlabai_sycl_targets}")
 
+    itlabai_sycl_root = os.environ.get("SYCL_ROOT", "")
+    if itlabai_sycl_root:
+        cmake_args.append(f"-DITLABAI_SYCL_ROOT={itlabai_sycl_root}")
+
     c_flags = os.environ.get("ITLABAI_C_FLAGS", "")
     cxx_flags = os.environ.get("ITLABAI_CXX_FLAGS", "")
     gcc_install_dir = os.environ.get("ITLABAI_GCC_INSTALL_DIR", "")

scripts/ci/sycl_x86_setup.py

@@ -214,17 +214,17 @@ def setup_windows_compilers(sycl_root: Path) -> None:
     cc_path = find_first_existing(
         [
             sycl_root / "bin" / "icx.exe",
+            sycl_root / "bin" / "clang.exe",
             sycl_root / "bin" / "icx-cl.exe",
             sycl_root / "bin" / "clang-cl.exe",
-            sycl_root / "bin" / "clang.exe",
         ]
     )
     cxx_path = find_first_existing(
         [
             sycl_root / "bin" / "icpx.exe",
+            sycl_root / "bin" / "clang++.exe",
             sycl_root / "bin" / "icx-cl.exe",
             sycl_root / "bin" / "clang-cl.exe",
-            sycl_root / "bin" / "clang++.exe",
         ]
     )
 
@@ -290,7 +290,7 @@ def setup_unix_compilers(sycl_root: Path) -> None:
             if gcc_openmp_header is not None and gcc_openmp_library.exists():
                 openmp_library = gcc_openmp_library
                 openmp_library_name = "gomp"
-                openmp_flags = "-fopenmp"
+                openmp_flags = "-fopenmp=libgomp"
         if openmp_library is None and not source_built_linux_toolchain:
             main_error("Unable to locate an Intel toolchain OpenMP runtime library")