AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 'amd-master-next' into 'amd-npi-next'

Browse Source 
Change-Id: I914aa748c92849f9f7ab796129a4617753d728db
This commit is contained in:
Jenkins
2020-08-25 11:10:53 -04:00
parent 1d83fef5da 15aff89ba1
commit f9ebdacdfa
15 changed files with 1698 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/hipcc
+1 -1
View File
@@ -201,7 +201,7 @@ if ($HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "clang") {
}
$HIP_CLANG_VERSION = `$HIPCC --version`;
$HIP_CLANG_VERSION=~/.*clang version ([^ ]+).*/;
$HIP_CLANG_VERSION=~/.*clang version (\S+).*/;
$HIP_CLANG_VERSION=$1;
if (! defined $HIP_CLANG_INCLUDE_PATH) {
bin/hipconfig
+2 -2
View File
@@ -1,7 +1,7 @@
#!/usr/bin/perl -w
$HIP_BASE_VERSION_MAJOR = "3";
$HIP_BASE_VERSION_MINOR = "8";
$HIP_BASE_VERSION_MINOR = "9";
# Need perl > 5.10 to use logic-defined or
use 5.006; use v5.10.1;
@@ -139,7 +139,7 @@ if ($HIP_COMPILER eq "clang") {
$HIP_CLANG_PATH = "$HIP_ROCCLR_HOME/bin";
}
$HIP_CLANG_VERSION = `$HIP_CLANG_PATH/clang++ --version`;
$HIP_CLANG_VERSION=~/.*clang version ([^ ]+).*/;
$HIP_CLANG_VERSION=~/.*clang version (\S+).*/;
$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";