https://github.com/YuriPlyakhin updated https://github.com/llvm/llvm-project/pull/198434
>From ab1a3c8b49391b0dd7cf4849bf0b761475809bfc Mon Sep 17 00:00:00 2001 From: "Plyakhin, Yury" <[email protected]> Date: Tue, 19 May 2026 03:16:35 +0200 Subject: [PATCH 1/2] [clang][test] Move offload tool tests to clang/test/OffloadTools/ Tests for clang-offload-bundler, clang-linker-wrapper, clang-nvlink-wrapper, and clang-sycl-linker were scattered across clang/test/Driver/ and clang/test/Tooling/. Neither location was appropriate: Driver/ is for testing the compiler driver, and Tooling/ is for testing the LibTooling infrastructure. Move them to clang/test/OffloadTools/ with one subdirectory per tool, following the convention used by llvm/test/tools/. The tool-name prefix is dropped from filenames since the containing directory already identifies the tool. The spirv-tools feature/substitution setup is carried over from Tooling's lit.local.cfg into a new lit.local.cfg in clang-linker-wrapper/, since the parent clang/test/lit.cfg.py does not set up that feature. The dead spirv-tools block is removed from Tooling/lit.local.cfg now that no tests there depend on it. --- .../linker-wrapper-canonical-prefixes.c | 0 .../linker-wrapper-hip-amdgcnspirv.c | 0 .../clang-linker-wrapper}/linker-wrapper-hip-no-rdc.c | 0 .../clang-linker-wrapper}/linker-wrapper-image.c | 0 .../clang-linker-wrapper}/linker-wrapper-llvm-help.c | 0 .../clang-linker-wrapper}/linker-wrapper.c | 0 .../test/OffloadTools/clang-linker-wrapper/lit.local.cfg | 6 ++++++ .../clang-linker-wrapper/spirv.cpp} | 0 .../clang-nvlink-wrapper}/nvlink-wrapper.c | 0 .../clang-offload-bundler/asserts-on.c} | 0 .../clang-offload-bundler/basic.c} | 0 .../clang-offload-bundler}/fat-archive-unbundle-ext.c | 0 .../clang-offload-bundler/standardize.c} | 0 .../clang-offload-bundler/zlib.c} | 0 .../clang-offload-bundler/zstd.c} | 0 .../clang-sycl-linker/basic.ll} | 0 .../clang-sycl-linker/split-mode.ll} | 0 clang/test/Tooling/lit.local.cfg | 9 --------- 18 files changed, 6 insertions(+), 9 deletions(-) rename clang/test/{Driver => OffloadTools/clang-linker-wrapper}/linker-wrapper-canonical-prefixes.c (100%) rename clang/test/{Driver => OffloadTools/clang-linker-wrapper}/linker-wrapper-hip-amdgcnspirv.c (100%) rename clang/test/{Driver => OffloadTools/clang-linker-wrapper}/linker-wrapper-hip-no-rdc.c (100%) rename clang/test/{Driver => OffloadTools/clang-linker-wrapper}/linker-wrapper-image.c (100%) rename clang/test/{Driver => OffloadTools/clang-linker-wrapper}/linker-wrapper-llvm-help.c (100%) rename clang/test/{Driver => OffloadTools/clang-linker-wrapper}/linker-wrapper.c (100%) create mode 100644 clang/test/OffloadTools/clang-linker-wrapper/lit.local.cfg rename clang/test/{Tooling/clang-linker-wrapper-spirv.cpp => OffloadTools/clang-linker-wrapper/spirv.cpp} (100%) rename clang/test/{Driver => OffloadTools/clang-nvlink-wrapper}/nvlink-wrapper.c (100%) rename clang/test/{Driver/clang-offload-bundler-asserts-on.c => OffloadTools/clang-offload-bundler/asserts-on.c} (100%) rename clang/test/{Driver/clang-offload-bundler.c => OffloadTools/clang-offload-bundler/basic.c} (100%) rename clang/test/{Driver => OffloadTools/clang-offload-bundler}/fat-archive-unbundle-ext.c (100%) rename clang/test/{Driver/clang-offload-bundler-standardize.c => OffloadTools/clang-offload-bundler/standardize.c} (100%) rename clang/test/{Driver/clang-offload-bundler-zlib.c => OffloadTools/clang-offload-bundler/zlib.c} (100%) rename clang/test/{Driver/clang-offload-bundler-zstd.c => OffloadTools/clang-offload-bundler/zstd.c} (100%) rename clang/test/{Tooling/clang-sycl-linker.ll => OffloadTools/clang-sycl-linker/basic.ll} (100%) rename clang/test/{Tooling/clang-sycl-linker-split-mode.ll => OffloadTools/clang-sycl-linker/split-mode.ll} (100%) diff --git a/clang/test/Driver/linker-wrapper-canonical-prefixes.c b/clang/test/OffloadTools/clang-linker-wrapper/linker-wrapper-canonical-prefixes.c similarity index 100% rename from clang/test/Driver/linker-wrapper-canonical-prefixes.c rename to clang/test/OffloadTools/clang-linker-wrapper/linker-wrapper-canonical-prefixes.c diff --git a/clang/test/Driver/linker-wrapper-hip-amdgcnspirv.c b/clang/test/OffloadTools/clang-linker-wrapper/linker-wrapper-hip-amdgcnspirv.c similarity index 100% rename from clang/test/Driver/linker-wrapper-hip-amdgcnspirv.c rename to clang/test/OffloadTools/clang-linker-wrapper/linker-wrapper-hip-amdgcnspirv.c diff --git a/clang/test/Driver/linker-wrapper-hip-no-rdc.c b/clang/test/OffloadTools/clang-linker-wrapper/linker-wrapper-hip-no-rdc.c similarity index 100% rename from clang/test/Driver/linker-wrapper-hip-no-rdc.c rename to clang/test/OffloadTools/clang-linker-wrapper/linker-wrapper-hip-no-rdc.c diff --git a/clang/test/Driver/linker-wrapper-image.c b/clang/test/OffloadTools/clang-linker-wrapper/linker-wrapper-image.c similarity index 100% rename from clang/test/Driver/linker-wrapper-image.c rename to clang/test/OffloadTools/clang-linker-wrapper/linker-wrapper-image.c diff --git a/clang/test/Driver/linker-wrapper-llvm-help.c b/clang/test/OffloadTools/clang-linker-wrapper/linker-wrapper-llvm-help.c similarity index 100% rename from clang/test/Driver/linker-wrapper-llvm-help.c rename to clang/test/OffloadTools/clang-linker-wrapper/linker-wrapper-llvm-help.c diff --git a/clang/test/Driver/linker-wrapper.c b/clang/test/OffloadTools/clang-linker-wrapper/linker-wrapper.c similarity index 100% rename from clang/test/Driver/linker-wrapper.c rename to clang/test/OffloadTools/clang-linker-wrapper/linker-wrapper.c diff --git a/clang/test/OffloadTools/clang-linker-wrapper/lit.local.cfg b/clang/test/OffloadTools/clang-linker-wrapper/lit.local.cfg new file mode 100644 index 0000000000000..002d7f4246b83 --- /dev/null +++ b/clang/test/OffloadTools/clang-linker-wrapper/lit.local.cfg @@ -0,0 +1,6 @@ +if config.spirv_tools_tests: + config.available_features.add("spirv-tools") + from lit.llvm import llvm_config + llvm_config.add_tool_substitutions( + ["spirv-dis", "spirv-val", "spirv-as", "spirv-link"] + ) diff --git a/clang/test/Tooling/clang-linker-wrapper-spirv.cpp b/clang/test/OffloadTools/clang-linker-wrapper/spirv.cpp similarity index 100% rename from clang/test/Tooling/clang-linker-wrapper-spirv.cpp rename to clang/test/OffloadTools/clang-linker-wrapper/spirv.cpp diff --git a/clang/test/Driver/nvlink-wrapper.c b/clang/test/OffloadTools/clang-nvlink-wrapper/nvlink-wrapper.c similarity index 100% rename from clang/test/Driver/nvlink-wrapper.c rename to clang/test/OffloadTools/clang-nvlink-wrapper/nvlink-wrapper.c diff --git a/clang/test/Driver/clang-offload-bundler-asserts-on.c b/clang/test/OffloadTools/clang-offload-bundler/asserts-on.c similarity index 100% rename from clang/test/Driver/clang-offload-bundler-asserts-on.c rename to clang/test/OffloadTools/clang-offload-bundler/asserts-on.c diff --git a/clang/test/Driver/clang-offload-bundler.c b/clang/test/OffloadTools/clang-offload-bundler/basic.c similarity index 100% rename from clang/test/Driver/clang-offload-bundler.c rename to clang/test/OffloadTools/clang-offload-bundler/basic.c diff --git a/clang/test/Driver/fat-archive-unbundle-ext.c b/clang/test/OffloadTools/clang-offload-bundler/fat-archive-unbundle-ext.c similarity index 100% rename from clang/test/Driver/fat-archive-unbundle-ext.c rename to clang/test/OffloadTools/clang-offload-bundler/fat-archive-unbundle-ext.c diff --git a/clang/test/Driver/clang-offload-bundler-standardize.c b/clang/test/OffloadTools/clang-offload-bundler/standardize.c similarity index 100% rename from clang/test/Driver/clang-offload-bundler-standardize.c rename to clang/test/OffloadTools/clang-offload-bundler/standardize.c diff --git a/clang/test/Driver/clang-offload-bundler-zlib.c b/clang/test/OffloadTools/clang-offload-bundler/zlib.c similarity index 100% rename from clang/test/Driver/clang-offload-bundler-zlib.c rename to clang/test/OffloadTools/clang-offload-bundler/zlib.c diff --git a/clang/test/Driver/clang-offload-bundler-zstd.c b/clang/test/OffloadTools/clang-offload-bundler/zstd.c similarity index 100% rename from clang/test/Driver/clang-offload-bundler-zstd.c rename to clang/test/OffloadTools/clang-offload-bundler/zstd.c diff --git a/clang/test/Tooling/clang-sycl-linker.ll b/clang/test/OffloadTools/clang-sycl-linker/basic.ll similarity index 100% rename from clang/test/Tooling/clang-sycl-linker.ll rename to clang/test/OffloadTools/clang-sycl-linker/basic.ll diff --git a/clang/test/Tooling/clang-sycl-linker-split-mode.ll b/clang/test/OffloadTools/clang-sycl-linker/split-mode.ll similarity index 100% rename from clang/test/Tooling/clang-sycl-linker-split-mode.ll rename to clang/test/OffloadTools/clang-sycl-linker/split-mode.ll diff --git a/clang/test/Tooling/lit.local.cfg b/clang/test/Tooling/lit.local.cfg index 9cda4b31e81da..4cd8ba72fa767 100644 --- a/clang/test/Tooling/lit.local.cfg +++ b/clang/test/Tooling/lit.local.cfg @@ -1,11 +1,2 @@ -import lit.util - if not config.root.clang_staticanalyzer: config.unsupported = True - -if config.spirv_tools_tests: - config.available_features.add("spirv-tools") - from lit.llvm import llvm_config - llvm_config.add_tool_substitutions( - ["spirv-dis", "spirv-val", "spirv-as", "spirv-link"] - ) >From 1b75936c8ebcd2b474717c5de8863cf2e65fecb6 Mon Sep 17 00:00:00 2001 From: "Plyakhin, Yury" <[email protected]> Date: Wed, 20 May 2026 17:40:33 +0200 Subject: [PATCH 2/2] new test --- .../clang-sycl-linker/triple.ll} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename clang/test/{Tooling/clang-sycl-linker-triple.ll => OffloadTools/clang-sycl-linker/triple.ll} (100%) diff --git a/clang/test/Tooling/clang-sycl-linker-triple.ll b/clang/test/OffloadTools/clang-sycl-linker/triple.ll similarity index 100% rename from clang/test/Tooling/clang-sycl-linker-triple.ll rename to clang/test/OffloadTools/clang-sycl-linker/triple.ll _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
