This is an archive of the discontinued LLVM Phabricator instance.

Differential D124270

[BOLT] Fix r_aarch64_prelxx test
ClosedPublic

Authored by yavtuk on Apr 22 2022, 9:36 AM.

Details

Reviewers
yota9
Amir
rafaelauler
rafauler
maksfb
Commits
rG61d54259ed2b: [BOLT] Fix r_aarch64_prelxx test
Summary

The relocation value is calculated using the formula S + A - P,
the verification of the value is performed by inversely calculating the location address

Diff Detail

Event Timeline

yavtuk created this revision.Apr 22 2022, 9:36 AM
Herald added a reviewer: rafauler. · View Herald TranscriptApr 22 2022, 9:36 AM
Herald added a reviewer: maksfb. · View Herald Transcript
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: ayermolo, kristof.beyls. · View Herald Transcript
yavtuk requested review of this revision.Apr 22 2022, 9:36 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 22 2022, 9:36 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
yavtuk added a comment.Apr 22 2022, 9:40 AM

@yota9 @rafaelauler @Amir hi folks, maybe you know how to check it easier?

Harbormaster completed remote builds in B160877: Diff 424506.Apr 22 2022, 9:44 AM
yavtuk updated this revision to Diff 424511.Apr 22 2022, 9:48 AM
Harbormaster completed remote builds in B160881: Diff 424511.Apr 22 2022, 9:57 AM
Amir added a comment.EditedApr 22 2022, 9:59 AM
In D124270#3467983, @yavtuk wrote:

@yota9 @rafaelauler @Amir hi folks, maybe you know how to check it easier?

No easy way unfortunately. I'll pick up this patch and build/test manually on the buildbot then post the result here.

UPD: just noticed that the test doesn't run the binary. Please move this test from bolt/test/runtime/AArch64 to bolt/test/AArch64 and it would be picked up on X86 hosts and pre-merge checks.

yavtuk added a comment.Apr 22 2022, 10:01 AM

@Amir thanks, please wait some time, I need to add alignment for data section

yavtuk updated this revision to Diff 424541.Apr 22 2022, 11:01 AM
Harbormaster completed remote builds in B160907: Diff 424541.Apr 22 2022, 11:12 AM
Amir added a comment.Apr 22 2022, 11:51 AM

@yavtuk:
Can you please move this test from bolt/test/runtime/AArch64 to bolt/test/AArch64? It would be tested in pre-merge checks run.

