Skip to content

Commit aa2748d

Browse files
[CI] Simplify passing igc-dev related variables (#15406)
This PR refactors sycl-linux-precommit workflow to simplify passing `igc-dev` related variables.
1 parent 227af47 commit aa2748d

File tree

2 files changed

+13
-18
lines changed

2 files changed

+13
-18
lines changed

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

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,13 @@ jobs:
8686
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
8787
target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
8888
reset_intel_gpu: true
89-
install_drivers: ${{ contains(needs.detect_changes.outputs.filters, 'drivers') }}
9089
extra_lit_opts: --param gpu-intel-gen12=True
9190
- name: E2E tests on Intel Arc A-Series Graphics
9291
runner: '["Linux", "arc"]'
9392
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
9493
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
9594
target_devices: level_zero:gpu;opencl:gpu
9695
reset_intel_gpu: true
97-
install_drivers: ${{ contains(needs.detect_changes.outputs.filters, 'drivers') }}
9896
extra_lit_opts: --param matrix-xmx8=True --param gpu-intel-dg2=True
9997
env: '{"LIT_FILTER":${{ needs.determine_arc_tests.outputs.arc_tests }} }'
10098
- name: E2E tests with dev igc on Intel Arc A-Series Graphics
@@ -103,14 +101,9 @@ jobs:
103101
image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
104102
target_devices: level_zero:gpu;opencl:gpu
105103
reset_intel_gpu: true
106-
install_drivers: >-
107-
${{ contains(needs.detect_changes.outputs.filters, 'drivers') ||
108-
contains(needs.detect_changes.outputs.filters, 'devigccfg') }}
109-
use_dev_igc: ${{ contains(needs.detect_changes.outputs.filters, 'devigccfg') }}
110104
extra_lit_opts: --param matrix-xmx8=True --param gpu-intel-dg2=True
111105
env: '{"LIT_FILTER":${{ needs.determine_arc_tests.outputs.arc_tests }} }'
112-
# Run only if the PR does not have the 'ci-no-devigc' label.
113-
skip_run: ${{ contains(github.event.pull_request.labels.*.name, 'ci-no-devigc') }}
106+
use_igc_dev: true
114107

115108
uses: ./.github/workflows/sycl-linux-run-tests.yml
116109
with:
@@ -120,11 +113,13 @@ jobs:
120113
image_options: ${{ matrix.image_options }}
121114
target_devices: ${{ matrix.target_devices }}
122115
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
123-
install_drivers: ${{ matrix.install_drivers }}
124-
use_dev_igc: ${{ matrix.use_dev_igc }}
125116
extra_lit_opts: ${{ matrix.extra_lit_opts }}
126117
env: ${{ matrix.env || '{}' }}
127-
skip_run: ${{ matrix.skip_run || 'false' }}
118+
119+
install_igc_driver: ${{ contains(needs.detect_changes.outputs.filters, 'drivers') }}
120+
install_dev_igc_driver: ${{ matrix.use_igc_dev && contains(needs.detect_changes.outputs.filters, 'devigccfg') || 'false' }}
121+
# Run only if the PR does not have the 'ci-no-devigc' label.
122+
skip_run: ${{matrix.use_igc_dev && contains(github.event.pull_request.labels.*.name, 'ci-no-devigc') || 'false'}}
128123

129124
ref: ${{ github.sha }}
130125
merge_ref: ''

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ on:
6565
reset_intel_gpu:
6666
type: string
6767
required: False
68-
install_drivers:
68+
install_igc_driver:
6969
type: string
7070
required: False
71-
use_dev_igc:
71+
install_dev_igc_driver:
7272
type: string
7373
required: False
7474
env:
@@ -134,13 +134,13 @@ on:
134134
Extra options to be added to LIT_OPTS.
135135
default: ''
136136

137-
install_drivers:
137+
install_igc_driver:
138138
type: choice
139139
options:
140140
- false
141141
- true
142142

143-
use_dev_igc:
143+
install_dev_igc_driver:
144144
type: choice
145145
options:
146146
- false
@@ -193,15 +193,15 @@ jobs:
193193
run: |
194194
git -C khronos_sycl_cts submodule update --init
195195
- name: Install drivers
196-
if: inputs.install_drivers == 'true'
196+
if: inputs.install_igc_driver == 'true' || inputs.install_dev_igc_driver == 'true'
197197
env:
198198
GITHUB_TOKEN: ${{ github.token }}
199199
run: |
200-
if [ "${{ inputs.use_dev_igc }}" = "true" ]; then
200+
if [ "${{ inputs.install_dev_igc_driver }}" = "true" ]; then
201201
# If libllvm14 is already installed (dev igc docker), still return true.
202202
sudo apt-get install -yqq libllvm14 || true;
203203
fi
204-
sudo -E bash devops/scripts/install_drivers.sh llvm/devops/dependencies.json ${{ inputs.use_dev_igc == 'true' && 'llvm/devops/dependencies-igc-dev.json --use-dev-igc' || '' }} --all
204+
sudo -E bash devops/scripts/install_drivers.sh llvm/devops/dependencies.json ${{ inputs.install_dev_igc_driver == 'true' && 'llvm/devops/dependencies-igc-dev.json --use-dev-igc' || '' }} --all
205205
- name: Source OneAPI TBB vars.sh
206206
shell: bash
207207
run: |

0 commit comments

Comments
 (0)