This is an archive of the discontinued LLVM Phabricator instance.

Differential D156071

[HIP] Update compile options
ClosedPublic

Authored by yaxunl on Jul 23 2023, 8:57 PM.

Details

Reviewers
tra
gkistanova
Commits
rTf6ef9c076aec: [HIP] Update compile options
Summary

Use --rocm-path to specify ROCM path. Update AMDGPU archs. Remove some outdated options.

Diff Detail

Repository
rT test-suite

Event Timeline

yaxunl created this revision.Jul 23 2023, 8:57 PM
Herald added a project: Restricted Project. · View Herald TranscriptJul 23 2023, 8:57 PM
Herald added a subscriber: tpr. · View Herald Transcript
yaxunl requested review of this revision.Jul 23 2023, 8:57 PM
yaxunl added a reviewer: gkistanova.Jul 27 2023, 2:57 PM
yaxunl added a comment.Jul 28 2023, 9:48 AM

A little background: I am now maintaining the HIP buildbot. This change has been tested on the bot.

gkistanova accepted this revision.Aug 3 2023, 11:22 AM

LGTM.

This revision is now accepted and ready to land.Aug 3 2023, 11:22 AM
Closed by commit rTf6ef9c076aec: [HIP] Update compile options (authored by yaxunl). · Explain WhyAug 6 2023, 6:52 AM
This revision was automatically updated to reflect the committed changes.
yaxunl added a commit: rTf6ef9c076aec: [HIP] Update compile options.

Revision Contents

PathSize
External/
HIP/
11 lines

Diff 547576

External/HIP/CMakeLists.txt

Show First 20 Lines • Show All 44 Lines • ▼ Show 20 Linesmacro(create_hip_tests)
# For ROCm, the path looks like rocm-4.1.0 # For ROCm, the path looks like rocm-4.1.0
message(STATUS "Checking HIP prerequisites in ${TEST_SUITE_HIP_ROOT}") message(STATUS "Checking HIP prerequisites in ${TEST_SUITE_HIP_ROOT}")
file(GLOB RocmVersions ${TEST_SUITE_HIP_ROOT}/rocm-*) file(GLOB RocmVersions ${TEST_SUITE_HIP_ROOT}/rocm-*)
list(SORT RocmVersions) list(SORT RocmVersions)
foreach(RocmDir IN LISTS RocmVersions) foreach(RocmDir IN LISTS RocmVersions)
get_version(RocmVersion ${RocmDir}) get_version(RocmVersion ${RocmDir})
message(STATUS "Found ROCm ${RocmVersion}") message(STATUS "Found ROCm ${RocmVersion}")
list(APPEND ROCM_PATHS ${RocmDir}) list(APPEND ROCM_PATHS ${RocmDir})
add_library(amdhip64-${RocmVersion} SHARED IMPORTED)
set_property(TARGET amdhip64-${RocmVersion} PROPERTY IMPORTED_LOCATION
${RocmDir}/lib/libamdhip64.so)
endforeach(RocmDir) endforeach(RocmDir)
if(NOT ROCM_PATHS) if(NOT ROCM_PATHS)
message(SEND_ERROR message(SEND_ERROR
"There are no ROCm installations in ${TEST_SUITE_HIP_ROOT}") "There are no ROCm installations in ${TEST_SUITE_HIP_ROOT}")
return() return()
endif() endif()
add_custom_target(hip-tests-simple add_custom_target(hip-tests-simple
COMMENT "Build all simple HIP tests") COMMENT "Build all simple HIP tests")
add_custom_target(check-hip-simple add_custom_target(check-hip-simple
COMMENT "Run all simple HIP tests") COMMENT "Run all simple HIP tests")
if(NOT AMDGPU_ARCHS) if(NOT AMDGPU_ARCHS)
list(APPEND AMDGPU_ARCHS "gfx906;gfx908") list(APPEND AMDGPU_ARCHS "gfx906;gfx90a;gfx1030;gfx1100")
endif() endif()
foreach(_RocmPath ${ROCM_PATHS}) foreach(_RocmPath ${ROCM_PATHS})
get_version(_RocmVersion ${_RocmPath}) get_version(_RocmVersion ${_RocmPath})
set(_HIP_Suffix "hip-${_RocmVersion}") set(_HIP_Suffix "hip-${_RocmVersion}")
# Set up HIP test flags # Set up HIP test flags
set(_HIP_CPPFLAGS -D__HIP_ROCclr__ -xhip --hip-device-lib-path=${_RocmPath}/amdgcn/bitcode set(_HIP_CPPFLAGS --rocm-path=${_RocmPath})
-I${_RocmPath}/include) set(_HIP_LDFLAGS --rocm-path=${_RocmPath} --hip-link -rtlib=compiler-rt -frtlib-add-rpath)
set(_HIP_LDFLAGS -L${_RocmPath}/lib -lamdhip64)
set(_HIP_Libs amdhip64-${RocmVersion})
# Unset these for each iteration of rocm path. # Unset these for each iteration of rocm path.
set(_ArchFlags) set(_ArchFlags)
set(_ArchList) set(_ArchList)
foreach(_AMDGPUArch IN LISTS AMDGPU_ARCHS) foreach(_AMDGPUArch IN LISTS AMDGPU_ARCHS)
list(APPEND _ArchFlags --offload-arch=${_AMDGPUArch}) list(APPEND _ArchFlags --offload-arch=${_AMDGPUArch})
endforeach() endforeach()
message(STATUS "Building ${_RocmPath} targets for ${AMDGPU_ARCHS}") message(STATUS "Building ${_RocmPath} targets for ${AMDGPU_ARCHS}")
Show All 14 Lines