Skip to content

Commit 669db88

Browse files
lamb-jyanyao-wang
authored andcommitted
Revert "[Comgr] Add -relink-builtin-bitcode-postop to device library linking"
This reverts commit 005d151. This commit can be reverted for 6.1 release branch: - Only hipRTC uses the COMPILE_SOURCE_WITH_DEVICE_LIBRARIES_TO_BC - For hip contexts we don't run AMDGPUSimplifyLibCalls, so relinking isn't needed Change-Id: Id203bccfeb8c3718e0e84a55b3559d1c0faba609
1 parent 96b2ba3 commit 669db88

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

amd/comgr/docs/ReleaseNotes.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,7 @@ lld::elf::link in Comgr's linkWithLLD()
5959
- Added -x assembler option to assembly compilation. Before, if an assembly file
6060
did not end with a .s file extension, it was not handled properly by the Comgr
6161
ASSEMBLE\_SOURCE\_TO\_RELOCATABLE action.
62-
- Added new -relink-builtin-bitcode-postop LLVM option to device library. This
63-
fixes an issue with the \*COMPILE\_SOURCE\_WITH\_DEVICE\_LIBRARIES\_TO\_BC where
64-
OpenCL applications that leveraged AMDGPUSimplifyLibCalls optimizations would
65-
need to re-link bitcodes separately to avoid errors at runtime.
62+
6663

6764
New APIs
6865
--------

amd/comgr/src/comgr-compiler.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1074,8 +1074,6 @@ amd_comgr_status_t AMDGPUCompiler::addDeviceLibraries() {
10741074
return AMD_COMGR_STATUS_ERROR;
10751075
}
10761076
Args.push_back(Saver.save(Twine("--rocm-path=") + FakeRocmDir).data());
1077-
Args.push_back("-mllvm");
1078-
Args.push_back("-relink-builtin-bitcode-postop");
10791077
NoGpuLib = false;
10801078

10811079
for (auto DeviceLib : getDeviceLibraries()) {

amd/comgr/test/compile_source_with_device_libs_to_bc_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ int main(int argc, char *argv[]) {
4848
amd_comgr_action_info_t DataAction;
4949
amd_comgr_status_t Status;
5050
const char *CodeGenOptions[] = {"-mllvm", "-amdgpu-early-inline-all",
51-
"-mcode-object-version=5", "-mllvm", "-amdgpu-prelink"};
51+
"-mcode-object-version=5"};
5252
size_t CodeGenOptionsCount =
5353
sizeof(CodeGenOptions) / sizeof(CodeGenOptions[0]);
5454

0 commit comments

Comments
 (0)