fix tests relying on spirv-as

Signed-off-by: Nathan Gauër <[email protected]>

Author: Keenuts

llvm/test/CMakeLists.txt

@@ -230,6 +230,7 @@ endif()
 if (LLVM_INCLUDE_SPIRV_TOOLS_TESTS)
   list(APPEND LLVM_TEST_DEPENDS spirv-dis)
   list(APPEND LLVM_TEST_DEPENDS spirv-val)
+  list(APPEND LLVM_TEST_DEPENDS spirv-as)
 endif()
 
 add_custom_target(llvm-test-depends DEPENDS ${LLVM_TEST_DEPENDS})

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

@@ -1,7 +1,20 @@
 if not "SPIRV" in config.root.targets:
     config.unsupported = True
 
+config.suffixes = [".ll", ".hlsl"]
+
+spirv_sim_root = os.path.join(config.llvm_src_root, "utils", "spirv-sim")
+
 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( ('%clang', 'clang'))
+    config.substitutions.append(
+      (
+        "spirv-sim",
+        "'%s' %s"
+        % (config.python_executable, os.path.join(spirv_sim_root, "spirv-sim.py")),
+      )
+    )

llvm/test/CodeGen/SPIRV/structurizer/cf.switch.opswitch.hlsl

@@ -1,4 +1,4 @@
-// RUN: %clang --driver-mode=dxc -T cs_6_0 -fspv-target-env=vulkan1.3 %s -spirv | spirv-as --preserve-numeric-ids - -o - | spirv-val
+// RUN: %if spirv-tools %{ %clang --driver-mode=dxc -T cs_6_0 -fspv-target-env=vulkan1.3 %s -spirv | spirv-as --preserve-numeric-ids - -o - | spirv-val %}
 
 int foo() { return 200; }
 

llvm/test/CodeGen/SPIRV/structurizer/cf.switch.opswitch.literal.hlsl

@@ -1,4 +1,4 @@
-// RUN: %clang --driver-mode=dxc -T cs_6_0 -fspv-target-env=vulkan1.3 %s -spirv | spirv-as --preserve-numeric-ids - -o - | spirv-val
+// RUN: %if spirv-tools %{ %clang --driver-mode=dxc -T cs_6_0 -fspv-target-env=vulkan1.3 %s -spirv | spirv-as --preserve-numeric-ids - -o - | spirv-val %}
 
 [numthreads(1, 1, 1)]
 void main() {

llvm/tools/spirv-tools/CMakeLists.txt

@@ -12,7 +12,7 @@ endif ()
 # SPIRV_DIS and SPIRV_VAL variables can be used to provide paths to existing
 # spirv-dis and spirv-val binaries, respectively. Otherwise, build them from
 # SPIRV-Tools source.
-if (NOT SPIRV_DIS OR NOT SPIRV_VAL)
+if (NOT SPIRV_DIS OR NOT SPIRV_VAL OR NOT SPIRV_AS)
   include(ExternalProject)
 
   set(BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/SPIRVTools-bin)
@@ -21,8 +21,8 @@ if (NOT SPIRV_DIS OR NOT SPIRV_VAL)
     GIT_REPOSITORY https://github.com/KhronosGroup/SPIRV-Tools.git
     GIT_TAG main
     BINARY_DIR ${BINARY_DIR}
-    BUILD_COMMAND ${CMAKE_COMMAND} --build ${BINARY_DIR} --target spirv-dis spirv-val
-    BUILD_BYPRODUCTS ${BINARY_DIR}/tools/spirv-dis ${BINARY_DIR}/tools/spirv-val
+    BUILD_COMMAND ${CMAKE_COMMAND} --build ${BINARY_DIR} --target spirv-dis spirv-val spirv-as
+    BUILD_BYPRODUCTS ${BINARY_DIR}/tools/spirv-dis ${BINARY_DIR}/tools/spirv-val ${BINARY_DIR}/tools/spirv-as
     DOWNLOAD_COMMAND git clone https://github.com/KhronosGroup/SPIRV-Tools.git SPIRVTools &&
       cd SPIRVTools &&
       ${Python3_EXECUTABLE} utils/git-sync-deps
@@ -63,3 +63,13 @@ else ()
     DEPENDS SPIRVTools
     )
 endif ()
+
+if (SPIRV_AS)
+  add_custom_target(spirv-as
+    COMMAND ${CMAKE_COMMAND} -E ${LLVM_LINK_OR_COPY} "${SPIRV_VAL}" "${LLVM_RUNTIME_OUTPUT_INTDIR}/spirv-as")
+else ()
+  add_custom_target(spirv-as
+    COMMAND ${CMAKE_COMMAND} -E ${LLVM_LINK_OR_COPY} "${BINARY_DIR}/tools/spirv-as${CMAKE_EXECUTABLE_SUFFIX}" "${LLVM_RUNTIME_OUTPUT_INTDIR}/spirv-as${CMAKE_EXECUTABLE_SUFFIX}"
+    DEPENDS SPIRVTools
+    )
+endif ()