From f6f82b86da3a632d0d00faca381bf53cd80423f0 Mon Sep 17 00:00:00 2001
From: ROCm CI Service Account <66695075+rocm-ci@users.noreply.github.com>
Date: Sat, 18 Feb 2023 00:04:51 +0530
Subject: [PATCH 1/2] SWDEV-379927 - ignore --rocm-path option on nvidia
 platform (#3156)

Change-Id: I5e9ff0378c14dc0894a07d71aff4261c155ec1af
---
 bin/hipcc.pl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/hipcc.pl b/bin/hipcc.pl
index f8fef933f9..739e34b1cf 100644
--- a/bin/hipcc.pl
+++ b/bin/hipcc.pl
@@ -244,7 +244,12 @@ if($HIP_PLATFORM eq "nvidia"){
     if($ARGV[0] eq "--genco"){
         foreach $isaarg (@ARGV[1..$#ARGV]){
             $ISACMD .= " ";
-            $ISACMD .= $isaarg;
+            # ignore --rocm-path=xxxx on nvcc nvidia platform
+            if ($isaarg !~ /--rocm-path/) {
+              $ISACMD .= $isaarg;
+            } else {
+              print "Ignoring --rocm-path= on nvidia nvcc platform.\n";
+            }
         }
         if ($verbose & 0x1) {
             print "hipcc-cmd: ", $ISACMD, "\n";

From 802e3f439726b0c119f58de5dde8770cda75b2b0 Mon Sep 17 00:00:00 2001
From: ROCm CI Service Account <66695075+rocm-ci@users.noreply.github.com>
Date: Sat, 18 Feb 2023 01:46:00 +0530
Subject: [PATCH 2/2] SWDEV-380145 - [GFX][CQE] Mathlibs and Blender build
 failed in both RT and CPL Jobs (#3169)

Remove --hip-device-lib-path from hip-config.cmake
and let clang determine device lib path

Change-Id: I81bfec0928480ff81ad2ef0dbbfb6feac9d96068
---
 hip-lang-config.cmake.in | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/hip-lang-config.cmake.in b/hip-lang-config.cmake.in
index cee1b0e76b..b14b550f3d 100644
--- a/hip-lang-config.cmake.in
+++ b/hip-lang-config.cmake.in
@@ -90,12 +90,6 @@ set_property(TARGET hip-lang::device APPEND PROPERTY
   INTERFACE_COMPILE_OPTIONS "$<$<COMPILE_LANGUAGE:HIP>:SHELL:-mllvm;-amdgpu-early-inline-all=true;-mllvm;-amdgpu-function-calls=false>"
 )
 
-if (NOT EXISTS "${AMD_DEVICE_LIBS_PREFIX}/amdgcn/bitcode")
-  set_property(TARGET hip-lang::device APPEND PROPERTY
-    INTERFACE_COMPILE_OPTIONS "$<$<COMPILE_LANGUAGE:HIP>:--hip-device-lib-path=${AMD_DEVICE_LIBS_PREFIX}/lib>"
-  )
-endif()
-
 set_property(TARGET hip-lang::device APPEND PROPERTY
   INTERFACE_LINK_OPTIONS "$<$<LINK_LANGUAGE:HIP>:--hip-link>"
 )