Skip to content

Add infrastructure for HIP catch tests; add unit/compiler tests #297

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

Draft
kasaurov wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Add infrastructure for HIP catch tests; add unit/compiler tests #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f1ec27
Add infrastructure for HIP catch tests; add unit/compiler tests
kasaurov Nov 25, 2025
3d055c4
Fix some tests; FIx statistics; Add Verbose run
kasaurov Nov 26, 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
710 changes: 710 additions & 0 deletions External/HIP/CATCH_TESTS_README.md
View file
Open in desktop

Large diffs are not rendered by default.

21 changes: 19 additions & 2 deletions External/HIP/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ message(STATUS "TEST_SUITE_HIP_ROOT: ${TEST_SUITE_HIP_ROOT}")
get_filename_component(HIP_CLANG_PATH ${CMAKE_CXX_COMPILER} DIRECTORY)
message(STATUS "HIP_CLANG_PATH: ${HIP_CLANG_PATH}")

# Include Catch tests integration module
include(${CMAKE_CURRENT_LIST_DIR}/HipCatchTests.cmake)

# Inspired from create_one_local_test. Runs hipify on the TestSource and then compiles it.
# Search for the reference files next to TestSource.
macro(create_one_hipify_cuda_test TestName TestSource VairantOffload VariantSuffix VariantCPPFlags VariantLibs)
Expand Down Expand Up @@ -151,6 +154,11 @@ function(create_hip_test VariantSuffix)
DEPENDS hip-tests-simple-${VariantSuffix}
USES_TERMINAL)
add_dependencies(check-hip-simple check-hip-simple-${VariantSuffix})

# Integrate Catch tests for this variant (if enabled)
if(ENABLE_HIP_CATCH_TESTS)
integrate_catch_tests(${VariantSuffix} ${_RocmPath})
endif()
endfunction(create_hip_test)

macro(create_hip_tests)
Expand All @@ -176,6 +184,9 @@ macro(create_hip_tests)
add_custom_target(check-hip-simple
COMMENT "Run all simple HIP tests")

# Initialize Catch tests framework
initialize_catch_tests()

if(NOT AMDGPU_ARCHS)
list(APPEND AMDGPU_ARCHS "gfx906;gfx90a;gfx1030;gfx1100;native")
endif()
Expand Down Expand Up @@ -260,8 +271,14 @@ macro(create_hip_tests)

endif()

add_custom_target(hip-tests-all DEPENDS hip-tests-simple
COMMENT "Build all HIP tests.")
# Build all HIP tests (simple + catch if enabled)
if(ENABLE_HIP_CATCH_TESTS)
add_custom_target(hip-tests-all DEPENDS hip-tests-simple hip-tests-catch
COMMENT "Build all HIP tests (simple + catch).")
else()
add_custom_target(hip-tests-all DEPENDS hip-tests-simple
COMMENT "Build all HIP tests (simple only, catch disabled).")
endif()

file(COPY lit.local.cfg DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
endmacro(create_hip_tests)
Expand Down
Loading