From e1bbdf5750ed16170858832770302a9babc26d3d Mon Sep 17 00:00:00 2001
From: ROCm CI Service Account <66695075+rocm-ci@users.noreply.github.com>
Date: Tue, 20 Dec 2022 09:35:27 +0530
Subject: [PATCH] SWDEV-372006 - Removed HSA_PATH variable from  hipconfig.pl
 (#3120)

HSA_PATH is not required in hipcc and removed from hipvars and hipcc.pl as part of SWDEV-345870.
The incomplete removal is causing build failure in pytorch due to invalid hip version
Removing HSA_PATH from hipconfig.pl, so that hipconfig will provide the hip version without any warning

Depends-On: Ia461cb4da2c0e0967703033f5c2c79b67732f5b5
Change-Id: I8f18b27f40f4080b68a936450ba6e092f997ec47
---
 bin/hipconfig.pl | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/bin/hipconfig.pl b/bin/hipconfig.pl
index 5ddb8e9b7d..dd03ad67a8 100755
--- a/bin/hipconfig.pl
+++ b/bin/hipconfig.pl
@@ -46,7 +46,6 @@ $CUDA_PATH      =   $hipvars::CUDA_PATH;
 $HIP_PATH       =   $hipvars::HIP_PATH;
 $ROCM_PATH      =   $hipvars::ROCM_PATH;
 $HIP_VERSION    =   $hipvars::HIP_VERSION;
-$HSA_PATH       =   $hipvars::HSA_PATH;
 
 Getopt::Long::Configure ( qw{bundling no_ignore_case});
 GetOptions(
@@ -81,7 +80,7 @@ if ($HIP_COMPILER eq "clang") {
     if($isWindows) {
         $CPP_CONFIG .= " -I\"$HIP_PATH_INCLUDE\" -I\"$HIP_CLANG_INCLUDE\"";
     } else {
-        $CPP_CONFIG .= " -I$HIP_PATH_INCLUDE -I$HIP_CLANG_INCLUDE -I$HSA_PATH/include";
+        $CPP_CONFIG .= " -I$HIP_PATH_INCLUDE -I$HIP_CLANG_INCLUDE ";
     }
 }
 if ($HIP_PLATFORM eq "nvidia") {
@@ -162,9 +161,6 @@ if (!$printed or $p_full) {
         if ($HIP_COMPILER eq "clang")
         {
             print "== hip-clang\n";
-            if (not $isWindows) {
-                print ("HSA_PATH         : $HSA_PATH\n");
-            }
             print ("HIP_CLANG_PATH   : $HIP_CLANG_PATH\n");
             if ($isWindows) {
                 system("\"$HIP_CLANG_PATH/clang++\" --version");
@@ -201,10 +197,10 @@ if (!$printed or $p_full) {
     print "=== Environment Variables\n";
     if ($isWindows) {
         print ("PATH=$ENV{PATH}\n");
-        system("set | findstr //B //C:\"HIP\" //C:\"HSA\" //C:\"CUDA\" //C:\"LD_LIBRARY_PATH\"");
+        system("set | findstr //B //C:\"HIP\" //C:\"CUDA\" //C:\"LD_LIBRARY_PATH\"");
     } else {
         system("echo PATH=\$PATH");
-        system("env | egrep '^HIP|^HSA|^CUDA|^LD_LIBRARY_PATH'");
+        system("env | egrep '^HIP|^CUDA|^LD_LIBRARY_PATH'");
     }
 
 
@@ -238,18 +234,6 @@ if ($p_check) {
     } else {
         printf "good\n";
     }
-
-    if ($HIP_PLATFORM eq "amd")  {
-        $LD_LIBRARY_PATH=$ENV{'LD_LIBRARY_PATH'};
-        printf("%-70s", "check LD_LIBRARY_PATH ($LD_LIBRARY_PATH) contains HSA_PATH ($HSA_PATH)...");
-        if (index($LD_LIBRARY_PATH, $HSA_PATH) == -1) {
-            print "FAIL\n";
-        } else {
-            printf "good\n";
-        }
-
-        # TODO - check hipcc / nvcc found and executable.
-    }
 }
 
 if ($p_newline) {