Skip to content

cmake: Add spirv-dis lit feature #2561

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

Merged
merged 1 commit into from
May 15, 2024
Merged

cmake: Add spirv-dis lit feature #2561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ if(SPIRV_TOOLS_FOUND AND NOT SPIRV-Tools-tools_FOUND)
set(SPIRV_TOOLS_SPIRV_AS_FOUND True)
endif()

find_program(SPIRV_TOOLS_SPIRV_DIS NAMES spirv-dis PATHS ${SPIRV_TOOLS_PREFIX}/bin)
if(SPIRV_TOOLS_SPIRV_DIS)
set(SPIRV_TOOLS_SPIRV_DIS_FOUND True)
endif()

find_program(SPIRV_TOOLS_SPIRV_LINK NAMES spirv-link PATHS ${SPIRV_TOOLS_PREFIX}/bin)
if(SPIRV_TOOLS_SPIRV_LINK)
set(SPIRV_TOOLS_SPIRV_LINK_FOUND True)
Expand All @@ -33,6 +38,10 @@ elseif(SPIRV-Tools-tools_FOUND)
set(SPIRV_TOOLS_SPIRV_AS_FOUND True)
endif()

if(TARGET spirv-dis)
set(SPIRV_TOOLS_SPIRV_DIS_FOUND True)
endif()

if(TARGET spirv-link)
set(SPIRV_TOOLS_SPIRV_LINK_FOUND True)
endif()
Expand All @@ -58,6 +67,11 @@ if(NOT SPIRV_TOOLS_SPIRV_AS_FOUND)
set(SPIRV_TOOLS_SPIRV_AS_FOUND False)
endif()

if(NOT SPIRV_TOOLS_SPIRV_DIS_FOUND)
message(WARNING "spirv-as not found! SPIR-V disassembly tests will not be run.")
set(SPIRV_TOOLS_SPIRV_DIS_FOUND False)
endif()

if(NOT SPIRV_TOOLS_SPIRV_LINK_FOUND)
message(WARNING "spirv-link not found! SPIR-V test involving the linker will not be run.")
set(SPIRV_TOOLS_SPIRV_LINK_FOUND False)
Expand Down
5 changes: 5 additions & 0 deletions test/lit.cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@
config.available_features.add('spirv-as')
using_spirv_tools = True

if config.spirv_tools_have_spirv_dis:
llvm_config.add_tool_substitutions(['spirv-dis'], [config.spirv_tools_bin_dir])
config.available_features.add('spirv-dis')
using_spirv_tools = True

if config.spirv_tools_have_spirv_link:
llvm_config.add_tool_substitutions(['spirv-link'], [config.spirv_tools_bin_dir])
config.available_features.add('spirv-link')
Expand Down
1 change: 1 addition & 0 deletions test/lit.site.cfg.py.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ config.python_executable = "@PYTHON_EXECUTABLE@"
config.test_run_dir = "@CMAKE_CURRENT_BINARY_DIR@"
config.spirv_tools_found = "@SPIRV_TOOLS_FOUND@"
config.spirv_tools_have_spirv_as = @SPIRV_TOOLS_SPIRV_AS_FOUND@
config.spirv_tools_have_spirv_dis = @SPIRV_TOOLS_SPIRV_DIS_FOUND@
config.spirv_tools_have_spirv_link = @SPIRV_TOOLS_SPIRV_LINK_FOUND@
config.spirv_tools_have_spirv_val = @SPIRV_TOOLS_SPIRV_VAL_FOUND@
config.spirv_tools_bin_dir = "@SPIRV_TOOLS_BINDIR@"
Expand Down