Line
Link Here
|
0 |
-- a/bin/hipcc |
0 |
++ b/bin/hipcc |
Lines 74-85
Link Here
|
74 |
# we find .info/version in the parent of HIP_PATH or not. If it is found, |
74 |
# we find .info/version in the parent of HIP_PATH or not. If it is found, |
75 |
# ROCM_PATH is defined relative to HIP_PATH else it is hardcoded to /opt/rocm. |
75 |
# ROCM_PATH is defined relative to HIP_PATH else it is hardcoded to /opt/rocm. |
76 |
# |
76 |
# |
77 |
$HIP_PATH=$ENV{'HIP_PATH'} // dirname(Cwd::abs_path("$0/../")); # use parent directory of hipcc |
77 |
|
78 |
if (-e "$HIP_PATH/../.info/version") { |
78 |
$HIP_PATH=$ENV{'HIP_PATH'} // "/usr/lib/hip"; |
79 |
$ROCM_PATH=$ENV{'ROCM_PATH'} // dirname("$HIP_PATH"); # use parent directory of HIP_PATH |
79 |
$ROCM_PATH=$ENV{'ROCM_PATH'} // "/usr"; |
80 |
} else { |
|
|
81 |
$ROCM_PATH=$ENV{'ROCM_PATH'} // "/opt/rocm"; |
82 |
} |
83 |
$HIP_VDI_HOME=$ENV{'HIP_VDI_HOME'}; |
80 |
$HIP_VDI_HOME=$ENV{'HIP_VDI_HOME'}; |
84 |
$HIP_LIB_PATH=$ENV{'HIP_LIB_PATH'}; |
81 |
$HIP_LIB_PATH=$ENV{'HIP_LIB_PATH'}; |
85 |
$HIP_CLANG_PATH=$ENV{'HIP_CLANG_PATH'}; |
82 |
$HIP_CLANG_PATH=$ENV{'HIP_CLANG_PATH'}; |
Lines 220-226
Link Here
|
220 |
} |
217 |
} |
221 |
|
218 |
|
222 |
if ($HIP_RUNTIME eq "HCC" ) { |
219 |
if ($HIP_RUNTIME eq "HCC" ) { |
223 |
$HSA_PATH=$ENV{'HSA_PATH'} // "$ROCM_PATH/hsa"; |
220 |
$HSA_PATH=$ENV{'HSA_PATH'} // "/usr"; |
224 |
$HIPCXXFLAGS .= " -isystem $HSA_PATH/include"; |
221 |
$HIPCXXFLAGS .= " -isystem $HSA_PATH/include"; |
225 |
} else { |
222 |
} else { |
226 |
$HIPCXXFLAGS .= " -fhip-new-launch-api"; |
223 |
$HIPCXXFLAGS .= " -fhip-new-launch-api"; |
Lines 231-239
Link Here
|
231 |
if (! defined $HIP_LIB_PATH) { |
228 |
if (! defined $HIP_LIB_PATH) { |
232 |
$HIP_LIB_PATH = "$HIP_PATH/lib"; |
229 |
$HIP_LIB_PATH = "$HIP_PATH/lib"; |
233 |
} |
230 |
} |
234 |
$HSA_PATH=$ENV{'HSA_PATH'} // "$ROCM_PATH/hsa"; |
231 |
$HSA_PATH=$ENV{'HSA_PATH'} // "/usr"; |
235 |
|
232 |
|
236 |
$HCC_HOME=$ENV{'HCC_HOME'} // $hipConfig{'HCC_HOME'} // "$ROCM_PATH/hcc"; |
233 |
$HCC_HOME=$ENV{'HCC_HOME'} // "/usr/lib/hcc/3.3"; |
237 |
|
234 |
|
238 |
$HCC_VERSION=`${HCC_HOME}/bin/hcc --version`; |
235 |
$HCC_VERSION=`${HCC_HOME}/bin/hcc --version`; |
239 |
$HCC_VERSION=~/.*based on HCC ([^ ]+).*/; |
236 |
$HCC_VERSION=~/.*based on HCC ([^ ]+).*/; |
Lines 282-288
Link Here
|
282 |
$HIPCXXFLAGS .= " -isystem $HSA_PATH/include"; |
279 |
$HIPCXXFLAGS .= " -isystem $HSA_PATH/include"; |
283 |
$HIPCXXFLAGS .= " -Wno-deprecated-register"; |
280 |
$HIPCXXFLAGS .= " -Wno-deprecated-register"; |
284 |
|
281 |
|
285 |
$HIPLDFLAGS .= " -L$HSA_PATH/lib -L$ROCM_PATH/lib -lhsa-runtime64 -lhc_am "; |
282 |
$HIPLDFLAGS .= " -L$HSA_PATH/lib64 -L$ROCM_PATH/lib64 -lhsa-runtime64 -lhc_am "; |
286 |
# $HIPLDFLAGS .= " -L$HCC_HOME/compiler/lib -lLLVMAMDGPUDesc -lLLVMAMDGPUUtils -lLLVMMC -lLLVMCore -lLLVMSupport "; |
283 |
# $HIPLDFLAGS .= " -L$HCC_HOME/compiler/lib -lLLVMAMDGPUDesc -lLLVMAMDGPUUtils -lLLVMMC -lLLVMCore -lLLVMSupport "; |
287 |
|
284 |
|
288 |
if (not $isWindows) { |
285 |
if (not $isWindows) { |