Merge branch 'sycl' into llvmspirv_pulldown

Author: mikolaj-pirog

.github/workflows/sycl-nightly-benchmarking.yml

@@ -1,11 +1,50 @@
 name: SYCL Nightly Benchmarking
 
-# Placeholder workflow for testing https://github.com/intel/llvm/pull/19280
 on:
   workflow_dispatch:
+  schedule:
+    - cron: '0 2 * * *'
+
+permissions: read-all
 
 jobs:
-  do-nothing:
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo "Test workflow for 19280"
+  ubuntu2204_build:
+    if: github.repository == 'intel/llvm'
+    uses: ./.github/workflows/sycl-linux-build.yml
+    secrets: inherit
+    with:
+      build_cache_root: "/__w/"
+      build_artifact_suffix: default
+      build_configure_extra_args: '--no-assertions'
+      build_image: ghcr.io/intel/llvm/ubuntu2404_build:latest
+      artifact_archive_name: sycl_linux.tar.gz
+
+  run-sycl-benchmarks:
+    needs: [ubuntu2204_build]
+    if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        runner: ['["PVC_PERF"]', '["BMG_PERF"]']
+        backend: ['level_zero:gpu', 'level_zero_v2:gpu']
+        include:
+          - ref: ${{ github.sha }}
+            save_name: 'Baseline'
+            preset: 'Minimal'
+    uses: ./.github/workflows/sycl-linux-run-tests.yml
+    secrets: inherit
+    with:
+      name: Run compute-benchmarks (${{ matrix.runner }}, ${{ matrix.backend }})
+      runner: ${{ matrix.runner }}
+      image: ghcr.io/intel/llvm/sycl_ubuntu2404_nightly:latest
+      image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
+      target_devices: ${{ matrix.backend }}
+      tests_selector: benchmarks
+      benchmark_upload_results: true
+      benchmark_save_name: ${{ matrix.save_name }}
+      benchmark_preset: ${{ matrix.preset }}
+      repo_ref: ${{ matrix.ref }}
+      sycl_toolchain_artifact: sycl_linux_default
+      sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
+      sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
+

.github/workflows/sycl-nightly.yml

@@ -280,35 +280,6 @@ jobs:
       sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }}
       sycl_cts_artifact: sycl_cts_bin_win
 
-  run-sycl-benchmarks:
-    needs: [ubuntu2204_build]
-    if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
-    strategy:
-      fail-fast: false
-      matrix:
-        runner: ['["PVC_PERF"]', '["BMG_PERF"]']
-        backend: ['level_zero:gpu', 'level_zero_v2:gpu']
-        include:
-          - ref: ${{ github.sha }}
-            save_name: 'Baseline'
-            preset: 'Minimal'
-    uses: ./.github/workflows/sycl-linux-run-tests.yml
-    secrets: inherit
-    with:
-      name: Run compute-benchmarks (${{ matrix.runner }}, ${{ matrix.backend }})
-      runner: ${{ matrix.runner }}
-      image: ghcr.io/intel/llvm/sycl_ubuntu2404_nightly:latest
-      image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
-      target_devices: ${{ matrix.backend }}
-      tests_selector: benchmarks
-      benchmark_upload_results: true
-      benchmark_save_name: ${{ matrix.save_name }}
-      benchmark_preset: ${{ matrix.preset }}
-      repo_ref: ${{ matrix.ref }}
-      sycl_toolchain_artifact: sycl_linux_default
-      sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
-      sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
-
   nightly_build_upload:
     name: Nightly Build Upload
     if: ${{ github.ref_name == 'sycl' }}

devops/scripts/benchmarks/benches/benchdnn.py

@@ -161,7 +161,6 @@ def run(self, env_vars):
                 unit="ms",
                 command=command,
                 env=env_vars,
-                stdout=output,
                 git_url=self.suite.git_url(),
                 git_hash=self.suite.git_tag(),
             )

devops/scripts/benchmarks/benches/compute.py

@@ -303,7 +303,6 @@ def run(self, env_vars) -> list[Result]:
                     stddev=stddev,
                     command=command,
                     env=env_vars,
-                    stdout=result,
                     unit=parse_unit_type(unit),
                     git_url=self.bench.git_url(),
                     git_hash=self.bench.git_hash(),

devops/scripts/benchmarks/benches/gromacs.py

@@ -15,7 +15,6 @@
 
 
 class GromacsBench(Suite):
-
     def git_url(self):
         return "https://gitlab.com/gromacs/gromacs.git"
 
@@ -221,7 +220,6 @@ def run(self, env_vars):
                 unit="s",
                 command=command,
                 env=env_vars,
-                stdout=mdrun_output,
                 git_url=self.suite.git_url(),
                 git_hash=self.suite.git_tag(),
             )

devops/scripts/benchmarks/benches/llamacpp.py

@@ -154,7 +154,6 @@ def run(self, env_vars) -> list[Result]:
                     value=mean,
                     command=command,
                     env=env_vars,
-                    stdout=result,
                     unit="token/s",
                     git_url=self.bench.git_url(),
                     git_hash=self.bench.git_hash(),

devops/scripts/benchmarks/benches/syclbench.py

@@ -165,7 +165,6 @@ def run(self, env_vars) -> list[Result]:
                             passed=(row[1] == "PASS"),
                             command=command,
                             env=env_vars,
-                            stdout=row,
                             unit="ms",
                             git_url=self.bench.git_url(),
                             git_hash=self.bench.git_hash(),

devops/scripts/benchmarks/benches/test.py

@@ -96,7 +96,6 @@ def run(self, env_vars) -> list[Result]:
                 value=random_value,
                 command=["test", "--arg1", "foo"],
                 env={"A": "B"},
-                stdout="no output",
                 unit="ms",
             )
         ]

devops/scripts/benchmarks/benches/umf.py

@@ -165,7 +165,6 @@ def run(self, env_vars) -> list[Result]:
                         value=value,
                         command=command,
                         env=env_vars,
-                        stdout=result,
                         unit=self.get_unit_time_or_overhead(explicit_group),
                     )
                 )

devops/scripts/benchmarks/benches/velocity.py

@@ -146,7 +146,6 @@ def run(self, env_vars) -> list[Result]:
                 value=self.parse_output(result),
                 command=command,
                 env=env_vars,
-                stdout=result,
                 unit=self.unit,
                 git_url=self.vb.git_url(),
                 git_hash=self.vb.git_hash(),