SWDEV-475293 - strip --hip-path and --rocm-path for nvidia

Change-Id: Ib4ef8d4e9e2f964be8aaad5f0b3e4aa3b8d7fec0
(cherry picked from commit 50a97b7)

Author: agunashe

amd/hipcc/bin/hipcc.pl

@@ -267,6 +267,11 @@ sub get_normalized_path {
     $trimarg =~ s/^\s+|\s+$//g;  # Remive whitespace
     my $swallowArg = 0;
     my $escapeArg = 1;
+    if ($HIP_PLATFORM eq "nvidia") {
+        if (($trimarg =~ /--rocm-path/) or ($trimarg =~ /--hip-path/)) {
+            next;
+        }
+    }
     if ($arg eq '-c' or $arg eq '--genco' or $arg eq '-E') {
         $compileOnly = 1;
         $needLDFLAGS  = 0;

amd/hipcc/src/hipBin_nvidia.h

@@ -396,7 +396,10 @@ void HipBinNvidia::executeHipCCCmd(vector<string> argv) {
     for (unsigned int i = 2; i < argv.size(); i++) {
       string isaarg = argv.at(i);
       ISACMD += " ";
-      if (!hipBinUtilPtr_->substringPresent(isaarg,"--rocm-path=")) {
+      if (hipBinUtilPtr_->substringPresent(isaarg,"--rocm-path=") ||
+          hipBinUtilPtr_->substringPresent(isaarg,"--hip-path=")) {
+        ISACMD += "-I" + hipBinUtilPtr_->splitStr(isaarg, '=')[1] + "/include";
+      } else {
         ISACMD += isaarg;
       }
     }
@@ -417,6 +420,12 @@ void HipBinNvidia::executeHipCCCmd(vector<string> argv) {
     string trimarg = hipBinUtilPtr_->replaceRegex(arg, toRemove, "");
     bool swallowArg = false;
     bool escapeArg = true;
+    // do not pass amd paths to nvcc
+    if (hipBinUtilPtr_->substringPresent(arg,"--rocm-path=") ||
+        hipBinUtilPtr_->substringPresent(arg,"--hip-path=")) {
+      continue;
+    }
+
     if (arg == "-c" || arg == "--genco" || arg == "-E") {
       compileOnly = true;
       needLDFLAGS  = false;