Skip to content

[memprof] Report an error when buildid and profile do not match #132504

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
Apr 3, 2025
Merged

[memprof] Report an error when buildid and profile do not match #132504

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
59575eb
[memprof] Report an error when buildid and profile do not match
zcfh Mar 22, 2025
bf832a1
fixup commit to clarify what is different between new llvm-profdata i…
zcfh Mar 22, 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
6 changes: 5 additions & 1 deletion llvm/lib/ProfileData/MemProfReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,11 @@ Error RawMemProfReader::setupForSymbolization() {
ProfiledTextSegmentEnd = Entry.End;
}
}
assert(NumMatched != 0 && "No matching executable segments in segment info.");
if (NumMatched == 0)
return make_error<StringError>(
Twine("No matching executable segments found in binary ") +
Binary.getBinary()->getFileName(),
inconvertibleErrorCode());
assert((PreferredTextSegmentAddress == 0 ||
(PreferredTextSegmentAddress == ProfiledTextSegmentStart)) &&
"Expect text segment address to be 0 or equal to profiled text "
Expand Down
6 changes: 6 additions & 0 deletions llvm/test/tools/llvm-profdata/memprof-buildid.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,9 @@ CHECK: Build ID: [[ID:[[:xdigit:]]+]]

COM: Then match it with the profdata output.
CHECK-COUNT-1: BuildId: {{.*}}[[ID]]

Test error message when profile build id does not match build id in a different binary.
RUN: not llvm-profdata show --memory %p/Inputs/buildid.memprofraw --profiled-binary %p/Inputs/basic.memprofexe -o - 2>&1 | FileCheck %s -check-prefix=BUILDID-NOT-MATCH
RUN: not llvm-profdata merge %p/Inputs/buildid.memprofraw %p/Inputs/basic.memprofraw --profiled-binary %p/Inputs/basic.memprofexe -o %t4.prof 2>&1 | FileCheck %s -check-prefix=BUILDID-NOT-MATCH

BUILDID-NOT-MATCH: No matching executable segments found in binary
Loading