Skip to content

Use WARP from nuget by default #7427

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.

Sign up for GitHub

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

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Use WARP from nuget by default #7427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d6ec5b6
Steps towards making using nuget warp the default
damyanp May 3, 2025
c17e2c9
WIP - install the nuget package
damyanp May 3, 2025
cb5b88f
Install the nuget package, and update the lit site config for the dll…
damyanp May 3, 2025
73d0396
Explicitly load WARP dll
damyanp May 3, 2025
69fd6d0
Fix formatting
damyanp May 3, 2025
8ce9a1f
Add RAII helper for ensuring FreeLibrary is called
damyanp May 9, 2025
742120f
Grammar fix
damyanp May 9, 2025
1560f10
Formatting
damyanp May 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ stages:
displayName: 'DXIL Tests'
- script: |
call utils\hct\hctstart.cmd %HLSL_SRC_DIR% %HLSL_BLD_DIR%
call utils\hct\hcttest.cmd -$(configuration) exec-warp
displayName: 'DXIL Execution Tests (Nuget WARP)'
call utils\hct\hcttest.cmd -$(configuration) exec
displayName: 'DXIL Execution Tests'

- job: Nix
timeoutInMinutes: 120
Expand Down
233 changes: 0 additions & 233 deletions cmake/modules/Nuget.cmake
View file
Open in desktop

This file was deleted.

78 changes: 35 additions & 43 deletions tools/clang/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ configure_lit_site_cfg(
${CMAKE_CURRENT_BINARY_DIR}/taef/lit.site.cfg
)

# HLSL Change begin
# This must be done before configuring taef_exec's lit.site.cfg.
include(taef_exec/DownloadWarp.cmake)
# HLSL Change end


configure_lit_site_cfg(
${CMAKE_CURRENT_SOURCE_DIR}/taef_exec/lit.site.cfg.in
${CMAKE_CURRENT_BINARY_DIR}/taef_exec/lit.site.cfg
Expand Down Expand Up @@ -122,54 +128,40 @@ add_lit_testsuites(CLANG ${CMAKE_CURRENT_SOURCE_DIR}
FOLDER "Clang tests/Suites"
)

# Manually generate targets that we need to expose in visual studio builds.

# The code below here _ONLY_ executes when building with Visual Studio or Xcode.
if (NOT CMAKE_CONFIGURATION_TYPES)
return()
endif()

# Add the unit test suite
add_lit_target("check-clang-unit" "Running lit suite clang-unit"
${CMAKE_CURRENT_SOURCE_DIR}/Unit
PARAMS ${CLANG_TEST_PARAMS}
DEPENDS ClangUnitTests
ARGS ${CLANG_TEST_EXTRA_ARGS}
)
# add_lit_testsuites doesn't generate targets for Visual Studio or Xcode builds
# (since these IDEs cannot handle the huge number of targets it generates).
#
# We must manually generate targets that we want to expose when using these
# generators.
if(CMAKE_CONFIGURATION_TYPES)

# Add TAEF targets
if (WIN32)
add_lit_target("check-clang-taef" "Running lit suite hlsl"
${CMAKE_CURRENT_SOURCE_DIR}/taef
PARAMS ${CLANG_TEST_PARAMS}
DEPENDS ClangHLSLTests
ARGS ${CLANG_TEST_EXTRA_ARGS}
)
set(TAEF_EXEC_ADAPTER "" CACHE STRING "adapter for taef exec test")

# Use a custom target so we can depend on it and re-run the cmake logic which downloads warp
# from nuget if requested.
add_custom_target(WarpFromNuget
COMMAND "${CMAKE_COMMAND}"
-DCMAKE_SYSTEM_PROCESSOR=${CMAKE_SYSTEM_PROCESSOR}
-DBUILD_TYPE=${CMAKE_BUILD_TYPE}
-DBINARY_DIR=${CMAKE_BINARY_DIR}
-P "${CMAKE_SOURCE_DIR}/cmake/modules/nuget.cmake")

add_lit_target("check-clang-taef-exec" "Running lit suite hlsl execution test"
${CMAKE_CURRENT_SOURCE_DIR}/taef_exec
# Add the unit test suite
add_lit_target("check-clang-unit" "Running lit suite clang-unit"
${CMAKE_CURRENT_SOURCE_DIR}/Unit
PARAMS ${CLANG_TEST_PARAMS}
adapter=${TAEF_EXEC_ADAPTER}
DEPENDS ExecHLSLTests dxexp
DEPENDS ClangUnitTests
ARGS ${CLANG_TEST_EXTRA_ARGS}
)

add_lit_target("check-clang-taef-exec-warp" "Running lit suite hlsl execution test with D3D WARP from nuget"
${CMAKE_CURRENT_SOURCE_DIR}/taef_exec
PARAMS ${CLANG_TEST_PARAMS}
adapter=${TAEF_EXEC_ADAPTER}
DEPENDS ExecHLSLTests dxexp WarpFromNuget
ARGS ${CLANG_TEST_EXTRA_ARGS}
)
# Add TAEF targets
if(WIN32)
add_lit_target("check-clang-taef" "Running lit suite hlsl"
${CMAKE_CURRENT_SOURCE_DIR}/taef
PARAMS ${CLANG_TEST_PARAMS}
DEPENDS ClangHLSLTests
ARGS ${CLANG_TEST_EXTRA_ARGS}
)
set(TAEF_EXEC_ADAPTER "" CACHE STRING "adapter for taef exec test")

add_lit_target("check-clang-taef-exec" "Running lit suite hlsl execution test"
${CMAKE_CURRENT_SOURCE_DIR}/taef_exec
PARAMS ${CLANG_TEST_PARAMS}
adapter=${TAEF_EXEC_ADAPTER}
DEPENDS ExecHLSLTests dxexp
ARGS ${CLANG_TEST_EXTRA_ARGS}
)
endif()
endif()

# HLSL Change End
Loading