Merge branch 'sycl' into llvmspirv_pulldown

Author: jsji

.github/workflows/sycl-aws.yml

@@ -21,7 +21,7 @@ on:
 
 jobs:
   aws:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     environment: aws
     steps:
       - uses: actions/checkout@v4

.github/workflows/sycl-containers-igc-dev.yaml

@@ -22,7 +22,7 @@ jobs:
   build_and_push_images:
     if: github.repository == 'intel/llvm'
     name: Build and Push IGC Dev Docker Images
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     permissions:
       packages: write
     strategy:

.github/workflows/sycl-containers.yaml

@@ -29,7 +29,7 @@ jobs:
   build_and_push_images:
     if: github.repository == 'intel/llvm'
     name: Build and Push Docker Images
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     permissions:
       packages: write
     strategy:

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

@@ -45,7 +45,7 @@ jobs:
             })
 
   aws-start:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     environment: aws
     steps:
       - uses: actions/checkout@v4
@@ -106,7 +106,7 @@ jobs:
   aws-stop:
     needs: [aws-start, e2e-cuda]
     if: always()
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     environment: aws
     steps:
       - uses: actions/checkout@v4

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

@@ -91,12 +91,14 @@ jobs:
             runner: '["Linux", "pvc"]'
             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;opencl:gpu
+            reset_intel_gpu: true
             extra_lit_opts: -j 50
           - name: Dev IGC on Intel Ponte Vecchio GPU
             runner: '["Linux", "pvc"]'
             image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:devigc
             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;opencl:gpu
+            reset_intel_gpu: true
             use_igc_dev: true
             extra_lit_opts: -j 50
           - name: Intel Battlemage Graphics

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

@@ -38,16 +38,17 @@ on:
       ref:
         type: string
         required: True
+        description: |
+          Commit SHA or branch to checkout the intel/llvm repo.
       devops_ref:
         type: string
         required: False
         description: |
-          By default we checkout the devops directory from "inputs.ref" branch.
-          devops_ref may be specified to checkout the devops dir from different
-          branch.
-          Note: it doesn't affect ./devops/actions/run-tests/* as these actions
-          call checkout again and therefore override the devops directory, so
-          configs/dependecies from input.ref are used.
+          Commit SHA or branch to checkout the devops directory.
+      tests_ref:
+        type: string
+        required: False
+        description: Commit SHA or branch to checkout e2e/cts tests.
 
       sycl_toolchain_artifact:
         type: string
@@ -205,7 +206,13 @@ jobs:
       if: inputs.reset_intel_gpu == 'true'
       run: |
         sudo mount -t debugfs none /sys/kernel/debug
-        sudo bash -c 'echo 1 > /sys/kernel/debug/dri/0/i915_wedged'
+        base_dir="/sys/kernel/debug/dri"
+
+        for dir in "$base_dir"/*; do
+         if [ -f "$dir/i915_wedged" ]; then
+          sudo bash -c 'echo 1 > $0/i915_wedged' $dir
+         fi
+        done
     - uses: actions/checkout@v4
       with:
         ref: ${{ inputs.devops_ref || inputs.ref }}
@@ -298,7 +305,7 @@ jobs:
       if: inputs.tests_selector == 'e2e'
       uses: ./devops/actions/run-tests/e2e
       with:
-        ref: ${{ inputs.ref || github.sha }}
+        ref: ${{ inputs.tests_ref || inputs.ref || github.sha }}
         binaries_artifact: ${{ inputs.e2e_binaries_artifact }}
         testing_mode: ${{ inputs.e2e_testing_mode }}
         extra_cmake_args: ${{ inputs.extra_cmake_args }}
@@ -310,6 +317,7 @@ jobs:
       if: inputs.tests_selector == 'cts'
       uses: ./devops/actions/run-tests/cts
       with:
+        ref: ${{ inputs.tests_ref || 'main' }}
         extra_cmake_args: ${{ inputs.extra_cmake_args }}
         cts_testing_mode: ${{ inputs.cts_testing_mode }}
         sycl_cts_artifact: ${{ inputs.sycl_cts_artifact }}

.github/workflows/sycl-nightly.yml

@@ -76,6 +76,7 @@ jobs:
             runner: '["Linux", "pvc"]'
             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
+            reset_intel_gpu: true
 
           - name: Intel L0 Battlemage GPU
             runner: '["Linux", "bmg"]'
@@ -113,6 +114,7 @@ jobs:
             runner: '["Linux", "pvc"]'
             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
+            reset_intel_gpu: true
             extra_lit_opts: --param test-preview-mode=True
 
     uses: ./.github/workflows/sycl-linux-run-tests.yml
@@ -137,6 +139,7 @@ jobs:
       name: Intel PVC L0 oneAPI
       runner: '["Linux", "pvc"]'
       target_devices: level_zero:gpu
+      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 }}
@@ -268,7 +271,7 @@ jobs:
             runner: '["Linux", "pvc"]'
             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
-            reset_intel_gpu: false
+            reset_intel_gpu: true
     uses: ./.github/workflows/sycl-linux-run-tests.yml
     secrets: inherit
     with:

.github/workflows/sycl-stale-issues.yml

@@ -11,7 +11,7 @@ jobs:
     permissions:
       issues: write  # for actions/stale to close stale issues
       pull-requests: write  # for actions/stale to close stale PRs
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/stale@v9
       with:

.github/workflows/sycl-sync-main.yml

@@ -9,7 +9,7 @@ jobs:
   sync:
     permissions:
       contents: write  # for Git to git push
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     if: github.repository == 'intel/llvm'
     steps:
       - uses: actions/checkout@v4

.github/workflows/sycl-update-gpu-driver.yml

@@ -11,7 +11,7 @@ jobs:
   update_driver_linux:
     permissions:
       contents: write  # for Git to git push
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     if: github.repository == 'intel/llvm'
     steps:
     - uses: actions/checkout@v4