From d90a0d9c57105e221e98008be3afed8d657f3293 Mon Sep 17 00:00:00 2001
From: Shilei Tian <shilei.tian@amd.com>
Date: Tue, 23 Jan 2024 12:14:28 -0500
Subject: [PATCH] SWDEV-442724 - Remove uses of `-amdgpu-early-inline-all` to
 enable function calls

Currently we force inlining everything for HIP. Now we'd like to enable function
supports. The first step is to remove uses of `-amdgpu-early-inline-all` in
various places. This patch is to remove all of them from clr.

Change-Id: Ib0cad1f586714c9989778b00746aa4c47a4eec95


[ROCm/clr commit: a09204388a9b73b0f3b66f2939a1827e21d33dd8]
---
 projects/clr/hipamd/hip-config-amd.cmake  |  4 ----
 projects/clr/rocclr/device/devprogram.cpp | 14 --------------
 2 files changed, 18 deletions(-)

diff --git a/projects/clr/hipamd/hip-config-amd.cmake b/projects/clr/hipamd/hip-config-amd.cmake
index d5e6484b59..6a00f8f43e 100755
--- a/projects/clr/hipamd/hip-config-amd.cmake
+++ b/projects/clr/hipamd/hip-config-amd.cmake
@@ -129,10 +129,6 @@ endif()
 
 get_property(compilePropIsSet TARGET hip::device PROPERTY INTERFACE_COMPILE_OPTIONS SET)
 
-if (NOT compilePropIsSet AND HIP_CXX_COMPILER MATCHES ".*clang\\+\\+")
-  hip_add_interface_compile_flags(hip::device -mllvm=-amdgpu-early-inline-all=true -mllvm=-amdgpu-function-calls=false)
-endif()
-
 if (NOT compilePropIsSet)
   hip_add_interface_compile_flags(hip::device -x hip)
 endif()
diff --git a/projects/clr/rocclr/device/devprogram.cpp b/projects/clr/rocclr/device/devprogram.cpp
index bc0db42eef..24581540cd 100644
--- a/projects/clr/rocclr/device/devprogram.cpp
+++ b/projects/clr/rocclr/device/devprogram.cpp
@@ -53,12 +53,6 @@
 #include "hsailctx.hpp"
 #endif
 
-#ifdef EARLY_INLINE
-#define AMDGPU_EARLY_INLINE_ALL_OPTION " -mllvm -amdgpu-early-inline-all"
-#else
-#define AMDGPU_EARLY_INLINE_ALL_OPTION
-#endif
-
 namespace device {
 
 // TODO: Can this be unified with the copies in:
@@ -675,10 +669,6 @@ bool Program::compileImplLC(const std::string& sourceCode,
   driverOptions.insert(driverOptions.end(), processedOptions.begin(), processedOptions.end());
 
   // Set whole program mode
-#ifdef EARLY_INLINE
-  driverOptions.push_back("-mllvm");
-  driverOptions.push_back("-amdgpu-early-inline-all");
-#endif
   driverOptions.push_back("-mllvm");
   driverOptions.push_back("-amdgpu-prelink");
 
@@ -1272,10 +1262,6 @@ bool Program::linkImplLC(amd::option::Options* options) {
   // Set whole program mode
   codegenOptions.push_back("-mllvm");
   codegenOptions.push_back("-amdgpu-internalize-symbols");
-#ifdef EARLY_INLINE
-  codegenOptions.push_back("-mllvm");
-  codegenOptions.push_back("-amdgpu-early-inline-all");
-#endif
 
   if (!device().settings().enableWgpMode_) {
     codegenOptions.push_back("-mcumode");