Merge commit '63959512e8e9' into llvmspirv_pulldown

Author: jsji

.github/CODEOWNERS

@@ -75,6 +75,7 @@ llvm/include/llvm/SYCLLowerIR/SYCLCreateNVVMAnnotations.h @intel/llvm-reviewers-
 llvm/lib/SYCLLowerIR/SYCLCreateNVVMAnnotations.cpp @intel/llvm-reviewers-cuda
 llvm/lib/Target/NVPTX @intel/llvm-reviewers-cuda
 llvm/lib/Target/AMDGPU @intel/llvm-reviewers-cuda
+unified-runtime/source/common/cuda-hip @intel/llvm-reviewers-cuda
 
 # XPTI instrumentation utilities
 xpti/ @intel/llvm-reviewers-runtime

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

@@ -22,6 +22,7 @@ on:
     - '.github/workflows/sycl-macos-*.yml'
     - '.github/workflows/sycl-nightly.yml'
     - '.github/workflows/sycl-rel-nightly.yml'
+    - '.github/workflows/trivy.yml'
     - 'devops/containers/**'
     - 'devops/actions/build_container/**'
 

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

@@ -44,7 +44,7 @@ jobs:
     with:
       build_cache_root: "/__w/"
       build_artifact_suffix: default
-      build_configure_extra_args: '--hip --cuda'
+      build_configure_extra_args: '--no-assertions --add_security_flags=sanitize --hip --cuda'
       build_image: ghcr.io/intel/llvm/ubuntu2204_build:latest
       build_ref: ${{ inputs.testing_branch || 'sycl-rel-6_1_0'  }}
 
@@ -63,34 +63,35 @@ jobs:
             runner: '["Linux", "amdgpu"]'
             image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
             target_devices: hip:gpu
-            tests_selector: e2e
 
-          - name: Intel L0 GPU
+          - name: Intel L0 Gen12 GPU
             runner: '["Linux", "gen12"]'
             image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
             target_devices: level_zero:gpu
-            tests_selector: e2e
             extra_lit_opts: --param gpu-intel-gen12=True
 
-          - name: Intel OCL GPU
+          - name: Intel L0 Battlemage GPU
+            runner: '["Linux", "bmg"]'
+            image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
+            target_devices: level_zero:gpu
+
+          - name: Intel OCL Gen12 GPU
             runner: '["Linux", "gen12"]'
             image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
             target_devices: opencl:gpu
-            tests_selector: e2e
             extra_lit_opts: --param gpu-intel-gen12=True
 
           - name: Intel OCL CPU
             runner: '["Linux", "gen12"]'
             image_options: -u 1001 --privileged --cap-add SYS_ADMIN
             target_devices: opencl:cpu
-            tests_selector: e2e
     uses: ./.github/workflows/sycl-linux-run-tests.yml
     with:
       name: ${{ matrix.name }}
       runner: ${{ matrix.runner }}
       image_options: ${{ matrix.image_options }}
       target_devices: ${{ matrix.target_devices }}
-      tests_selector: ${{ matrix.tests_selector }}
+      tests_selector: e2e
       extra_lit_opts: ${{ matrix.extra_lit_opts }}
       repo_ref: ${{ inputs.testing_branch || 'sycl-rel-6_1_0'  }}
       devops_ref: sycl
@@ -104,6 +105,7 @@ jobs:
     uses: ./.github/workflows/sycl-windows-build.yml
     with:
       ref: ${{ inputs.testing_branch || 'sycl-rel-6_1_0'  }}
+      build_configure_extra_args: '--no-assertions --add_security_flags=sanitize'
 
       # We upload both Linux/Windows build via Github's "Releases"
       # functionality, make sure Linux/Windows names follow the same pattern.
@@ -116,12 +118,22 @@ jobs:
       always()
       && !cancelled()
       && needs.build-win.outputs.build_conclusion == 'success'
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: Intel GEN12 Graphics with Level Zero
+            runner: '["Windows","gen12"]'
+            # 6_1_0 doesn't support the auto-detection, keep it until 6_2_0.
+            extra_lit_opts: --param gpu-intel-gen12=True
+          - name: Intel Battlemage Graphics with Level Zero
+            runner: '["Windows","bmg"]'
     uses: ./.github/workflows/sycl-windows-run-tests.yml
     with:
-      name: Intel GEN12 Graphics with Level Zero
-      runner: '["Windows","gen12"]'
+      name: ${{ matrix.name }}
+      runner: ${{ matrix.runner }}
       sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }}
-      extra_lit_opts: --param gpu-intel-gen12=True
+      extra_lit_opts: ${{ matrix.extra_lit_opts }}
       repo_ref: ${{ inputs.testing_branch || 'sycl-rel-6_1_0'  }}
       devops_ref: sycl
 

.github/workflows/sycl-windows-precommit.yml