Amir retitled this revision from [BOLT] fixed r_aarch64_prelxx test to [BOLT] Fix r_aarch64_prelxx test.Apr 22 2022, 12:11 PM
yavtuk updated this revision to Diff 424780.Apr 24 2022, 6:00 AM
Harbormaster completed remote builds in B161068: Diff 424780.Apr 24 2022, 6:10 AM
yota9 added inline comments.Apr 24 2022, 6:55 AM
bolt/test/AArch64/r_aarch64_prelxx.s
11 ↗(On Diff #424780)

Please add -mlittle-endian flag

yavtuk updated this revision to Diff 424822.Apr 24 2022, 11:32 PM
Harbormaster completed remote builds in B161104: Diff 424822.Apr 24 2022, 11:39 PM
Amir accepted this revision.Apr 25 2022, 5:20 AM

LGTM

PASS: BOLT :: AArch64/r_aarch64_prelxx.s (20 of 169)

This revision is now accepted and ready to land.Apr 25 2022, 5:20 AM
Closed by commit rG61d54259ed2b: [BOLT] Fix r_aarch64_prelxx test (authored by yavtuk, committed by yota9). · Explain WhyApr 28 2022, 1:53 PM
This revision was automatically updated to reflect the committed changes.
yota9 added a commit: rG61d54259ed2b: [BOLT] Fix r_aarch64_prelxx test.

Revision Contents

PathSize
bolt/
test/
runtime/
AArch64/
34 lines

Diff 424541

bolt/test/runtime/AArch64/r_aarch64_prelxx.s

// This test checks processing of R_AARCH64_PREL64/32/16 relocations // This test checks processing of R_AARCH64_PREL64/32/16 relocations
// S + A - P = Value
// S = P - A + Value
// mul(D1,0x100) == << 8
// mul(D2,0x10000) == << 16
// mul(D3,0x1000000) == << 24
// REQUIRES: system-linux
// RUN: %clang %cflags -nostartfiles -nostdlib %s -o %t.exe -Wl,-q \ // RUN: %clang %cflags -nostartfiles -nostdlib %s -o %t.exe -Wl,-q \
// RUN: -Wl,-z,max-page-size=4 // RUN: -Wl,-z,max-page-size=4
// RUN: llvm-readelf -Wa %t.exe | FileCheck %s -check-prefix=CHECKPREL // RUN: llvm-readelf -Wa %t.exe | FileCheck %s -check-prefix=CHECKPREL
// CHECKPREL: R_AARCH64_PREL16 {{.*}} .dummy + 0 // CHECKPREL: R_AARCH64_PREL16 {{.*}} .dummy + 0
// CHECKPREL-NEXT: R_AARCH64_PREL32 {{.*}} _start + 4 // CHECKPREL-NEXT: R_AARCH64_PREL32 {{.*}} _start + 4
// CHECKPREL-NEXT: R_AARCH64_PREL64 {{.*}} _start + 8 // CHECKPREL-NEXT: R_AARCH64_PREL64 {{.*}} _start + 8
// RUN: llvm-bolt %t.exe -o %t.bolt // RUN: llvm-bolt %t.exe -o %t.bolt
// RUN: llvm-readobj -S --section-data %t.bolt | FileCheck %s // RUN: llvm-objdump -D %t.bolt | FileCheck %s --check-prefix=CHECKPREL32
// CHECK: Name: .data // CHECKPREL32: [[#%x,DATATABLEADDR:]] <datatable>:
// CHECK: SectionData ( // CHECKPREL32-NEXT: 00:
// CHECK: 0000: FCFF0000 44FF3F00 44FF3F00 00000000 // CHECKPREL32-NEXT: 04: [[#%x,D0:]] [[#%x,D1:]] [[#%x,D2:]] [[#%x,D3:]]
// CHECK: )
// 4 is offset in datatable
// 8 is addend
// CHECKPREL32: [[#DATATABLEADDR + 4 - 8 + D0 + mul(D1,0x100) + mul(D2,0x10000) + mul(D3,0x1000000)]] <_start>:
// RUN: llvm-objdump -D %t.bolt | FileCheck %s --check-prefix=CHECKPREL64
// CHECKPREL64: [[#%x,DATATABLEADDR:]] <datatable>:
// CHECKPREL64-NEXT: 00:
// CHECKPREL64-NEXT: 04: [[#%x,D0:]] [[#%x,D1:]] [[#%x,D2:]] [[#%x,D3:]]
// CHECKPREL64-NEXT: 08: [[#%.0x,D0:]] [[#%.0x,D1:]] [[#%.0x,D2:]] [[#%.0x,D3:]]
// 8 is offset in datatable
// 12 is addend
// CHECKPREL64: [[#DATATABLEADDR + 8 - 12 + D0 + mul(D1,0x100) + mul(D2,0x10000) + mul(D3,0x1000000)]] <_start>:
.text .text
.align 4 .align 4
.globl _start .globl _start
.type _start, %function .type _start, %function
_start: _start:
adr x0, datatable adr x0, datatable
mov x0, #0 mov x0, #0
ret ret
.section .dummy, "da" .section .dummy, "da"
dummy: dummy:
.word 0 .word 0
.section .data .data
.align 4
datatable: datatable:
.hword dummy - datatable .hword dummy - datatable
.align 2 .align 2
.word _start - datatable .word _start - datatable
.xword _start - datatable .xword _start - datatable