Skip to content

Conversation

jharryma
Copy link

@jharryma jharryma commented Sep 26, 2025

Motivation

Builds hip-tests on theRock (closes the first point from #1354)

Technical Details

add hip-tests subproject to the core CMakeLists

Test Plan

Ensure hip-tests builds correctly on CI

Test Result

Submission Checklist

Copy link
Member

Choose a reason for hiding this comment

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

Nice, thanks for taking this on! Since this isn't marked as a draft PR, I'll leave some review comments.

Please fill in the PR description and tag #1354 .

Comment on lines 157 to 159
therock_cmake_subproject_declare(hip-tests
USE_DIST_AMDGPU_TARGETS
EXTERNAL_SOURCE_DIR "${THEROCK_ROCM_SYSTEMS_SOURCE_DIR}/projects/hip-tests/catch"
Copy link
Member

Choose a reason for hiding this comment

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

Does this work as-is? I think @geomin12 tried something similar and saw conflicts between the forked version of Catch2 in hip-tests (https://github.com/ROCm/rocm-systems/tree/develop/projects/hip-tests/catch/external/Catch2) and the version we bundle in TheRock:

therock_subproject_fetch(therock-catch2-sources
CMAKE_PROJECT
# Originally mirrored from: https://github.com/catchorg/Catch2/archive/refs/tags/v3.8.1.tar.gz
URL https://rocm-third-party-deps.s3.us-east-2.amazonaws.com/Catch2-3.8.1.tar.gz
URL_HASH SHA256=18b3f70ac80fccc340d8c6ff0f339b2ae64944782f8d2fca2bd705cf47cadb79
)
therock_cmake_subproject_declare(therock-catch2
BACKGROUND_BUILD
EXCLUDE_FROM_ALL
NO_MERGE_COMPILE_COMMANDS
OUTPUT_ON_FAILURE
EXTERNAL_SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/source"
)

Comment on lines 157 to 159
therock_cmake_subproject_declare(hip-tests
USE_DIST_AMDGPU_TARGETS
EXTERNAL_SOURCE_DIR "${THEROCK_ROCM_SYSTEMS_SOURCE_DIR}/projects/hip-tests/catch"
Copy link
Member

Choose a reason for hiding this comment

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

I also wonder if we'd want to run other samples from hip-tests (https://github.com/ROCm/rocm-systems/tree/develop/projects/hip-tests/samples), or if the catch/ folder has enough representative tests. The samples did look more standalone and harder to integrate into this build system...

Copy link
Contributor

Choose a reason for hiding this comment

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

The goal is to have sharding work with hip-tests and have it run through the pre-submit tests we see in the legacy CI systems.

Comment on lines +18 to +21
[components.test."core/hip-tests/stage"]
include = [
"share/hip/**",
]
Copy link
Member

Choose a reason for hiding this comment

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

Are there no binaries that should be included or are these located at share/hip?

Copy link
Contributor

Choose a reason for hiding this comment

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

From build logs in the Azure CI system that builds hip-tests, the produced files seem to only be in share/hip: https://dev.azure.com/ROCm-CI/ROCm-CI/_build/results?buildId=56010&view=logs&j=82fb555c-110a-59d3-1c2a-ac6df3710f95&t=f7e7b015-7ae0-53a0-6899-73e18ee6a991

@jharryma jharryma force-pushed the jharryma/enable-hip-tests branch from 56df402 to 534bfc7 Compare September 29, 2025 17:08
@jharryma jharryma closed this Sep 29, 2025
@github-project-automation github-project-automation bot moved this from TODO to Done in TheRock Triage Sep 29, 2025
@jharryma jharryma reopened this Sep 29, 2025
@jayhawk-commits jayhawk-commits marked this pull request as draft September 30, 2025 15:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants