Simplify build configuraiton and DXV detection

With this change configuraiton requires setting `DXC_DIR` to the folder
containing dxc and dxv, and the rest is handled by CMake.

Author: llvm-beanz

.github/workflows/test-all.yaml

@@ -117,14 +117,14 @@ jobs:
             cd DXC
             mkdir build
             cd build
-            cmake -G Ninja -DCMAKE_POLICY_DEFAULT_CMP0141=NEW -DCMAKE_BUILD_TYPE=${{ inputs.BuildType }} -C ${{ github.workspace }}/DXC/cmake/caches/PredefinedParams.cmake -C ${{ github.workspace }}/HLSLTest/cmake/caches/sccache.cmake -DHLSL_DISABLE_SOURCE_GENERATION=On ${{ github.workspace }}/DXC/
+            cmake -G Ninja -DCMAKE_BUILD_TYPE=${{ inputs.BuildType }} -C ${{ github.workspace }}/DXC/cmake/caches/PredefinedParams.cmake -C ${{ github.workspace }}/HLSLTest/cmake/caches/sccache.cmake -DHLSL_DISABLE_SOURCE_GENERATION=On ${{ github.workspace }}/DXC/
             ninja
       - name: Build LLVM
         run: |
             cd llvm-project
             mkdir build
             cd build
-            cmake -G Ninja -DCMAKE_BUILD_TYPE=${{ inputs.BuildType }} -C ${{ github.workspace }}/llvm-project/clang/cmake/caches/HLSL.cmake -C ${{ github.workspace }}/HLSLTest/cmake/caches/sccache.cmake -DDXC_BUILD_DIR=${{ github.workspace }}/DXC/build/bin -DLLVM_EXTERNAL_HLSLTEST_SOURCE_DIR=${{ github.workspace }}/HLSLTest -DLLVM_EXTERNAL_PROJECTS="HLSLTest" -DLLVM_LIT_ARGS="--xunit-xml-output=testresults.xunit.xml -v" -DHLSLTEST_TEST_CLANG=${{ inputs.Test-Clang }} ${{ github.workspace }}/llvm-project/llvm/
+            cmake -G Ninja -DCMAKE_BUILD_TYPE=${{ inputs.BuildType }} -C ${{ github.workspace }}/llvm-project/clang/cmake/caches/HLSL.cmake -C ${{ github.workspace }}/HLSLTest/cmake/caches/sccache.cmake -DDXC_DIR=${{ github.workspace }}/DXC/build/bin -DLLVM_EXTERNAL_HLSLTEST_SOURCE_DIR=${{ github.workspace }}/HLSLTest -DLLVM_EXTERNAL_PROJECTS="HLSLTest" -DLLVM_LIT_ARGS="--xunit-xml-output=testresults.xunit.xml -v" -DHLSLTEST_TEST_CLANG=${{ inputs.Test-Clang }} ${{ github.workspace }}/llvm-project/llvm/
             ninja hlsl-test-depends
       - name: Run HLSL Tests
         run: |

CMakeLists.txt

@@ -12,11 +12,10 @@ set(HLSLTEST_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
 set(HLSLTEST_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 set(HLSLTEST_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
-set(DXC_BUILD_DIR "" CACHE STRING "Path to a DXC build directory")
-find_program(DXC_EXECUTABLE dxc HINTS ${DXC_BUILD_DIR})
-find_program(DXV_EXECUTABLE dxv HINTS ${DXC_BUILD_DIR})
+set(DXC_DIR "" CACHE STRING "Path to a DXC build or install binary directory")
+find_program(DXC_EXECUTABLE dxc HINTS ${DXC_DIR})
+find_program(DXV_EXECUTABLE dxv HINTS ${DXC_DIR})
 
-set(HLSLTEST_COMPILER ${DXC_EXECUTABLE} CACHE STRING "Compiler to use for testing (uses dxc from PATH if unset)")
 if ("clang" IN_LIST LLVM_ENABLE_PROJECTS)
   set(default_HLSLTEST_TEST_CLANG On)
 else()

README.md

@@ -31,7 +31,7 @@ If you do not have a build of dxc on your path you'll need to specify the shader
 compiler to use by passing:
 
 ```shell
--DHLSLTEST_COMPILER=<path to compiler>
+-DDXC_DIR=<path to folder containing dxc & dxv>
 ```
 
 # YAML Pipeline Format

test/CMakeLists.txt

@@ -20,7 +20,7 @@ function(try_compile_hlsl output)
   set(TRY_COMPILE_FLAGS "${ARG_FLAGS}")
   string(REPLACE ";" " " extra_flags "${TRY_COMPILE_FLAGS}")
 
-  set(test_compile_command ${HLSLTEST_COMPILER} ${extra_flags} ${SIMPLE_HLSL})
+  set(test_compile_command ${DXC_EXECUTABLE} ${extra_flags} ${SIMPLE_HLSL})
   string(REPLACE "\"" "" test_compile_command "${test_compile_command}")
   string(REPLACE " " ";" test_compile_command "${test_compile_command}")
 

test/lit.cfg.py

@@ -48,13 +48,13 @@
   tools.append(ToolSubst("%gpu-exec", FindTool("gpu-exec")))
 
 if config.hlsltest_test_clang:
-  if os.path.exists(config.hlsltest_dxv):
-    tools.append(ToolSubst("dxc", FindTool("clang-dxc"), extra_args=["--dxv-path=%s" % config.hlsltest_dxv]))
+  if os.path.exists(config.hlsltest_dxc_dir):
+    tools.append(ToolSubst("dxc", FindTool("clang-dxc"), extra_args=["--dxv-path=%s" % config.hlsltest_dxc_dir]))
   else:
     tools.append(ToolSubst("dxc", FindTool("clang-dxc")))
   config.available_features.add("Clang")
 else:
-  tools.append(ToolSubst("dxc", config.hlsltest_compiler))
+  tools.append(ToolSubst("dxc", config.hlsltest_dxc))
 
 llvm_config.add_tool_substitutions(tools, config.llvm_tools_dir)
 

test/lit.site.cfg.py.in

@@ -5,11 +5,11 @@ import sys
 config.hlsltest_obj_root = path(r"@HLSLTEST_BINARY_DIR@")
 config.hlsltest_src_root = path(r"@HLSLTEST_SOURCE_DIR@")
 config.llvm_tools_dir = lit_config.substitute(path(r"@LLVM_TOOLS_DIR@"))
-config.hlsltest_compiler = path(r"@HLSLTEST_COMPILER@")
+config.hlsltest_dxc = path(r"@DXC_EXECUTABLE@")
 config.hlsltest_supports_spirv = @SUPPORTS_SPIRV@
 config.hlsltest_test_clang = @FORCE_CLANG@
 config.hlsltest_test_warp = @FORCE_WARP@
-config.hlsltest_dxv = "@DXV_EXECUTABLE@"
+config.hlsltest_dxc_dir = r"@DXC_DIR@"
 
 config.hlsltest_suite = "@suite@"
 config.hlsltest_enable_d3d12 = @TEST_d3d12@