Skip to content

Commit f12546b

Browse files
[CI] Temporarily disable tests requiring spirv-tools in CI (#16743)
#16724 installed `spirv-tools` on Linux docker containers and now some llvm-spirv tests are failing due to this (example: https://github.com/intel/llvm/actions/runs/12915358763/job/36017038536). In this PR, we disable detection of `spirv-tools` LIT feature temporarily in CI to fix post-commit. --------- Co-authored-by: Marcos Maronas <[email protected]>
1 parent 4e5a72e commit f12546b

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,9 @@ jobs:
199199
cmake --build $GITHUB_WORKSPACE/build --target check-sycl-unittests
200200
- name: check-llvm-spirv
201201
if: always() && !cancelled() && contains(inputs.changes, 'llvm_spirv')
202+
# Temporary workaround to disable running tests requiring spirv-tools.
203+
env:
204+
LIT_OPTS: "--param disable-spirv-tools=True"
202205
run: |
203206
cmake --build $GITHUB_WORKSPACE/build --target check-llvm-spirv
204207
- name: check-xptifw

.github/workflows/sycl-windows-build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,9 @@ jobs:
158158
cmake --build build --target check-sycl-unittests
159159
- name: check-llvm-spirv
160160
if: always() && !cancelled() && contains(inputs.changes, 'llvm_spirv')
161+
# Temporary workaround to disable running tests requiring spirv-tools.
162+
env:
163+
LIT_OPTS: "--param disable-spirv-tools=True"
161164
run: |
162165
cmake --build build --target check-llvm-spirv
163166
- name: check-xptifw

llvm-spirv/test/lit.cfg.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,24 +60,27 @@
6060

6161
using_spirv_tools = False
6262

63-
if config.spirv_tools_have_spirv_as:
63+
# Explicitly disable using spirv tools, if requested.
64+
disable_spirv_tools = lit_config.params.get("disable-spirv-tools", False)
65+
66+
if config.spirv_tools_have_spirv_as and not disable_spirv_tools:
6467
llvm_config.add_tool_substitutions(['spirv-as'], [config.spirv_tools_bin_dir])
6568
config.available_features.add('spirv-as')
6669
using_spirv_tools = True
6770

68-
if config.spirv_tools_have_spirv_dis:
71+
if config.spirv_tools_have_spirv_dis and not disable_spirv_tools:
6972
llvm_config.add_tool_substitutions(['spirv-dis'], [config.spirv_tools_bin_dir])
7073
config.available_features.add('spirv-dis')
7174
using_spirv_tools = True
7275

73-
if config.spirv_tools_have_spirv_link:
76+
if config.spirv_tools_have_spirv_link and not disable_spirv_tools:
7477
llvm_config.add_tool_substitutions(['spirv-link'], [config.spirv_tools_bin_dir])
7578
config.available_features.add('spirv-link')
7679
using_spirv_tools = True
7780

7881
# Unlike spirv-{as,dis,link} above, running spirv-val is optional: if spirv-val is
7982
# not available, the test must still run and just skip any spirv-val commands.
80-
if config.spirv_tools_have_spirv_val:
83+
if config.spirv_tools_have_spirv_val and not disable_spirv_tools:
8184
llvm_config.add_tool_substitutions(['spirv-val'], [config.spirv_tools_bin_dir])
8285
using_spirv_tools = True
8386
else:

0 commit comments

Comments
 (0)