Skip to content

[BOLT] Avoid repeated hash lookups (NFC) #140426

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
May 18, 2025
Merged

[BOLT] Avoid repeated hash lookups (NFC) #140426

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
1db1b37
[BOLT] Avoid repeated hash lookups (NFC)
kazutakahirata May 18, 2025
7ce1c4c
Address a comment.
kazutakahirata May 18, 2025
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
10 changes: 4 additions & 6 deletions bolt/include/bolt/Profile/DataReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,8 @@ struct FuncBranchData {

FuncBranchData() {}

FuncBranchData(StringRef Name, ContainerTy Data)
: Name(Name), Data(std::move(Data)) {}

FuncBranchData(StringRef Name, ContainerTy Data, ContainerTy EntryData)
FuncBranchData(StringRef Name, ContainerTy Data = ContainerTy(),
ContainerTy EntryData = ContainerTy())
: Name(Name), Data(std::move(Data)), EntryData(std::move(EntryData)) {}

ErrorOr<const BranchInfo &> getBranch(uint64_t From, uint64_t To) const;
Expand Down Expand Up @@ -205,7 +203,7 @@ struct FuncMemData {

FuncMemData() {}

FuncMemData(StringRef Name, ContainerTy Data)
FuncMemData(StringRef Name, ContainerTy Data = ContainerTy())
: Name(Name), Data(std::move(Data)) {}
};

Expand Down Expand Up @@ -241,7 +239,7 @@ struct FuncBasicSampleData {
StringRef Name;
ContainerTy Data;

FuncBasicSampleData(StringRef Name, ContainerTy Data)
FuncBasicSampleData(StringRef Name, ContainerTy Data = ContainerTy())
: Name(Name), Data(std::move(Data)) {}

/// Get the number of samples recorded in [Start, End)
Expand Down
38 changes: 4 additions & 34 deletions bolt/lib/Profile/DataReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1088,26 +1088,11 @@ bool DataReader::hasMemData() {

std::error_code DataReader::parseInNoLBRMode() {
auto GetOrCreateFuncEntry = [&](StringRef Name) {
auto I = NamesToBasicSamples.find(Name);
if (I == NamesToBasicSamples.end()) {
bool Success;
std::tie(I, Success) = NamesToBasicSamples.insert(std::make_pair(
Name, FuncBasicSampleData(Name, FuncBasicSampleData::ContainerTy())));

assert(Success && "unexpected result of insert");
}
return I;
return NamesToBasicSamples.try_emplace(Name, Name).first;
};

auto GetOrCreateFuncMemEntry = [&](StringRef Name) {
auto I = NamesToMemEvents.find(Name);
if (I == NamesToMemEvents.end()) {
bool Success;
std::tie(I, Success) = NamesToMemEvents.insert(
std::make_pair(Name, FuncMemData(Name, FuncMemData::ContainerTy())));
assert(Success && "unexpected result of insert");
}
return I;
return NamesToMemEvents.try_emplace(Name, Name).first;
};

while (hasBranchData()) {
Expand Down Expand Up @@ -1151,26 +1136,11 @@ std::error_code DataReader::parseInNoLBRMode() {

std::error_code DataReader::parse() {
auto GetOrCreateFuncEntry = [&](StringRef Name) {
auto I = NamesToBranches.find(Name);
if (I == NamesToBranches.end()) {
bool Success;
std::tie(I, Success) = NamesToBranches.insert(std::make_pair(
Name, FuncBranchData(Name, FuncBranchData::ContainerTy(),
FuncBranchData::ContainerTy())));
assert(Success && "unexpected result of insert");
}
return I;
return NamesToBranches.try_emplace(Name, Name).first;
};

auto GetOrCreateFuncMemEntry = [&](StringRef Name) {
auto I = NamesToMemEvents.find(Name);
if (I == NamesToMemEvents.end()) {
bool Success;
std::tie(I, Success) = NamesToMemEvents.insert(
std::make_pair(Name, FuncMemData(Name, FuncMemData::ContainerTy())));
assert(Success && "unexpected result of insert");
}
return I;
return NamesToMemEvents.try_emplace(Name, Name).first;
};

Col = 0;
Expand Down
Loading