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

JIT: Enable profile consistency checking up to morph #111047

Merged
merged 11 commits into from
Jan 7, 2025
Merged

JIT: Enable profile consistency checking up to morph #111047

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a04ad03
Propagate profile data in head-tail merging
amanasifkhalid Dec 30, 2024
ee9de04
Simplify throw merging
amanasifkhalid Dec 31, 2024
8827743
Clean up other fgReplaceJumpTarget call sites
amanasifkhalid Dec 31, 2024
189b526
Move shared pred edge iterator logic to base class
amanasifkhalid Dec 31, 2024
d00f85f
Make operator* non-virtual
amanasifkhalid Jan 2, 2025
24ca55c
Undo loop inversion changes
amanasifkhalid Jan 2, 2025
a566e66
Merge branch 'simplify-throw-merging' into profile-checks-tail-merge
amanasifkhalid Jan 2, 2025
399ea0e
Merge branch 'pred-iterators' into profile-checks-tail-merge
amanasifkhalid Jan 2, 2025
d6e9939
Propagate profile data in throw merging
amanasifkhalid Jan 2, 2025
53f5a94
Maintain profile through flowgraph simplification
amanasifkhalid Jan 3, 2025
13d28ea
Merge from main
amanasifkhalid Jan 6, 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
Next Next commit
Propagate profile data in head-tail merging
  • Loading branch information
@amanasifkhalid
amanasifkhalid committed Dec 30, 2024
commit a04ad03df6c8ff49ede7cb6c939747ee70ce93d3
15 changes: 10 additions & 5 deletions src/coreclr/jit/compiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4711,11 +4711,6 @@ void Compiler::compCompile(void** methodCodePtr, uint32_t* methodCodeSize, JitFl
//
DoPhase(this, PHASE_CLONE_FINALLY, &Compiler::fgCloneFinally);

// Drop back to just checking profile likelihoods.
//
activePhaseChecks &= ~PhaseChecks::CHECK_PROFILE;
activePhaseChecks |= PhaseChecks::CHECK_LIKELIHOODS;

// Do some flow-related optimizations
//
if (opts.OptimizationEnabled())
Expand All @@ -4726,6 +4721,11 @@ void Compiler::compCompile(void** methodCodePtr, uint32_t* methodCodeSize, JitFl
return fgHeadTailMerge(true);
});

// Drop back to just checking profile likelihoods.
//
activePhaseChecks &= ~PhaseChecks::CHECK_PROFILE;
activePhaseChecks |= PhaseChecks::CHECK_LIKELIHOODS;

// Merge common throw blocks
//
DoPhase(this, PHASE_MERGE_THROWS, &Compiler::fgTailMergeThrows);
Expand All @@ -4735,6 +4735,11 @@ void Compiler::compCompile(void** methodCodePtr, uint32_t* methodCodeSize, JitFl
DoPhase(this, PHASE_EARLY_UPDATE_FLOW_GRAPH, &Compiler::fgUpdateFlowGraphPhase);
}

// Drop back to just checking profile likelihoods.
//
activePhaseChecks &= ~PhaseChecks::CHECK_PROFILE;
activePhaseChecks |= PhaseChecks::CHECK_LIKELIHOODS;

// Promote struct locals
//
DoPhase(this, PHASE_PROMOTE_STRUCTS, &Compiler::fgPromoteStructs);
Expand Down
7 changes: 7 additions & 0 deletions src/coreclr/jit/fgopt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6600,6 +6600,13 @@ PhaseStatus Compiler::fgHeadTailMerge(bool early)
FlowEdge* const newEdge = fgAddRefPred(crossJumpTarget, predBlock);
predBlock->SetKindAndTargetEdge(BBJ_ALWAYS, newEdge);
}

// For tail merge we have a common successor of predBlock and
// crossJumpTarget, so the profile update can be done locally.
if (crossJumpTarget->hasProfileWeight())
{
crossJumpTarget->setBBProfileWeight(crossJumpTarget->bbWeight + predBlock->bbWeight);
}
}

// We changed things
Expand Down