Skip to content

Commit 52d5465

Browse files
committed
Merge remote-tracking branch 'origin/sycl-rel-6_3' into rel-upd-clang-version
2 parents f625d63 + fed9b59 commit 52d5465

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
@@ -45,7 +45,7 @@ jobs:
4545

4646
ubuntu2204_test:
4747
needs: [ubuntu2204_build]
48-
if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
48+
if: ${{ !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
4949
strategy:
5050
fail-fast: false
5151
matrix:
@@ -62,36 +62,31 @@ jobs:
6262

6363
- name: Intel L0 Gen12 GPU
6464
runner: '["Linux", "gen12"]'
65-
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
6665
target_devices: level_zero:gpu
67-
extra_lit_opts: --param gpu-intel-gen12=True
6866

6967
- name: Intel L0 Battlemage GPU
7068
runner: '["Linux", "bmg"]'
71-
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
7269
target_devices: level_zero:gpu
7370

7471
- name: Intel L0 Arc A-Series GPU
7572
runner: '["Linux", "arc"]'
76-
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
7773
target_devices: level_zero:gpu
7874

7975
- name: Intel OCL Gen12 GPU
8076
runner: '["Linux", "gen12"]'
81-
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
8277
target_devices: opencl:gpu
83-
extra_lit_opts: --param gpu-intel-gen12=True
8478

85-
- name: Intel OCL CPU
79+
- name: OCL CPU (Intel/GEN12)
8680
runner: '["Linux", "gen12"]'
8781
image_options: -u 1001 --privileged --cap-add SYS_ADMIN
8882
target_devices: opencl:cpu
83+
8984
uses: ./.github/workflows/sycl-linux-run-tests.yml
9085
with:
9186
name: ${{ matrix.name }}
9287
runner: ${{ matrix.runner }}
9388
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps-ae0e85c8391ba07b7c895e36cfb8a78cacd421dd
94-
image_options: ${{ matrix.image_options }}
89+
image_options: ${{ matrix.image_options || '-u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN' }}
9590
target_devices: ${{ matrix.target_devices }}
9691
tests_selector: e2e
9792
extra_lit_opts: ${{ matrix.extra_lit_opts }}
@@ -104,41 +99,42 @@ jobs:
10499
needs: get_build_info
105100
uses: ./.github/workflows/sycl-windows-build.yml
106101
with:
107-
build_configure_extra_args: '-DSYCL_BUILD_INFO="${{ needs.get_build_info.outputs.info }}" -DLLVM_SPIRV_ENABLE_LIBSPIRV_DIS=off -DCMAKE_POSITION_INDEPENDENT_CODE=ON --disable-jit --no-assertions --add_security_flags=sanitize'
108-
pack_release: 'true'
109-
110102
# We upload both Linux/Windows build via Github's "Releases"
111103
# functionality, make sure Linux/Windows names follow the same pattern.
112104
artifact_archive_name: sycl_windows.tar.gz
105+
build_configure_extra_args: '-DLLVM_SPIRV_ENABLE_LIBSPIRV_DIS=off -DCMAKE_POSITION_INDEPENDENT_CODE=ON --disable-jit --no-assertions --add_security_flags=sanitize'
106+
pack_release: 'true'
113107

114108
e2e-win:
115109
needs: build-win
116110
# Continue if build was successful.
117111
if: |
118-
always()
119-
&& !cancelled()
112+
!cancelled()
120113
&& needs.build-win.outputs.build_conclusion == 'success'
121114
strategy:
122115
fail-fast: false
123116
matrix:
124117
include:
125-
- name: Intel GEN12 Graphics with Level Zero
126-
runner: '["Windows","gen12"]'
118+
- name: Intel L0 Gen12 GPU
119+
runner: '["Windows", "gen12"]'
120+
121+
- name: Intel L0 Arc GPU
122+
runner: '["Windows", "arc"]'
127123

128-
- name: Intel Battlemage Graphics with Level Zero
124+
- name: Intel L0 Battlemage GPU
129125
runner: '["Windows","bmg"]'
126+
130127
uses: ./.github/workflows/sycl-windows-run-tests.yml
131128
with:
132129
name: ${{ matrix.name }}
133130
runner: ${{ matrix.runner }}
134131
target_devices: level_zero:gpu
135132
sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }}
136133
extra_lit_opts: ${{ matrix.extra_lit_opts }}
137-
repo_ref: ${{ github.sha }}
138134

139-
build-sycl-cts:
135+
build-sycl-cts-linux:
140136
needs: ubuntu2204_build
141-
if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
137+
if: ${{ !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
142138
uses: ./.github/workflows/sycl-linux-run-tests.yml
143139
with:
144140
name: Build SYCL-CTS
@@ -158,9 +154,9 @@ jobs:
158154
sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
159155
sycl_cts_artifact: sycl_cts_bin_linux
160156

161-
run-sycl-cts:
162-
needs: [ubuntu2204_build, build-sycl-cts]
163-
if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
157+
run-sycl-cts-linux:
158+
needs: [ubuntu2204_build, build-sycl-cts-linux]
159+
if: ${{ !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
164160
strategy:
165161
fail-fast: false
166162
matrix:
@@ -189,11 +185,49 @@ jobs:
189185
sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
190186
sycl_cts_artifact: sycl_cts_bin_linux
191187

188+
build-sycl-cts-win:
189+
needs: build-win
190+
if: ${{ !cancelled() && needs.build-win.outputs.build_conclusion == 'success' }}
191+
uses: ./.github/workflows/sycl-windows-run-tests.yml
192+
with:
193+
name: Build SYCL-CTS for Windows
194+
runner: '["Windows", "build"]'
195+
cts_testing_mode: 'build-only'
196+
tests_selector: cts
197+
repo_ref: ${{ github.sha }}
198+
# Author: Tom Deakin <[email protected]>
199+
# Date: Thu Jul 10 16:45:48 2025 +0100
200+
# Merge pull request #1102 from steffenlarsen/steffen/remove_secondary_queue_exceptions
201+
# Remove expected exceptions for secondary queue
202+
tests_ref: 19e4ed34377c8a8a354d701772427be8c5430b0d
203+
sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }}
204+
sycl_cts_artifact: sycl_cts_bin_win
205+
206+
run-sycl-cts-win:
207+
needs: [build-win, build-sycl-cts-win]
208+
if: ${{ !cancelled() && needs.build-win.outputs.build_conclusion == 'success' }}
209+
strategy:
210+
fail-fast: false
211+
matrix:
212+
include:
213+
- name: SYCL-CTS on L0 gen12
214+
runner: '["Windows", "gen12"]'
215+
target_devices: level_zero:gpu
216+
uses: ./.github/workflows/sycl-windows-run-tests.yml
217+
with:
218+
name: ${{ matrix.name }}
219+
runner: ${{ matrix.runner }}
220+
cts_testing_mode: 'run-only'
221+
target_devices: ${{ matrix.target_devices }}
222+
tests_selector: cts
223+
repo_ref: ${{ github.sha }}
224+
sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }}
225+
sycl_cts_artifact: sycl_cts_bin_win
226+
192227
hardening-check:
193228
needs: [ubuntu2204_build, build-win]
194229
if: |
195-
always()
196-
&& !cancelled()
230+
!cancelled()
197231
&& needs.ubuntu2204_build.outputs.build_conclusion == 'success'
198232
&& needs.build-win.outputs.build_conclusion == 'success'
199233
uses: ./.github/workflows/sycl-hardening-check.yml

0 commit comments

Comments
 (0)