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: some small profile related fixes #43408

Merged
merged 1 commit into from
Oct 16, 2020
Merged

JIT: some small profile related fixes #43408

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
40 changes: 15 additions & 25 deletions src/coreclr/src/jit/block.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,47 +565,37 @@ struct BasicBlock : private LIR::Range
}

// this block will inherit the same weight and relevant bbFlags as bSrc
//
void inheritWeight(BasicBlock* bSrc)
{
this->bbWeight = bSrc->bbWeight;

if (bSrc->hasProfileWeight())
{
this->bbFlags |= BBF_PROF_WEIGHT;
}
else
{
this->bbFlags &= ~BBF_PROF_WEIGHT;
}

if (this->bbWeight == 0)
{
this->bbFlags |= BBF_RUN_RARELY;
}
else
{
this->bbFlags &= ~BBF_RUN_RARELY;
}
inheritWeightPercentage(bSrc, 100);
}

// Similar to inheritWeight(), but we're splitting a block (such as creating blocks for qmark removal).
// So, specify a percentage (0 to 99; if it's 100, just use inheritWeight()) of the weight that we're
// going to inherit. Since the number isn't exact, clear the BBF_PROF_WEIGHT flag.
// So, specify a percentage (0 to 100) of the weight the block should inherit.
//
void inheritWeightPercentage(BasicBlock* bSrc, unsigned percentage)
{
assert(0 <= percentage && percentage < 100);
assert(0 <= percentage && percentage <= 100);

// Check for overflow
if (bSrc->bbWeight * 100 <= bSrc->bbWeight)
if ((bSrc->bbWeight * 100) <= bSrc->bbWeight)
{
this->bbWeight = bSrc->bbWeight;
}
else
{
this->bbWeight = bSrc->bbWeight * percentage / 100;
this->bbWeight = (bSrc->bbWeight * percentage) / 100;
}

this->bbFlags &= ~BBF_PROF_WEIGHT;
if (bSrc->hasProfileWeight())
{
this->bbFlags |= BBF_PROF_WEIGHT;
}
else
{
this->bbFlags &= ~BBF_PROF_WEIGHT;
}

if (this->bbWeight == 0)
{
Expand Down
4 changes: 1 addition & 3 deletions src/coreclr/src/jit/compiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4209,9 +4209,7 @@ void Compiler::EndPhase(Phases phase)
pCompJitTimer->EndPhase(this, phase);
}
#endif
#if DUMP_FLOWGRAPHS
fgDumpFlowGraph(phase);
#endif // DUMP_FLOWGRAPHS

mostRecentlyActivePhase = phase;
}

Expand Down
24 changes: 18 additions & 6 deletions src/coreclr/src/jit/flowgraph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4344,6 +4344,7 @@ void Compiler::fgSwitchToOptimized()
JITDUMP("****\n**** JIT Tier0 jit request switching to Tier1 because of loop\n****\n");
assert(opts.jitFlags->IsSet(JitFlags::JIT_FLAG_TIER0));
opts.jitFlags->Clear(JitFlags::JIT_FLAG_TIER0);
opts.jitFlags->Clear(JitFlags::JIT_FLAG_BBINSTR);

// Leave a note for jit diagnostics
compSwitchedToOptimized = true;
Expand Down Expand Up @@ -19929,8 +19930,7 @@ bool Compiler::fgDumpFlowGraph(Phases phase)
return false;
}
bool validWeights = fgHaveValidEdgeWeights;
unsigned calledCount = max(fgCalledCount, BB_UNITY_WEIGHT) / BB_UNITY_WEIGHT;
double weightDivisor = (double)(calledCount * BB_UNITY_WEIGHT);
double weightDivisor = (double)fgCalledCount;
const char* escapedString;
const char* regionString = "NONE";

Expand Down Expand Up @@ -19972,7 +19972,7 @@ bool Compiler::fgDumpFlowGraph(Phases phase)

if (fgHaveProfileData())
{
fprintf(fgxFile, "\n calledCount=\"%d\"", calledCount);
fprintf(fgxFile, "\n calledCount=\"%d\"", fgCalledCount);
fprintf(fgxFile, "\n profileData=\"true\"");
}
if (compHndBBtabCount > 0)
Expand Down Expand Up @@ -20122,20 +20122,32 @@ bool Compiler::fgDumpFlowGraph(Phases phase)
{
fprintf(fgxFile, " " FMT_BB " -> " FMT_BB, bSource->bbNum, bTarget->bbNum);

const char* sep = "";

if (bSource->bbNum > bTarget->bbNum)
{
// Lexical backedge
fprintf(fgxFile, " [color=green]\n");
fprintf(fgxFile, " [color=green");
sep = ", ";
}
else if ((bSource->bbNum + 1) == bTarget->bbNum)
{
// Lexical successor
fprintf(fgxFile, " [color=blue, weight=20]\n");
fprintf(fgxFile, " [color=blue, weight=20");
sep = ", ";
}
else
{
fprintf(fgxFile, ";\n");
fprintf(fgxFile, " [");
}

if (validWeights)
{
unsigned edgeWeight = (edge->edgeWeightMin() + edge->edgeWeightMax()) / 2;
fprintf(fgxFile, "%slabel=\"%7.2f\"", sep, (double)edgeWeight / weightDivisor);
}

fprintf(fgxFile, "];\n");
}
else
{
Expand Down