Fix Intel SYCL example builds on x86 CI

Author: allnes

app/SYCL/CMakeLists.txt

@@ -1,12 +1,63 @@
 add_executable(SYCL_Example
     sycl_example.cpp
-    sycl_kernel.cpp
 )
 target_link_libraries(SYCL_Example PRIVATE layers_lib)
-itlabai_add_sycl_to_target(TARGET SYCL_Example SOURCES
-    sycl_kernel.cpp
+
+set_source_files_properties(sycl_example.cpp PROPERTIES
+    COMPILE_DEFINITIONS "SYCL_DISABLE_FSYCL_SYCLHPP_WARNING=1"
+    COMPILE_OPTIONS "-Wno-deprecated-declarations"
 )
 
+if(WIN32 AND ITLABAI_SYCL_IMPLEMENTATION STREQUAL "IntelLLVM")
+    if(NOT ITLABAI_SYCL_ROOT OR NOT EXISTS "${ITLABAI_SYCL_ROOT}/bin/clang++.exe")
+        message(FATAL_ERROR
+            "Windows IntelLLVM SYCL build requires clang++.exe under ITLABAI_SYCL_ROOT")
+    endif()
+
+    set(SYCL_EXAMPLE_KERNEL_OBJECT
+        "${CMAKE_CURRENT_BINARY_DIR}/SYCL_Example.sycl_kernel.obj")
+    set(SYCL_KERNEL_COMPILE_COMMAND
+        "${ITLABAI_SYCL_ROOT}/bin/clang++.exe"
+        -std=c++20
+        -fsycl
+        -I"${CMAKE_SOURCE_DIR}/include"
+        -I"${ITLABAI_SYCL_ROOT}/include"
+        -c
+        "${CMAKE_CURRENT_SOURCE_DIR}/sycl_kernel.cpp"
+        -o
+        "${SYCL_EXAMPLE_KERNEL_OBJECT}"
+    )
+    if(ITLABAI_SYCL_TARGETS)
+        list(APPEND SYCL_KERNEL_COMPILE_COMMAND
+            "-fsycl-targets=${ITLABAI_SYCL_TARGETS}"
+        )
+    endif()
+
+    add_custom_command(
+        OUTPUT "${SYCL_EXAMPLE_KERNEL_OBJECT}"
+        COMMAND ${SYCL_KERNEL_COMPILE_COMMAND}
+        DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/sycl_kernel.cpp"
+        VERBATIM
+    )
+    target_sources(SYCL_Example PRIVATE "${SYCL_EXAMPLE_KERNEL_OBJECT}")
+    set_source_files_properties("${SYCL_EXAMPLE_KERNEL_OBJECT}" PROPERTIES
+        EXTERNAL_OBJECT TRUE
+        GENERATED TRUE
+    )
+    target_include_directories(SYCL_Example PRIVATE "${ITLABAI_SYCL_ROOT}/include")
+    target_link_options(SYCL_Example PRIVATE -fsycl)
+    if(ITLABAI_SYCL_TARGETS)
+        target_link_options(SYCL_Example PRIVATE
+            -fsycl-targets=${ITLABAI_SYCL_TARGETS}
+        )
+    endif()
+else()
+    target_sources(SYCL_Example PRIVATE sycl_kernel.cpp)
+    itlabai_add_sycl_to_target(TARGET SYCL_Example SOURCES
+        sycl_kernel.cpp
+    )
+endif()
+
 add_test(NAME SYCL.Example COMMAND SYCL_Example)
 set_tests_properties(SYCL.Example PROPERTIES
     LABELS "sycl;smoke"

scripts/ci/sycl_x86_setup.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import os
+import shutil
 import sys
 from pathlib import Path
 
@@ -276,6 +277,7 @@ def setup_unix_compilers(sycl_root: Path) -> None:
 
     if require_env("RUNNER_OS") == "Linux":
         export_openmp_include_dir = True
+        openmp_header = None
         openmp_library = find_file([sycl_root, Path("/opt/intel/oneapi")], "libiomp5.so")
         openmp_library_name = "iomp5"
         openmp_flags = "-fopenmp=libiomp5"
@@ -289,27 +291,31 @@ def setup_unix_compilers(sycl_root: Path) -> None:
             gcc_openmp_header = find_file([gcc_include_root], "omp.h")
             gcc_openmp_library = Path(capture(["gcc-13", "-print-file-name=libgomp.so"]))
             if gcc_openmp_header is not None and gcc_openmp_library.exists():
+                staged_openmp_include_dir = Path(require_env("RUNNER_TEMP")) / "gcc-openmp-include"
+                staged_openmp_include_dir.mkdir(parents=True, exist_ok=True)
+                shutil.copy2(gcc_openmp_header, staged_openmp_include_dir / "omp.h")
                 openmp_library = gcc_openmp_library
                 openmp_library_name = "gomp"
                 openmp_flags = "-fopenmp=libgomp"
-                export_openmp_include_dir = False
+                openmp_header = staged_openmp_include_dir / "omp.h"
         if openmp_library is None and not source_built_linux_toolchain:
             main_error("Unable to locate an Intel toolchain OpenMP runtime library")
 
-        resource_dir = Path(capture([str(cxx_path), "-print-resource-dir"]))
-        openmp_header = find_file(
-            [
-                resource_dir / "include",
-                sycl_root,
-                Path("/opt/intel/oneapi"),
-            ],
-            "omp.h",
-        )
-        if openmp_header is None and source_built_linux_toolchain:
+        if openmp_library_name != "gomp":
+            resource_dir = Path(capture([str(cxx_path), "-print-resource-dir"]))
+            openmp_header = find_file(
+                [
+                    resource_dir / "include",
+                    sycl_root,
+                    Path("/opt/intel/oneapi"),
+                ],
+                "omp.h",
+            )
+        if openmp_library_name != "gomp" and openmp_header is None and source_built_linux_toolchain:
             gcc_root = Path(require_env("ITLABAI_GCC_INSTALL_DIR"))
             openmp_header = find_file([gcc_root / "include"], "omp.h")
             export_openmp_include_dir = False
-        if openmp_header is None and not source_built_linux_toolchain:
+        if openmp_library_name != "gomp" and openmp_header is None and not source_built_linux_toolchain:
             main_error(
                 "Unable to locate Intel-provided omp.h under the SYCL toolchain"
             )