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 7e02ad0600..c030e76b0e 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: @@ -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");