Fix include path and wrapper header
Currently std::complex and some other std functions require uses to include hip_runtime.h before any other headers to work, which is not reliable. changes are made in clang to fix this issue: https://reviews.llvm.org/D81176 which requires hipcc and HIP headers to make corresponding changes. This patch will make sure the clang change will not break HIP/ROCclr during this transition. After the transition is done, we can remove explicitly setting include path for HIP-Clang and HIP header in hipcc and hip config cmake files and rely on clang driver to set it automatically. Change-Id: I5d226861c2560ffa6c5ab17343a43cc378048061
This commit is contained in:
committed by
Christophe Paquot
parent
06c6951205
commit
0a513d8a02
+4
-1
@@ -214,6 +214,7 @@ if ($HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "clang") {
|
||||
$HIP_LIB_PATH = "$HIP_PATH/lib";
|
||||
}
|
||||
if ($verbose & 0x2) {
|
||||
print ("ROCM_PATH=$ROCM_PATH\n");
|
||||
if (defined $HIP_ROCCLR_HOME) {
|
||||
print ("HIP_ROCCLR_HOME=$HIP_ROCCLR_HOME\n");
|
||||
}
|
||||
@@ -823,7 +824,9 @@ if ($HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "clang") {
|
||||
$HIPLDFLAGS .= " -mllvm -amdgpu-early-inline-all=true -mllvm -amdgpu-function-calls=false";
|
||||
}
|
||||
}
|
||||
$HIP_DEVLIB_FLAGS = " --hip-device-lib-path=$DEVICE_LIB_PATH";
|
||||
if ($DEVICE_LIB_PATH ne "$ROCM_PATH/amdgcn/bitcode") {
|
||||
$HIP_DEVLIB_FLAGS = " --hip-device-lib-path=$DEVICE_LIB_PATH";
|
||||
}
|
||||
if ($hasHIP) {
|
||||
$HIPCXXFLAGS .= " $HIP_DEVLIB_FLAGS";
|
||||
if ($HIP_RUNTIME ne "HCC") {
|
||||
|
||||
Reference in New Issue
Block a user