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

JIT: fix issues with profile incorporation phase #47723

Merged
merged 1 commit into from
Feb 2, 2021
Merged

JIT: fix issues with profile incorporation phase #47723

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
29 changes: 0 additions & 29 deletions src/coreclr/jit/fgbasic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2206,35 +2206,6 @@ unsigned Compiler::fgMakeBasicBlocks(const BYTE* codeAddr, IL_OFFSET codeSize, F
curBBdesc->bbCodeOffs = curBBoffs;
curBBdesc->bbCodeOffsEnd = nxtBBoffs;

BasicBlock::weight_t profileWeight;

if (fgGetProfileWeightForBasicBlock(curBBoffs, &profileWeight))
{
if (compIsForInlining())
{
if (impInlineInfo->profileScaleState == InlineInfo::ProfileScaleState::KNOWN)
{
double scaledWeight = impInlineInfo->profileScaleFactor * profileWeight;
profileWeight = (BasicBlock::weight_t)scaledWeight;
}
}

curBBdesc->setBBProfileWeight(profileWeight);

if (profileWeight == 0)
{
curBBdesc->bbSetRunRarely();
}
else
{
// Note that bbNewBasicBlock (called from fgNewBasicBlock) may have
// already marked the block as rarely run. In that case (and when we know
// that the block profile weight is non-zero) we want to unmark that.

curBBdesc->bbFlags &= ~BBF_RUN_RARELY;
}
}

switch (jmpKind)
{
case BBJ_SWITCH:
Expand Down
23 changes: 16 additions & 7 deletions src/coreclr/jit/fgprofile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -932,25 +932,24 @@ PhaseStatus Compiler::fgIncorporateProfileData()
// Notes:
// Count data for inlinees is scaled (usually down).
//
// Since we are now running before the importer, we do not know which
// blocks will be imported, and we should not see any internal blocks.
//
// Todo:
// Normalize counts.
//
// Take advantage of the (likely) correspondence between block order
// and schema order?
//
// Find some other mechanism for handling cases where handler entry
// blocks must be in the hot section.
//
void Compiler::fgIncorporateBlockCounts()
{
for (BasicBlock* block = fgFirstBB; block != nullptr; block = block->bbNext)
{
BasicBlock::weight_t profileWeight;

// Skip internal and un-imported blocks.
//
if ((block->bbFlags & (BBF_INTERNAL | BBF_IMPORTED)) != BBF_IMPORTED)
{
continue;
}

if (fgGetProfileWeightForBasicBlock(block->bbCodeOffs, &profileWeight))
{
if (compIsForInlining())
Expand All @@ -972,6 +971,16 @@ void Compiler::fgIncorporateBlockCounts()
{
block->bbFlags &= ~BBF_RUN_RARELY;
}

#if HANDLER_ENTRY_MUST_BE_IN_HOT_SECTION
// Handle a special case -- some handler entries can't have zero profile count.
//
if (this->bbIsHandlerBeg(block) && block->isRunRarely())
{
JITDUMP("Suppressing zero count for " FMT_BB " as it is a handler entry\n", block->bbNum);
block->makeBlockHot();
}
#endif
}
}
}
Expand Down