Use Intel SYCL build tree directly in CI

Author: allnes

.github/workflows/sycl-ci.yml

@@ -38,8 +38,8 @@ jobs:
     - name: Restore Intel toolchain cache
       uses: actions/cache@v4
       with:
-        path: ${{ runner.temp }}/intel-nativecpu-toolchain/toolchain
-        key: intel-nativecpu-toolchain-${{ env.INTEL_LLVM_TAG }}-v3
+        path: ${{ runner.temp }}/intel-nativecpu-toolchain/build
+        key: intel-nativecpu-toolchain-${{ env.INTEL_LLVM_TAG }}-v4
 
     - name: Prepare Intel native_cpu toolchain
       run: python3 ./scripts/ci/sycl_x86_setup.py linux-x86_64
@@ -77,8 +77,8 @@ jobs:
     - name: Restore Intel toolchain cache
       uses: actions/cache@v4
       with:
-        path: ${{ runner.temp }}/intel-nativecpu-toolchain/toolchain
-        key: intel-nativecpu-toolchain-${{ env.INTEL_LLVM_TAG }}-v3
+        path: ${{ runner.temp }}/intel-nativecpu-toolchain/build
+        key: intel-nativecpu-toolchain-${{ env.INTEL_LLVM_TAG }}-v4
 
     - name: Prepare platform settings
       run: python3 ./scripts/ci/sycl_x86_setup.py linux-x86_64

scripts/ci/sycl_x86_setup.py

@@ -22,13 +22,16 @@
 
 
 def linux_native_cpu_toolchain_root() -> Path:
-    return Path(require_env("RUNNER_TEMP")) / "intel-nativecpu-toolchain" / "toolchain"
+    return Path(require_env("RUNNER_TEMP")) / "intel-nativecpu-toolchain" / "build"
 
 
 def linux_native_cpu_toolchain_ready(toolchain_root: Path) -> bool:
     if not toolchain_root.exists():
         return False
-    compiler_candidates = [toolchain_root / "bin" / "clang++"]
+    compiler_candidates = [
+        toolchain_root / "bin" / "clang++",
+        toolchain_root / "bin" / "compiler" / "clang++",
+    ]
     has_compiler = any(path.exists() for path in compiler_candidates)
     has_runtime = find_file([toolchain_root], "libsycl.so") is not None or find_file(
         [toolchain_root], "libsycl.so.9"
@@ -109,7 +112,7 @@ def build_linux_native_cpu_toolchain() -> Path:
 
     toolchain_base = toolchain_root.parent
     source_dir = toolchain_base / "src"
-    build_dir = toolchain_base / "build"
+    build_dir = toolchain_root
     llvm_tag = require_env("INTEL_LLVM_TAG")
 
     toolchain_base.mkdir(parents=True, exist_ok=True)
@@ -152,7 +155,6 @@ def build_linux_native_cpu_toolchain() -> Path:
                 "-DCMAKE_CXX_COMPILER=g++-13",
                 "-DCMAKE_C_COMPILER_LAUNCHER=ccache",
                 "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",
-                f"-DCMAKE_INSTALL_PREFIX={toolchain_root}",
                 "-DSYCL_ENABLE_BACKENDS=native_cpu",
                 "-DSYCL_INCLUDE_TESTS=OFF",
                 "-DLLVM_INSTALL_UTILS=ON",
@@ -161,21 +163,11 @@ def build_linux_native_cpu_toolchain() -> Path:
         )
 
     run(["cmake", "--build", str(build_dir), "--target", "sycl-toolchain", "--parallel"])
-    run(
-        [
-            "cmake",
-            "--install",
-            str(build_dir / "runtimes" / "runtimes-bins"),
-            "--prefix",
-            str(toolchain_root),
-        ]
-    )
-    run(["cmake", "--build", str(build_dir), "--target", "deploy-sycl-toolchain", "--parallel"])
 
     if not linux_native_cpu_toolchain_ready(toolchain_root):
         main_error(
             "Intel SYCL native_cpu toolchain build completed, but required files "
-            "were not deployed into the toolchain directory"
+            "were not produced in the build tree"
         )
 
     write_env("SYCL_ROOT", str(toolchain_root))