Skip to content

KPACK rollup 20260209. #3347

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
stellaraccident merged 4 commits into from
Feb 11, 2026
+27 −1
Merged

KPACK rollup 20260209. #3347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a30e50
Bump kpack to HEAD.
stellaraccident Feb 10, 2026
0473540
Plumb ROCM_KPACK_ENABLED through to hip-clr when splitting artifacts
stellaraccident Jan 15, 2026
b300248
Quality of life improvements.
stellaraccident Feb 10, 2026
5194e79
Merge branch 'main' into users/stella/kpack-rollup-20260209
stellaraccident Feb 11, 2026
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
2 changes: 1 addition & 1 deletion base/rocm-kpack
Open in desktop
Submodule rocm-kpack updated 14 files
+21 −5 python/rocm_kpack/artifact_splitter.py
+12 −2 python/rocm_kpack/coff/kpack_transform.py
+13 −3 python/rocm_kpack/elf/kpack_transform.py
+23 −2 runtime/CMakeLists.txt
+5 −0 runtime/cmake/rocm-kpack-config.cmake.in
+11 −2 runtime/include/rocm_kpack/kpack.h
+13 −4 runtime/src/loader.cpp
+23 −18 runtime/tests/generate_test_data.py
+24 −24 runtime/tests/test_archive_integration.cpp
+ − runtime/tests/test_assets/test_noop.kpack
+ − runtime/tests/test_assets/test_zstd.kpack
+33 −33 runtime/tests/test_loader_api.cpp
+33 −0 tests/coff/test_kpack_transform.py
+34 −0 tests/elf/test_kpack_transform.py
15 changes: 15 additions & 0 deletions cmake/therock_subproject.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,6 +564,21 @@ get_property(existing_packages GLOBAL PROPERTY THEROCK_ALL_PROVIDED_PACKAGES)
endif()
endfunction()

# therock_cmake_subproject_require_program
# Requires that find_program finds a named program at super-project configure time.
# This is to avoid downstream errors that would otherwise only show up at build time.
# Only to be used by programs that must exist on the host in order to build. Programs
# that are built as part of the project are resolved internally.
function(therock_cmake_subproject_require_host_program target_name)
_therock_assert_is_cmake_subproject("${target_name}")
foreach(prog IN LISTS ARGN)
find_program(found "${prog}" OPTIONAL)
if(NOT found)
message(FATAL_ERROR "Building sub-project ${target_name} requires program '${prog}' on the system path but it is not found")
endif()
endforeach()
endfunction()

# therock_cmake_subproject_activate
# If using multi-step setup (i.e. without 'ACTIVATE' on the declare), then this
# must be called once all configuration is complete.
Expand Down
10 changes: 10 additions & 0 deletions core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,14 @@ if(THEROCK_ENABLE_HIP_RUNTIME)
)
endif()

# Conditional rocm-kpack support for kpack split artifacts
set(_hip_clr_kpack_runtime_deps)
set(_hip_clr_kpack_cmake_args)
if(THEROCK_KPACK_SPLIT_ARTIFACTS)
list(APPEND _hip_clr_kpack_runtime_deps rocm-kpack)
list(APPEND _hip_clr_kpack_cmake_args "-DROCM_KPACK_ENABLED=ON")
endif()
Comment on lines +116 to +122
Copy link
Member

@ScottTodd ScottTodd Feb 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: we could use consistent variable casing here, or append to the existing HIP_CLR_CMAKE_ARGS and HIP_CLR_RUNTIME_DEPS variables instread of introducing new variables

see below where both variables are used:

      ${HIP_CLR_CMAKE_ARGS}
      ${_hip_clr_kpack_cmake_args}

Copy link
Collaborator Author

@stellaraccident stellaraccident Feb 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. I'll normalize in a follow-up. Easier on my branches to fix on the upstream integration branch and save a CI cycle.


therock_cmake_subproject_declare(hip-clr
USE_DIST_AMDGPU_TARGETS
EXTERNAL_SOURCE_DIR "${THEROCK_ROCM_SYSTEMS_SOURCE_DIR}/projects/clr"
Expand All @@ -130,6 +138,7 @@ if(THEROCK_ENABLE_HIP_RUNTIME)
# and can use local machine tools.
"-DHIPCC_BIN_DIR="
${HIP_CLR_CMAKE_ARGS}
${_hip_clr_kpack_cmake_args}
BUILD_DEPS
rocm-cmake
therock-simde
Expand All @@ -139,6 +148,7 @@ if(THEROCK_ENABLE_HIP_RUNTIME)
hipcc # For hipconfig
rocm-core
${HIP_CLR_RUNTIME_DEPS}
${_hip_clr_kpack_runtime_deps}
INTERFACE_LINK_DIRS
"lib"
INTERFACE_INSTALL_RPATH_DIRS
Expand Down
1 change: 1 addition & 0 deletions math-libs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,7 @@ if(THEROCK_ENABLE_LIBHIPCXX)
SUBDIRS
.
)
therock_cmake_subproject_require_host_program(libhipcxx lit)
therock_cmake_subproject_activate(libhipcxx)

therock_provide_artifact(libhipcxx
Expand Down
Loading