Skip to content

[PseudoProbe] Fix cleanup for pseudo probe after annotation #119660

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 1 commit into from
Dec 13, 2024
Merged

[PseudoProbe] Fix cleanup for pseudo probe after annotation #119660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 20 additions & 4 deletions llvm/lib/Transforms/IPO/SampleProfile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ class SampleProfileLoader final : public SampleProfileLoaderBaseImpl<Function> {
void generateMDProfMetadata(Function &F);
bool rejectHighStalenessProfile(Module &M, ProfileSummaryInfo *PSI,
const SampleProfileMap &Profiles);
void removePseudoProbeInsts(Module &M);
void removePseudoProbeInstsDiscriminator(Module &M);

/// Map from function name to Function *. Used to find the function from
/// the function name. If the function name contains suffix, additional
Expand Down Expand Up @@ -2138,13 +2138,25 @@ bool SampleProfileLoader::rejectHighStalenessProfile(
return false;
}

void SampleProfileLoader::removePseudoProbeInsts(Module &M) {
void SampleProfileLoader::removePseudoProbeInstsDiscriminator(Module &M) {
for (auto &F : M) {
std::vector<Instruction *> InstsToDel;
for (auto &BB : F) {
for (auto &I : BB) {
if (isa<PseudoProbeInst>(&I))
InstsToDel.push_back(&I);
else if (isa<CallBase>(&I))
if (const DILocation *DIL = I.getDebugLoc().get()) {
// Restore dwarf discriminator for call.
unsigned Discriminator = DIL->getDiscriminator();
if (DILocation::isPseudoProbeDiscriminator(Discriminator)) {
std::optional<uint32_t> DwarfDiscriminator =
PseudoProbeDwarfDiscriminator::extractDwarfBaseDiscriminator(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A friendly caveat: this is still not the original DwarfBaseDiscriminator, it's only keep 3 bits(#94506), though it can cover most of the cases(95%+), just not the exact same.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. I noticed it.

Discriminator);
I.setDebugLoc(DIL->cloneWithDiscriminator(
DwarfDiscriminator ? *DwarfDiscriminator : 0));
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is zero discriminator same effect as no discriminator in DILexicalBlockFile?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so, looks the encoding https://github.com/llvm/llvm-project/blob/main/llvm/include/llvm/IR/DebugInfoMetadata.h#L2101 0 means all the components are empty.

}
}
}
}
for (auto *I : InstsToDel)
Expand Down Expand Up @@ -2224,8 +2236,12 @@ bool SampleProfileLoader::runOnModule(Module &M, ModuleAnalysisManager *AM,
notInlinedCallInfo)
updateProfileCallee(pair.first, pair.second.entryCount);

if (RemoveProbeAfterProfileAnnotation && FunctionSamples::ProfileIsProbeBased)
removePseudoProbeInsts(M);
if (RemoveProbeAfterProfileAnnotation &&
FunctionSamples::ProfileIsProbeBased) {
removePseudoProbeInstsDiscriminator(M);
if (auto *FuncInfo = M.getNamedMetadata(PseudoProbeDescMetadataName))
M.eraseNamedMetadata(FuncInfo);
}

return retval;
}
Expand Down
2 changes: 2 additions & 0 deletions llvm/test/Transforms/SampleProfile/pseudo-probe-profile.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
; RUN: opt < %t -passes=sample-profile -sample-profile-file=%S/Inputs/pseudo-probe-profile.prof -sample-profile-remove-probe -S | FileCheck %s -check-prefix=REMOVE-PROBE

; REMOVE-PROBE-NOT: call void @llvm.pseudoprobe
; REMOVE-PROBE-NOT: !llvm.pseudo_probe_desc
; REMOVE-PROBE: !DILexicalBlockFile({{.*}}, discriminator: 0)

define dso_local i32 @foo(i32 %x, ptr %f) #0 !dbg !4 {
entry:
Expand Down
Loading