Merge pull request #119 from emankov/emankov/nvcc

emankov · web-flow · commit cf2b79e71ccf · 2023-07-31T14:55:20.000+01:00
[fix][SWDEV-413305][nvcc] Recovering the fallback building of HIP programs via nvcc
diff --git a/amd/hipcc/bin/hipcc.pl b/amd/hipcc/bin/hipcc.pl
@@ -450,8 +450,9 @@ sub get_normalized_path {
                 if ($HIP_PLATFORM eq "amd") {
                     $hasHIP = 1;
                     $toolArgs .= " -x hip";
-                } else {
+                } elsif ($HIP_PLATFORM eq "nvidia") {
                     $hasCU = 1;
+                    $toolArgs .= " -x cu";
                 }
             }
         }
@@ -532,10 +533,6 @@ sub get_normalized_path {
     $ENV{HCC_EXTRA_LIBRARIES}="\n";
 }
 
-if ($hasCXX and $HIP_PLATFORM eq 'nvidia') {
-    $HIPCXXFLAGS .= " -x cu";
-}
-
 if ($buildDeps and $HIP_PLATFORM eq 'nvidia') {
     $HIPCXXFLAGS .= " -M -D__CUDACC__";
     $HIPCFLAGS .= " -M -D__CUDACC__";

Original file line number	Diff line number	Diff line change
`@@ -450,8 +450,9 @@ sub get_normalized_path {`
`450`	`450`	`if ($HIP_PLATFORM eq "amd") {`
`451`	`451`	`$hasHIP = 1;`
`452`	`452`	`$toolArgs .= " -x hip";`
`453`		`- } else {`
	`453`	`+ } elsif ($HIP_PLATFORM eq "nvidia") {`
`454`	`454`	`$hasCU = 1;`
	`455`	`+ $toolArgs .= " -x cu";`
`455`	`456`	`}`
`456`	`457`	`}`
`457`	`458`	`}`
`@@ -532,10 +533,6 @@ sub get_normalized_path {`
`532`	`533`	`$ENV{HCC_EXTRA_LIBRARIES}="\n";`
`533`	`534`	`}`
`534`	`535`
`535`		`-if ($hasCXX and $HIP_PLATFORM eq 'nvidia') {`
`536`		`- $HIPCXXFLAGS .= " -x cu";`
`537`		`-}`
`538`		`-`
`539`	`536`	`if ($buildDeps and $HIP_PLATFORM eq 'nvidia') {`
`540`	`537`	`$HIPCXXFLAGS .= " -M -D__CUDACC__";`
`541`	`538`	`$HIPCFLAGS .= " -M -D__CUDACC__";`