RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-18 10:32:48 +02:00
Code Issues Projects Releases Wiki Activity

[AMDGPU] Handle s_branch to another section.

Browse Source 
Currently, if target of s_branch instruction is in another section, it will fail with the error of undefined label.  Although in this case, the label is not undefined but present in another section. This patch tries to handle this issue. So while handling fixup_si_sopp_br fixup in getRelocType, if the target label is undefined we issue an error as before. If it is defined, a new relocation type R_AMDGPU_REL16 is returned.

This issue has been reported in https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100181 and https://bugs.llvm.org/show_bug.cgi?id=45887. Before https://reviews.llvm.org/D79943, we used to get an crash for this scenario. The crash is fixed now but the we still get an undefined label error.  Jumps to other section can arise with hold/cold splitting.

A patch to handle the relocation in lld will follow shortly.

Reviewed By: arsenm

Differential Revision: https://reviews.llvm.org/D105760
This commit is contained in:
Hafiz Abid Qadeer 2021-07-13 11:17:04 +01:00
parent b6e292416f
commit 5ad78e6343
5 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/AMDGPUUsage.rst
View File

@ -1574,6 +1574,7 @@ The following relocation types are supported:
``R_AMDGPU_REL32_HI`` Static 11 ``word32`` (S + A - P) >> 32
*reserved* 12
``R_AMDGPU_RELATIVE64`` Dynamic 13 ``word64`` B + A
``R_AMDGPU_REL16`` Static 14 ``word16`` ((S + A - P) - 4) / 4
========================== ======= ===== ========== ==============================
``R_AMDGPU_ABS32_LO`` and ``R_AMDGPU_ABS32_HI`` are only supported by

1
include/llvm/BinaryFormat/ELFRelocs/AMDGPU.def
View File

@ -15,3 +15,4 @@ ELF_RELOC(R_AMDGPU_GOTPCREL32_HI, 9)
ELF_RELOC(R_AMDGPU_REL32_LO, 10)
ELF_RELOC(R_AMDGPU_REL32_HI, 11)
ELF_RELOC(R_AMDGPU_RELATIVE64, 13)
ELF_RELOC(R_AMDGPU_REL16, 14)

9
lib/Target/AMDGPU/MCTargetDesc/AMDGPUELFObjectWriter.cpp
View File

@ -80,9 +80,12 @@ unsigned AMDGPUELFObjectWriter::getRelocType(MCContext &Ctx,
const auto *SymA = Target.getSymA();
assert(SymA);
Ctx.reportError(Fixup.getLoc(),
Twine("undefined label '") + SymA->getSymbol().getName() + "'");
return ELF::R_AMDGPU_NONE;
if (SymA->getSymbol().isUndefined()) {
Ctx.reportError(Fixup.getLoc(), Twine("undefined label '") +
SymA->getSymbol().getName() + "'");
return ELF::R_AMDGPU_NONE;
}
return ELF::R_AMDGPU_REL16;
}
llvm_unreachable("unhandled relocation type");

6
test/MC/AMDGPU/reloc.s
View File

@ -9,6 +9,7 @@
// CHECK: R_AMDGPU_GOTPCREL32_HI global_var2
// CHECK: R_AMDGPU_REL32_LO global_var3
// CHECK: R_AMDGPU_REL32_HI global_var4
// CHECK: R_AMDGPU_REL16 .text.unlikely
// CHECK: R_AMDGPU_ABS32 var
// CHECK: }
// CHECK: .rel.data {
@ -25,6 +26,11 @@ kernel:
s_mov_b32 s4, global_var2@gotpcrel32@hi
s_mov_b32 s5, global_var3@rel32@lo
s_mov_b32 s6, global_var4@rel32@hi
s_branch cold
.section .text.unlikely
cold:
s_add_i32 s15, s15, 1
.globl global_var0
.globl global_var1

2
test/tools/llvm-readobj/ELF/reloc-types-elf-amdgpu.test
View File

@ -18,6 +18,7 @@
# CHECK-NEXT: 0x0 R_AMDGPU_REL32_LO - 0x0
# CHECK-NEXT: 0x0 R_AMDGPU_REL32_HI - 0x0
# CHECK-NEXT: 0x0 R_AMDGPU_RELATIVE64 - 0x0
# CHECK-NEXT: 0x0 R_AMDGPU_REL16 - 0x0
# CHECK-NEXT: }
!ELF
@ -43,3 +44,4 @@ Sections:
- Type: R_AMDGPU_REL32_LO
- Type: R_AMDGPU_REL32_HI
- Type: R_AMDGPU_RELATIVE64
- Type: R_AMDGPU_REL16