This is an archive of the discontinued LLVM Phabricator instance.

Differential D122190

[AMDGPU][LLD] Adding support for ABI version 5 option
ClosedPublic

Authored by lamb-j on Mar 21 2022, 2:57 PM.

Details

Reviewers
kzhuravl
b-sumner
MaskRay
Commits
rG71b162c4bdf7: [AMDGPU][LLD] Adding support for ABI version 5 option
Summary

Code object version 5 will use the same EFlags as version 4, so we only need to add an additional case

Diff Detail

Event Timeline

lamb-j created this revision.Mar 21 2022, 2:57 PM
Herald added a reviewer: MaskRay. · View Herald TranscriptMar 21 2022, 2:57 PM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: kerbowa, arichardson, t-tye and 5 others. · View Herald Transcript
lamb-j requested review of this revision.Mar 21 2022, 2:57 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 21 2022, 2:57 PM
Herald added subscribers: llvm-commits, StephenFan, wdng. · View Herald Transcript
lamb-j updated this revision to Diff 417110.Mar 21 2022, 2:58 PM

Updating commit message

b-sumner added a comment.Mar 21 2022, 3:38 PM

This change goes along with 1194b9cdda30d and should probably have been landed with it.

Harbormaster completed remote builds in B155504: Diff 417110.Mar 21 2022, 4:27 PM
kzhuravl added a comment.Mar 22 2022, 1:02 PM

Do we need to add the test for it?

lamb-j updated this revision to Diff 417395.Mar 22 2022, 1:56 PM

Adding test

MaskRay requested changes to this revision.Mar 22 2022, 2:00 PM

Can the test be placed in the existing amdgpu-tid.s
The difference with ELFABIVERSION_AMDGPU_HSA_V4 is so small that I don't think we need so many extra RUN lines.

This revision now requires changes to proceed.Mar 22 2022, 2:00 PM
Harbormaster completed remote builds in B155696: Diff 417395.Mar 22 2022, 2:09 PM
lamb-j updated this revision to Diff 417437.Mar 22 2022, 4:50 PM

Switching test

Harbormaster completed remote builds in B155733: Diff 417437.Mar 22 2022, 5:09 PM
MaskRay accepted this revision.Mar 22 2022, 5:11 PM

LGTM.

This revision is now accepted and ready to land.Mar 22 2022, 5:11 PM
Closed by commit rG71b162c4bdf7: [AMDGPU][LLD] Adding support for ABI version 5 option (authored by lamb-j). · Explain WhyMar 23 2022, 1:22 AM
This revision was automatically updated to reflect the committed changes.
lamb-j added a commit: rG71b162c4bdf7: [AMDGPU][LLD] Adding support for ABI version 5 option.

Revision Contents

PathSize
lld/
ELF/
Arch/
1 line
test/
ELF/
20 lines

Diff 417437

lld/ELF/Arch/AMDGPU.cpp

Show First 20 Lines • Show All 108 Lines • ▼ Show 20 Linesuint32_t AMDGPU::calcEFlags() const {
uint8_t abiVersion = cast<ObjFile<ELF64LE>>(objectFiles[0])->getObj() uint8_t abiVersion = cast<ObjFile<ELF64LE>>(objectFiles[0])->getObj()
.getHeader().e_ident[EI_ABIVERSION]; .getHeader().e_ident[EI_ABIVERSION];
switch (abiVersion) { switch (abiVersion) {
case ELFABIVERSION_AMDGPU_HSA_V2: case ELFABIVERSION_AMDGPU_HSA_V2:
case ELFABIVERSION_AMDGPU_HSA_V3: case ELFABIVERSION_AMDGPU_HSA_V3:
return calcEFlagsV3(); return calcEFlagsV3();
case ELFABIVERSION_AMDGPU_HSA_V4: case ELFABIVERSION_AMDGPU_HSA_V4:
case ELFABIVERSION_AMDGPU_HSA_V5:
return calcEFlagsV4(); return calcEFlagsV4();
default: default:
error("unknown abi version: " + Twine(abiVersion)); error("unknown abi version: " + Twine(abiVersion));
return 0; return 0;
} }
} }
void AMDGPU::relocate(uint8_t *loc, const Relocation &rel, uint64_t val) const { void AMDGPU::relocate(uint8_t *loc, const Relocation &rel, uint64_t val) const {
▲ Show 20 Lines • Show All 60 Lines • Show Last 20 Lines

lld/test/ELF/amdgpu-abi-version.s

# REQUIRES: amdgpu # REQUIRES: amdgpu
# RUN: llvm-mc -triple amdgcn-amd-amdhsa -mcpu=gfx900 --amdhsa-code-object-version=3 -filetype=obj %s -o %t.o # RUN: llvm-mc -triple amdgcn-amd-amdhsa -mcpu=gfx900 --amdhsa-code-object-version=3 -filetype=obj %s -o %t.o
# RUN: ld.lld -shared %t.o -o %t.so # RUN: ld.lld -shared %t.o -o %t.so
# RUN: llvm-readobj --file-headers %t.so | FileCheck %s # RUN: llvm-readobj --file-headers %t.so | FileCheck --check-prefix=COV3 %s
# CHECK: OS/ABI: AMDGPU_HSA (0x40) # COV3: OS/ABI: AMDGPU_HSA (0x40)
# CHECK: ABIVersion: 1 # COV3: ABIVersion: 1
# RUN: llvm-mc -triple amdgcn-amd-amdhsa -mcpu=gfx900 --amdhsa-code-object-version=4 -filetype=obj %s -o %t.o
# RUN: ld.lld -shared %t.o -o %t.so
# RUN: llvm-readobj --file-headers %t.so | FileCheck --check-prefix=COV4 %s
# COV4: OS/ABI: AMDGPU_HSA (0x40)
# COV4: ABIVersion: 2
# RUN: llvm-mc -triple amdgcn-amd-amdhsa -mcpu=gfx900 --amdhsa-code-object-version=5 -filetype=obj %s -o %t.o
# RUN: ld.lld -shared %t.o -o %t.so
# RUN: llvm-readobj --file-headers %t.so | FileCheck --check-prefix=COV5 %s
# COV5: OS/ABI: AMDGPU_HSA (0x40)
# COV5: ABIVersion: 3
.text .text
s_nop 0x0 s_nop 0x0
s_endpgm s_endpgm