Merge "Add __HIP_VDI__ to hipconfig host flags for VDI" into amd-master-next

[ROCm/hip commit: 5d042bfe5c]
Этот коммит содержится в:
Aaron En Ye Shi
2020-05-04 19:07:28 -04:00
коммит произвёл Gerrit Code Review
родитель 0c944d69cb 1a3f036478
Коммит f9bbe7946a
+5 -2
Просмотреть файл
@@ -109,14 +109,17 @@ if (not defined $HIP_PLATFORM) {
}
if ($HIP_COMPILER eq "hcc") {
$CPP_CONFIG= " -D__HIP_PLATFORM_HCC__= -I$HIP_PATH/include -I$HCC_HOME/include -I$HSA_PATH/include";
$CPP_CONFIG = " -D__HIP_PLATFORM_HCC__= -I$HIP_PATH/include -I$HCC_HOME/include -I$HSA_PATH/include";
}
if ($HIP_COMPILER eq "clang") {
$HIP_CLANG_VERSION = `$HIP_CLANG_PATH/clang++ --version`;
$HIP_CLANG_VERSION=~/.*clang version ([^ ]+).*/;
$HIP_CLANG_VERSION=$1;
$CPP_CONFIG= " -D__HIP_PLATFORM_HCC__= -I$HIP_PATH/include -I$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION -I$HSA_PATH/include";
$CPP_CONFIG = " -D__HIP_PLATFORM_HCC__= -I$HIP_PATH/include -I$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION -I$HSA_PATH/include";
}
if ($HIP_RUNTIME eq "VDI") {
$CPP_CONFIG .= " -D__HIP_VDI__";
}
if ($HIP_PLATFORM eq "nvcc") {
$CPP_CONFIG = " -D__HIP_PLATFORM_NVCC__= -I$HIP_PATH/include -I$CUDA_PATH/include";