Fix Windows SYCL clang-cl pipeline

Author: allnes

.github/actions/setup-sycl-toolchain/action.yml

@@ -131,21 +131,11 @@ runs:
         $clangClPath = $clangCl.FullName
       }
       $clangBin = Split-Path $clangClPath -Parent
-      $clangPath = Join-Path $clangBin 'clang.exe'
-      $clangCxxPath = Join-Path $clangBin 'clang++.exe'
-      if (-not (Test-Path $clangPath)) {
-        throw "clang.exe was not found next to $clangClPath. Install the Visual Studio LLVM/Clang toolset on the Windows runner."
-      }
-      if (-not (Test-Path $clangCxxPath)) {
-        throw "clang++.exe was not found next to $clangClPath. Install the Visual Studio LLVM/Clang toolset on the Windows runner."
-      }
-      $clangShortPath = Get-ShortPath $clangPath
-      $clangCxxShortPath = Get-ShortPath $clangCxxPath
+      $clangClShortPath = Get-ShortPath $clangClPath
 
-      "ITLABAI_CC=$clangShortPath" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-      "ITLABAI_CXX=$clangCxxShortPath" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-      "ITLABAI_ACPP_CPU_CXX=$clangCxxShortPath" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-      "ITLABAI_WINDOWS_CLANG_FLAGS=--target=x86_64-pc-windows-msvc" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+      "ITLABAI_CC=$clangClShortPath" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+      "ITLABAI_CXX=$clangClShortPath" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+      "ITLABAI_ACPP_CPU_CXX=$clangClShortPath" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
       "$clangBin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
   - name: Configure Windows toolchain environment
@@ -187,8 +177,6 @@ runs:
         "-DCMAKE_INSTALL_PREFIX=$env:ACPP_INSTALL_DIR" `
         "-DCMAKE_C_COMPILER=$env:ITLABAI_CC" `
         "-DCMAKE_CXX_COMPILER=$env:ITLABAI_CXX" `
-        "-DCMAKE_C_FLAGS=$env:ITLABAI_WINDOWS_CLANG_FLAGS" `
-        "-DCMAKE_CXX_FLAGS=$env:ITLABAI_WINDOWS_CLANG_FLAGS" `
         -DCMAKE_C_COMPILER_LAUNCHER=ccache `
         -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
       if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }

app/SYCL/CMakeLists.txt

@@ -6,57 +6,8 @@ add_executable(SYCL_Example
 target_link_libraries(SYCL_Example PRIVATE layers_lib AdaptiveCpp::acpp-rt)
 
 if(WIN32)
-    target_compile_definitions(SYCL_Example PRIVATE _USE_MATH_DEFINES)
-
-    set(SYCL_EXAMPLE_KERNEL_OBJECT "${CMAKE_CURRENT_BINARY_DIR}/sycl_kernel.cpp.obj")
-    set(_sycl_cpu_cxx "${ACPP_CPU_CXX}")
-    if(NOT _sycl_cpu_cxx)
-        get_filename_component(_sycl_compiler_dir "${CMAKE_CXX_COMPILER}" DIRECTORY)
-        if(EXISTS "${_sycl_compiler_dir}/clang++.exe")
-            set(_sycl_cpu_cxx "${_sycl_compiler_dir}/clang++.exe")
-        endif()
-    endif()
-    if(NOT _sycl_cpu_cxx)
-        message(FATAL_ERROR "ACPP_CPU_CXX must point to the Visual Studio LLVM clang++.exe when building SYCL on Windows")
-    endif()
-
-    set(_sycl_kernel_command python "${ACPP_COMPILER}")
-    if(ACPP_TARGETS)
-        list(APPEND _sycl_kernel_command "--acpp-targets=${ACPP_TARGETS}")
-    endif()
-    list(APPEND _sycl_kernel_command
-        "--acpp-cpu-cxx=${_sycl_cpu_cxx}"
-        -std=c++20
-        -fms-runtime-lib=dll
-        -DITLABAI_HAS_SYCL
-        -D_USE_MATH_DEFINES
-        -I "${CMAKE_SOURCE_DIR}/include"
-    )
-    get_target_property(_acpp_include_dirs AdaptiveCpp::acpp-rt INTERFACE_INCLUDE_DIRECTORIES)
-    foreach(_acpp_include_dir IN LISTS _acpp_include_dirs)
-        list(APPEND _sycl_kernel_command -isystem "${_acpp_include_dir}")
-    endforeach()
-    list(APPEND _sycl_kernel_command
-        -c "${CMAKE_CURRENT_SOURCE_DIR}/sycl_kernel.cpp"
-        -o "${SYCL_EXAMPLE_KERNEL_OBJECT}"
-    )
-    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-        list(APPEND _sycl_kernel_command -g)
-    else()
-        list(APPEND _sycl_kernel_command -O2)
-    endif()
-
-    add_custom_command(
-        OUTPUT "${SYCL_EXAMPLE_KERNEL_OBJECT}"
-        COMMAND ${_sycl_kernel_command}
-        DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/sycl_kernel.cpp"
-        VERBATIM
-    )
-    set_source_files_properties("${SYCL_EXAMPLE_KERNEL_OBJECT}" PROPERTIES
-        EXTERNAL_OBJECT TRUE
-        GENERATED TRUE
-    )
-    target_sources(SYCL_Example PRIVATE "${SYCL_EXAMPLE_KERNEL_OBJECT}")
+    target_sources(SYCL_Example PRIVATE sycl_kernel.cpp)
+    target_compile_definitions(SYCL_Example PRIVATE _USE_MATH_DEFINES ITLABAI_HAS_SYCL)
 else()
     add_library(SYCL_Example_kernel OBJECT sycl_kernel.cpp)
     target_compile_definitions(SYCL_Example_kernel PRIVATE ITLABAI_HAS_SYCL)

src/layers/CMakeLists.txt

@@ -9,9 +9,15 @@ target_link_libraries(layers_lib PUBLIC Kokkos_imported)
 if(ITLABAI_ENABLE_SYCL)
     find_package(AdaptiveCpp CONFIG REQUIRED)
     target_compile_definitions(layers_lib PUBLIC ITLABAI_HAS_SYCL)
-    target_link_libraries(layers_lib PUBLIC AdaptiveCpp::acpp-rt)
     if(WIN32)
-        set_property(TARGET layers_lib PROPERTY CXX_COMPILER_LAUNCHER "")
+        target_compile_definitions(layers_lib PUBLIC
+            _ENABLE_EXTENDED_ALIGNED_STORAGE
+            _USE_MATH_DEFINES
+            __ACPP_ENABLE_OMPHOST_TARGET__
+        )
+    endif()
+    target_link_libraries(layers_lib PUBLIC AdaptiveCpp::acpp-rt)
+    if(NOT WIN32)
+        add_sycl_to_target(TARGET layers_lib SOURCES ${layers_src})
     endif()
-    add_sycl_to_target(TARGET layers_lib SOURCES ${layers_src})
 endif()

test/CMakeLists.txt

@@ -13,10 +13,9 @@ itlabai_copy_opencv_runtime(run_test)
 
 if(ITLABAI_ENABLE_SYCL)
     find_package(AdaptiveCpp CONFIG REQUIRED)
-    if(WIN32)
-        set_property(TARGET run_test PROPERTY CXX_COMPILER_LAUNCHER "")
+    if(NOT WIN32)
+        add_sycl_to_target(TARGET run_test SOURCES ${TEST_SRC_FILES})
     endif()
-    add_sycl_to_target(TARGET run_test SOURCES ${TEST_SRC_FILES})
 endif()
 
 target_include_directories(run_test PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}")