Skip to content

Commit ff06bac

Browse files
sarnexsarnex
authored
[CI][NFC] Rename reset_gpu variable (#14987)
It only works for Intel GPUs. Based on feedback from [here](#14980 (comment)). Signed-off-by: Sarnie, Nick <nick.sarnie@intel.com>
1 parent 2422e85 commit ff06bac

File tree

5 files changed

+22
-22
lines changed

5 files changed

+22
-22
lines changed

‎.github/workflows/sycl-linux-matrix-e2e-on-nightly.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ jobs:
3030
image: ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:latest
3131
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
3232
target_devices: level_zero:gpu
33-
reset_gpu: true
33+
reset_intel_gpu: true
3434

3535
- name: Intel OCL GPU
3636
runner: '["Linux", "gen12"]'
3737
image: ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:latest
3838
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
3939
target_devices: opencl:gpu
40-
reset_gpu: true
40+
reset_intel_gpu: true
4141

4242
- name: OCL CPU
4343
runner: '["Linux", "x86-cpu"]'
@@ -57,7 +57,7 @@ jobs:
5757
image: ${{ matrix.image }}
5858
image_options: ${{ matrix.image_options }}
5959
target_devices: ${{ matrix.target_devices }}
60-
reset_gpu: ${{ matrix.reset_gpu }}
60+
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
6161
env: ${{ inputs.env }}
6262
ref: ${{ github.sha }}
6363
merge_ref: ''

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,15 @@ jobs:
8686
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
8787
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
8888
target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
89-
reset_gpu: true
89+
reset_intel_gpu: true
9090
install_drivers: ${{ contains(needs.detect_changes.outputs.filters, 'drivers') }}
9191
extra_lit_opts: --param gpu-intel-gen12=True
9292
- name: E2E tests on Intel Arc A-Series Graphics
9393
runner: '["Linux", "arc"]'
9494
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
9595
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
9696
target_devices: level_zero:gpu;opencl:gpu
97-
reset_gpu: true
97+
reset_intel_gpu: true
9898
install_drivers: ${{ contains(needs.detect_changes.outputs.filters, 'drivers') }}
9999
extra_lit_opts: --param matrix-xmx8=True --param gpu-intel-dg2=True
100100
env: '{"LIT_FILTER":${{ needs.determine_arc_tests.outputs.arc_tests }} }'
@@ -103,7 +103,7 @@ jobs:
103103
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:${{ contains(github.event.pull_request.labels.*.name, 'ci-no-devigc') && 'latest' || 'devigc' }}
104104
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
105105
target_devices: level_zero:gpu;opencl:gpu
106-
reset_gpu: true
106+
reset_intel_gpu: true
107107
install_drivers: >-
108108
${{ contains(needs.detect_changes.outputs.filters, 'drivers') ||
109109
contains(needs.detect_changes.outputs.filters, 'devigccfg') }}
@@ -118,7 +118,7 @@ jobs:
118118
image: ${{ matrix.image }}
119119
image_options: ${{ matrix.image_options }}
120120
target_devices: ${{ matrix.target_devices }}
121-
reset_gpu: ${{ matrix.reset_gpu }}
121+
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
122122
install_drivers: ${{ matrix.install_drivers }}
123123
use_dev_igc: ${{ matrix.use_dev_igc }}
124124
extra_lit_opts: ${{ matrix.extra_lit_opts }}
@@ -147,12 +147,12 @@ jobs:
147147
runner: '["Linux", "gen12"]'
148148
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
149149
image_extra_opts: --device=/dev/dri
150-
reset_gpu: true
150+
reset_intel_gpu: true
151151
- name: Intel Arc A-Series Graphics system
152152
runner: '["Linux", "arc"]'
153153
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
154154
image_extra_opts: --device=/dev/dri
155-
reset_gpu: true
155+
reset_intel_gpu: true
156156
- name: AMD system
157157
runner: '["Linux", "amdgpu"]'
158158
image: ghcr.io/intel/llvm/ubuntu2204_build:latest
@@ -169,7 +169,7 @@ jobs:
169169
image: ${{ matrix.image }}
170170
image_options: -u 1001 --privileged --cap-add SYS_ADMIN ${{ matrix.image_extra_opts }}
171171
target_devices: all
172-
reset_gpu: ${{ matrix.reset_gpu }}
172+
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
173173

174174
env: '{"LIT_FILTER":"PerformanceTests/"}'
175175
extra_lit_opts: -a -j 1 --param enable-perf-tests=True

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ on:
6262
default: ''
6363
required: False
6464

65-
reset_gpu:
65+
reset_intel_gpu:
6666
type: string
6767
required: False
6868
install_drivers:
@@ -153,8 +153,8 @@ jobs:
153153
options: ${{ inputs.image_options }}
154154
env: ${{ fromJSON(inputs.env) }}
155155
steps:
156-
- name: Reset GPU
157-
if: inputs.reset_gpu == 'true'
156+
- name: Reset Intel GPU
157+
if: inputs.reset_intel_gpu == 'true'
158158
run: |
159159
sudo mount -t debugfs none /sys/kernel/debug
160160
sudo bash -c 'echo 1 > /sys/kernel/debug/dri/0/i915_wedged'

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
4343
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
4444
target_devices: level_zero:gpu
45-
reset_gpu: true
45+
reset_intel_gpu: true
4646
tests_selector: e2e
4747
extra_lit_opts: --param gpu-intel-gen12=True
4848

@@ -51,7 +51,7 @@ jobs:
5151
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
5252
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
5353
target_devices: opencl:gpu
54-
reset_gpu: true
54+
reset_intel_gpu: true
5555
tests_selector: e2e
5656
extra_lit_opts: --param gpu-intel-gen12=True
5757

@@ -98,7 +98,7 @@ jobs:
9898
target_devices: ${{ matrix.target_devices }}
9999
tests_selector: ${{ matrix.tests_selector }}
100100
extra_lit_opts: ${{ matrix.extra_lit_opts }}
101-
reset_gpu: ${{ matrix.reset_gpu }}
101+
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
102102
ref: ${{ github.sha }}
103103
merge_ref: ''
104104
sycl_toolchain_artifact: sycl_linux_default

‎.github/workflows/sycl-post-commit.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,17 @@ jobs:
6868
runner: '["Linux", "gen12"]'
6969
extra_lit_opts: --param gpu-intel-gen12=True
7070
target_devices: level_zero:gpu;opencl:fpga
71-
reset_gpu: true
71+
reset_intel_gpu: true
7272
- name: Intel Arc A-Series Graphics with Level Zero
7373
runner: '["Linux", "arc"]'
7474
extra_lit_opts: --param matrix-xmx8=True --param gpu-intel-dg2=True
75-
reset_gpu: true
75+
reset_intel_gpu: true
7676
- name: AMD/HIP
7777
runner: '["Linux", "amdgpu"]'
7878
image: ghcr.io/intel/llvm/ubuntu2204_build:latest-0300ac924620a51f76c4929794637b82790f12ab
7979
image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
8080
target_devices: ext_oneapi_hip:gpu
81-
reset_gpu: false
81+
reset_intel_gpu: false
8282
# Use static build because of shared lld packaging issue
8383
sycl_toolchain_artifact: sycl_linux_sprod_static
8484
sycl_toolchain_archive: ${{ needs.build-lin-static.outputs.artifact_archive_name }}
@@ -94,21 +94,21 @@ jobs:
9494
env: '{"LIT_FILTER":"PerformanceTests/"}'
9595
extra_lit_opts: -a -j 1 --param enable-perf-tests=True --param gpu-intel-gen12=True
9696
target_devices: all
97-
reset_gpu: true
97+
reset_intel_gpu: true
9898
- name: Perf tests on Intel Arc A-Series Graphics system
9999
runner: '["Linux", "arc"]'
100100
env: '{"LIT_FILTER":"PerformanceTests/"}'
101101
extra_lit_opts: -a -j 1 --param enable-perf-tests=True
102102
target_devices: all
103-
reset_gpu: true
103+
reset_intel_gpu: true
104104
uses: ./.github/workflows/sycl-linux-run-tests.yml
105105
with:
106106
name: ${{ matrix.name }}
107107
runner: ${{ matrix. runner }}
108108
image: ${{ matrix.image || 'ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest' }}
109109
image_options: ${{ matrix.image_options || '-u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN' }}
110110
target_devices: ${{ matrix.target_devices || 'level_zero:gpu' }}
111-
reset_gpu: ${{ matrix.reset_gpu }}
111+
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
112112

113113
extra_lit_opts: ${{ matrix.extra_lit_opts }}
114114
env: ${{ matrix.env || '{}' }}

0 commit comments

Comments
 (0)