--- a/bin/hipcc +++ b/bin/hipcc @@ -74,12 +74,9 @@ # we find .info/version in the parent of HIP_PATH or not. If it is found, # ROCM_PATH is defined relative to HIP_PATH else it is hardcoded to /opt/rocm. # -$HIP_PATH=$ENV{'HIP_PATH'} // dirname(Cwd::abs_path("$0/../")); # use parent directory of hipcc -if (-e "$HIP_PATH/../.info/version") { - $ROCM_PATH=$ENV{'ROCM_PATH'} // dirname("$HIP_PATH"); # use parent directory of HIP_PATH -} else { - $ROCM_PATH=$ENV{'ROCM_PATH'} // "/opt/rocm"; -} + +$HIP_PATH=$ENV{'HIP_PATH'} // "/usr/lib/hip"; +$ROCM_PATH=$ENV{'ROCM_PATH'} // "/usr"; $HIP_VDI_HOME=$ENV{'HIP_VDI_HOME'}; $HIP_LIB_PATH=$ENV{'HIP_LIB_PATH'}; $HIP_CLANG_PATH=$ENV{'HIP_CLANG_PATH'}; @@ -220,7 +217,7 @@ } if ($HIP_RUNTIME eq "HCC" ) { - $HSA_PATH=$ENV{'HSA_PATH'} // "$ROCM_PATH/hsa"; + $HSA_PATH=$ENV{'HSA_PATH'} // "/usr"; $HIPCXXFLAGS .= " -isystem $HSA_PATH/include"; } else { $HIPCXXFLAGS .= " -fhip-new-launch-api"; @@ -231,9 +228,9 @@ if (! defined $HIP_LIB_PATH) { $HIP_LIB_PATH = "$HIP_PATH/lib"; } - $HSA_PATH=$ENV{'HSA_PATH'} // "$ROCM_PATH/hsa"; - - $HCC_HOME=$ENV{'HCC_HOME'} // $hipConfig{'HCC_HOME'} // "$ROCM_PATH/hcc"; + $HSA_PATH=$ENV{'HSA_PATH'} // "/usr"; + + $HCC_HOME=$ENV{'HCC_HOME'} // "/usr/lib/hcc/3.3"; $HCC_VERSION=`${HCC_HOME}/bin/hcc --version`; $HCC_VERSION=~/.*based on HCC ([^ ]+).*/; @@ -282,7 +279,7 @@ $HIPCXXFLAGS .= " -isystem $HSA_PATH/include"; $HIPCXXFLAGS .= " -Wno-deprecated-register"; - $HIPLDFLAGS .= " -L$HSA_PATH/lib -L$ROCM_PATH/lib -lhsa-runtime64 -lhc_am "; + $HIPLDFLAGS .= " -L$HSA_PATH/lib64 -L$ROCM_PATH/lib64 -lhsa-runtime64 -lhc_am "; # $HIPLDFLAGS .= " -L$HCC_HOME/compiler/lib -lLLVMAMDGPUDesc -lLLVMAMDGPUUtils -lLLVMMC -lLLVMCore -lLLVMSupport "; if (not $isWindows) {