This is an archive of the discontinued LLVM Phabricator instance.

Differential D47734

AMDGPU/LLD: Handle R_AMDGPU_REL64 relocation
ClosedPublic

Authored by kzhuravl on Jun 4 2018, 11:42 AM.

Details

Reviewers
ruiu
t-tye
• espindola
Commits
rGd70c367267df: AMDGPU/LLD: Handle R_AMDGPU_REL64 relocation
rLLD334444: AMDGPU/LLD: Handle R_AMDGPU_REL64 relocation
rL334444: AMDGPU/LLD: Handle R_AMDGPU_REL64 relocation

Diff Detail

Event Timeline

kzhuravl created this revision.Jun 4 2018, 11:42 AM
Herald added a reviewer: • espindola. · View Herald TranscriptJun 4 2018, 11:42 AM
Herald added subscribers: arichardson, tpr, dstuttard and 4 others. · View Herald Transcript
kzhuravl added a parent revision: D47601: AMDGPU: Add 64-bit relative variant kind.Jun 4 2018, 1:06 PM
ruiu accepted this revision.Jun 5 2018, 8:31 AM

LGTM

This revision is now accepted and ready to land.Jun 5 2018, 8:31 AM
Closed by commit rL334444: AMDGPU/LLD: Handle R_AMDGPU_REL64 relocation (authored by kzhuravl). · Explain WhyJun 11 2018, 2:47 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
ELF/
Arch/
2 lines
test/
ELF/
12 lines

Diff 149819

ELF/Arch/AMDGPU.cpp

Show First 20 Lines • Show All 60 Lines • ▼ Show 20 Linesvoid AMDGPU::relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const {
case R_AMDGPU_ABS32: case R_AMDGPU_ABS32:
case R_AMDGPU_GOTPCREL: case R_AMDGPU_GOTPCREL:
case R_AMDGPU_GOTPCREL32_LO: case R_AMDGPU_GOTPCREL32_LO:
case R_AMDGPU_REL32: case R_AMDGPU_REL32:
case R_AMDGPU_REL32_LO: case R_AMDGPU_REL32_LO:
write32le(Loc, Val); write32le(Loc, Val);
break; break;
case R_AMDGPU_ABS64: case R_AMDGPU_ABS64:
case R_AMDGPU_REL64:
write64le(Loc, Val); write64le(Loc, Val);
break; break;
case R_AMDGPU_GOTPCREL32_HI: case R_AMDGPU_GOTPCREL32_HI:
case R_AMDGPU_REL32_HI: case R_AMDGPU_REL32_HI:
write32le(Loc, Val >> 32); write32le(Loc, Val >> 32);
break; break;
default: default:
error(getErrorLocation(Loc) + "unrecognized reloc " + Twine(Type)); error(getErrorLocation(Loc) + "unrecognized reloc " + Twine(Type));
} }
} }
RelExpr AMDGPU::getRelExpr(RelType Type, const Symbol &S, RelExpr AMDGPU::getRelExpr(RelType Type, const Symbol &S,
const uint8_t *Loc) const { const uint8_t *Loc) const {
switch (Type) { switch (Type) {
case R_AMDGPU_ABS32: case R_AMDGPU_ABS32:
case R_AMDGPU_ABS64: case R_AMDGPU_ABS64:
return R_ABS; return R_ABS;
case R_AMDGPU_REL32: case R_AMDGPU_REL32:
case R_AMDGPU_REL32_LO: case R_AMDGPU_REL32_LO:
case R_AMDGPU_REL32_HI: case R_AMDGPU_REL32_HI:
case R_AMDGPU_REL64:
return R_PC; return R_PC;
case R_AMDGPU_GOTPCREL: case R_AMDGPU_GOTPCREL:
case R_AMDGPU_GOTPCREL32_LO: case R_AMDGPU_GOTPCREL32_LO:
case R_AMDGPU_GOTPCREL32_HI: case R_AMDGPU_GOTPCREL32_HI:
return R_GOT_PC; return R_GOT_PC;
default: default:
return R_INVALID; return R_INVALID;
} }
} }
TargetInfo *elf::getAMDGPUTargetInfo() { TargetInfo *elf::getAMDGPUTargetInfo() {
static AMDGPU Target; static AMDGPU Target;
return &Target; return &Target;
} }

test/ELF/amdgpu-relocs.s

