Merge branch 'sycl' of https://github.com/intel/llvm into ianayl/benchmark-ci-no-botuser

Author: ianayl

.github/workflows/bandit.yml renamed to .github/workflows/sycl-bandit.yml

@@ -14,6 +14,7 @@ permissions: read-all
 
 jobs:
   notify-ready-prs:
+    if: github.repository == 'intel/llvm'
     permissions:
       pull-requests: write
     runs-on: ubuntu-latest

.github/workflows/sycl-benchmark-aggregate.yml

@@ -1,6 +1,18 @@
 name: Coverity
 on:
   workflow_dispatch:
+    inputs:
+      description:
+        description: 'Custom build description'
+        required: true
+        type: string
+        default: 'Out-of-order Coverity scan'
+      ref:
+        description: 'Git ref to checkout and scan'
+        required: true
+        type: string
+        default: 'sycl'
+
   schedule:
     - cron: '0 0 * * 0'
 
@@ -27,7 +39,7 @@ jobs:
     - uses: ./devops/actions/cached_checkout
       with:
         path: src
-        ref: ${{ github.sha }}
+        ref: ${{ inputs.ref || github.sha }}
         cache_path: "/__w/repo_cache/"
 
     - name: Get coverity tool
@@ -45,7 +57,7 @@ jobs:
         cd $GITHUB_WORKSPACE/build
         python3 $GITHUB_WORKSPACE/src/buildbot/configure.py -w $GITHUB_WORKSPACE \
           -s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t Release \
-          --ci-defaults --hip --cuda \
+          --ci-defaults --use-zstd --hip --cuda \
           -DNATIVECPU_USE_OCK=Off
 
     - name: Build with coverity
@@ -56,10 +68,15 @@ jobs:
 
     - name: Submit build
       run: |
+        default_description="${{ inputs.description }}"
+        if [[ -z $default_description ]]; then
+          default_description="Regular build"
+        fi
+
         # Initialize a build. Fetch a cloud upload url.
         curl -X POST \
-        -d version="sycl: ${{ github.sha }}" \
-        -d description="Regular build" \
+        -d version="${{ inputs.ref || github.sha }}" \
+        -d description="$default_description" \
         -d email=${{ secrets.COVERITY_EMAIL }} \
         -d token=${{ secrets.COVERITY_TOKEN }} \
         -d file_name="intel_llvm.tgz" \

.github/workflows/sycl-check-ready-to-merge-prs.yml

@@ -67,6 +67,8 @@ jobs:
               - devops/dependencies-igc-dev.json
             benchmarks:
               - 'devops/scripts/benchmarks/**'
