
Since Linux 6.14, Perf gained the ability to report SPE branch events using the `brstack` format, which matches the layout of LBR/BRBE. This patch reuses the existing LBR parsing logic to support SPE. Example SPE brstack format: ```bash perf script -i perf.data -F pid,brstack --itrace=bl ``` ``` PID FROM / TO / PREDICTED 16984 0x72e342e5f4/0x72e36192d0/M/-/-/11/RET/- 16984 0x72e7b8b3b4/0x72e7b8b3b8/PN/-/-/11/COND/- 16984 0x72e7b92b48/0x72e7b92b4c/PN/-/-/8/COND/- 16984 0x72eacc6b7c/0x760cc94b00/P/-/-/9/RET/- 16984 0x72e3f210fc/0x72e3f21068/P/-/-/4//- 16984 0x72e39b8c5c/0x72e3627b24/P/-/-/4//- 16984 0x72e7b89d20/0x72e7b92bbc/P/-/-/4/RET/- ``` SPE brstack flags can be two characters long: `PN` or `MN`: - `P` = predicted branch - `M` = mispredicted branch - `N` = optionally appears when the branch is NOT-TAKEN - flag is relevant only to conditional branches Example of usage with BOLT: 1. Capture SPE branch events: ```bash perf record -e 'arm_spe_0/branch_filter=1/u' -- binary ``` 2. Convert profile for BOLT: ```bash perf2bolt -p perf.data -o perf.fdata --spe binary ``` 3. Run BOLT Optimization: ```bash llvm-bolt binary -o binary.bolted --data perf.fdata ... ``` A unit test verifies the parsing of the 'SPE brstack format'. --------- Co-authored-by: Paschalis Mpeis <paschalis.mpeis@arm.com>
334 lines
12 KiB
C++
334 lines
12 KiB
C++
//===- bolt/tools/driver/llvm-bolt.cpp - Feedback-directed optimizer ------===//
|
|
//
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// This is a binary optimizer that will take 'perf' output and change
|
|
// basic block layout for better performance (a.k.a. branch straightening),
|
|
// plus some other optimizations that are better performed on a binary.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "bolt/Profile/DataAggregator.h"
|
|
#include "bolt/Rewrite/MachORewriteInstance.h"
|
|
#include "bolt/Rewrite/RewriteInstance.h"
|
|
#include "bolt/Utils/CommandLineOpts.h"
|
|
#include "llvm/MC/TargetRegistry.h"
|
|
#include "llvm/Object/Binary.h"
|
|
#include "llvm/Support/CommandLine.h"
|
|
#include "llvm/Support/Errc.h"
|
|
#include "llvm/Support/Error.h"
|
|
#include "llvm/Support/ManagedStatic.h"
|
|
#include "llvm/Support/Path.h"
|
|
#include "llvm/Support/PrettyStackTrace.h"
|
|
#include "llvm/Support/Signals.h"
|
|
#include "llvm/Support/TargetSelect.h"
|
|
|
|
#define DEBUG_TYPE "bolt"
|
|
|
|
using namespace llvm;
|
|
using namespace object;
|
|
using namespace bolt;
|
|
|
|
namespace opts {
|
|
|
|
static cl::OptionCategory *BoltCategories[] = {&BoltCategory,
|
|
&BoltOptCategory,
|
|
&BoltRelocCategory,
|
|
&BoltInstrCategory,
|
|
&BoltOutputCategory};
|
|
|
|
static cl::OptionCategory *BoltDiffCategories[] = {&BoltDiffCategory};
|
|
|
|
static cl::OptionCategory *Perf2BoltCategories[] = {&AggregatorCategory,
|
|
&BoltOutputCategory};
|
|
|
|
static cl::opt<std::string> InputFilename(cl::Positional,
|
|
cl::desc("<executable>"),
|
|
cl::Required, cl::cat(BoltCategory),
|
|
cl::sub(cl::SubCommand::getAll()));
|
|
|
|
static cl::opt<std::string>
|
|
InputDataFilename("data",
|
|
cl::desc("<data file>"),
|
|
cl::Optional,
|
|
cl::cat(BoltCategory));
|
|
|
|
static cl::alias
|
|
BoltProfile("b",
|
|
cl::desc("alias for -data"),
|
|
cl::aliasopt(InputDataFilename),
|
|
cl::cat(BoltCategory));
|
|
|
|
static cl::opt<std::string>
|
|
LogFile("log-file",
|
|
cl::desc("redirect journaling to a file instead of stdout/stderr"),
|
|
cl::Hidden, cl::cat(BoltCategory));
|
|
|
|
static cl::opt<std::string>
|
|
InputDataFilename2("data2",
|
|
cl::desc("<data file>"),
|
|
cl::Optional,
|
|
cl::cat(BoltCategory));
|
|
|
|
static cl::opt<std::string>
|
|
InputFilename2(
|
|
cl::Positional,
|
|
cl::desc("<executable>"),
|
|
cl::Optional,
|
|
cl::cat(BoltDiffCategory));
|
|
|
|
} // namespace opts
|
|
|
|
static StringRef ToolName;
|
|
|
|
static void report_error(StringRef Message, std::error_code EC) {
|
|
assert(EC);
|
|
errs() << ToolName << ": '" << Message << "': " << EC.message() << ".\n";
|
|
exit(1);
|
|
}
|
|
|
|
static void report_error(StringRef Message, Error E) {
|
|
assert(E);
|
|
errs() << ToolName << ": '" << Message << "': " << toString(std::move(E))
|
|
<< ".\n";
|
|
exit(1);
|
|
}
|
|
|
|
static void printBoltRevision(llvm::raw_ostream &OS) {
|
|
OS << "BOLT revision " << BoltRevision << "\n";
|
|
}
|
|
|
|
void perf2boltMode(int argc, char **argv) {
|
|
cl::HideUnrelatedOptions(ArrayRef(opts::Perf2BoltCategories));
|
|
cl::AddExtraVersionPrinter(printBoltRevision);
|
|
cl::ParseCommandLineOptions(
|
|
argc, argv,
|
|
"perf2bolt - BOLT data aggregator\n"
|
|
"\nEXAMPLE: perf2bolt -p=perf.data executable -o data.fdata\n");
|
|
if (opts::PerfData.empty()) {
|
|
errs() << ToolName << ": expected -perfdata=<filename> option.\n";
|
|
exit(1);
|
|
}
|
|
if (!opts::InputDataFilename.empty()) {
|
|
errs() << ToolName << ": unknown -data option.\n";
|
|
exit(1);
|
|
}
|
|
if (!sys::fs::exists(opts::PerfData))
|
|
report_error(opts::PerfData, errc::no_such_file_or_directory);
|
|
if (!DataAggregator::checkPerfDataMagic(opts::PerfData)) {
|
|
errs() << ToolName << ": '" << opts::PerfData
|
|
<< "': expected valid perf.data file.\n";
|
|
exit(1);
|
|
}
|
|
if (opts::OutputFilename.empty()) {
|
|
errs() << ToolName << ": expected -o=<output file> option.\n";
|
|
exit(1);
|
|
}
|
|
opts::AggregateOnly = true;
|
|
opts::ShowDensity = true;
|
|
}
|
|
|
|
void boltDiffMode(int argc, char **argv) {
|
|
cl::HideUnrelatedOptions(ArrayRef(opts::BoltDiffCategories));
|
|
cl::AddExtraVersionPrinter(printBoltRevision);
|
|
cl::ParseCommandLineOptions(
|
|
argc, argv,
|
|
"llvm-boltdiff - BOLT binary diff tool\n"
|
|
"\nEXAMPLE: llvm-boltdiff -data=a.fdata -data2=b.fdata exec1 exec2\n");
|
|
if (opts::InputDataFilename2.empty()) {
|
|
errs() << ToolName << ": expected -data2=<filename> option.\n";
|
|
exit(1);
|
|
}
|
|
if (opts::InputDataFilename.empty()) {
|
|
errs() << ToolName << ": expected -data=<filename> option.\n";
|
|
exit(1);
|
|
}
|
|
if (opts::InputFilename2.empty()) {
|
|
errs() << ToolName << ": expected second binary name.\n";
|
|
exit(1);
|
|
}
|
|
if (opts::InputFilename.empty()) {
|
|
errs() << ToolName << ": expected binary.\n";
|
|
exit(1);
|
|
}
|
|
opts::DiffOnly = true;
|
|
}
|
|
|
|
void boltMode(int argc, char **argv) {
|
|
cl::HideUnrelatedOptions(ArrayRef(opts::BoltCategories));
|
|
// Register the target printer for --version.
|
|
cl::AddExtraVersionPrinter(printBoltRevision);
|
|
cl::AddExtraVersionPrinter(TargetRegistry::printRegisteredTargetsForVersion);
|
|
|
|
cl::ParseCommandLineOptions(argc, argv,
|
|
"BOLT - Binary Optimization and Layout Tool\n");
|
|
|
|
if (opts::OutputFilename.empty()) {
|
|
errs() << ToolName << ": expected -o=<output file> option.\n";
|
|
exit(1);
|
|
}
|
|
}
|
|
|
|
int main(int argc, char **argv) {
|
|
// Print a stack trace if we signal out.
|
|
sys::PrintStackTraceOnErrorSignal(argv[0]);
|
|
PrettyStackTraceProgram X(argc, argv);
|
|
|
|
llvm_shutdown_obj Y; // Call llvm_shutdown() on exit.
|
|
|
|
std::string ToolPath = llvm::sys::fs::getMainExecutable(argv[0], nullptr);
|
|
|
|
// Initialize targets and assembly printers/parsers.
|
|
#define BOLT_TARGET(target) \
|
|
LLVMInitialize##target##TargetInfo(); \
|
|
LLVMInitialize##target##TargetMC(); \
|
|
LLVMInitialize##target##AsmParser(); \
|
|
LLVMInitialize##target##Disassembler(); \
|
|
LLVMInitialize##target##Target(); \
|
|
LLVMInitialize##target##AsmPrinter();
|
|
|
|
#include "bolt/Core/TargetConfig.def"
|
|
|
|
ToolName = argv[0];
|
|
|
|
if (llvm::sys::path::filename(ToolName).starts_with("perf2bolt"))
|
|
perf2boltMode(argc, argv);
|
|
else if (llvm::sys::path::filename(ToolName).starts_with("llvm-boltdiff"))
|
|
boltDiffMode(argc, argv);
|
|
else
|
|
boltMode(argc, argv);
|
|
|
|
if (!sys::fs::exists(opts::InputFilename))
|
|
report_error(opts::InputFilename, errc::no_such_file_or_directory);
|
|
|
|
// Initialize journaling streams
|
|
raw_ostream *BOLTJournalOut = &outs();
|
|
raw_ostream *BOLTJournalErr = &errs();
|
|
// RAII obj to keep log file open throughout execution
|
|
std::unique_ptr<raw_fd_ostream> LogFileStream;
|
|
if (!opts::LogFile.empty()) {
|
|
std::error_code LogEC;
|
|
LogFileStream = std::make_unique<raw_fd_ostream>(
|
|
opts::LogFile, LogEC, sys::fs::OpenFlags::OF_None);
|
|
if (LogEC) {
|
|
errs() << "BOLT-ERROR: cannot open requested log file for writing: "
|
|
<< LogEC.message() << "\n";
|
|
exit(1);
|
|
}
|
|
BOLTJournalOut = LogFileStream.get();
|
|
BOLTJournalErr = LogFileStream.get();
|
|
}
|
|
|
|
// Attempt to open the binary.
|
|
if (!opts::DiffOnly) {
|
|
Expected<OwningBinary<Binary>> BinaryOrErr =
|
|
createBinary(opts::InputFilename);
|
|
if (Error E = BinaryOrErr.takeError())
|
|
report_error(opts::InputFilename, std::move(E));
|
|
Binary &Binary = *BinaryOrErr.get().getBinary();
|
|
|
|
if (auto *e = dyn_cast<ELFObjectFileBase>(&Binary)) {
|
|
auto RIOrErr = RewriteInstance::create(e, argc, argv, ToolPath,
|
|
*BOLTJournalOut, *BOLTJournalErr);
|
|
if (Error E = RIOrErr.takeError())
|
|
report_error(opts::InputFilename, std::move(E));
|
|
RewriteInstance &RI = *RIOrErr.get();
|
|
|
|
if (opts::AggregateOnly && !RI.getBinaryContext().isAArch64() &&
|
|
opts::ArmSPE) {
|
|
errs() << ToolName << ": -spe is available only on AArch64.\n";
|
|
exit(1);
|
|
}
|
|
|
|
if (!opts::PerfData.empty()) {
|
|
if (!opts::AggregateOnly) {
|
|
errs() << ToolName
|
|
<< ": WARNING: reading perf data directly is unsupported, "
|
|
"please use "
|
|
"-aggregate-only or perf2bolt.\n!!! Proceed on your own "
|
|
"risk. !!!\n";
|
|
}
|
|
if (Error E = RI.setProfile(opts::PerfData))
|
|
report_error(opts::PerfData, std::move(E));
|
|
}
|
|
if (!opts::InputDataFilename.empty()) {
|
|
if (Error E = RI.setProfile(opts::InputDataFilename))
|
|
report_error(opts::InputDataFilename, std::move(E));
|
|
}
|
|
if (opts::AggregateOnly && opts::PerfData.empty()) {
|
|
errs() << ToolName << ": missing required -perfdata option.\n";
|
|
exit(1);
|
|
}
|
|
|
|
if (Error E = RI.run())
|
|
report_error(opts::InputFilename, std::move(E));
|
|
} else if (auto *O = dyn_cast<MachOObjectFile>(&Binary)) {
|
|
auto MachORIOrErr = MachORewriteInstance::create(O, ToolPath);
|
|
if (Error E = MachORIOrErr.takeError())
|
|
report_error(opts::InputFilename, std::move(E));
|
|
MachORewriteInstance &MachORI = *MachORIOrErr.get();
|
|
|
|
if (!opts::InputDataFilename.empty())
|
|
if (Error E = MachORI.setProfile(opts::InputDataFilename))
|
|
report_error(opts::InputDataFilename, std::move(E));
|
|
|
|
MachORI.run();
|
|
} else {
|
|
report_error(opts::InputFilename, object_error::invalid_file_type);
|
|
}
|
|
|
|
return EXIT_SUCCESS;
|
|
}
|
|
|
|
// Bolt-diff
|
|
Expected<OwningBinary<Binary>> BinaryOrErr1 =
|
|
createBinary(opts::InputFilename);
|
|
Expected<OwningBinary<Binary>> BinaryOrErr2 =
|
|
createBinary(opts::InputFilename2);
|
|
if (Error E = BinaryOrErr1.takeError())
|
|
report_error(opts::InputFilename, std::move(E));
|
|
if (Error E = BinaryOrErr2.takeError())
|
|
report_error(opts::InputFilename2, std::move(E));
|
|
Binary &Binary1 = *BinaryOrErr1.get().getBinary();
|
|
Binary &Binary2 = *BinaryOrErr2.get().getBinary();
|
|
if (auto *ELFObj1 = dyn_cast<ELFObjectFileBase>(&Binary1)) {
|
|
if (auto *ELFObj2 = dyn_cast<ELFObjectFileBase>(&Binary2)) {
|
|
auto RI1OrErr = RewriteInstance::create(ELFObj1, argc, argv, ToolPath);
|
|
if (Error E = RI1OrErr.takeError())
|
|
report_error(opts::InputFilename, std::move(E));
|
|
RewriteInstance &RI1 = *RI1OrErr.get();
|
|
if (Error E = RI1.setProfile(opts::InputDataFilename))
|
|
report_error(opts::InputDataFilename, std::move(E));
|
|
auto RI2OrErr = RewriteInstance::create(ELFObj2, argc, argv, ToolPath);
|
|
if (Error E = RI2OrErr.takeError())
|
|
report_error(opts::InputFilename2, std::move(E));
|
|
RewriteInstance &RI2 = *RI2OrErr.get();
|
|
if (Error E = RI2.setProfile(opts::InputDataFilename2))
|
|
report_error(opts::InputDataFilename2, std::move(E));
|
|
outs() << "BOLT-DIFF: *** Analyzing binary 1: " << opts::InputFilename
|
|
<< "\n";
|
|
outs() << "BOLT-DIFF: *** Binary 1 fdata: " << opts::InputDataFilename
|
|
<< "\n";
|
|
if (Error E = RI1.run())
|
|
report_error(opts::InputFilename, std::move(E));
|
|
outs() << "BOLT-DIFF: *** Analyzing binary 2: " << opts::InputFilename2
|
|
<< "\n";
|
|
outs() << "BOLT-DIFF: *** Binary 2 fdata: "
|
|
<< opts::InputDataFilename2 << "\n";
|
|
if (Error E = RI2.run())
|
|
report_error(opts::InputFilename2, std::move(E));
|
|
RI1.compare(RI2);
|
|
} else {
|
|
report_error(opts::InputFilename2, object_error::invalid_file_type);
|
|
}
|
|
} else {
|
|
report_error(opts::InputFilename, object_error::invalid_file_type);
|
|
}
|
|
|
|
return EXIT_SUCCESS;
|
|
}
|