Skip to content

Add hip-tests to be built with TheRock #2373

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
agunashe merged 4 commits into from
Dec 8, 2025
Merged

Add hip-tests to be built with TheRock #2373

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
30407f0
Add hip-tests to be built with TheRock
cjatin Dec 2, 2025
2a0a0c4
Add windows artifact file
cjatin Dec 2, 2025
4c5c8c1
Remove extra newline
cjatin Dec 2, 2025
6326c7d
Fix a type
cjatin Dec 2, 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
8 changes: 8 additions & 0 deletions BUILD_TOPOLOGY.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,14 @@ platform = "windows"
artifact_deps = ["core-hip"]
feature_group = "CORE" # Part of core, enabled by default

# --- hip-tests (per-arch) ---

[artifacts.core-hiptests]
artifact_group = "hip-runtime"
type = "target-specific"
artifact_deps = ["core-hip"]
feature_group = "CORE" # Part of core, enabled by default

# --- Math Libraries (per-arch) ---

[artifacts.blas]
Expand Down
45 changes: 45 additions & 0 deletions core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,51 @@ if(THEROCK_ENABLE_HIP_RUNTIME)
)
endif()

if(THEROCK_BUILD_TESTING)
set(HIP_TESTS_CMAKE_ARGS)
set(_hip_tests_subproject_names)
therock_cmake_subproject_declare(hip-tests
USE_DIST_AMDGPU_TARGETS
EXTERNAL_SOURCE_DIR "${THEROCK_ROCM_SYSTEMS_SOURCE_DIR}/projects/hip-tests/catch"
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/hip-tests"
BACKGROUND_BUILD
COMPILER_TOOLCHAIN
amd-hip
CMAKE_ARGS
-DHIP_PLATFORM="amd"
-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON
BUILD_DEPS
rocm-cmake
therock-boost
therock-catch2
RUNTIME_DEPS
hip-clr
${THEROCK_BUNDLED_NUMACTL}
INTERFACE_LINK_DIRS
lib
lib/rocm_sysdeps/lib
INTERFACE_INSTALL_RPATH_DIRS
lib
lib/rocm_sysdeps/lib
)
therock_cmake_subproject_glob_c_sources(hip-tests SUBDIRS catch)
therock_cmake_subproject_activate(hip-tests)
if(WIN32)
set(hip-tests_artifact_file artifact-core-hiptests_win.toml)
else()
set(hip-tests_artifact_file artifact-core-hiptests.toml)
endif()
# Provide it as an artifact:
therock_provide_artifact(core-hiptests
TARGETS USE_DIST_AMDGPU_TARGETS
DESCRIPTOR ${hip-tests_artifact_file}
COMPONENTS
test
SUBPROJECT_DEPS
hip-tests
)
list(APPEND _hip_tests_subproject_names hip-tests)
endif(THEROCK_BUILD_TESTING)
endif(THEROCK_ENABLE_HIP_RUNTIME)

################################################################################
Expand Down
9 changes: 9 additions & 0 deletions core/artifact-core-hiptests.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# hiptests
[components.dbg."core/hip-tests/stage"]
[components.dev."core/hip-tests/stage"]
[components.doc."core/hip-tests/stage"]
[components.lib."core/hip-tests/stage"]
[components.test."core/hip-tests/stage"]
include = [
"share/hip/**",
]
9 changes: 9 additions & 0 deletions core/artifact-core-hiptests_win.toml
View file
Open in desktop

@ScottTodd ScottTodd Dec 2, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Copying a comment from #2001

We should have the same artifact file for Linux and Windows. Let's change hip-tests so that is possible.

@cjatin cjatin Dec 5, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I think this is being worked on.

@ScottTodd ScottTodd Dec 8, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Okay, we can follow-up with that later. Baseline test coverage on both operating systems takes priority over getting the ideal setup consistently across platforms.

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# hip-tests
[components.dbg."core/hip-tests/stage"]
[components.dev."core/hip-tests/stage"]
[components.doc."core/hip-tests/stage"]
[components.lib."core/hip-tests/stage"]
[components.test."core/hip-tests/stage"]
include = [
"catch_tests/**",
]
Loading