Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BOLT] Support computed goto and allow map addrs inside functions #120267

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
+97 −20
Open

[BOLT] Support computed goto and allow map addrs inside functions #120267

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f6435e5
[BOLT][AArch64] Create entry points for addresses referenced by dynam…
rin-arm Dec 17, 2024
dd67da5
Fix clang-format and address PR comments.
rin-arm Dec 18, 2024
1dd6d5a
Remove redundant test and expand different test.
rin-arm Dec 31, 2024
b1d8033
Add target independent test.
rin-arm Jan 20, 2025
b44c28a
Fix formatting issue.
rin-arm Jan 23, 2025
39d46f3
Address comments regarding tests
Rin18 Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion bolt/lib/Rewrite/RewriteInstance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2439,6 +2439,14 @@ void RewriteInstance::readDynamicRelocations(const SectionRef &Section,
if (Symbol)
SymbolIndex[Symbol] = getRelocationSymbol(InputFile, Rel);

const uint64_t SymAddress = SymbolAddress + Addend;
BinaryFunction *Func = BC->getBinaryFunctionContainingAddress(SymAddress);
if(Func){
Rin18 marked this conversation as resolved.
Show resolved Hide resolved
Rin18 marked this conversation as resolved.
Show resolved Hide resolved
const uint64_t FunctionOffset = SymAddress - Func->getAddress();
if(FunctionOffset)
Rin18 marked this conversation as resolved.
Show resolved Hide resolved
Func->addEntryPointAtOffset(FunctionOffset);
}

BC->addDynamicRelocation(Rel.getOffset(), Symbol, RType, Addend);
}
}
Expand Down Expand Up @@ -5599,7 +5607,7 @@ uint64_t RewriteInstance::getNewFunctionOrDataAddress(uint64_t OldAddress) {
for (const BinaryBasicBlock &BB : *BF)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not directly related to your change, but we should use BinaryFunction::forEachEntryPoint() here.

if (BB.isEntryPoint() &&
(BF->getAddress() + BB.getOffset()) == OldAddress)
return BF->getOutputAddress() + BB.getOffset();
return BB.getOutputStartAddress();
}
BC->errs() << "BOLT-ERROR: unable to get new address corresponding to "
"input address 0x"
Expand Down
39 changes: 39 additions & 0 deletions bolt/test/AArch64/computed-goto.s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# RUN: llvm-mc -filetype=obj -triple aarch64-unknown-unknown %s -o %t.o
# RUN: %clang %cflags %t.o -o %t.exe -Wl,-q
# RUN: llvm-bolt %t.exe -o %t.bolt 2>&1 | FileCheck %s

## Before bolt could handle mapping addresses within moved functions, it
## would bail out with an error of the form:
## BOLT-ERROR: unable to get new address corresponding to input address 0x10390 in function main. Consider adding this function to --skip-funcs=...
## These addresses arise if computed GOTO is in use.
## Check that bolt does not emit any error.

# CHECK-NOT: BOLT-ERROR
Rin18 marked this conversation as resolved.
Show resolved Hide resolved

.globl main
.p2align 2
.type main,@function
main:
.cfi_startproc
adrp x8, .L__const.main.ptrs+8
add x8, x8, :lo12:.L__const.main.ptrs+8
ldr x9, [x8], #8
br x9

.Label0: // Block address taken
ldr x9, [x8], #8
br x9

.Label1: // Block address taken
mov w0, #42
ret

.Lfunc_end0:
.size main, .Lfunc_end0-main
.cfi_endproc
.type .L__const.main.ptrs,@object
.section .data.rel.ro,"aw",@progbits
.p2align 3, 0x0
.L__const.main.ptrs:
.xword .Label0
.xword .Label1
Loading