Skip to content

[clang-linker-wrapper][lit] Fix SPIR-V ELF test when spirv-tools feature is available #126756

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 11, 2025
Merged

[clang-linker-wrapper][lit] Fix SPIR-V ELF test when spirv-tools feature is available #126756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a758efe
[clang-linker-wrapper][lit] Fix SPIR-V ELF test when spirv-tools feat…
sarnex Feb 11, 2025
5f74d4e
use lit which
sarnex Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions clang/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,15 @@ if(CLANG_BUILD_EXAMPLES AND CLANG_PLUGIN_SUPPORT)
)
endif ()

if(LLVM_INCLUDE_SPIRV_TOOLS_TESTS)
list(APPEND CLANG_TEST_DEPS
spirv-dis
spirv-val
spirv-as
spirv-link
)
endif()

set(CLANG_TEST_PARAMS
USE_Z3_SOLVER=0
)
Expand Down
1 change: 1 addition & 0 deletions clang/test/Tooling/clang-linker-wrapper-spirv-elf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Verify the ELF packaging of OpenMP SPIR-V device images.
// REQUIRES: system-linux
// REQUIRES: spirv-tools
// REQUIRES: llvm-spirv
// RUN: mkdir -p %t_tmp
// RUN: cd %t_tmp
// RUN: %clangxx -fopenmp -fopenmp-targets=spirv64-intel -nogpulib -c -o %t_clang-linker-wrapper-spirv-elf.o %s
Expand Down
6 changes: 6 additions & 0 deletions clang/test/Tooling/lit.local.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import lit.util

if not config.root.clang_staticanalyzer:
config.unsupported = True

Expand All @@ -6,3 +8,7 @@ if config.spirv_tools_tests:
config.substitutions.append(("spirv-dis", os.path.join(config.llvm_tools_dir, "spirv-dis")))
config.substitutions.append(("spirv-val", os.path.join(config.llvm_tools_dir, "spirv-val")))
config.substitutions.append(("spirv-as", os.path.join(config.llvm_tools_dir, "spirv-as")))
config.substitutions.append(("spirv-link", os.path.join(config.llvm_tools_dir, "spirv-link")))

if lit.util.which("llvm-spirv"):
config.available_features.add("llvm-spirv")