From 5a310cc103d9702101426b49639810daf455c74a Mon Sep 17 00:00:00 2001 From: Tom Rix Date: Sun, 11 Aug 2024 15:59:43 -0700 Subject: [PATCH] Generalize hipfc to other linux distros --- bin/hipfc | 56 +++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 48 insertions(+), 8 deletions(-) diff --git a/bin/hipfc b/bin/hipfc index edad40822405..e04aec790a37 100755 --- a/bin/hipfc +++ b/bin/hipfc @@ -151,7 +151,7 @@ function getdname(){ function addrocmlib(){ name=${1} libdir="" - for dir in "${ROCM_PATH}/lib" "${ROCM_PATH}/${name}/lib"; do + for dir in "${ROCM_PATH}/lib" "${ROCM_PATH}/lib64" "${ROCM_PATH}/${name}/lib"; do for ext in "so" "a"; do if [ -f "${dir}/lib${name}.${ext}" ]; then libdir=${dir} @@ -160,7 +160,7 @@ function addrocmlib(){ done done if [[ -z ${libdir} ]]; then - echo "ERROR: Library $name could not be found in $ROCM_PATH/lib/ or $ROCM_PATH/$name/lib/" + echo "ERROR: Library $name could not be found in $ROCM_PATH/lib/ $ROCM_PATH/lib64/ or $ROCM_PATH/$name/lib/" echo " Please install $name" exit $DEADRC fi @@ -266,7 +266,19 @@ cdir=$(getdname $0) HOW_CALLED=${0##*/} CUDA_PATH=${CUDA_PATH:-/usr/local/cuda} -ROCM_PATH=${ROCM_PATH:-/opt/rocm} +if [ -z ${ROCM_PATH} ]; then + # No one has set the ROCm path yet + if [ -d /opt/rocm ]; then + # A usual place + ROCM_PATH=/opt/rocm + else + # Assume hipconfig is in the PATH + try_ROCM_PATH=`hipconfig -R` + if [ $? = 0 ] && [ -d $try_ROCm_PATH ]; then + ROCM_PATH=$try_ROCM_PATH + fi + fi +fi HIP_PLATFORM=${HIP_PLATFORM:-amd} HIPFORT=${HIPFORT:-$cdir/_HIPFORT_INSTALL_DIR_} @@ -297,7 +309,8 @@ if [ ! $HIPFORT_GPU ] ; then # Use the mygpu in pair with this script, not the pre-installed one. HIPFORT_GPU=`$cdir/../libexec/hipfort/mygpu` if [ "$HIPFORT_GPU" == "unknown" ] ; then - HIPFORT_GPU=$(rocm_agent_enumerator | sort -n | uniq | sed '/gfx000/d') + # Pick the first one of highest arch + HIPFORT_GPU=$(rocm_agent_enumerator | sort -rn | sed '/gfx000/d' | head -n1) fi fi @@ -325,17 +338,39 @@ else fi TARGET_TRIPLE=${TARGET_TRIPLE:-amdgcn-amd-amdhsa} TARGET_ARCH="amdgcn" - TARGET_LIBS="-L$ROCM_PATH/lib -lamdhip64 -Wl,-rpath=$ROCM_PATH/lib " + if [ -f $ROCM_PATH/lib64/libamdhip64.a ] || [ -f $ROCM_PATH/lib64/libamdhip64.so ]; then + TARGET_LIBS="-L$ROCM_PATH/lib64 -lamdhip64 -Wl,-rpath=$ROCM_PATH/lib64 " + else + TARGET_LIBS="-L$ROCM_PATH/lib -lamdhip64 -Wl,-rpath=$ROCM_PATH/lib " + fi HIPCC_ENV="HIP_PLATFORM=$HIP_PLATFORM" if [ -z ${HIP_CLANG_PATH+x} ]; then - HIPCC_ENV+=" HIP_CLANG_PATH=$ROCM_PATH/llvm/bin" + if [ -d $ROCM_PATH/llvm/bin ]; then + HIPCC_ENV+=" HIP_CLANG_PATH=$ROCM_PATH/llvm/bin" + else + try_HIP_CLANG_PATH=`$ROCM_PATH/bin/hipconfig -l` + if [ -d $try_HIP_CLANG_PATH ]; then + HIPCC_ENV+=" HIP_CLANG_PATH=$try_HIP_CLANG_PATH" + fi + fi fi if [ -z ${DEVICE_LIB_PATH+x} ]; then # Future versions of ROCm will install the device library in ROCM_PATH/amdgcn/bitcode if [ -d $ROCM_PATH/amdgcn/bitcode ] ; then HIPCC_ENV+=" DEVICE_LIB_PATH=$ROCM_PATH/amdgcn/bitcode" else - HIPCC_ENV+=" DEVICE_LIB_PATH=$ROCM_PATH/lib" + if [ -f $ROCM_PATH/lib/hip.bc ]; then + HIPCC_ENV+=" DEVICE_LIB_PATH=$ROCM_PATH/lib" + else + # Look in the clang resource dir + try_HIP_CLANG_PATH=`$ROCM_PATH/bin/hipconfig -l` + if [ -x ${try_HIP_CLANG_PATH}/clang ]; then + resource_dir=`${try_HIP_CLANG_PATH}/clang -print-resource-dir` + if [ -d $resource_dir/amdgcn/bitcode ]; then + HIPCC_ENV+=" DEVICE_LIB_PATH=$resource_dir/amdgcn/bitcode" + fi + fi + fi fi fi HIPCC_OPTS="-fno-gpu-rdc -fPIC" @@ -420,7 +455,12 @@ if [ $GEN_OBJECT_ONLY ] ; then HIPCC_OPTS=" -c $HIPCC_OPTS" LINKOPTS="" else - LINKOPTS="-L$HIPFORT/lib -lhipfort-$TARGET_ARCH" + if [ -f ${HIPFORT}/lib64/hipfort-${TARGET_ARCH}.a ] || [ -f ${HIPFORT}/lib64/libhipfort-${TARGET_ARCH}.so ]; then + LINKOPTS="-L$HIPFORT/lib64" + else + LINKOPTS="-L$HIPFORT/lib" + fi + LINKOPTS="${LINKOPTS} -lhipfort-$TARGET_ARCH" for lib in $ROCM_LIBS; do addrocmlib $lib done -- 2.46.0