Merge remote-tracking branch 'upstream/sycl' into new_offload_entry

Author: uditagarwal97

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

@@ -71,7 +71,7 @@ jobs:
       target_devices: cuda:gpu
       # No idea why but that seems to work and be in sync with the main
       # pre-commit workflow.
-      ref: ${{ github.event.workflow_run.referenced_workflows[0].sha }}
+      repo_ref: ${{ github.event.workflow_run.referenced_workflows[0].sha }}
 
       sycl_toolchain_artifact: sycl_linux_default
       sycl_toolchain_archive: llvm_sycl.tar.zst

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

@@ -121,9 +121,9 @@ jobs:
       image: ${{ matrix.image }}
       image_options: ${{ matrix.image_options }}
       target_devices: ${{ matrix.target_devices }}
-      extra_lit_opts: --param fallback-to-build-if-requires-build-and-run=True ${{ matrix.extra_lit_opts }}
+      extra_lit_opts: ${{ matrix.extra_lit_opts }}
       reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
-      ref: ${{ github.sha }}
+      repo_ref: ${{ github.sha }}
       sycl_toolchain_artifact: sycl_linux_default
       sycl_toolchain_archive: ${{ needs.build.outputs.artifact_archive_name }}
       sycl_toolchain_decompress_command: ${{ needs.build.outputs.artifact_decompress_command }}
@@ -180,7 +180,7 @@ jobs:
       env: '{"LIT_FILTER":"PerformanceTests/"}'
       extra_lit_opts: -a -j 1 --param enable-perf-tests=True
 
-      ref: ${{ github.sha }}
+      repo_ref: ${{ github.sha }}
 
       sycl_toolchain_artifact: sycl_linux_default
       sycl_toolchain_archive: ${{ needs.build.outputs.artifact_archive_name }}

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

@@ -35,7 +35,7 @@ on:
         type: string
         default: ''
 
-      ref:
+      repo_ref:
         type: string
         required: True
         description: |
@@ -214,7 +214,7 @@ jobs:
         done
     - uses: actions/checkout@v4
       with:
-        ref: ${{ inputs.devops_ref || inputs.ref }}
+        ref: ${{ inputs.devops_ref || inputs.repo_ref }}
         sparse-checkout: |
           devops
     - name: Register cleanup after job is finished
@@ -304,7 +304,7 @@ jobs:
       if: inputs.tests_selector == 'e2e'
       uses: ./devops/actions/run-tests/e2e
       with:
-        ref: ${{ inputs.tests_ref || inputs.ref || github.sha }}
+        ref: ${{ inputs.tests_ref || inputs.repo_ref || github.sha }}
         binaries_artifact: ${{ inputs.e2e_binaries_artifact }}
         testing_mode: ${{ inputs.e2e_testing_mode }}
         extra_cmake_args: ${{ inputs.extra_cmake_args }}

.github/workflows/sycl-nightly.yml

@@ -126,7 +126,7 @@ jobs:
       tests_selector: e2e
       extra_lit_opts: "--param 'cxx_flags=-D_GLIBCXX_USE_CXX11_ABI=0' ${{ matrix.extra_lit_opts }}"
       reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
-      ref: ${{ github.sha }}
+      repo_ref: ${{ github.sha }}
       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 }}
@@ -142,7 +142,7 @@ jobs:
       reset_intel_gpu: true
       extra_lit_opts: -j 50
       image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
-      ref: ${{ github.sha }}
+      repo_ref: ${{ github.sha }}
       sycl_toolchain_artifact: sycl_linux_oneapi
       sycl_toolchain_archive: ${{ needs.ubuntu2404_oneapi_build.outputs.artifact_archive_name }}
       sycl_toolchain_decompress_command: ${{ needs.ubuntu2404_oneapi_build.outputs.artifact_decompress_command }}
@@ -187,7 +187,7 @@ jobs:
       image: ghcr.io/intel/llvm/ubuntu2204_build:latest
       image_options: -u 1001 --gpus all --cap-add SYS_ADMIN --env NVIDIA_DISABLE_REQUIRE=1
       target_devices: cuda:gpu
-      ref: ${{ github.sha }}
+      repo_ref: ${{ github.sha }}
 
       sycl_toolchain_artifact: sycl_linux_default
       sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
