Add options to configure warp-only and to select a warp version

This doesn't seem to quite be working, but it doesn't break anything...

Author: llvm-beanz

CMakeLists.txt

@@ -23,6 +23,11 @@ else()
 endif()
 option(HLSLTEST_TEST_CLANG "Enable testing clang as the HLSL Compiler" ${default_HLSLTEST_TEST_CLANG})
 
+option(HLSLTEST_WARP_ONLY "Only generate Warp configurations (useful for testing in VMs, Windows-only)." OFF)
+if (HLSLTEST_WARP_ONLY AND NOT WIN32)
+  message(FATAL_ERROR "HLSLTEST_WARP_ONLY is only suppoted on Windows hosts!")
+endif()
+
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include
                     ${CMAKE_CURRENT_BINARY_DIR}/include)
 
@@ -81,6 +86,9 @@ if (WIN32)
   set(SKIP_INSTALL_EXPORT On)
 endif ()
 add_subdirectory(third-party/libpng)
+
+include(Warp)
+
 add_subdirectory(lib)
 add_subdirectory(tools)
 

cmake/modules/Warp.cmake

@@ -0,0 +1,44 @@
+function(guess_nuget_arch output_var)
+  if ((CMAKE_GENERATOR_PLATFORM STREQUAL "x64") OR ("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "x64"))
+    set(${output_var} "x64" PARENT_SCOPE)
+  elseif ((CMAKE_GENERATOR_PLATFORM STREQUAL "x86") OR ("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "x86"))
+    set(${output_var} "x86" PARENT_SCOPE)
+  elseif ((CMAKE_GENERATOR_PLATFORM MATCHES "ARM64.*") OR ("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" MATCHES "ARM64.*"))
+    set(${output_var} "arm64" PARENT_SCOPE)
+  elseif ((CMAKE_GENERATOR_PLATFORM MATCHES "ARM.*") OR ("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" MATCHES "ARM.*"))
+    set(${output_var} "arm" PARENT_SCOPE)
+  else()
+    message(FATAL_ERROR "Failed to guess NuGet arch! (${CMAKE_GENERATOR_PLATFORM}, ${CMAKE_C_COMPILER_ARCHITECTURE_ID})")
+  endif()
+endfunction()
+
+function(setup_warp version)
+  if (NOT WIN32)
+    return()
+  endif()
+
+  if (version STREQUAL "System")
+    return()
+  endif()
+
+  message(STATUS "Fetching WARP ${version}...")
+
+  set(WARP_ARCHIVE "${CMAKE_CURRENT_BINARY_DIR}/Microsoft.Direct3D.WARP.${version}.zip")
+  file(DOWNLOAD "https://www.nuget.org/api/v2/package/Microsoft.Direct3D.WARP/${version}/" ${WARP_ARCHIVE})
+
+  guess_nuget_arch(NUGET_ARCH)
+
+  file(ARCHIVE_EXTRACT INPUT ${WARP_ARCHIVE} DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/warp" PATTERNS *${NUGET_ARCH}*dll *${NUGET_ARCH}*pdb)
+
+  file(GLOB_RECURSE LIBS "${CMAKE_CURRENT_BINARY_DIR}/warp/*.dll" $<IF:$<CONFIG:DEBUG>,"${CMAKE_CURRENT_BINARY_DIR}/warp/*.pdb">)
+
+  foreach(FILE ${LIBS})
+    get_filename_component(FILENAME ${FILE} NAME)
+    file(COPY_FILE ${FILE} "${LLVM_RUNTIME_OUTPUT_INTDIR}/${FILENAME}")
+  endforeach()
+
+  file(REMOVE_RECURSE "${CMAKE_CURRENT_BINARY_DIR}/warp")
+endfunction()
+
+set(WARP_VERSION "System" CACHE STRING "")
+setup_warp(${WARP_VERSION})

test/CMakeLists.txt

@@ -131,18 +131,21 @@ function(add_hlsltest_lit_suite suite)
 endfunction()
 
 umbrella_lit_testsuite_begin(check-hlsl)
-foreach(platform ${platforms_to_test})
-  set(TEST_${platform} True)
-  add_hlsltest_lit_suite(${platform})
 
-  if (HLSLTEST_TEST_CLANG)
-    set(FORCE_CLANG True)
-    add_hlsltest_lit_suite(clang-${platform})
-    set(FORCE_CLANG False)
-  endif()
+if (NOT HLSLTEST_WARP_ONLY)
+  foreach(platform ${platforms_to_test})
+    set(TEST_${platform} True)
+    add_hlsltest_lit_suite(${platform})
 
-  set(TEST_${platform} False)
-endforeach()
+    if (HLSLTEST_TEST_CLANG)
+      set(FORCE_CLANG True)
+      add_hlsltest_lit_suite(clang-${platform})
+      set(FORCE_CLANG False)
+    endif()
+
+    set(TEST_${platform} False)
+  endforeach()
+endif()
 
 if (HLSLTEST_ENABLE_D3D12)
   set(TEST_d3d12 True)

tools/api-query/CMakeLists.txt

@@ -1,4 +1,4 @@
 add_hlsl_tool(api-query
               api-query.cpp)
 
-target_link_libraries(api-query PRIVATE LLVMSupport HLSLTestAPI)
+target_link_libraries(api-query PRIVATE LLVMSupport HLSLTestAPI)

tools/gpu-exec/CMakeLists.txt

@@ -4,4 +4,4 @@ add_hlsl_tool(gpu-exec
 
 target_include_directories(gpu-exec PRIVATE SYSTEM BEFORE "${HLSLTEST_BINARY_DIR}/third-party/libpng/")
 
-target_link_libraries(gpu-exec PRIVATE LLVMSupport HLSLTestAPI png_static)
+target_link_libraries(gpu-exec PRIVATE LLVMSupport HLSLTestAPI png_static)