Skip to content

Commit 00fa6e6

Browse files
committed
[CI] Add GPU reset for BMG
Signed-off-by: Sarnie, Nick <[email protected]>
1 parent 122f221 commit 00fa6e6

File tree

3 files changed

+17
-10
lines changed

3 files changed

+17
-10
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,12 @@ jobs:
112112
runner: '["Linux", "bmg"]'
113113
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
114114
target_devices: level_zero:gpu
115-
# The new Xe kernel driver used by BMG doesn't support resetting.
116-
reset_intel_gpu: false
115+
reset_intel_gpu: true
117116
- name: SPIR-V Backend / Intel Battlemage Graphics
118117
runner: '["Linux", "bmg"]'
119118
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
120119
target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
121-
reset_intel_gpu: false
120+
reset_intel_gpu: true
122121
extra_lit_opts: --param spirv-backend=True
123122
e2e_binaries_artifact: sycl_e2e_bin_default_spirv_backend
124123
uses: ./.github/workflows/sycl-linux-run-tests.yml

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

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -203,15 +203,22 @@ jobs:
203203
steps:
204204
- name: Reset Intel GPU
205205
if: inputs.reset_intel_gpu == 'true'
206+
shell: bash
206207
run: |
207-
sudo mount -t debugfs none /sys/kernel/debug
208-
base_dir="/sys/kernel/debug/dri"
208+
if [[ '${{ inputs.runner }}' == '["Linux", "bmg"]' ]]; then
209+
sudo bash -c 'echo 0000:05:00.0 > /sys/bus/pci/drivers/xe/unbind'
210+
sudo bash -c 'echo 1 > /sys/bus/pci/devices/0000:05:00.0/reset'
211+
sudo bash -c 'echo 0000:05:00.0 > /sys/bus/pci/drivers/xe/bind'
212+
else
213+
sudo mount -t debugfs none /sys/kernel/debug
214+
base_dir="/sys/kernel/debug/dri"
209215
210-
for dir in "$base_dir"/*; do
211-
if [ -f "$dir/i915_wedged" ]; then
212-
sudo bash -c 'echo 1 > $0/i915_wedged' $dir
213-
fi
214-
done
216+
for dir in "$base_dir"/*; do
217+
if [ -f "$dir/i915_wedged" ]; then
218+
sudo bash -c 'echo 1 > $0/i915_wedged' $dir
219+
fi
220+
done
221+
fi
215222
- uses: actions/checkout@v4
216223
with:
217224
ref: ${{ inputs.devops_ref || inputs.repo_ref }}

.github/workflows/sycl-nightly.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ jobs:
8282
runner: '["Linux", "bmg"]'
8383
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
8484
target_devices: level_zero:gpu
85+
reset_intel_gpu: true
8586

8687
- name: Intel L0 Arc A-Series GPU
8788
runner: '["Linux", "arc"]'

0 commit comments

Comments
 (0)