@@ -211,7 +211,7 @@ jobs:
       cts_testing_mode: 'build-only'
       image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
       tests_selector: cts
-      ref: ${{ github.sha }}
+      repo_ref: ${{ github.sha }}
       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 }}
@@ -240,7 +240,7 @@ jobs:
       image_options: ${{ matrix.image_options }}
       target_devices: ${{ matrix.target_devices }}
       tests_selector: cts
-      ref: ${{ github.sha }}
+      repo_ref: ${{ github.sha }}
       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 }}
@@ -281,7 +281,7 @@ jobs:
       target_devices: ${{ matrix.target_devices }}
       tests_selector: compute-benchmarks
       reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
-      ref: ${{ github.sha }}
+      repo_ref: ${{ github.sha }}
       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-post-commit.yml

@@ -18,6 +18,8 @@ on:
     - .github/workflows/sycl-macos-build-and-test.yml
     - ./devops/actions/cleanup
     - ./devops/actions/cached_checkout
+    - ./devops/dependencies.json
+    - ./devops/dependencies-igc-dev.json
 
 concurrency:
   #  Cancel a currently running workflow from the same PR or commit hash.
@@ -86,7 +88,7 @@ jobs:
       extra_lit_opts: ${{ matrix.extra_lit_opts }}
       env: ${{ matrix.env || '{}' }}
 
-      ref: ${{ github.sha }}
+      repo_ref: ${{ github.sha }}
 
       sycl_toolchain_artifact: sycl_linux_default
       sycl_toolchain_archive: ${{ needs.build-lin.outputs.artifact_archive_name }}

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

@@ -89,7 +89,7 @@ jobs:
       tests_selector: ${{ matrix.tests_selector }}
       extra_lit_opts: ${{ matrix.extra_lit_opts }}
       reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
-      ref: sycl-rel-6_0_0
+      repo_ref: sycl-rel-6_0_0
       devops_ref: sycl
       sycl_toolchain_artifact: sycl_linux_default
       sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
@@ -141,7 +141,7 @@ jobs:
       image: ghcr.io/intel/llvm/ubuntu2204_build:latest
       image_options: -u 1001 --gpus all --cap-add SYS_ADMIN --env NVIDIA_DISABLE_REQUIRE=1
       target_devices: cuda:gpu
-      ref: sycl-rel-6_0_0
+      repo_ref: sycl-rel-6_0_0
       devops_ref: sycl
 
       sycl_toolchain_artifact: sycl_linux_default
@@ -167,7 +167,7 @@ jobs:
       cts_testing_mode: 'build-only'
       image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
       tests_selector: cts
-      ref: sycl-rel-6_0_0
+      repo_ref: sycl-rel-6_0_0
       devops_ref: sycl
       sycl_toolchain_artifact: sycl_linux_default
       sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
@@ -197,7 +197,7 @@ jobs:
       image_options: ${{ matrix.image_options }}
       target_devices: ${{ matrix.target_devices }}
       tests_selector: cts
-      ref: ${{ github.sha }}
+      repo_ref: ${{ github.sha }}
       devops_ref: sycl
       sycl_toolchain_artifact: sycl_linux_default
       sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}

.github/workflows/sycl-weekly.yml

@@ -30,7 +30,7 @@ jobs:
       cts_testing_mode: 'build-only'
       image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
       tests_selector: cts
-      ref: ${{ github.sha }}
+      repo_ref: ${{ github.sha }}
       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 }}
@@ -60,7 +60,7 @@ jobs:
       image_options: ${{ matrix.image_options }}
       target_devices: ${{ matrix.target_devices }}
       tests_selector: cts
-      ref: ${{ github.sha }}
+      repo_ref: ${{ github.sha }}
       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-windows-run-tests.yml

@@ -111,7 +111,7 @@ jobs:
       shell: cmd
       run: |
         mkdir build-e2e
