Skip to content

[rocisa][stinkytofu] Move rocisa conversion glue out of stinkytofu #8765

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
KKyang wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[rocisa][stinkytofu] Move rocisa conversion glue out of stinkytofu #8765

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
19 changes: 10 additions & 9 deletions projects/hipblaslt/tensilelite/rocisa/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,15 +149,15 @@ if(HIPBLASLT_BUNDLE_PYTHON_DEPS OR ROCISA_STANDALONE)
target_link_libraries(_rocisa PUBLIC roc::origami)
target_link_libraries(_rocisa PRIVATE hip::host stinkytofu::stinkytofu)

# rocisa<->stinkytofu conversion glue. These sources live in the stinkytofu
# source tree but are rocisa-side bindings (they include rocisa headers and
# define init_stinkytofu), so they compile into _rocisa, not libstinkytofu.
# rocisa owns them directly here rather than relying on stinkytofu to inject
# them, so the de-bundled (find_package) build links them too.
set(_stinkytofu_src_dir "${CMAKE_CURRENT_SOURCE_DIR}/../../../../shared/stinkytofu")
# rocisa<->stinkytofu conversion glue. These sources bridge rocisa types to
# stinkytofu IR and compile into _rocisa (they include both rocisa and
# stinkytofu headers, and define init_stinkytofu).
target_sources(_rocisa PRIVATE
"${_stinkytofu_src_dir}/src/conversion/rocisa/AllHwMappings.cpp"
"${_stinkytofu_src_dir}/src/conversion/rocisa/ToStinkyTofuUtils.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/rocisa/src/stinkytofu/AllHwMappings.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/rocisa/src/stinkytofu/ToStinkyTofuUtils.cpp"
)
target_include_directories(_rocisa PRIVATE
"${CMAKE_CURRENT_SOURCE_DIR}/rocisa/src/stinkytofu"
)

if(_stinkytofu_from_subdirectory)
Expand Down Expand Up @@ -217,7 +217,8 @@ if(HIPBLASLT_BUNDLE_PYTHON_DEPS OR ROCISA_STANDALONE)
# which would leave the path empty and make the check scan the CWD. Point it
# at the real stinkytofu source tree.
if(NOT STINKYTOFU_ROOT_DIR)
cmake_path(ABSOLUTE_PATH _stinkytofu_src_dir NORMALIZE OUTPUT_VARIABLE STINKYTOFU_ROOT_DIR)
set(_st_sibling "${CMAKE_CURRENT_SOURCE_DIR}/../../../../shared/stinkytofu")
cmake_path(ABSOLUTE_PATH _st_sibling NORMALIZE OUTPUT_VARIABLE STINKYTOFU_ROOT_DIR)
endif()
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/rocisa/_build_info.py.in"
Expand Down
0 ...u/src/conversion/rocisa/AllHwMappings.cpp → ...a/rocisa/src/stinkytofu/AllHwMappings.cpp
View file
Open in desktop
File renamed without changes.
0 ...u/src/conversion/rocisa/AllHwMappings.hpp → ...a/rocisa/src/stinkytofu/AllHwMappings.hpp
View file
Open in desktop
File renamed without changes.
0 ...nversion/rocisa/Gfx1250RocisaArchInfo.hpp → .../src/stinkytofu/Gfx1250RocisaArchInfo.hpp
View file
Open in desktop
File renamed without changes.
0 .../src/conversion/rocisa/RocisaArchInfo.hpp → .../rocisa/src/stinkytofu/RocisaArchInfo.hpp
View file
Open in desktop
File renamed without changes.
0 ...c/conversion/rocisa/ToStinkyTofuUtils.cpp → ...cisa/src/stinkytofu/ToStinkyTofuUtils.cpp
View file
Open in desktop
File renamed without changes.
2 changes: 0 additions & 2 deletions shared/stinkytofu/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,8 +394,6 @@ install(FILES
${TABLEGEN_OUTPUT_DIR}/hardware/gfxIsa.inc
DESTINATION include/stinkytofu/hardware
)
# Per-arch rocisa conversion mappings, included by the rocisa conversion glue
# (src/conversion/rocisa/*ArchInfo.hpp) which rocisa compiles into _rocisa.
install(DIRECTORY ${TABLEGEN_OUTPUT_DIR}/stinkytofu/ir/rocisa/
DESTINATION include/stinkytofu/stinkytofu/ir/rocisa
FILES_MATCHING PATTERN "*.inc"
Expand Down
2 changes: 1 addition & 1 deletion shared/stinkytofu/tools/tablegen/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

set(SOURCES
tablegen.cpp
GenRocisaHwMapping.cpp
GenRocisaHwMapping.cpp # TODO: remove when rocisa is replaced by stinkytofu IR
GenLogicalToAsmMapping.cpp
GenPatterns.cpp
GenLogicalIR.cpp
Expand Down
Loading