Skip to content

Commit b64927f

Browse files
David SalinasDavid Salinas
authored andcommitted
Enable hipconfig.bin by default
SWDEV-440552 - enable hipconfig.bin by default Change-Id: I3635f24fa1ecfa2d37e4ad927e64d0476697958b
1 parent 0f37734 commit b64927f

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

amd/hipcc/bin/hipconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ use File::Spec::Functions 'catfile';
2929

3030
#TODO: By default select perl script until change incorporated in HIP build script
3131
my $USE_PERL_SCRIPT = $ENV{'HIP_USE_PERL_SCRIPTS'};
32-
$USE_PERL_SCRIPT //= 1; # use defined-or assignment operator. Use env var, but if not defined default to 1.
32+
$USE_PERL_SCRIPT //= 0; # use defined-or assignment operator. Use env var, but if not defined default to 0.
3333
my $isWindows = ($^O eq 'MSWin32' or $^O eq 'msys');
3434
my $SCRIPT_DIR=dirname(__FILE__);
3535
if ($USE_PERL_SCRIPT) {

amd/hipcc/src/hipBin_amd.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ HipBinAmd::HipBinAmd() {
9191
constructHipPath();
9292
constructRoccmPath();
9393
constructCompilerPath();
94+
readHipVersion();
9495
}
9596

9697
// returns the Rocclr Home path
@@ -227,7 +228,7 @@ void HipBinAmd::printCompilerInfo() const {
227228
const string& hipClangPath = getCompilerPath();
228229
const string& hipPath = getHipPath();
229230
if (isWindows()) {
230-
string cmd = hipClangPath + "/clang++ --print-resource-dir";
231+
string cmd = hipClangPath + "/clang++ --version";
231232
system(cmd.c_str()); // hipclang version
232233
cout << "llc-version :" << endl;
233234
cmd = hipClangPath + "/llc --version";
@@ -240,7 +241,7 @@ void HipBinAmd::printCompilerInfo() const {
240241
system(cmd.c_str()); // ld flags
241242
cout << endl;
242243
} else {
243-
string cmd = hipClangPath + "/clang++ --print-resource-dir";
244+
string cmd = hipClangPath + "/clang++ --version";
244245
system(cmd.c_str()); // hipclang version
245246
cmd = hipClangPath + "/llc --version";
246247
system(cmd.c_str()); // llc version
@@ -417,10 +418,9 @@ void HipBinAmd::printFull() {
417418
cout << "CPP_CONFIG :" << ccpConfig << endl;
418419

419420
cout << endl << "==hip-clang" << endl;
420-
cout << "HSA_PATH :" << hsaPath << endl;
421421
cout << "HIP_CLANG_PATH :" << hipClangPath << endl;
422422
printCompilerInfo();
423-
cout << endl << "== Envirnoment Variables" << endl;
423+
cout << endl << "== Environment Variables" << endl;
424424
printEnvironmentVariables();
425425
getSystemInfo();
426426
if (fs::exists("/usr/bin/lsb_release"))

amd/hipcc/src/hipBin_nvidia.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ void HipBinNvidia::printFull() {
155155
cout << endl << "== nvcc" << endl;
156156
cout << "CUDA_PATH :" << cudaPath <<endl;
157157
printCompilerInfo();
158-
cout << endl << "== Envirnoment Variables" << endl;
158+
cout << endl << "== Environment Variables" << endl;
159159
printEnvironmentVariables();
160160
getSystemInfo();
161161
if (fs::exists("/usr/bin/lsb_release"))

0 commit comments

Comments
 (0)