Skip to content

Commit fed9b59

Browse files
authored
[CI][sycl-rel] Update sycl-rel-nightly.yml (#20658)
Align with sycl branch sycl-nightly.yml: 1. Remove redundant always() 2. Remove repeating image_options in the ubuntu2204_test job 2.1. Rename Intel OCL CPU entry (just to align with sycl branch) 2.2. Remove redundant --param gpu-intel-gen12=True 4. Add win-e2e on Arc & align names 5. Rename sycl-cts on linux & add cts on Win
1 parent 7ce4d2f commit fed9b59

File tree

1 file changed

+59
-25
lines changed

1 file changed

+59
-25
lines changed

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

Lines changed: 59 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
ubuntu2204_test:
2424
needs: [ubuntu2204_build]
25-
if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
25+
if: ${{ !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
2626
strategy:
2727
fail-fast: false
2828
matrix:
@@ -39,36 +39,31 @@ jobs:
3939

4040
- name: Intel L0 Gen12 GPU
4141
runner: '["Linux", "gen12"]'
42-
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
4342
target_devices: level_zero:gpu
44-
extra_lit_opts: --param gpu-intel-gen12=True
4543

4644
- name: Intel L0 Battlemage GPU
4745
runner: '["Linux", "bmg"]'
48-
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
4946
target_devices: level_zero:gpu
5047

5148
- name: Intel L0 Arc A-Series GPU
5249
runner: '["Linux", "arc"]'
53-
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
5450
target_devices: level_zero:gpu
5551

5652
- name: Intel OCL Gen12 GPU
5753
runner: '["Linux", "gen12"]'
58-
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
5954
target_devices: opencl:gpu
60-
extra_lit_opts: --param gpu-intel-gen12=True
6155

62-
- name: Intel OCL CPU
56+
- name: OCL CPU (Intel/GEN12)
6357
runner: '["Linux", "gen12"]'
6458
image_options: -u 1001 --privileged --cap-add SYS_ADMIN
6559
target_devices: opencl:cpu
60+
6661
uses: ./.github/workflows/sycl-linux-run-tests.yml
6762
with:
6863
name: ${{ matrix.name }}
6964
runner: ${{ matrix.runner }}
7065
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps-ae0e85c8391ba07b7c895e36cfb8a78cacd421dd
71-
image_options: ${{ matrix.image_options }}
66+
image_options: ${{ matrix.image_options || '-u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN' }}
7267
target_devices: ${{ matrix.target_devices }}
7368
tests_selector: e2e
7469
extra_lit_opts: ${{ matrix.extra_lit_opts }}
@@ -80,41 +75,42 @@ jobs:
8075
build-win:
8176
uses: ./.github/workflows/sycl-windows-build.yml
8277
with:
83-
build_configure_extra_args: '-DLLVM_SPIRV_ENABLE_LIBSPIRV_DIS=off -DCMAKE_POSITION_INDEPENDENT_CODE=ON --disable-jit --no-assertions --add_security_flags=sanitize'
84-
pack_release: 'true'
85-
8678
# We upload both Linux/Windows build via Github's "Releases"
8779
# functionality, make sure Linux/Windows names follow the same pattern.
8880
artifact_archive_name: sycl_windows.tar.gz
81+
build_configure_extra_args: '-DLLVM_SPIRV_ENABLE_LIBSPIRV_DIS=off -DCMAKE_POSITION_INDEPENDENT_CODE=ON --disable-jit --no-assertions --add_security_flags=sanitize'
82+
pack_release: 'true'
8983

9084
e2e-win:
9185
needs: build-win
9286
# Continue if build was successful.
9387
if: |
94-
always()
95-
&& !cancelled()
88+
!cancelled()
9689
&& needs.build-win.outputs.build_conclusion == 'success'
9790
strategy:
9891
fail-fast: false
9992
matrix:
10093
include:
101-
- name: Intel GEN12 Graphics with Level Zero
102-
runner: '["Windows","gen12"]'
94+
- name: Intel L0 Gen12 GPU
95+
runner: '["Windows", "gen12"]'
10396

104-
- name: Intel Battlemage Graphics with Level Zero
97+
- name: Intel L0 Arc GPU
98+
runner: '["Windows", "arc"]'
99+
100+
- name: Intel L0 Battlemage GPU
105101
runner: '["Windows","bmg"]'
102+
106103
uses: ./.github/workflows/sycl-windows-run-tests.yml
107104
with:
108105
name: ${{ matrix.name }}
109106
runner: ${{ matrix.runner }}
110107
target_devices: level_zero:gpu
111108
sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }}
112109
extra_lit_opts: ${{ matrix.extra_lit_opts }}
113-
repo_ref: ${{ github.sha }}
114110

115-
build-sycl-cts:
111+
build-sycl-cts-linux:
116112
needs: ubuntu2204_build
117-
if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
113+
if: ${{ !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
118114
uses: ./.github/workflows/sycl-linux-run-tests.yml
119115
with:
120116
name: Build SYCL-CTS
@@ -134,9 +130,9 @@ jobs:
134130
sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
135131
sycl_cts_artifact: sycl_cts_bin_linux
136132

137-
run-sycl-cts:
138-
needs: [ubuntu2204_build, build-sycl-cts]
139-
if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
133+
run-sycl-cts-linux:
134+
needs: [ubuntu2204_build, build-sycl-cts-linux]
135+
if: ${{ !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
140136
strategy:
141137
fail-fast: false
142138
matrix:
@@ -165,11 +161,49 @@ jobs:
165161
sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
166162
sycl_cts_artifact: sycl_cts_bin_linux
167163

164+
build-sycl-cts-win:
165+
needs: build-win
166+
if: ${{ !cancelled() && needs.build-win.outputs.build_conclusion == 'success' }}
167+
uses: ./.github/workflows/sycl-windows-run-tests.yml
168+
with:
169+
name: Build SYCL-CTS for Windows
170+
runner: '["Windows", "build"]'
171+
cts_testing_mode: 'build-only'
172+
tests_selector: cts
173+
repo_ref: ${{ github.sha }}
174+
# Author: Tom Deakin <thomasdeakin@gmail.com>
175+
# Date: Thu Jul 10 16:45:48 2025 +0100
176+
# Merge pull request #1102 from steffenlarsen/steffen/remove_secondary_queue_exceptions
177+
# Remove expected exceptions for secondary queue
178+
tests_ref: 19e4ed34377c8a8a354d701772427be8c5430b0d
179+
sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }}
180+
sycl_cts_artifact: sycl_cts_bin_win
181+
182+
run-sycl-cts-win:
183+
needs: [build-win, build-sycl-cts-win]
184+
if: ${{ !cancelled() && needs.build-win.outputs.build_conclusion == 'success' }}
185+
strategy:
186+
fail-fast: false
187+
matrix:
188+
include:
189+
- name: SYCL-CTS on L0 gen12
190+
runner: '["Windows", "gen12"]'
191+
target_devices: level_zero:gpu
192+
uses: ./.github/workflows/sycl-windows-run-tests.yml
193+
with:
194+
name: ${{ matrix.name }}
195+
runner: ${{ matrix.runner }}
196+
cts_testing_mode: 'run-only'
197+
target_devices: ${{ matrix.target_devices }}
198+
tests_selector: cts
199+
repo_ref: ${{ github.sha }}
200+
sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }}
201+
sycl_cts_artifact: sycl_cts_bin_win
202+
168203
hardening-check:
169204
needs: [ubuntu2204_build, build-win]
170205
if: |
171-
always()
172-
&& !cancelled()
206+
!cancelled()
173207
&& needs.ubuntu2204_build.outputs.build_conclusion == 'success'
174208
&& needs.build-win.outputs.build_conclusion == 'success'
175209
uses: ./.github/workflows/sycl-hardening-check.yml

0 commit comments

Comments
 (0)