Skip to content

Extend the hack to propagate HIP usage requirements a bit further. #46

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
stellaraccident wants to merge 1 commit into
base: amd-staging
Choose a base branch
from
Draft

Extend the hack to propagate HIP usage requirements a bit further. #46

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
11 changes: 10 additions & 1 deletion cmake/rocprofiler_config_interfaces.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,14 @@ find_package(
${rocm_version_DIR}
${ROCM_PATH})
target_link_libraries(rocprofiler-sdk-hip INTERFACE hip::host)
# TODO: As of 2024/2/12, the hip::host target does not advertise its
# include directory but amdhip64 does. This ordinarily wouldn't be an issue
# because most folks just get it transitively, but here this is doing direct
# property copying to get usage requirements.
# The proper fix is for hip to export a hip::headers target with only usage
# requirements and depend on that.
rocprofiler_config_nolink_target(rocprofiler-sdk-hip-nolink hip::host)
rocprofiler_config_nolink_target(rocprofiler-sdk-hip-nolink hip::amdhip64)

# ----------------------------------------------------------------------------------------#
#
Expand Down Expand Up @@ -218,7 +225,9 @@ find_library(
HINTS ${rocm_version_DIR} ${ROCM_PATH}
PATHS ${rocm_version_DIR} ${ROCM_PATH})

target_link_libraries(rocprofiler-sdk-hsa-aql INTERFACE ${hsa-amd-aqlprofile64_library})
if(hsa-amd-aqlprofile64_library)
target_link_libraries(rocprofiler-sdk-hsa-aql INTERFACE ${hsa-amd-aqlprofile64_library})
endif()

# ----------------------------------------------------------------------------------------#
#
Expand Down
1 change: 1 addition & 0 deletions source/lib/common/container/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ set(containers_sources ring_buffer.cpp record_header_buffer.cpp ring_buffer.cpp

target_sources(rocprofiler-sdk-common-library PRIVATE ${containers_sources}
${containers_headers})
target_link_libraries(rocprofiler-sdk-common-library PRIVATE rocprofiler-sdk-hip-nolink)
3 changes: 2 additions & 1 deletion source/lib/output/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,5 @@ target_link_libraries(
rocprofiler-sdk::rocprofiler-sdk-common-library
rocprofiler-sdk::rocprofiler-sdk-cereal
rocprofiler-sdk::rocprofiler-sdk-perfetto
rocprofiler-sdk::rocprofiler-sdk-otf2)
rocprofiler-sdk::rocprofiler-sdk-otf2
rocprofiler-sdk-hip-nolink)