From 9643c3bc38e9503cbb47658857e541779bd3a097 Mon Sep 17 00:00:00 2001 From: "Kornev, Nikita" Date: Fri, 14 Nov 2025 12:40:55 +0100 Subject: [PATCH] [CI][sycl-rel] Update sycl-rel-nightly.yml 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 2.2. Remove redundant --param gpu-intel-gen12=True 3. Add win-e2e on Arc & align names 4. Rename sycl-cts on linux & add cts on Win --- .github/workflows/sycl-rel-nightly.yml | 84 ++++++++++++++++++-------- 1 file changed, 59 insertions(+), 25 deletions(-) diff --git a/.github/workflows/sycl-rel-nightly.yml b/.github/workflows/sycl-rel-nightly.yml index 604ba5d393427..14de1478f1e9b 100644 --- a/.github/workflows/sycl-rel-nightly.yml +++ b/.github/workflows/sycl-rel-nightly.yml @@ -22,7 +22,7 @@ jobs: ubuntu2204_test: needs: [ubuntu2204_build] - if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }} + if: ${{ !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }} strategy: fail-fast: false matrix: @@ -39,36 +39,31 @@ jobs: - name: Intel L0 Gen12 GPU runner: '["Linux", "gen12"]' - image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN target_devices: level_zero:gpu - extra_lit_opts: --param gpu-intel-gen12=True - name: Intel L0 Battlemage GPU runner: '["Linux", "bmg"]' - image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN target_devices: level_zero:gpu - name: Intel L0 Arc A-Series GPU runner: '["Linux", "arc"]' - image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN target_devices: level_zero:gpu - name: Intel OCL Gen12 GPU runner: '["Linux", "gen12"]' - image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN target_devices: opencl:gpu - extra_lit_opts: --param gpu-intel-gen12=True - - name: Intel OCL CPU + - name: OCL CPU (Intel/GEN12) runner: '["Linux", "gen12"]' image_options: -u 1001 --privileged --cap-add SYS_ADMIN target_devices: opencl:cpu + uses: ./.github/workflows/sycl-linux-run-tests.yml with: name: ${{ matrix.name }} runner: ${{ matrix.runner }} image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps-ae0e85c8391ba07b7c895e36cfb8a78cacd421dd - image_options: ${{ matrix.image_options }} + image_options: ${{ matrix.image_options || '-u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN' }} target_devices: ${{ matrix.target_devices }} tests_selector: e2e extra_lit_opts: ${{ matrix.extra_lit_opts }} @@ -80,29 +75,31 @@ jobs: build-win: uses: ./.github/workflows/sycl-windows-build.yml with: - build_configure_extra_args: '-DLLVM_SPIRV_ENABLE_LIBSPIRV_DIS=off -DCMAKE_POSITION_INDEPENDENT_CODE=ON --disable-jit --no-assertions --add_security_flags=sanitize' - pack_release: 'true' - # We upload both Linux/Windows build via Github's "Releases" # functionality, make sure Linux/Windows names follow the same pattern. artifact_archive_name: sycl_windows.tar.gz + build_configure_extra_args: '-DLLVM_SPIRV_ENABLE_LIBSPIRV_DIS=off -DCMAKE_POSITION_INDEPENDENT_CODE=ON --disable-jit --no-assertions --add_security_flags=sanitize' + pack_release: 'true' e2e-win: needs: build-win # Continue if build was successful. if: | - always() - && !cancelled() + !cancelled() && needs.build-win.outputs.build_conclusion == 'success' strategy: fail-fast: false matrix: include: - - name: Intel GEN12 Graphics with Level Zero - runner: '["Windows","gen12"]' + - name: Intel L0 Gen12 GPU + runner: '["Windows", "gen12"]' - - name: Intel Battlemage Graphics with Level Zero + - name: Intel L0 Arc GPU + runner: '["Windows", "arc"]' + + - name: Intel L0 Battlemage GPU runner: '["Windows","bmg"]' + uses: ./.github/workflows/sycl-windows-run-tests.yml with: name: ${{ matrix.name }} @@ -110,11 +107,10 @@ jobs: target_devices: level_zero:gpu sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }} extra_lit_opts: ${{ matrix.extra_lit_opts }} - repo_ref: ${{ github.sha }} - build-sycl-cts: + build-sycl-cts-linux: needs: ubuntu2204_build - if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }} + if: ${{ !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }} uses: ./.github/workflows/sycl-linux-run-tests.yml with: name: Build SYCL-CTS @@ -134,9 +130,9 @@ jobs: sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }} sycl_cts_artifact: sycl_cts_bin_linux - run-sycl-cts: - needs: [ubuntu2204_build, build-sycl-cts] - if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }} + run-sycl-cts-linux: + needs: [ubuntu2204_build, build-sycl-cts-linux] + if: ${{ !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }} strategy: fail-fast: false matrix: @@ -165,11 +161,49 @@ jobs: sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }} sycl_cts_artifact: sycl_cts_bin_linux + build-sycl-cts-win: + needs: build-win + if: ${{ !cancelled() && needs.build-win.outputs.build_conclusion == 'success' }} + uses: ./.github/workflows/sycl-windows-run-tests.yml + with: + name: Build SYCL-CTS for Windows + runner: '["Windows", "build"]' + cts_testing_mode: 'build-only' + tests_selector: cts + repo_ref: ${{ github.sha }} + # Author: Tom Deakin + # Date: Thu Jul 10 16:45:48 2025 +0100 + # Merge pull request #1102 from steffenlarsen/steffen/remove_secondary_queue_exceptions + # Remove expected exceptions for secondary queue + tests_ref: 19e4ed34377c8a8a354d701772427be8c5430b0d + sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }} + sycl_cts_artifact: sycl_cts_bin_win + + run-sycl-cts-win: + needs: [build-win, build-sycl-cts-win] + if: ${{ !cancelled() && needs.build-win.outputs.build_conclusion == 'success' }} + strategy: + fail-fast: false + matrix: + include: + - name: SYCL-CTS on L0 gen12 + runner: '["Windows", "gen12"]' + target_devices: level_zero:gpu + uses: ./.github/workflows/sycl-windows-run-tests.yml + with: + name: ${{ matrix.name }} + runner: ${{ matrix.runner }} + cts_testing_mode: 'run-only' + target_devices: ${{ matrix.target_devices }} + tests_selector: cts + repo_ref: ${{ github.sha }} + sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }} + sycl_cts_artifact: sycl_cts_bin_win + hardening-check: needs: [ubuntu2204_build, build-win] if: | - always() - && !cancelled() + !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' && needs.build-win.outputs.build_conclusion == 'success' uses: ./.github/workflows/sycl-hardening-check.yml