-        cmake -GNinja -B build-e2e -S.\llvm\sycl\test-e2e -DSYCL_TEST_E2E_TARGETS="level_zero:gpu" -DCMAKE_CXX_COMPILER="clang++" -DLEVEL_ZERO_LIBS_DIR="D:\github\level-zero_win-sdk\lib" -DLEVEL_ZERO_INCLUDE="D:\github\level-zero_win-sdk\include" -DLLVM_LIT="..\llvm\llvm\utils\lit\lit.py"
+        cmake -GNinja -B build-e2e -S.\llvm\sycl\test-e2e -DSYCL_TEST_E2E_TARGETS="level_zero:gpu" -DCMAKE_CXX_COMPILER="clang++" -DLEVEL_ZERO_LIBS_DIR="D:\\github\\level-zero_win-sdk\\lib" -DLEVEL_ZERO_INCLUDE="D:\\github\\level-zero_win-sdk\\include" -DLLVM_LIT="..\\llvm\\llvm\\utils\\lit\\lit.py"
     - name: Run End-to-End tests
       shell: bash
       run: |

.github/workflows/ur-benchmarks-reusable.yml

@@ -1,198 +1,12 @@
 name: Benchmarks Reusable
 
-on:
-  workflow_call:
-    inputs:
-      str_name:
-        required: true
-        type: string
-      pr_no:
-        required: true
-        # even though this is a number, this is a workaround for issues with
-        # reusable workflow calls that result in "Unexpected value '0'" error.
-        type: string
-      bench_script_params:
-        required: false
-        type: string
-        default: ''
-      sycl_config_params:
-        required: false
-        type: string
-        default: ''
-      upload_report:
-        required: false
-        type: boolean
-        default: false
-      compute_runtime_commit:
-        required: false
-        type: string
-        default: ''
+# This workflow is a WIP: This workflow file acts as a placeholder.
 
-permissions:
-  contents: read
-  pull-requests: write
+on: [ workflow_call ]
 
 jobs:
-  bench-run:
-    name: Build SYCL, Run Benchmarks
-    strategy:
-      matrix:
-        adapter: [
-          {str_name: "${{ inputs.str_name }}",
-          sycl_config: "${{ inputs.sycl_config_params }}"
-          }
-        ]
-        build_type: [Release]
-        compiler: [{c: clang, cxx: clang++}]
-
-    runs-on: "PVC_PERF"
-
+  do-nothing:
+    runs-on: ubuntu-latest
     steps:
