Skip to content
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

Jump to bottom

[ctx_profile] Decouple ctx instrumentation from PGOOpt #92445

Merged
merged 3 commits into from
May 16, 2024
Merged

[ctx_profile] Decouple ctx instrumentation from PGOOpt #92445

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1dbe45a
[ctx_profile] Decouple ctx instrumentation from PGOOpt
mtrofin May 16, 2024
b1f443a
feedback
mtrofin May 16, 2024
0d693d8
Merge branch 'main' into pipeline
mtrofin May 16, 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
23 changes: 16 additions & 7 deletions llvm/lib/Passes/PassBuilderPipelines.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,10 +839,6 @@ void PassBuilder::addPGOInstrPasses(ModulePassManager &MPM,
MPM.addPass(PGOInstrumentationGen(IsCS));

addPostPGOLoopRotation(MPM, Level);
if (PGOCtxProfLoweringPass::isContextualIRPGOEnabled()) {
MPM.addPass(PGOCtxProfLoweringPass());
return;
}
// Add the profile lowering pass.
InstrProfOptions Options;
if (!ProfileFile.empty())
Expand Down Expand Up @@ -1157,8 +1153,17 @@ PassBuilder::buildModuleSimplificationPipeline(OptimizationLevel Level,
const bool IsPGOInstrUse =
IsPGOPreLink && PGOOpt->Action == PGOOptions::IRUse;
const bool IsMemprofUse = IsPGOPreLink && !PGOOpt->MemoryProfile.empty();

if (IsPGOInstrGen || IsPGOInstrUse || IsMemprofUse)
// We don't want to mix pgo ctx gen and pgo gen; we also don't currently
Copy link
Contributor

Choose a reason for hiding this comment

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

should there be an assert that fires if both are enabled?

Copy link
Member Author

Choose a reason for hiding this comment

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

done.

// enable ctx profiling from the frontend.
assert(
!(IsPGOInstrGen && PGOCtxProfLoweringPass::isContextualIRPGOEnabled()) &&
"Enabling both instrumented FDO and contextual instrumentation is not "
"supported.");
// Enable contextual profiling instrumentation.
const bool IsCtxProfGen = !IsPGOInstrGen && IsPreLink &&
PGOCtxProfLoweringPass::isContextualIRPGOEnabled();

if (IsPGOInstrGen || IsPGOInstrUse || IsMemprofUse || IsCtxProfGen)
addPreInlinerPasses(MPM, Level, Phase);

// Add all the requested passes for instrumentation PGO, if requested.
Expand All @@ -1168,9 +1173,13 @@ PassBuilder::buildModuleSimplificationPipeline(OptimizationLevel Level,
/*IsCS=*/false, PGOOpt->AtomicCounterUpdate,
PGOOpt->ProfileFile, PGOOpt->ProfileRemappingFile,
PGOOpt->FS);
} else if (IsCtxProfGen) {
MPM.addPass(PGOInstrumentationGen(false));
Copy link
Contributor

Choose a reason for hiding this comment

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

document constant parameter

Copy link
Member Author

Choose a reason for hiding this comment

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

done.

addPostPGOLoopRotation(MPM, Level);
MPM.addPass(PGOCtxProfLoweringPass());
}

if (IsPGOInstrGen || IsPGOInstrUse)
if (IsPGOInstrGen || IsPGOInstrUse || IsCtxProfGen)
MPM.addPass(PGOIndirectCallPromotion(false, false));

if (IsPGOPreLink && PGOOpt->CSAction == PGOOptions::CSIRInstr)
Expand Down
Loading