intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-14 03:50:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

[BOLT-AArch64] Support SPEC17 programs and organize AArch64 tests

Browse Source 
Summary:
Add a few new relocation types to support a wider variety of
binaries, add support for constant island duplication (so we can split
functions in large binaries) and make LongJmp pass really precise with
respect to layout, so we don't miss stubs insertions at the correct
places for really large binaries. In LongJmp, introduce "freeze"
annotations so fixBranches won't mess the jumps we carefully determined
that needed a stub.

(cherry picked from FBD6294390)
This commit is contained in:
Rafael Auler
2017-11-09 16:59:18 -08:00
committed by Maksim Panchenko
parent a599fe1bbc
commit f8f52d01d0
10 changed files with 253 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
bolt/BinaryFunction.cpp
View File

@@ -913,6 +913,10 @@ void BinaryFunction::disassemble(ArrayRef<uint8_t> FunctionData) {
isInConstantIsland(TargetAddress)) {
TargetSymbol = BC.getOrCreateGlobalSymbol(TargetAddress, "ISLANDat");
IslandSymbols[TargetAddress - getAddress()] = TargetSymbol;
if (!ColdIslandSymbols.count(TargetSymbol)) {
ColdIslandSymbols[TargetSymbol] =
Ctx->getOrCreateSymbol(TargetSymbol->getName() + ".cold");
}
}
// Note that the address does not necessarily have to reside inside
@@ -2033,6 +2037,9 @@ uint64_t BinaryFunction::getEditDistance() const {
}
void BinaryFunction::emitBody(MCStreamer &Streamer, bool EmitColdPart) {
if (EmitColdPart && hasConstantIsland())
duplicateConstantIslands();
int64_t CurrentGnuArgsSize = 0;
for (auto BB : layout()) {
if (EmitColdPart != BB->isCold())
@@ -2078,8 +2085,7 @@ void BinaryFunction::emitBody(MCStreamer &Streamer, bool EmitColdPart) {
}
}
if (!EmitColdPart)
emitConstantIslands(Streamer);
emitConstantIslands(Streamer, EmitColdPart);
}
void BinaryFunction::emitBodyRaw(MCStreamer *Streamer) {
@@ -2140,11 +2146,15 @@ void BinaryFunction::emitBodyRaw(MCStreamer *Streamer) {
}
}
void BinaryFunction::emitConstantIslands(MCStreamer &Streamer) {
void BinaryFunction::emitConstantIslands(MCStreamer &Streamer,
bool EmitColdPart) {
if (DataOffsets.empty())
return;
Streamer.EmitLabel(getFunctionConstantIslandLabel());
if (!EmitColdPart)
Streamer.EmitLabel(getFunctionConstantIslandLabel());
else
Streamer.EmitLabel(getFunctionColdConstantIslandLabel());
// Raw contents of the function.
StringRef SectionContents;
Section.getContents(SectionContents);
@@ -2196,7 +2206,10 @@ void BinaryFunction::emitConstantIslands(MCStreamer &Streamer) {
if (IS != IslandSymbols.end() && FunctionOffset == IS->first) {
DEBUG(dbgs() << "BOLT-DEBUG: emitted label " << IS->second->getName()
<< " at offset 0x" << Twine::utohexstr(IS->first) << '\n');
Streamer.EmitLabel(IS->second);
if (!EmitColdPart)
Streamer.EmitLabel(IS->second);
else
Streamer.EmitLabel(ColdIslandSymbols[IS->second]);
++IS;
}
if (RI != MoveRelocations.end() && FunctionOffset == RI->first) {
@@ -2218,6 +2231,33 @@ void BinaryFunction::emitConstantIslands(MCStreamer &Streamer) {
assert(IS == IslandSymbols.end() && "some symbols were not emitted!");
}
void BinaryFunction::duplicateConstantIslands() {
for (auto BB : layout()) {
if (!BB->isCold())
continue;
for (auto &Inst : *BB) {
int OpNum = 0;
for (auto &Operand : Inst) {
if (!Operand.isExpr()) {
++OpNum;
continue;
}
const auto *Symbol = BC.MIA->getTargetSymbol(Inst, OpNum);
auto ISym = ColdIslandSymbols.find(Symbol);
if (ISym == ColdIslandSymbols.end())
continue;
Operand = MCOperand::createExpr(BC.MIA->getTargetExprFor(
Inst,
MCSymbolRefExpr::create(ISym->second, MCSymbolRefExpr::VK_None,
*BC.Ctx),
*BC.Ctx, 0));
++OpNum;
}
}
}
}
namespace {
#ifndef MAX_PATH
@@ -2480,7 +2520,8 @@ void BinaryFunction::fixBranches() {
assert(CondBranch && "conditional branch expected");
const auto *TSuccessor = BB->getConditionalSuccessor(true);
const auto *FSuccessor = BB->getConditionalSuccessor(false);
if (NextBB && NextBB == TSuccessor) {
if (NextBB && NextBB == TSuccessor &&
!BC.MIA->hasAnnotation(*CondBranch, "DoNotChangeTarget")) {
std::swap(TSuccessor, FSuccessor);
MIA->reverseBranchCondition(*CondBranch, TSuccessor->getLabel(), Ctx);
BB->swapConditionalSuccessors();
@@ -2490,7 +2531,10 @@ void BinaryFunction::fixBranches() {
if (TSuccessor == FSuccessor) {
BB->removeDuplicateConditionalSuccessor(CondBranch);
}
if (!NextBB || (NextBB != TSuccessor && NextBB != FSuccessor)) {
if (!NextBB ||
((NextBB != TSuccessor ||
BC.MIA->hasAnnotation(*CondBranch, "DoNotChangeTarget")) &&
NextBB != FSuccessor)) {
BB->addBranchInstruction(FSuccessor);
}
}