-    - name: Add comment to PR
-      uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-      if: ${{ always() && inputs.pr_no != 0 }}
-      with:
-        script: |
-          const pr_no = '${{ inputs.pr_no }}';
-          const adapter = '${{ matrix.adapter.str_name }}';
-          const url = '${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}';
-          const params = '${{ inputs.bench_script_params }}';
-          const body = `Compute Benchmarks ${adapter} run (with params: ${params}):\n${url}`;
-
-          github.rest.issues.createComment({
-            issue_number: pr_no,
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            body: body
-          })
-
-    - name: Checkout SYCL
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      with:
-        path: sycl-repo
-
-    # We need to fetch special ref for proper PR's merge commit. Note, this ref may be absent if the PR is already merged.
-    - name: Fetch PR's merge commit
-      if: ${{ inputs.pr_no != 0 }}
-      working-directory: ${{github.workspace}}/sycl-repo
-      run: |
-        git fetch -- https://github.com/${{github.repository}} +refs/pull/${{ inputs.pr_no }}/*:refs/remotes/origin/pr/${{ inputs.pr_no }}/*
-        git checkout origin/pr/${{ inputs.pr_no }}/merge
-        git rev-parse origin/pr/${{ inputs.pr_no }}/merge
-
-    - name: Install pip packages
-      run: |
-        pip install --force-reinstall -r ${{github.workspace}}/sycl-repo/unified-runtime/scripts/benchmarks/requirements.txt
-
-    - name: Configure SYCL
-      run: >
-        python3 sycl-repo/buildbot/configure.py
-        -t ${{matrix.build_type}}
-        -o ${{github.workspace}}/sycl_build
-        --cmake-gen "Ninja"
-        --cmake-opt="-DLLVM_INSTALL_UTILS=ON"
-        --cmake-opt="-DSYCL_PI_TESTS=OFF"
-        --cmake-opt=-DCMAKE_C_COMPILER_LAUNCHER=ccache
-        --cmake-opt=-DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-        ${{matrix.adapter.sycl_config}}
-
-    - name: Build SYCL
-      run: cmake --build ${{github.workspace}}/sycl_build -j $(nproc)
-
-    # We need a complete installed UR for compute-benchmarks.
-    - name: Configure UR
-      run: >
-        cmake -DCMAKE_BUILD_TYPE=${{matrix.build_type}}
-        -S${{github.workspace}}/sycl-repo/unified-runtime
-        -B${{github.workspace}}/ur_build
-        -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/ur_install
-        -DUR_BUILD_TESTS=OFF
-        -DUR_BUILD_ADAPTER_L0=ON
-        -DUR_BUILD_ADAPTER_L0_V2=ON
-        -DUMF_DISABLE_HWLOC=ON
-
-    - name: Build UR
-      run: cmake --build ${{github.workspace}}/ur_build -j $(nproc)
-
-    - name: Install UR
-      run: cmake --install ${{github.workspace}}/ur_build
-
-    - name: Compute core range
-      run: |
-        # Compute the core range for the first NUMA node; second node is for UMF jobs.
-        # Skip the first 4 cores - the kernel is likely to schedule more work on these.
-        CORES="$(lscpu | awk '
-          /NUMA node0 CPU|On-line CPU/ {line=$0}
-          END {
-            split(line, a, " ")
-            split(a[4], b, ",")
-            sub(/^0/, "4", b[1])
-            print b[1]
-          }')"
-        echo "Selected core: $CORES"
-        echo "CORES=$CORES" >> $GITHUB_ENV
-
-        ZE_AFFINITY_MASK=0
-        echo "ZE_AFFINITY_MASK=$ZE_AFFINITY_MASK" >> $GITHUB_ENV
-
-    - name: Run benchmarks
-      working-directory: ${{ github.workspace }}
-      id: benchmarks
-      run: >
-        taskset -c "${{ env.CORES }}" ${{ github.workspace }}/sycl-repo/unified-runtime/scripts/benchmarks/main.py
-        ~/llvm_bench_workdir
-        --sycl ${{ github.workspace }}/sycl_build
-        --ur ${{ github.workspace }}/ur_install
-        --adapter ${{ matrix.adapter.str_name }}
-        --compare baseline
-        --compute-runtime ${{ inputs.compute_runtime_commit }}
-        --build-igc
-        ${{ inputs.upload_report && '--output-html' || '' }}
-        ${{ inputs.pr_no != 0 && '--output-markdown' || '' }}
-        ${{ inputs.bench_script_params }}
-
-    - name: Print benchmark results
-      run: |
-        cat ${{ github.workspace }}/benchmark_results.md || true
-
-    - name: Add comment to PR
-      uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-      if: ${{ always() && inputs.pr_no != 0 }}
-      with:
-        script: |
-          let markdown = ""
-          try {
-            const fs = require('fs');
-            markdown = fs.readFileSync('benchmark_results.md', 'utf8');
-          } catch(err) {
-          }
-
-          const pr_no = '${{ inputs.pr_no }}';
-          const adapter = '${{ matrix.adapter.str_name }}';
-          const url = '${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}';
-          const test_status = '${{ steps.benchmarks.outcome }}';
-          const job_status = '${{ job.status }}';
-          const params = '${{ inputs.bench_script_params }}';
-          const body = `Benchmarks ${adapter} run (${params}):\n${url}\nJob status: ${job_status}. Test status: ${test_status}.\n ${markdown}`;
-
-          github.rest.issues.createComment({
-            issue_number: pr_no,
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            body: body
-          })
-
-    - name: Rename benchmark results file
-      if: ${{ always() && inputs.upload_report }}
-      run: mv benchmark_results.html benchmark_results_${{ inputs.pr_no }}.html
-
-    - name: Upload HTML report
-      if: ${{ always() && inputs.upload_report }}
-      uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
-      with:
-        path: benchmark_results_${{ inputs.pr_no }}.html
-        key: benchmark-results-${{ inputs.pr_no }}-${{ matrix.adapter.str_name }}-${{ github.run_id }}
-
-    - name: Get information about platform
-      if: ${{ always() }}
-      run: ${{github.workspace}}/sycl-repo/unified-runtime/.github/scripts/get_system_info.sh
+      - run: echo 'This workflow is a WIP.'
+