[BOLT][AArch64] Don't change layout in PatchEntries (#71278)
Due to LongJmp pass that is executed before PatchEntries we can't ignore the function here since it would change pre-calculated output layout. The test reloc-26 relied on the wrong behavior, rewritten to unittest. This is also attemp to fix #70771
This commit is contained in:
Vladislav Khmelevsky
GitHub
parent
1fa58c7790
commit
485075c095
@ -98,6 +98,17 @@ void PatchEntries::runOnFunctions(BinaryContext &BC) {
|
||||
});
|
||||
|
||||
if (!Success) {
|
||||
// We can't change output layout for AArch64 due to LongJmp pass
|
||||
if (BC.isAArch64()) {
|
||||
if (opts::ForcePatch) {
|
||||
errs() << "BOLT-ERROR: unable to patch entries in " << Function
|
||||
<< "\n";
|
||||
exit(1);
|
||||
}
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
// If the original function entries cannot be patched, then we cannot
|
||||
// safely emit new function body.
|
||||
errs() << "BOLT-WARNING: failed to patch entries in " << Function
|
||||
|
||||
36
bolt/test/AArch64/patch-entries.s
Normal file
36
bolt/test/AArch64/patch-entries.s
Normal file
@ -0,0 +1,36 @@
|
||||
# This test checks patch entries functionality
|
||||
|
||||
# REQUIRES: system-linux
|
||||
|
||||
# RUN: llvm-mc -filetype=obj -triple aarch64-unknown-unknown \
|
||||
# RUN: %s -o %t.o
|
||||
# RUN: %clang %cflags -pie %t.o -o %t.exe -nostdlib -Wl,-q
|
||||
# RUN: llvm-bolt %t.exe -o %t.bolt --use-old-text=0 --lite=0 --skip-funcs=_start
|
||||
# RUN: llvm-objdump -dz %t.bolt | FileCheck %s
|
||||
|
||||
# CHECK: <pathedEntries.org.0>:
|
||||
# CHECK-NEXT: adrp x16, 0x[[#%x,ADRP:]]
|
||||
# CHECK-NEXT: add x16, x16, #0x[[#%x,ADD:]]
|
||||
# CHECK-NEXT: br x16
|
||||
|
||||
# CHECK: [[#ADRP + ADD]] <pathedEntries>:
|
||||
# CHECK-NEXT: [[#ADRP + ADD]]: {{.*}} ret
|
||||
|
||||
.text
|
||||
.balign 4
|
||||
.global pathedEntries
|
||||
.type pathedEntries, %function
|
||||
pathedEntries:
|
||||
.rept 32
|
||||
nop
|
||||
.endr
|
||||
ret
|
||||
.size pathedEntries, .-pathedEntries
|
||||
|
||||
.global _start
|
||||
.type _start, %function
|
||||
_start:
|
||||
bl pathedEntries
|
||||
.inst 0xdeadbeef
|
||||
ret
|
||||
.size _start, .-_start
|
||||
@ -1,51 +0,0 @@
|
||||
## This test checks processing of R_AARCH64_CALL26 relocation
|
||||
## when option `--funcs` is enabled
|
||||
|
||||
## We want to test on relocations against functions with both higher
|
||||
## and lower addresses. The '--force-patch' option is used to prevent
|
||||
## the functions func1 and func2 from being optimized, so that their
|
||||
## addresses can remain unchanged. Therefore, the relocations can be
|
||||
## updated via encodeValueAArch64 and the address order in the output
|
||||
## binary is func1 < _start < func2.
|
||||
|
||||
# REQUIRES: system-linux
|
||||
|
||||
# RUN: llvm-mc -filetype=obj -triple aarch64-unknown-unknown \
|
||||
# RUN: %s -o %t.o
|
||||
# RUN: %clang %cflags %t.o -o %t.exe -Wl,-q
|
||||
# RUN: llvm-bolt %t.exe -o %t.bolt --funcs=func1,func2 \
|
||||
# RUN: --force-patch 2>&1 | FileCheck %s -check-prefix=CHECK-BOLT
|
||||
# RUN: llvm-objdump -d --disassemble-symbols='_start' %t.bolt | \
|
||||
# RUN: FileCheck %s
|
||||
# RUN: llvm-nm --numeric-sort --extern-only %t.bolt | FileCheck \
|
||||
# RUN: %s -check-prefix=CHECK-FUNC-ORDER
|
||||
|
||||
# CHECK-BOLT: BOLT-WARNING: failed to patch entries in func1. The function will not be optimized.
|
||||
# CHECK-BOLT: BOLT-WARNING: failed to patch entries in func2. The function will not be optimized.
|
||||
# CHECK: {{.*}} bl {{.*}} <func1>
|
||||
# CHECK: {{.*}} bl {{.*}} <func2>
|
||||
|
||||
# CHECK-FUNC-ORDER: {{.*}} func1
|
||||
# CHECK-FUNC-ORDER-NEXT: {{.*}} _start
|
||||
# CHECK-FUNC-ORDER-NEXT: {{.*}} func2
|
||||
|
||||
.text
|
||||
.align 4
|
||||
.global func1
|
||||
.type func1, %function
|
||||
func1:
|
||||
ret
|
||||
.size func1, .-func1
|
||||
.global _start
|
||||
.type _start, %function
|
||||
_start:
|
||||
bl func1
|
||||
bl func2
|
||||
mov w8, #93
|
||||
svc #0
|
||||
.size _start, .-_start
|
||||
.global func2
|
||||
.type func2, %function
|
||||
func2:
|
||||
ret
|
||||
.size func2, .-func2
|
||||
@ -62,6 +62,46 @@ INSTANTIATE_TEST_SUITE_P(X86, BinaryContextTester,
|
||||
INSTANTIATE_TEST_SUITE_P(AArch64, BinaryContextTester,
|
||||
::testing::Values(Triple::aarch64));
|
||||
|
||||
TEST_P(BinaryContextTester, FlushPendingRelocCALL26) {
|
||||
if (GetParam() != Triple::aarch64)
|
||||
GTEST_SKIP();
|
||||
|
||||
// This test checks that encodeValueAArch64 used by flushPendingRelocations
|
||||
// returns correctly encoded values for CALL26 relocation for both backward
|
||||
// and forward branches.
|
||||
//
|
||||
// The offsets layout is:
|
||||
// 4: func1
|
||||
// 8: bl func1
|
||||
// 12: bl func2
|
||||
// 16: func2
|
||||
|
||||
char Data[20] = {};
|
||||
BinarySection &BS = BC->registerOrUpdateSection(
|
||||
".text", ELF::SHT_PROGBITS, ELF::SHF_EXECINSTR | ELF::SHF_ALLOC,
|
||||
(uint8_t *)Data, sizeof(Data), 4);
|
||||
MCSymbol *RelSymbol1 = BC->getOrCreateGlobalSymbol(4, "Func1");
|
||||
ASSERT_TRUE(RelSymbol1);
|
||||
BS.addRelocation(8, RelSymbol1, ELF::R_AARCH64_CALL26, 0, 0, true);
|
||||
MCSymbol *RelSymbol2 = BC->getOrCreateGlobalSymbol(16, "Func2");
|
||||
ASSERT_TRUE(RelSymbol2);
|
||||
BS.addRelocation(12, RelSymbol2, ELF::R_AARCH64_CALL26, 0, 0, true);
|
||||
|
||||
std::error_code EC;
|
||||
SmallVector<char> Vect(sizeof(Data));
|
||||
raw_svector_ostream OS(Vect);
|
||||
|
||||
BS.flushPendingRelocations(OS, [&](const MCSymbol *S) {
|
||||
return S == RelSymbol1 ? 4 : S == RelSymbol2 ? 16 : 0;
|
||||
});
|
||||
|
||||
const uint8_t Func1Call[4] = {255, 255, 255, 151};
|
||||
const uint8_t Func2Call[4] = {1, 0, 0, 148};
|
||||
|
||||
EXPECT_FALSE(memcmp(Func1Call, &Vect[8], 4)) << "Wrong backward call value\n";
|
||||
EXPECT_FALSE(memcmp(Func2Call, &Vect[12], 4)) << "Wrong forward call value\n";
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
TEST_P(BinaryContextTester, BaseAddress) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user