[llvm] [SPIR-V] Enable `spirv-sim` lit substitution unconditionally (PR #109451)

Justin Bogner via llvm-commits llvm-commits at lists.llvm.org
Fri Sep 20 10:56:56 PDT 2024


https://github.com/bogner created https://github.com/llvm/llvm-project/pull/109451

The uses of spirv-sim aren't gated by LLVM_INCLUDE_SPIRV_TOOLS_TESTS, so the substitution shouldn't be gated either. Fixes tests after #107408

>From 3a99576b575cb81138107147bdef160acc63db02 Mon Sep 17 00:00:00 2001
From: Justin Bogner <mail at justinbogner.com>
Date: Fri, 20 Sep 2024 10:48:40 -0700
Subject: [PATCH] [SPIR-V] Enable `spirv-sim` lit substitution unconditionally

The uses of spirv-sim aren't gated by LLVM_INCLUDE_SPIRV_TOOLS_TESTS, so
the substitution shouldn't be gated either. Fixes tests after #107408
---
 llvm/test/CodeGen/SPIRV/lit.local.cfg | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/llvm/test/CodeGen/SPIRV/lit.local.cfg b/llvm/test/CodeGen/SPIRV/lit.local.cfg
index 7a20bcc82ad0ff..4655633a256827 100644
--- a/llvm/test/CodeGen/SPIRV/lit.local.cfg
+++ b/llvm/test/CodeGen/SPIRV/lit.local.cfg
@@ -3,15 +3,16 @@ if not "SPIRV" in config.root.targets:
 
 spirv_sim_root = os.path.join(config.llvm_src_root, "utils", "spirv-sim")
 
+config.substitutions.append(
+    (
+        "spirv-sim",
+        "'%s' %s" % (config.python_executable,
+                     os.path.join(spirv_sim_root, "spirv-sim.py")),
+    )
+)
+
 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-sim",
-        "'%s' %s"
-        % (config.python_executable, os.path.join(spirv_sim_root, "spirv-sim.py")),
-      )
-    )



More information about the llvm-commits mailing list