Stage Intel OpenCL runtime for Windows SYCL

Author: allnes

scripts/ci/sycl_test.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import shutil
 import os
 import subprocess
 import sys
@@ -10,65 +11,35 @@
 from common import find_file
 
 
-def find_windows_tbb_runtime_dir() -> Path | None:
-    build_root = Path("build").resolve()
-    fallback: Path | None = None
-    for current_root, _, files in os.walk(build_root):
-        current_files = set(files)
-        if "tbb12.dll" not in current_files:
-            continue
-
-        candidate = Path(current_root)
-        if "tbbmalloc.dll" in current_files or "tbbmalloc_proxy.dll" in current_files:
-            return candidate
-        if fallback is None:
-            fallback = candidate
-
-    return fallback
-
-
-def configure_windows_opencl_tbb() -> None:
+def prepare_windows_opencl_runtime() -> None:
     if os.environ.get("RUNNER_OS") != "Windows":
         return
 
     icd_path = os.environ.get("OCL_ICD_FILENAMES")
     if not icd_path:
         return
 
-    config_path = Path(icd_path).with_name("cl.cfg")
-    if not config_path.exists():
+    runtime_dir = Path(icd_path).resolve().parent
+    runtime_opencl = runtime_dir / "OpenCL.dll"
+    if not runtime_opencl.exists():
         return
 
-    tbb_runtime_dir = find_windows_tbb_runtime_dir()
-    if tbb_runtime_dir is None:
+    example_binary = find_file([Path("build").resolve()], "SYCL_Example.exe")
+    if example_binary is None:
         return
 
-    tbb_dir = str(tbb_runtime_dir.resolve())
-    existing_lines = config_path.read_text(encoding="utf-8").splitlines()
-    updated_lines: list[str] = []
-    updated = False
-    for line in existing_lines:
-        if line.strip().startswith("CL_CONFIG_TBB_DLL_PATH"):
-            updated_lines.append(f"CL_CONFIG_TBB_DLL_PATH = {tbb_dir}")
-            updated = True
-        else:
-            updated_lines.append(line)
-
-    if not updated:
-        updated_lines.append(f"CL_CONFIG_TBB_DLL_PATH = {tbb_dir}")
-
-    config_path.write_text("\n".join(updated_lines) + "\n", encoding="utf-8")
-    print(f"+ patched {config_path} with CL_CONFIG_TBB_DLL_PATH={tbb_dir}", flush=True)
+    staged_opencl = example_binary.parent / runtime_opencl.name
+    shutil.copy2(runtime_opencl, staged_opencl)
+    print(
+        f"+ staged {runtime_opencl} next to {example_binary}",
+        flush=True,
+    )
 
 
 def main() -> int:
-    configure_windows_opencl_tbb()
+    prepare_windows_opencl_runtime()
 
     env = os.environ.copy()
-    if os.environ.get("RUNNER_OS") == "Windows":
-        tbb_runtime_dir = find_windows_tbb_runtime_dir()
-        if tbb_runtime_dir is not None:
-            env["PATH"] = f"{tbb_runtime_dir}{os.pathsep}{env.get('PATH', '')}"
 
     device_selector = env.get("DEVICE_SELECTOR", "")
     if device_selector: