Skip to content

[BOLT][NFC] Speedup merge-fdata #119942

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

Merged
merged 2 commits into from
Dec 15, 2024
Merged

[BOLT][NFC] Speedup merge-fdata #119942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66f78b7
[𝘀𝗽𝗿] initial version
aaupov Dec 14, 2024
62f684c
Simplify optional handling
aaupov Dec 15, 2024
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
2 changes: 1 addition & 1 deletion bolt/test/merge-fdata-mixed-bat-no-lbr.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# RUN: split-file %s %t
# RUN: not merge-fdata %t/a.fdata %t/b.fdata 2>&1 | FileCheck %s

# CHECK: cannot mix profile collected in BOLT and non-BOLT deployments
# CHECK: cannot mix profile with and without boltedcollection

#--- a.fdata
boltedcollection
Expand Down
2 changes: 1 addition & 1 deletion bolt/test/merge-fdata-mixed-mode.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# RUN: split-file %s %t
# RUN: not merge-fdata %t/a.fdata %t/b.fdata 2>&1 | FileCheck %s

# CHECK: cannot mix 'no_lbr' and 'lbr' profiles.
# CHECK: cannot mix profile with and without no_lbr

#--- a.fdata
no_lbr
Expand Down
59 changes: 22 additions & 37 deletions bolt/tools/merge-fdata/merge-fdata.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "llvm/Support/Signals.h"
#include "llvm/Support/ThreadPool.h"
#include <algorithm>
#include <fstream>
#include <mutex>
#include <unordered_map>

Expand Down Expand Up @@ -274,52 +275,36 @@ void mergeLegacyProfiles(const SmallVectorImpl<std::string> &Filenames) {

if (isYAML(Filename))
report_error(Filename, "cannot mix YAML and legacy formats");
ErrorOr<std::unique_ptr<MemoryBuffer>> MB =
MemoryBuffer::getFileOrSTDIN(Filename);
if (std::error_code EC = MB.getError())
report_error(Filename, EC);

StringRef Buf = MB.get()->getBuffer();
std::ifstream FdataFile(Filename, std::ios::in);
std::string FdataLine;
std::getline(FdataFile, FdataLine);

auto checkMode = [&](const std::string &Key, std::optional<bool> &Flag) {
const bool KeyIsSet = FdataLine.rfind(Key, 0) == 0;

if (!Flag.has_value())
Flag = KeyIsSet;
else if (*Flag != KeyIsSet)
report_error(Filename, "cannot mix profile with and without " + Key);
if (KeyIsSet)
// Advance line
std::getline(FdataFile, FdataLine);
};

ProfileTy *Profile;
{
std::lock_guard<std::mutex> Lock(BoltedCollectionMutex);
// Check if the string "boltedcollection" is in the first line
if (Buf.starts_with("boltedcollection\n")) {
if (!BoltedCollection.value_or(true))
report_error(
Filename,
"cannot mix profile collected in BOLT and non-BOLT deployments");
BoltedCollection = true;
Buf = Buf.drop_front(17);
} else {
if (BoltedCollection.value_or(false))
report_error(
Filename,
"cannot mix profile collected in BOLT and non-BOLT deployments");
BoltedCollection = false;
}
checkMode("boltedcollection", BoltedCollection);
// Check if the string "no_lbr" is in the first line
// (or second line if BoltedCollection is true)
size_t CheckNoLBRPos = Buf.find('\n');
if (CheckNoLBRPos != StringRef::npos) {
StringRef FirstLine = Buf.substr(0, CheckNoLBRPos);
if (FirstLine.contains("no_lbr")) {
if (!NoLBRCollection.value_or(true))
report_error(Filename, "cannot mix 'no_lbr' and 'lbr' profiles");
NoLBRCollection = true;
Buf = Buf.drop_front(CheckNoLBRPos + 1);
} else {
if (NoLBRCollection.value_or(false))
report_error(Filename, "cannot mix 'no_lbr' and 'lbr' profiles");
NoLBRCollection = false;
}
}
checkMode("no_lbr", NoLBRCollection);
Profile = &Profiles[tid];
}

SmallVector<StringRef> Lines;
SplitString(Buf, Lines, "\n");
for (StringRef Line : Lines) {
do {
StringRef Line(FdataLine);
size_t Pos = Line.rfind(" ");
if (Pos == StringRef::npos)
report_error(Filename, "Malformed / corrupted profile");
Expand All @@ -329,7 +314,7 @@ void mergeLegacyProfiles(const SmallVectorImpl<std::string> &Filenames) {
report_error(Filename, "Malformed / corrupted profile counter");
Count += Profile->lookup(Signature);
Profile->insert_or_assign(Signature, Count);
}
} while (std::getline(FdataFile, FdataLine));
};

// The final reduction has non-trivial cost, make sure each thread has at
Expand Down
Loading