[llvm] 56bb0a4 - [SPIR-V] Use ToolSubst for spirv-tools lit substitutions (#192462)

[via llvm-commits]

Author: Arseniy Obolenskiy
Date: 2026-04-17T17:15:54+02:00
New Revision: 56bb0a4fce3030b62ce842e5b06e8ecc5b816de1

URL: https://github.com/llvm/llvm-project/commit/56bb0a4fce3030b62ce842e5b06e8ecc5b816de1
DIFF: https://github.com/llvm/llvm-project/commit/56bb0a4fce3030b62ce842e5b06e8ecc5b816de1.diff

LOG: [SPIR-V] Use ToolSubst for spirv-tools lit substitutions (#192462)

Bare-string substitutions match as substrings and the replacement path
contains the tool name, causing corrupted RUN lines

The issue is reproducible, for example, when path to llvm has tool name
substring at any point

Added: 
    

Modified: 
    llvm/test/CodeGen/SPIRV/lit.local.cfg

Removed: 
    


################################################################################
diff  --git a/llvm/test/CodeGen/SPIRV/lit.local.cfg b/llvm/test/CodeGen/SPIRV/lit.local.cfg
index 51795425cc887..59d93b548ea1d 100644
--- a/llvm/test/CodeGen/SPIRV/lit.local.cfg
+++ b/llvm/test/CodeGen/SPIRV/lit.local.cfg
@@ -3,7 +3,7 @@ if not "SPIRV" in config.root.targets:
 
 if config.spirv_tools_tests:
     config.available_features.add("spirv-tools")
-    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")))
+    from lit.llvm import llvm_config
+    llvm_config.add_tool_substitutions(
+        ["spirv-dis", "spirv-val", "spirv-as", "spirv-link"]
+    )