Skip to content
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.

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

[SPIR-V] Enable spirv-sim lit substitution unconditionally #109451

Merged
merged 1 commit into from
Sep 20, 2024

Conversation

bogner
Copy link
Contributor

@bogner bogner commented Sep 20, 2024

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

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 llvm#107408
@llvmbot
Copy link
Collaborator

llvmbot commented Sep 20, 2024

@llvm/pr-subscribers-backend-spir-v

Author: Justin Bogner (bogner)

Changes

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


Full diff: https://github.com/llvm/llvm-project/pull/109451.diff

1 Files Affected:

  • (modified) llvm/test/CodeGen/SPIRV/lit.local.cfg (+8-7)
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")),
-      )
-    )

@bogner bogner merged commit 28ad801 into llvm:main Sep 20, 2024
9 of 11 checks passed
xgupta pushed a commit to xgupta/llvm-project that referenced this pull request Oct 4, 2024
…9451)

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 llvm#107408
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants