Skip to content

Commit 85cfcda

Browse files
authored
[CI] Re-enable GPU resetting for PVC (#17173)
The out-of-tree kernel driver for PVC enables a different framebuffer driver that takes the `dri/0` spot, so on those runners `dri/1` is the one with the `i915_wedged` file. Just find all folders with `i915_wedged` and reset those. --------- Signed-off-by: Sarnie, Nick <nick.sarnie@intel.com>
1 parent c6b0032 commit 85cfcda

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,14 @@ jobs:
9191
runner: '["Linux", "pvc"]'
9292
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
9393
target_devices: level_zero:gpu;opencl:gpu
94+
reset_intel_gpu: true
9495
extra_lit_opts: -j 50
9596
- name: Dev IGC on Intel Ponte Vecchio GPU
9697
runner: '["Linux", "pvc"]'
9798
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:devigc
9899
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
99100
target_devices: level_zero:gpu;opencl:gpu
101+
reset_intel_gpu: true
100102
use_igc_dev: true
101103
extra_lit_opts: -j 50
102104
- name: Intel Battlemage Graphics

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,13 @@ jobs:
206206
if: inputs.reset_intel_gpu == 'true'
207207
run: |
208208
sudo mount -t debugfs none /sys/kernel/debug
209-
sudo bash -c 'echo 1 > /sys/kernel/debug/dri/0/i915_wedged'
209+
base_dir="/sys/kernel/debug/dri"
210+
211+
for dir in "$base_dir"/*; do
212+
if [ -f "$dir/i915_wedged" ]; then
213+
sudo bash -c 'echo 1 > $0/i915_wedged' $dir
214+
fi
215+
done
210216
- uses: actions/checkout@v4
211217
with:
212218
ref: ${{ inputs.devops_ref || inputs.ref }}

.github/workflows/sycl-nightly.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ jobs:
7676
runner: '["Linux", "pvc"]'
7777
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
7878
target_devices: level_zero:gpu
79+
reset_intel_gpu: true
7980

8081
- name: Intel L0 Battlemage GPU
8182
runner: '["Linux", "bmg"]'
@@ -113,6 +114,7 @@ jobs:
113114
runner: '["Linux", "pvc"]'
114115
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
115116
target_devices: level_zero:gpu
117+
reset_intel_gpu: true
116118
extra_lit_opts: --param test-preview-mode=True
117119

118120
uses: ./.github/workflows/sycl-linux-run-tests.yml
@@ -137,6 +139,7 @@ jobs:
137139
name: Intel PVC L0 oneAPI
138140
runner: '["Linux", "pvc"]'
139141
target_devices: level_zero:gpu
142+
reset_intel_gpu: true
140143
extra_lit_opts: -j 50
141144
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
142145
ref: ${{ github.sha }}
@@ -268,7 +271,7 @@ jobs:
268271
runner: '["Linux", "pvc"]'
269272
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
270273
target_devices: level_zero:gpu
271-
reset_intel_gpu: false
274+
reset_intel_gpu: true
272275
uses: ./.github/workflows/sycl-linux-run-tests.yml
273276
secrets: inherit
274277
with:

0 commit comments

Comments
 (0)