@@ -21,6 +21,7 @@ on:
     - '.github/workflows/sycl-macos-*.yml'
     - '.github/workflows/sycl-nightly.yml'
     - '.github/workflows/sycl-rel-nightly.yml'
+    - '.github/workflows/trivy.yml'
     - 'devops/containers/**'
     - 'devops/actions/build_container/**'
 

.github/workflows/sycl-windows-run-tests.yml

@@ -117,12 +117,14 @@ jobs:
         echo "C:\Program Files\Git\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
     - name: Register cleanup after job is finished
       uses: ./devops/actions/cleanup
-    - uses: ./devops/actions/cached_checkout
+    - uses: actions/checkout@v4
       if: inputs.tests_selector == 'e2e'
       with:
         path: llvm
         ref: ${{ inputs.repo_ref || github.sha }}
-        cache_path: "D:\\\\github\\\\_work\\\\repo_cache\\\\"
+        sparse-checkout: |
+          llvm/utils/lit
+          sycl/test-e2e          
     - name: Download compiler toolchain
       uses: actions/download-artifact@v4
       with:

.github/workflows/trivy.yml

@@ -30,6 +30,7 @@ jobs:
         run: ./bin/trivy config --format json --output trivy-report.json --ignorefile=devops/.trivyignore.yaml devops/containers --exit-code 1
 
       - name: Upload report artifact
+        if: always() && !cancelled()
         uses: actions/upload-artifact@v4
         with:
           name: trivy-report

devops/actions/run-tests/e2e/action.yml

@@ -23,11 +23,13 @@ runs:
   using: "composite"
   steps:
   - name: Checkout E2E tests
-    uses: ./devops/actions/cached_checkout
+    uses: actions/checkout@v4
     with:
       path: llvm
       ref: ${{ inputs.ref || github.sha }}
-      cache_path: "/__w/repo_cache/"
+      sparse-checkout: |
+        llvm/utils/lit
+        sycl/test-e2e
 
   - name: Download E2E Binaries
     if: inputs.testing_mode == 'run-only'

devops/scripts/benchmarks/benches/base.py

@@ -129,13 +129,20 @@ def unstable(self) -> str:
     def get_tags(self) -> list[str]:
         return []
 
+    def range(self) -> tuple[float, float]:
+        return None
+
     def get_metadata(self) -> BenchmarkMetadata:
+        range = self.range()
+
         return BenchmarkMetadata(
             type="benchmark",
             description=self.description(),
             notes=self.notes(),
             unstable=self.unstable(),
             tags=self.get_tags(),
+            range_min=range[0] if range else None,
+            range_max=range[1] if range else None,
         )
 
 

devops/scripts/benchmarks/benches/compute.py

@@ -92,6 +92,7 @@ def additionalMetadata(self) -> dict[str, BenchmarkMetadata]:
                 "The UR v2 adapter noticeably reduces UR layer overhead, also improving SYCL performance.\n"
                 "Work is ongoing to reduce the overhead of the SYCL API\n",
                 tags=["submit", "micro", "SYCL", "UR", "L0"],
+                range_min=0.0,
             ),
             "SinKernelGraph": BenchmarkMetadata(
                 type="group",
@@ -294,11 +295,9 @@ def name(self):
         return f"api_overhead_benchmark_{self.runtime.value} SubmitKernel {order}{completion_str}"
 
     def explicit_group(self):
-        return (
-            "SubmitKernel"
-            if self.measure_completion == 0
-            else "SubmitKernel With Completion"
-        )
+        order = "In Order" if self.ioq else "Out Of Order"
+        completion_str = " With Completion" if self.measure_completion else ""
+        return f"SubmitKernel {order}{completion_str}"
 
     def description(self) -> str:
         order = "in-order" if self.ioq else "out-of-order"
@@ -317,6 +316,9 @@ def description(self) -> str:
             f"Runs 10 simple kernels with minimal execution time to isolate API overhead from kernel execution time. {l0_specific}"
         )
 
+    def range(self) -> tuple[float, float]:
+        return (0.0, None)
+
     def bin_args(self) -> list[str]:
         return [
             f"--Ioq={self.ioq}",

devops/scripts/benchmarks/history.py

@@ -77,13 +77,18 @@ def create_run(self, name: str, results: list[Result]) -> BenchmarkRun:
             git_hash = "unknown"
             github_repo = None
 
+        compute_runtime = (
+            options.compute_runtime_tag if options.build_compute_runtime else None
+        )
+
         return BenchmarkRun(
             name=name,
             git_hash=git_hash,
             github_repo=github_repo,
             date=datetime.now(tz=timezone.utc),
             results=results,
             hostname=socket.gethostname(),
+            compute_runtime=compute_runtime,
         )
 
     def save(self, save_name, results: list[Result], to_file=True):