https://github.com/sarnex created https://github.com/llvm/llvm-project/pull/126756
My last change made the test not run when the `spirv-tools` feature is not available, which is always the case in CI for clang tests, but it fails if `spirv-tools` is available for the following reasons: 1) We didn't build `spirv-link` as part of the internal `SPIRV-Tools` build, which is required by the `clang` call in `clang-linker-wrapper`, I already fixed that [here](https://github.com/llvm/llvm-project/pull/126319). 2) We didn't depend on the `SPIRV-Tools` CMake targets in clang tests, so depending on what CMake targets were build before running `check-clang`, `SPIR-V Tools` might not have been built. 3) We didn't check for `llvm-spirv` being available, which is not part of `SPIRV-Tools` but is currently required for SPIR-V compilation. Manually confirmed this works. >From a758efe88d1e58a5b53dd7a4b7da6e174f645356 Mon Sep 17 00:00:00 2001 From: "Sarnie, Nick" <nick.sar...@intel.com> Date: Tue, 11 Feb 2025 07:57:11 -0800 Subject: [PATCH] [clang-linker-wrapper][lit] Fix SPIR-V ELF test when spirv-tools feature is available Signed-off-by: Sarnie, Nick <nick.sar...@intel.com> --- clang/test/CMakeLists.txt | 9 +++++++++ clang/test/Tooling/clang-linker-wrapper-spirv-elf.cpp | 1 + clang/test/Tooling/lit.local.cfg | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/clang/test/CMakeLists.txt b/clang/test/CMakeLists.txt index e9eb54a67204cda..b796a51ef600e72 100644 --- a/clang/test/CMakeLists.txt +++ b/clang/test/CMakeLists.txt @@ -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 ) diff --git a/clang/test/Tooling/clang-linker-wrapper-spirv-elf.cpp b/clang/test/Tooling/clang-linker-wrapper-spirv-elf.cpp index 4f8658064e857d0..9b16727d7419251 100644 --- a/clang/test/Tooling/clang-linker-wrapper-spirv-elf.cpp +++ b/clang/test/Tooling/clang-linker-wrapper-spirv-elf.cpp @@ -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 diff --git a/clang/test/Tooling/lit.local.cfg b/clang/test/Tooling/lit.local.cfg index bc2a096c8f64f88..9083a48c7bb2a4f 100644 --- a/clang/test/Tooling/lit.local.cfg +++ b/clang/test/Tooling/lit.local.cfg @@ -1,3 +1,5 @@ +import shutil + if not config.root.clang_staticanalyzer: config.unsupported = True @@ -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 shutil.which("llvm-spirv"): + config.available_features.add("llvm-spirv") _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
