Revert "SWDEV-459556 - Revert "SWDEV-442724 - Remove uses of -amdgpu-early-inline-all to enable function calls""

This reverts commit e5b6537315ce9b2688ee0269ba0828a703c3e2c9.

The regressions (SWDEV-459556 and SWDEV-460260)  caused by the original patch
has been resolved.

Change-Id: I32344492b4ff88bd7e91ea47983ac15636dc77c1


[ROCm/clr commit: b0930263e5]
This commit is contained in:
Shilei Tian
2024-05-13 11:06:19 -04:00
committed by Maneesh Gupta
parent 026346a6c7
commit ce4e3ebe04
2 changed files with 0 additions and 18 deletions
-4
View File
@@ -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()
-14
View File
@@ -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:
@@ -663,10 +657,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");
@@ -1255,10 +1245,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");