+              - 'devops/actions/run-tests/benchmark/**'
+              - '.github/workflows/sycl-ur-perf-benchmarking.yml'
             perf-tests:
               - sycl/test-e2e/PerformanceTests/**
             esimd:

.github/workflows/coverity.yml renamed to .github/workflows/sycl-coverity.yml

@@ -201,7 +201,7 @@ jobs:
           -s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build \
           -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/toolchain \
           -t Release \
-          --ci-defaults ${{ inputs.build_configure_extra_args }} \
+          --ci-defaults --use-zstd ${{ inputs.build_configure_extra_args }} \
           -DCMAKE_C_COMPILER_LAUNCHER=ccache \
           -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
           -DLLVM_INSTALL_UTILS=ON
@@ -286,20 +286,9 @@ jobs:
 
     - name: Install utilities
       if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' }}
-      # TODO replace utility installation with a single CMake target
       run: |
-        cmake --build $GITHUB_WORKSPACE/build --target utils/FileCheck/install
-        cmake --build $GITHUB_WORKSPACE/build --target utils/count/install
-        cmake --build $GITHUB_WORKSPACE/build --target utils/not/install
-        cmake --build $GITHUB_WORKSPACE/build --target utils/lit/install
-        cmake --build $GITHUB_WORKSPACE/build --target utils/llvm-lit/install
-        cmake --build $GITHUB_WORKSPACE/build --target install-llvm-size
-        cmake --build $GITHUB_WORKSPACE/build --target install-llvm-cov
-        cmake --build $GITHUB_WORKSPACE/build --target install-llvm-profdata
-        cmake --build $GITHUB_WORKSPACE/build --target install-compiler-rt
-        # This is required to perform the DeviceConfigFile consistency test, see
-        # sycl/test-e2e/Basic/device_config_file_consistency.cpp.
-        cmake --install $GITHUB_WORKSPACE/build --component DeviceConfigFile
+        cmake --build $GITHUB_WORKSPACE/build --target install-sycl-test-utilities
+
     - name: Additional Install for "--shared-libs" build
       if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' && contains(inputs.build_configure_extra_args, '--shared-libs') }}
       run: |

.github/workflows/sycl-detect-changes.yml

@@ -9,6 +9,7 @@ on:
     - sycl
     - sycl-rel-**
     # Do not run builds if changes are only in the following locations
+    # Note: benchmark-related paths are the same as in sycl-ur-perf-benchmarking.yml (to run there instead)
     paths-ignore:
     - '.github/ISSUE_TEMPLATE/**'
     - '.github/CODEOWNERS'
@@ -23,14 +24,18 @@ on:
     - '.github/workflows/sycl-nightly.yml'
     - '.github/workflows/sycl-rel-nightly.yml'
     - '.github/workflows/sycl-rel-nightly-launch.yml'
-    - '.github/workflows/trivy.yml'
+    - '.github/workflows/sycl-trivy.yml'
+    - '.github/workflows/sycl-coverity.yml'
     - 'devops/containers/**'
     - 'devops/actions/build_container/**'
     - 'unified-runtime/examples/**'
     - 'unified-runtime/scripts/**'
     - 'unified-runtime/test/**'
     - 'unified-runtime/third_party/**'
     - 'unified-runtime/tools/**'
+    - 'devops/scripts/benchmarks/**'
+    - 'devops/actions/run-tests/benchmark/**'
+    - '.github/workflows/sycl-ur-perf-benchmarking.yml'
 
 concurrency:
   #  Cancel a currently running workflow from the same PR, branch or tag.
@@ -224,28 +229,6 @@ jobs:
       skip_run: ${{matrix.use_igc_dev && contains(github.event.pull_request.labels.*.name, 'ci-no-devigc') || 'false'}}
       env: ${{ matrix.env || (contains(needs.detect_changes.outputs.filters, 'esimd') && '{}' || '{"LIT_FILTER_OUT":"ESIMD/"}') }}
 
-  test_benchmark_scripts:
-    needs: [build, detect_changes]
-    if: |
-      always() && !cancelled()
-      && needs.build.outputs.build_conclusion == 'success'
-      && contains(needs.detect_changes.outputs.filters, 'benchmarks')
-    uses: ./.github/workflows/sycl-linux-run-tests.yml
-    with:
-      name: Benchmark suite precommit testing
-      runner: '["PVC_PERF"]'
-      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: 'level_zero:gpu'
-      tests_selector: benchmarks
-      benchmark_upload_results: false
-      benchmark_preset: 'Minimal'
-      benchmark_dry_run: true
-      repo_ref: ${{ github.sha }}
-      toolchain_artifact: ${{ needs.build.outputs.toolchain_artifact }}
-      toolchain_artifact_filename: ${{ needs.build.outputs.toolchain_artifact_filename }}
-      toolchain_decompress_command: ${{ needs.build.outputs.toolchain_decompress_command }}
-
   test-perf:
     needs: [build, detect_changes]
     if: |

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

@@ -134,12 +134,19 @@ on:
         type: string
         default: 'Minimal'
         required: False
+      # dry-run is passed only to compare.py (to not fail on regression), not to main.py (where such flag would omit all benchmark runs)
       benchmark_dry_run:
         description: |
           Whether or not to fail the workflow upon a regression.
         type: string
         default: 'false'
         required: False
+      benchmark_exit_on_failure:
+        description: |
+          Whether or not to fail the workflow upon a failure.
+        type: string
+        default: 'false'
+        required: False
 
   workflow_dispatch:
     inputs:
@@ -211,6 +218,12 @@ on:
           - "build-only"
           - "run-only"
 
+      benchmark_exit_on_failure:
+        type: choice
+        options:
+          - "true"
+          - "false"
+
 permissions:
   contents: read
   packages: read
@@ -361,6 +374,7 @@ jobs:
         save_name: ${{ inputs.benchmark_save_name }}
         preset: ${{ inputs.benchmark_preset }}
         dry_run: ${{ inputs.benchmark_dry_run }}
+        exit_on_failure: ${{ inputs.benchmark_exit_on_failure }}
         build_ref: ${{ inputs.repo_ref }}
       env:
         RUNNER_TAG: ${{ inputs.runner }}

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

@@ -24,7 +24,7 @@ permissions: read-all
 jobs:
   build:
     name: Build
-    runs-on: macos-13
+    runs-on: macos-latest
     env:
       CCACHE_DIR: $GITHUB_WORKSPACE/build_cache_${{ inputs.build_cache_suffix }}
       CCACHE_MAXSIZE: ${{ inputs.build_cache_size }}
@@ -49,7 +49,7 @@ jobs:
         cd $GITHUB_WORKSPACE/build
         python3 $GITHUB_WORKSPACE/src/buildbot/configure.py -w $GITHUB_WORKSPACE \
           -s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t Release \
-          --ci-defaults $ARGS \
+          --ci-defaults --use-zstd $ARGS \
           -DCMAKE_C_COMPILER_LAUNCHER=ccache \
           -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
           -DLLVM_INSTALL_UTILS=ON