Merge branch 'sycl' into no_handler_scheduler_bypass

Author: slawekptak

.github/workflows/sycl-linux-build.yml

@@ -93,11 +93,13 @@ on:
         type: choice
         options:
           - "[]"
+          - '[sycl]'
           - '[llvm, clang, sycl, llvm_spirv, xptifw, libclc]'
       build_image:
         type: choice
         options:
           - 'ghcr.io/intel/llvm/sycl_ubuntu2404_nightly:latest'
+          - 'ghcr.io/intel/llvm/ubuntu2204_build:latest'
       cc:
         type: choice
         options:

clang/lib/Driver/ToolChains/SYCL.cpp

@@ -1815,7 +1815,7 @@ void SYCLToolChain::AddImpliedTargetArgs(const llvm::Triple &Triple,
   // Default device AOT: -g -cl-opt-disable
   // Default device JIT: -g (-O0 is handled by the runtime)
   // GEN:  -options "-g -O0"
-  // CPU:  "--bo=-g -cl-opt-disable"
+  // CPU: "--bo=-g" "-bo=-cl-opt-disable"
   llvm::opt::ArgStringList BeArgs;
   // Per-device argument vector storing the device name and the backend argument
   // string
@@ -1969,17 +1969,23 @@ void SYCLToolChain::AddImpliedTargetArgs(const llvm::Triple &Triple,
       CmdArgs.push_back(Args.MakeArgString(A));
     return;
   }
-  SmallString<128> BeOpt;
-  if (IsGen)
+  if (IsGen) {
+    SmallString<128> BeOpt;
     CmdArgs.push_back("-options");
-  else
-    BeOpt = "--bo=";
-  for (unsigned I = 0; I < BeArgs.size(); ++I) {
-    if (I)
-      BeOpt += ' ';
-    BeOpt += BeArgs[I];
+    for (unsigned I = 0; I < BeArgs.size(); ++I) {
+      if (I)
+        BeOpt += ' ';
+      BeOpt += BeArgs[I];
+    }
+    CmdArgs.push_back(Args.MakeArgString(BeOpt));
+  } else {
+    for (unsigned I = 0; I < BeArgs.size(); ++I) {
+      SmallString<128> BeOpt;
+      BeOpt += "--bo=";
+      BeOpt += BeArgs[I];
+      CmdArgs.push_back(Args.MakeArgString(BeOpt));
+    }
   }
-  CmdArgs.push_back(Args.MakeArgString(BeOpt));
 }
 
 void SYCLToolChain::TranslateBackendTargetArgs(

clang/test/Driver/sycl-offload-aot.cpp

@@ -145,7 +145,7 @@
 // RUN:   | FileCheck -check-prefix=CHK-TOOLS-IMPLIED-OPTS-CPU %s
 // RUN:   %clang_cl -### -fsycl -fsycl-targets=spir64_x86_64-unknown-unknown -Zi -Od -Xsycl-target-backend "-DFOO1 -DFOO2" -- %s 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHK-TOOLS-IMPLIED-OPTS-CPU %s
-// CHK-TOOLS-IMPLIED-OPTS-CPU: opencl-aot{{.*}} "--bo=-g -cl-opt-disable" "-DFOO1" "-DFOO2"
+// CHK-TOOLS-IMPLIED-OPTS-CPU: opencl-aot{{.*}} "--bo=-g" "--bo=-cl-opt-disable" "-DFOO1" "-DFOO2"
 
 // RUN:   %clang -### -target x86_64-unknown-linux-gnu -fsycl -fsycl-targets=spir64_gen-unknown-unknown -g -O0 -Xsycl-target-backend "-DFOO1 -DFOO2" %s 2>&1 \
 // RUN:   | FileCheck -check-prefix=CHK-TOOLS-IMPLIED-OPTS-GEN %s

devops/containers/ubuntu2204_intel_drivers.Dockerfile

@@ -9,7 +9,6 @@ USER root
 
 RUN apt update && apt install -yqq wget
 
-COPY scripts/get_release.py /
 COPY scripts/install_drivers.sh /
 COPY dependencies.json /
 

devops/containers/ubuntu2404_intel_drivers.Dockerfile

@@ -9,7 +9,6 @@ USER root
 
 RUN apt update && apt install -yqq wget
 
-COPY scripts/get_release.py /
 COPY scripts/install_drivers.sh /
 COPY dependencies.json /
 

devops/containers/ubuntu2404_intel_drivers_igc_dev.Dockerfile

@@ -9,7 +9,6 @@ USER root
 
 RUN apt update && apt install -yqq libllvm14 libllvm15 libz3-4
 
-COPY scripts/get_release.py /
 COPY scripts/install_drivers.sh /
 COPY dependencies.json /
 COPY dependencies-igc-dev.json /

devops/dependencies-igc-dev.json

@@ -1,10 +1,10 @@
 {
   "linux": {
     "igc_dev": {
-      "github_tag": "igc-dev-6d3f69e",
-      "version": "6d3f69e",
-      "updated_at": "2025-09-20T11:44:56Z",
-      "url": "https://api.github.com/repos/intel/intel-graphics-compiler/actions/artifacts/4062749149/zip",
+      "github_tag": "igc-dev-5572ee3",
+      "version": "5572ee3",
+      "updated_at": "2025-09-28T11:41:20Z",
+      "url": "https://api.github.com/repos/intel/intel-graphics-compiler/actions/artifacts/4125423999/zip",
       "root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
     }
   }

devops/scripts/benchmarks/CONTRIB.md

@@ -191,12 +191,17 @@ The benchmark suite generates an interactive HTML dashboard that visualizes `Res
 
 ## Utilities
 
+* **`git_project.GitProject`:** Manages git repository cloning, building, and installation for benchmark suites:
+    * Automatically clones repositories to a specified directory and checks out specific commits/refs.
+    * Provides standardized directory structure with `src_dir`, `build_dir`, and `install_dir` properties.
+    * Handles incremental updates - only re-clones if the target commit has changed.
+    * Supports force rebuilds and custom directory naming via constructor options.
+    * Provides `configure()`, `build()`, and `install()` methods for CMake-based projects.
+    * Use this for benchmark suites that need to build from external git repositories (e.g., `ComputeBench`, `VelocityBench`).
 * **`utils.utils`:** Provides common helper functions:
     * `run()`: Executes shell commands with environment setup (SYCL paths, LD_LIBRARY_PATH).
-    * `git_clone()`: Clones/updates Git repositories.
     * `download()`: Downloads files via HTTP, checks checksums, optionally extracts tar/gz archives.
     * `prepare_workdir()`: Sets up the main working directory.
-    * `create_build_path()`: Creates a clean build directory.
 * **`utils.oneapi`:** Provides the `OneAPI` singleton class (`get_oneapi()`). Downloads and installs specified oneAPI components (oneDNN, oneMKL) into the working directory if needed, providing access to their paths (libs, includes, CMake configs). Use this if your benchmark depends on these components instead of requiring a system-wide install.
 * **`options.py`:** Defines and holds global configuration options, populated by `argparse` in `main.py`. Use options instead of defining your own global variables.
 * **`presets.py`:** Defines named sets of suites (`enabled_suites()`) used by the `--preset` argument.

devops/scripts/benchmarks/benches/base.py

@@ -49,8 +49,7 @@ class TracingType(Enum):
 
 
 class Benchmark(ABC):
-    def __init__(self, directory, suite):
-        self.directory = directory
+    def __init__(self, suite):
         self.suite = suite
 
     @abstractmethod
@@ -84,8 +83,8 @@ def tracing_enabled(self, run_trace, force_trace, tr_type: TracingType):
         """Returns whether tracing is enabled for the given type."""
         return (self.traceable(tr_type) or force_trace) and run_trace == tr_type
 
-    @abstractmethod
     def setup(self):
+        """Extra setup steps to be performed before running the benchmark."""
         pass
 
     @abstractmethod
@@ -205,9 +204,9 @@ def run_bench(
 
     def create_data_path(self, name, skip_data_dir=False):
         if skip_data_dir:
-            data_path = os.path.join(self.directory, name)
+            data_path = os.path.join(options.workdir, name)
         else:
-            data_path = os.path.join(self.directory, "data", name)
+            data_path = os.path.join(options.workdir, "data", name)
             if options.redownload and Path(data_path).exists():
                 shutil.rmtree(data_path)
 

devops/scripts/benchmarks/benches/benchdnn.py

@@ -8,19 +8,16 @@
 
 from .base import Suite, Benchmark, TracingType
 from options import options
-from utils.utils import git_clone, run, create_build_path
 from utils.result import Result
 from utils.oneapi import get_oneapi
 from utils.logger import log
 from .benchdnn_list import get_bench_dnn_list
+from git_project import GitProject
 
 
 class OneDnnBench(Suite):
-    def __init__(self, directory):
-        self.directory = Path(directory).resolve()
-        build_path = create_build_path(self.directory, "onednn-build")
-        self.build_dir = Path(build_path)
-        self.src_dir = self.directory / "onednn-repo"
+    def __init__(self):
+        self.project = None
 
     def git_url(self):
         return "https://github.com/uxlfoundation/oneDNN.git"
@@ -62,36 +59,35 @@ def setup(self) -> None:
         if options.sycl is None:
             return
 
-        self.src_dir = git_clone(
-            self.directory,
-            "onednn-repo",
-            self.git_url(),
-            self.git_tag(),
-        )
-
         self.oneapi = get_oneapi()
-        cmake_args = [
-            "cmake",
-            f"-S {self.src_dir}",
-            f"-B {self.build_dir}",
+        if self.project is None:
+            self.project = GitProject(
+                self.git_url(),
+                self.git_tag(),
+                Path(options.workdir),
+                "onednn",
+                force_rebuild=True,
+            )
+
+        extra_cmake_args = [
             f"-DCMAKE_PREFIX_PATH={options.sycl}",
             "-DCMAKE_CXX_COMPILER=clang++",
             "-DCMAKE_C_COMPILER=clang",
-            "-DCMAKE_BUILD_TYPE=Release",
             "-DDNNL_BUILD_TESTS=ON",
             "-DDNNL_BUILD_EXAMPLES=OFF",
             "-DDNNL_CPU_RUNTIME=NONE",  # Disable SYCL CPU support
             "-DDNNL_GPU_RUNTIME=SYCL",  # Enable SYCL GPU support
         ]
-        run(
-            cmake_args,
+        self.project.configure(
+            extra_cmake_args,
+            install_prefix=False,
             add_sycl=True,
         )
-
-        run(
-            f"cmake --build {self.build_dir} --target benchdnn -j {options.build_jobs}",
+        self.project.build(
+            target="benchdnn",
             add_sycl=True,
-            ld_library=[str(self.build_dir) + "/src"] + self.oneapi.ld_libraries(),
+            ld_library=[str(self.project.build_dir / "src")]
+            + self.oneapi.ld_libraries(),
             timeout=60 * 20,
         )
 
@@ -113,7 +109,10 @@ def __init__(self, suite, bench_driver, bench_name, bench_args, syclgraph=True):
             self.bench_args += " --execution-mode=direct"
             self.bench_name += "-eager"
         self.bench_args += f" {bench_args}"
-        self.bench_bin = suite.build_dir / "tests" / "benchdnn" / "benchdnn"
+
+    @property
+    def benchmark_bin(self) -> Path:
+        return self.suite.project.build_dir / "tests" / "benchdnn" / "benchdnn"
 
     def enabled(self):
         if options.sycl is None:
@@ -129,8 +128,8 @@ def explicit_group(self) -> str:
         return self.exp_group
 
     def setup(self):
-        if not self.bench_bin.exists():
-            raise FileNotFoundError(f"Benchmark binary not found: {self.bench_bin}")
+        if not self.benchmark_bin.exists():
+            raise FileNotFoundError(f"Benchmark binary not found: {self.benchmark_bin}")
 
     def run(
         self,
@@ -145,12 +144,12 @@ def run(
             extra_trace_opt = None
 
         command = [
-            str(self.bench_bin),
+            str(self.benchmark_bin),
             *self.bench_args.split(),
         ]
 
         ld_library = self.suite.oneapi.ld_libraries() + [
-            str(self.suite.build_dir / "src")
+            str(self.suite.project.build_dir / "src")
         ]
 
         env_vars = dict(env_vars) if env_vars else {}