This is an archive of the discontinued LLVM Phabricator instance.

Differential D121298

[BOLT] LongJmp: Use per-function alignment values
ClosedPublic

Authored by yota9 on Mar 9 2022, 8:29 AM.

Details

Reviewers
maksfb
rafauler
Amir
Commits
rG04b87cf0e79d: [BOLT] LongJmp: Use per-function alignment values
Summary

The per-function alignment values must be used in order to create
tentative layout.

Diff Detail

Event Timeline

yota9 created this revision.Mar 9 2022, 8:29 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 9 2022, 8:29 AM
Herald added a subscriber: ayermolo. · View Herald Transcript
yota9 requested review of this revision.Mar 9 2022, 8:29 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 9 2022, 8:29 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
yota9 retitled this revision from LongJmp: Use per-function alignment values to [BOLT] LongJmp: Use per-function alignment values.Mar 9 2022, 8:30 AM
yota9 updated this revision to Diff 414110.Mar 9 2022, 8:32 AM

Remove unused extern opts

Harbormaster completed remote builds in B153366: Diff 414110.Mar 9 2022, 8:38 AM
rafauler accepted this revision.Mar 9 2022, 6:40 PM

LGTM, thanks!

This revision is now accepted and ready to land.Mar 9 2022, 6:40 PM
Closed by commit rG04b87cf0e79d: [BOLT] LongJmp: Use per-function alignment values (authored by yota9). · Explain WhyMar 10 2022, 8:50 AM
This revision was automatically updated to reflect the committed changes.
yota9 added a commit: rG04b87cf0e79d: [BOLT] LongJmp: Use per-function alignment values.

Revision Contents

PathSize
bolt/
lib/
Passes/
8 lines

Diff 414109

bolt/lib/Passes/LongJmp.cpp

Show First 20 Lines • Show All 296 Lines • ▼ Show 20 Lines
uint64_t LongJmpPass::tentativeLayoutRelocColdPart( uint64_t LongJmpPass::tentativeLayoutRelocColdPart(
const BinaryContext &BC, std::vector<BinaryFunction *> &SortedFunctions, const BinaryContext &BC, std::vector<BinaryFunction *> &SortedFunctions,
uint64_t DotAddress) { uint64_t DotAddress) {
for (BinaryFunction *Func : SortedFunctions) { for (BinaryFunction *Func : SortedFunctions) {
if (!Func->isSplit()) if (!Func->isSplit())
continue; continue;
DotAddress = alignTo(DotAddress, BinaryFunction::MinAlign); DotAddress = alignTo(DotAddress, BinaryFunction::MinAlign);
uint64_t Pad = uint64_t Pad =
offsetToAlignment(DotAddress, llvm::Align(opts::AlignFunctions)); offsetToAlignment(DotAddress, llvm::Align(Func->getAlignment()));
if (Pad <= opts::AlignFunctionsMaxBytes) if (Pad <= Func->getMaxColdAlignmentBytes())
DotAddress += Pad; DotAddress += Pad;
ColdAddresses[Func] = DotAddress; ColdAddresses[Func] = DotAddress;
LLVM_DEBUG(dbgs() << Func->getPrintName() << " cold tentative: " LLVM_DEBUG(dbgs() << Func->getPrintName() << " cold tentative: "
<< Twine::utohexstr(DotAddress) << "\n"); << Twine::utohexstr(DotAddress) << "\n");
DotAddress += Func->estimateColdSize(); DotAddress += Func->estimateColdSize();
DotAddress += Func->estimateConstantIslandSize(); DotAddress += Func->estimateConstantIslandSize();
} }
return DotAddress; return DotAddress;
Show All 29 Lines if (!ColdLayoutDone && CurrentIndex >= LastHotIndex) {
tentativeLayoutRelocColdPart(BC, SortedFunctions, DotAddress); tentativeLayoutRelocColdPart(BC, SortedFunctions, DotAddress);
ColdLayoutDone = true; ColdLayoutDone = true;
if (opts::HotFunctionsAtEnd) if (opts::HotFunctionsAtEnd)
DotAddress = alignTo(DotAddress, BC.PageAlign); DotAddress = alignTo(DotAddress, BC.PageAlign);
} }
DotAddress = alignTo(DotAddress, BinaryFunction::MinAlign); DotAddress = alignTo(DotAddress, BinaryFunction::MinAlign);
uint64_t Pad = uint64_t Pad =
offsetToAlignment(DotAddress, llvm::Align(opts::AlignFunctions)); offsetToAlignment(DotAddress, llvm::Align(Func->getAlignment());
if (Pad <= opts::AlignFunctionsMaxBytes) if (Pad <= Func->getMaxAlignmentBytes())
DotAddress += Pad; DotAddress += Pad;
HotAddresses[Func] = DotAddress; HotAddresses[Func] = DotAddress;
LLVM_DEBUG(dbgs() << Func->getPrintName() << " tentative: " LLVM_DEBUG(dbgs() << Func->getPrintName() << " tentative: "
<< Twine::utohexstr(DotAddress) << "\n"); << Twine::utohexstr(DotAddress) << "\n");
if (!Func->isSplit()) if (!Func->isSplit())
DotAddress += Func->estimateSize(); DotAddress += Func->estimateSize();
else else
DotAddress += Func->estimateHotSize(); DotAddress += Func->estimateHotSize();
▲ Show 20 Lines • Show All 268 Lines • Show Last 20 Lines