Skip to content

[CSSPGO] Fix redundant reading of profile metadata #129609

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
Mar 4, 2025
Merged

[CSSPGO] Fix redundant reading of profile metadata #129609

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
15df878
[CSSPGO] Fix repeated reading of profile metadata
wlei-llvm Mar 3, 2025
cd164c2
return early if FuncsToUse is empty
wlei-llvm Mar 3, 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
2 changes: 1 addition & 1 deletion llvm/include/llvm/ProfileData/SampleProfReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,7 @@ class SampleProfileReaderExtBinaryBase : public SampleProfileReaderBinary {
std::error_code readSecHdrTable();

std::error_code readFuncMetadata(bool ProfileHasAttribute,
SampleProfileMap &Profiles);
DenseSet<FunctionSamples *> &Profiles);
std::error_code readFuncMetadata(bool ProfileHasAttribute);
std::error_code readFuncMetadata(bool ProfileHasAttribute,
FunctionSamples *FProfile);
Expand Down
20 changes: 14 additions & 6 deletions llvm/lib/ProfileData/SampleProfReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,13 +826,23 @@ bool SampleProfileReaderExtBinaryBase::useFuncOffsetList() const {
std::error_code
SampleProfileReaderExtBinaryBase::read(const DenseSet<StringRef> &FuncsToUse,
SampleProfileMap &Profiles) {
if (FuncsToUse.empty())
return sampleprof_error::success;

Data = ProfileSecRange.first;
End = ProfileSecRange.second;
if (std::error_code EC = readFuncProfiles(FuncsToUse, Profiles))
return EC;
End = Data;
DenseSet<FunctionSamples *> ProfilesToReadMetadata;
for (auto FName : FuncsToUse) {
auto I = Profiles.find(FName);
if (I != Profiles.end())
ProfilesToReadMetadata.insert(&I->second);
}

if (std::error_code EC = readFuncMetadata(ProfileHasAttribute, Profiles))
if (std::error_code EC =
readFuncMetadata(ProfileHasAttribute, ProfilesToReadMetadata))
return EC;
return sampleprof_error::success;
}
Expand Down Expand Up @@ -1300,14 +1310,12 @@ SampleProfileReaderExtBinaryBase::readFuncMetadata(bool ProfileHasAttribute,
return sampleprof_error::success;
}

std::error_code
SampleProfileReaderExtBinaryBase::readFuncMetadata(bool ProfileHasAttribute,
SampleProfileMap &Profiles) {
std::error_code SampleProfileReaderExtBinaryBase::readFuncMetadata(
bool ProfileHasAttribute, DenseSet<FunctionSamples *> &Profiles) {
if (FuncMetadataIndex.empty())
return sampleprof_error::success;

for (auto &I : Profiles) {
FunctionSamples *FProfile = &I.second;
for (auto *FProfile : Profiles) {
auto R = FuncMetadataIndex.find(FProfile->getContext().getHashCode());
if (R == FuncMetadataIndex.end())
continue;
Expand Down
Loading