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

SWDEV-299127 - Merge 'develop' into 'amd-staging'

Browse Source 
Change-Id: Ic07df3a0769baf7ce7c556112bd97c1c49af4e47
This commit is contained in:
Jenkins
2022-01-24 07:11:44 -05:00
parent 3239bb1609 b253a4617b
commit 1c49ca304e
4 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/hipcc
+5
View File
@@ -759,6 +759,11 @@ if ($printCXXFlags) {
if ($printLDFlags) {
print $HIPLDFLAGS;
}
$warn = "\nPlease note that hipcc/hipconfig perl binaries are deprecated and will be removed in a future release.
hipcc/hipconfig as C++ binaries are available for use as hipcc.bin and hipconfig.bin. \n";
print "$warn";
if ($runCmd) {
system ("$CMD");
if ($? == -1) {
bin/hipconfig
+4
View File
@@ -48,6 +48,7 @@ $ROCM_PATH = $hipvars::ROCM_PATH;
$HIP_VERSION = $hipvars::HIP_VERSION;
$HSA_PATH = $hipvars::HSA_PATH;
Getopt::Long::Configure ( qw{bundling no_ignore_case});
GetOptions(
"help|h" => \$p_help
@@ -148,6 +149,9 @@ if ($p_version) {
}
if (!$printed or $p_full) {
$warn = "Please note that hipcc/hipconfig perl binaries are deprecated and will be removed in a future release.
hipcc/hipconfig as C++ binaries are available for use as hipcc.bin and hipconfig.bin. \n";
print "$warn";
print "HIP version : ", $HIP_VERSION, "\n\n";
print "== hipconfig\n";
print "HIP_PATH : ", $HIP_PATH, "\n";
tests/hit/HIT.cmake
+2 -2
View File
@@ -372,8 +372,8 @@ macro(HIT_ADD_FILES _config _dir _label _parent)
string(REGEX REPLACE "%hc" "${HIP_HIPCC_EXECUTABLE}" _contents "${_contents}")
string(REGEX REPLACE "%hip-path" "${HIP_ROOT_DIR}" _contents "${_contents}")
string(REGEX REPLACE "%rocm-path" "${ROCM_PATH}" _contents "${_contents}")
string(REGEX REPLACE "%cc" "/usr/bin/cc" _contents "${_contents}")
string(REGEX REPLACE "%cxx" "/usr/bin/c++" _contents "${_contents}")
string(REGEX REPLACE "%cc" "cc" _contents "${_contents}")
string(REGEX REPLACE "%cxx" "c++" _contents "${_contents}")
string(REGEX REPLACE "%S" ${_dir} _contents "${_contents}")
string(REGEX REPLACE "%T" ${_label} _contents "${_contents}")
foreach(_cmd ${_contents})
tests/hit/parser
+1 -1
View File
@@ -67,7 +67,7 @@ sub parse_file {
$line =~ s/%s/$file/g; # Substitute %s -> filename
$line =~ s/%t/$exe/g; # Substitute %t -> targetname
# Substitute %hc -> /path/to/hipcc and %hip-path -> /path/to/hip happens in cmake
# Substitute %cc -> /usr/bin/cc and %cxx -> /usr/bin/c++ happens in cmake
# Substitute %cc -> cc and %cxx -> c++ happens in cmake
# Substitute %S -> src dir and %T -> target build dir happens in cmake
$line =~ s/\R//g; # Remove line endings
push @customBuildCMDs, $line;