This is an archive of the discontinued LLVM Phabricator instance.

Differential D159507

[BOLT] Fix AutoFDO output format after D154120
ClosedPublic

Authored by Amir on Sep 12 2023, 11:48 AM.

Details

Reviewers
rafauler
maksfb
Group Reviewers
Restricted Project
Commits
rG4627446d38b2: [BOLT] Fix AutoFDO output format after D154120
Summary

AutoFDO profile has no leading 0x in hex dumps.

Diff Detail

Event Timeline

Amir created this revision.Sep 12 2023, 11:48 AM
Herald added a reviewer: rafauler. · View Herald TranscriptSep 12 2023, 11:48 AM
Herald added a reviewer: maksfb. · View Herald Transcript
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: wlei, treapster, ayermolo, wenlei. · View Herald Transcript
Amir requested review of this revision.Sep 12 2023, 11:48 AM
Herald added a project: Restricted Project. · View Herald TranscriptSep 12 2023, 11:48 AM
Herald added subscribers: llvm-commits, yota9. · View Herald Transcript
Harbormaster completed remote builds in B257099: Diff 556600.Sep 12 2023, 11:50 AM
rafauler accepted this revision.Sep 12 2023, 12:14 PM
This revision is now accepted and ready to land.Sep 12 2023, 12:14 PM
Closed by commit rG4627446d38b2: [BOLT] Fix AutoFDO output format after D154120 (authored by Amir). · Explain WhySep 12 2023, 1:58 PM
This revision was automatically updated to reflect the committed changes.
Amir added a commit: rG4627446d38b2: [BOLT] Fix AutoFDO output format after D154120.

Revision Contents

PathSize
bolt/
lib/
Profile/
6 lines

Diff 556610

bolt/lib/Profile/DataAggregator.cpp

Show First 20 Lines • Show All 392 Lines • ▼ Show 20 Linesstd::error_code DataAggregator::writeAutoFDOData(StringRef OutputFilename) {
auto filterAddress = [&FirstAllocAddress](uint64_t Address) -> uint64_t { auto filterAddress = [&FirstAllocAddress](uint64_t Address) -> uint64_t {
if (Address < FirstAllocAddress) if (Address < FirstAllocAddress)
return 0; return 0;
return Address - FirstAllocAddress; return Address - FirstAllocAddress;
}; };
OutFile << FallthroughLBRs.size() << "\n"; OutFile << FallthroughLBRs.size() << "\n";
for (const auto &[Trace, Info] : FallthroughLBRs) { for (const auto &[Trace, Info] : FallthroughLBRs) {
OutFile << formatv("{0:x}-{1:x}:{2}\n", filterAddress(Trace.From), OutFile << formatv("{0:x-}-{1:x-}:{2}\n", filterAddress(Trace.From),
filterAddress(Trace.To), filterAddress(Trace.To),
Info.InternCount + Info.ExternCount); Info.InternCount + Info.ExternCount);
} }
OutFile << BasicSamples.size() << "\n"; OutFile << BasicSamples.size() << "\n";
for (const auto [PC, HitCount] : BasicSamples) for (const auto [PC, HitCount] : BasicSamples)
OutFile << formatv("{0:x}:{1}\n", filterAddress(PC), HitCount); OutFile << formatv("{0:x-}:{1}\n", filterAddress(PC), HitCount);
OutFile << BranchLBRs.size() << "\n"; OutFile << BranchLBRs.size() << "\n";
for (const auto &[Trace, Info] : BranchLBRs) { for (const auto &[Trace, Info] : BranchLBRs) {
OutFile << formatv("{0:x}->{1:x}:{2}\n", filterAddress(Trace.From), OutFile << formatv("{0:x-}->{1:x-}:{2}\n", filterAddress(Trace.From),
filterAddress(Trace.To), Info.TakenCount); filterAddress(Trace.To), Info.TakenCount);
} }
outs() << "PERF2BOLT: wrote " << FallthroughLBRs.size() << " unique traces, " outs() << "PERF2BOLT: wrote " << FallthroughLBRs.size() << " unique traces, "
<< BasicSamples.size() << " sample addresses and " << BranchLBRs.size() << BasicSamples.size() << " sample addresses and " << BranchLBRs.size()
<< " unique branches to " << OutputFilename << "\n"; << " unique branches to " << OutputFilename << "\n";
return std::error_code(); return std::error_code();
▲ Show 20 Lines • Show All 1,847 Lines • Show Last 20 Lines