Show First 20 Lines • Show All 71 Lines • ▼ Show 20 Lines# R_AMDGPU_RELATIVE64:
.type ptr2, @object .type ptr2, @object
.globl ptr2 .globl ptr2
.size ptr2, 8 .size ptr2, 8
.p2align 3 .p2align 3
ptr2: ptr2:
.quad temp2 .quad temp2
# R_AMDGPU_REL64:
.type foo, @object
.rodata
.globl foo
.p2align 3
foo:
.quad temp2@rel64
.size foo, 8
# The relocation for local_var{0, 1, 2} and var should be resolved by the # The relocation for local_var{0, 1, 2} and var should be resolved by the
# linker. # linker.
# CHECK: Relocations [ # CHECK: Relocations [
# CHECK: .rela.dyn { # CHECK: .rela.dyn {
# CHECK-NEXT: R_AMDGPU_RELATIVE64 - 0x0 # CHECK-NEXT: R_AMDGPU_RELATIVE64 - 0x0
# CHECK-NEXT: R_AMDGPU_ABS64 common_var0 0x0 # CHECK-NEXT: R_AMDGPU_ABS64 common_var0 0x0
# CHECK-NEXT: R_AMDGPU_ABS64 common_var1 0x0 # CHECK-NEXT: R_AMDGPU_ABS64 common_var1 0x0
# CHECK-NEXT: R_AMDGPU_ABS64 common_var2 0x0 # CHECK-NEXT: R_AMDGPU_ABS64 common_var2 0x0
# CHECK-NEXT: R_AMDGPU_ABS64 extern_var0 0x0 # CHECK-NEXT: R_AMDGPU_ABS64 extern_var0 0x0
# CHECK-NEXT: R_AMDGPU_ABS64 extern_var1 0x0 # CHECK-NEXT: R_AMDGPU_ABS64 extern_var1 0x0
# CHECK-NEXT: R_AMDGPU_ABS64 extern_var2 0x0 # CHECK-NEXT: R_AMDGPU_ABS64 extern_var2 0x0
# CHECK-NEXT: R_AMDGPU_ABS64 global_var0 0x0 # CHECK-NEXT: R_AMDGPU_ABS64 global_var0 0x0
# CHECK-NEXT: R_AMDGPU_ABS64 global_var1 0x0 # CHECK-NEXT: R_AMDGPU_ABS64 global_var1 0x0
# CHECK-NEXT: R_AMDGPU_ABS64 global_var2 0x0 # CHECK-NEXT: R_AMDGPU_ABS64 global_var2 0x0
# CHECK-NEXT: R_AMDGPU_ABS64 temp 0x0 # CHECK-NEXT: R_AMDGPU_ABS64 temp 0x0
# CHECK-NEXT: R_AMDGPU_ABS64 weak_var0 0x0 # CHECK-NEXT: R_AMDGPU_ABS64 weak_var0 0x0
# CHECK-NEXT: R_AMDGPU_ABS64 weak_var1 0x0 # CHECK-NEXT: R_AMDGPU_ABS64 weak_var1 0x0
# CHECK-NEXT: R_AMDGPU_ABS64 weak_var2 0x0 # CHECK-NEXT: R_AMDGPU_ABS64 weak_var2 0x0
# CHECK-NEXT: R_AMDGPU_ABS64 weakref_alias_var0 0x0 # CHECK-NEXT: R_AMDGPU_ABS64 weakref_alias_var0 0x0
# CHECK-NEXT: R_AMDGPU_ABS64 weakref_alias_var1 0x0 # CHECK-NEXT: R_AMDGPU_ABS64 weakref_alias_var1 0x0
# CHECK-NEXT: R_AMDGPU_ABS64 weakref_alias_var2 0x0 # CHECK-NEXT: R_AMDGPU_ABS64 weakref_alias_var2 0x0
# CHECK-NEXT: } # CHECK-NEXT: }
# CHECK-NEXT: ] # CHECK-NEXT: ]
# OBJDUMP: Contents of section .rodata:
# OBJDUMP: 28fbffff ffffffff
# OBJDUMP: Contents of section nonalloc: # OBJDUMP: Contents of section nonalloc:
# OBJDUMP-NEXT: 0000 00000000 04480000 00000000 08440000 # OBJDUMP-NEXT: 0000 00000000 04480000 00000000 08440000
# OBJDUMP-NEXT: 00000000 0c400000 # OBJDUMP-NEXT: 00000000 0c400000