Skip to content

Commit a5f090e

Browse files
[CI] Move SPIRV-backend testing to post-commit
1 parent 5f713e2 commit a5f090e

File tree

5 files changed

+21
-17
lines changed

5 files changed

+21
-17
lines changed

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ jobs:
5959

6060
toolchain_artifact: sycl_linux_default
6161
e2e_binaries_artifact: e2e_bin
62-
e2e_binaries_spirv_backend_artifact: e2e_bin_spirv_backend
6362
e2e_binaries_preview_artifact: e2e_bin_preview
6463

6564
# If a PR changes CUDA adapter, run the build on Ubuntu 22.04 as well.
@@ -128,12 +127,6 @@ jobs:
128127
runner: '["Linux", "bmg"]'
129128
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
130129
target_devices: level_zero_v1:gpu;level_zero_v2:gpu
131-
- name: SPIR-V Backend / Intel Battlemage Graphics
132-
runner: '["Linux", "bmg"]'
133-
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
134-
target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
135-
extra_lit_opts: --param spirv-backend=True
136-
e2e_binaries_artifact: e2e_bin_spirv_backend
137130
- name: Preview Mode
138131
runner: '["Linux", "gen12"]'
139132
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ jobs:
4343
build_configure_extra_args: --no-assertions --hip --cuda --native_cpu -DSYCL_ENABLE_STACK_PRINTING=ON -DSYCL_LIB_WITH_DEBUG_SYMBOL=ON
4444

4545
toolchain_artifact: sycl_linux_default
46+
e2e_binaries_spirv_backend_artifact: e2e_bin_spirv_backend
4647

4748
e2e-lin:
4849
needs: [detect_changes, build-lin]
@@ -73,6 +74,13 @@ jobs:
7374
env: '{"LIT_FILTER":"PerformanceTests/"}'
7475
extra_lit_opts: -a -j 1 --param enable-perf-tests=True
7576
target_devices: all
77+
- name: SPIR-V Backend / Intel Battlemage Graphics
78+
runner: '["Linux", "bmg"]'
79+
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
80+
target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
81+
extra_lit_opts: --param spirv-backend=True
82+
e2e_binaries_artifact: e2e_bin_spirv_backend
83+
e2e_testing_mode: 'run-only'
7684
uses: ./.github/workflows/sycl-linux-run-tests.yml
7785
with:
7886
name: ${{ matrix.name }}
@@ -89,6 +97,9 @@ jobs:
8997
toolchain_artifact_filename: ${{ needs.build-lin.outputs.toolchain_artifact_filename }}
9098
toolchain_decompress_command: ${{ needs.build-lin.outputs.toolchain_decompress_command }}
9199

100+
e2e_binaries_artifact: ${{ matrix.e2e_binaries_artifact }}
101+
e2e_testing_mode: ${{ matrix.e2e_testing_mode || 'full' }}
102+
92103
# Do not install drivers on AMD and CUDA runners.
93104
install_igc_driver: >-
94105
${{ github.event_name == 'pull_request' }} &&

sycl/test-e2e/Graph/Explicit/interop-level-zero-get-native-mem.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// UNSUPPORTED: ze_debug
33
// UNSUPPORTED-INTENDED: Leaks detection is done at UR level and doesn't account
44
// for native L0 API calls.
5-
// UNSUPPORTED: linux && gpu-intel-dg2 && run-mode && !igc-dev
5+
// UNSUPPORTED: linux && (gpu-intel-dg2 || arch-intel_gpu_bmg_g21) && run-mode && !igc-dev
66
// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/18273
77
// RUN: %{build} %level_zero_options -o %t.out
88
// RUN: %{run} %t.out

sycl/test-e2e/Graph/RecordReplay/interop-level-zero-get-native-mem.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// UNSUPPORTED: ze_debug
33
// UNSUPPORTED-INTENDED: Leaks detection is done at UR level and doesn't account
44
// for native L0 API calls.
5-
// UNSUPPORTED: linux && gpu-intel-dg2 && run-mode && !igc-dev
5+
// UNSUPPORTED: linux && (gpu-intel-dg2 || arch-intel_gpu_bmg_g21) && run-mode && !igc-dev
66
// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/18273
77
// RUN: %{build} %level_zero_options -o %t.out
88
// RUN: %{run} %t.out

sycl/test-e2e/lit.cfg.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -650,12 +650,6 @@ def open_check_file(file_name):
650650
if not sycl_ls:
651651
lit_config.fatal("can't find `sycl-ls`")
652652

653-
syclbin_dump = FindTool("syclbin-dump").resolve(
654-
llvm_config, os.pathsep.join([config.dpcpp_bin_dir, config.llvm_tools_dir])
655-
)
656-
if not syclbin_dump:
657-
lit_config.fatal("can't find `syclbin-dump`")
658-
659653
if (
660654
len(config.sycl_build_targets) == 1
661655
and next(iter(config.sycl_build_targets)) == "target-all"
@@ -833,8 +827,14 @@ def remove_level_zero_suffix(devices):
833827
ToolSubst(
834828
r"\| \bnot\b", command=FindTool("not"), verbatim=True, unresolved="ignore"
835829
),
836-
ToolSubst("sycl-ls", command=sycl_ls, unresolved="ignore"),
837-
ToolSubst("syclbin-dump", command=syclbin_dump, unresolved="ignore"),
830+
ToolSubst("sycl-ls", command=sycl_ls, unresolved="fatal"),
831+
ToolSubst("syclbin-dump", unresolved="fatal"),
832+
ToolSubst("llvm-ar", unresolved="fatal"),
833+
ToolSubst("clang-offload-bundler", unresolved="fatal"),
834+
ToolSubst("clang-offload-wrapper", unresolved="fatal"),
835+
ToolSubst("sycl-post-link", unresolved="fatal"),
836+
ToolSubst("file-table-tform", unresolved="fatal"),
837+
ToolSubst("llvm-foreach", unresolved="fatal"),
838838
] + feature_tools
839839

840840
# Try and find each of these tools in the DPC++ bin directory, in the llvm tools directory

0 commit comments

Comments
 (0)