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

Don't call fgMorphBlockStmt in LoopClonning #113558

Merged
merged 1 commit into from
Mar 15, 2025
Merged

Don't call fgMorphBlockStmt in LoopClonning #113558

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
87 changes: 17 additions & 70 deletions src/coreclr/jit/loopcloning.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,10 @@ GenTree* LC_Array::ToGenTree(Compiler* comp, BasicBlock* bb)
arrAddr->gtFlags |= GTF_INX_ADDR_NONNULL;

arr = comp->gtNewIndexIndir(arrAddr->AsIndexAddr());

// We don't really need to call morph here if we import arr[i] directly
// without gtNewArrayIndexAddr (but it's a bit of verbose).
arr = comp->fgMorphTree(arr);
}
// If asked for arrlen invoke arr length operator.
if (oper == ArrLen)
Expand Down Expand Up @@ -861,98 +865,41 @@ BasicBlock* LoopCloneContext::CondToStmtInBlock(Compiler*
//
const weight_t fastLikelihood = fastPathWeightScaleFactor;

// Choose how to generate the conditions
const bool generateOneConditionPerBlock = true;

if (generateOneConditionPerBlock)
{
// N = conds.Size() branches must all be true to execute the fast loop.
// Use the N'th root....
//
const weight_t fastLikelihoodPerBlock = exp(log(fastLikelihood) / (weight_t)conds.Size());

for (unsigned i = 0; i < conds.Size(); ++i)
{
BasicBlock* newBlk = comp->fgNewBBafter(BBJ_COND, insertAfter, /*extendRegion*/ true);
newBlk->inheritWeight(insertAfter);

JITDUMP("Adding " FMT_BB " -> " FMT_BB "\n", newBlk->bbNum, slowPreheader->bbNum);
FlowEdge* const trueEdge = comp->fgAddRefPred(slowPreheader, newBlk);
newBlk->SetTrueEdge(trueEdge);
trueEdge->setLikelihood(1 - fastLikelihoodPerBlock);

if (insertAfter->KindIs(BBJ_COND))
{
JITDUMP("Adding " FMT_BB " -> " FMT_BB "\n", insertAfter->bbNum, newBlk->bbNum);
FlowEdge* const falseEdge = comp->fgAddRefPred(newBlk, insertAfter);
insertAfter->SetFalseEdge(falseEdge);
falseEdge->setLikelihood(fastLikelihoodPerBlock);
}

JITDUMP("Adding conditions %u to " FMT_BB "\n", i, newBlk->bbNum);

GenTree* cond = conds[i].ToGenTree(comp, newBlk, /* invert */ true);
GenTree* jmpTrueTree = comp->gtNewOperNode(GT_JTRUE, TYP_VOID, cond);
Statement* stmt = comp->fgNewStmtFromTree(jmpTrueTree);

comp->fgInsertStmtAtEnd(newBlk, stmt);

// Remorph.
JITDUMP("Loop cloning condition tree before morphing:\n");
DBEXEC(comp->verbose, comp->gtDispTree(jmpTrueTree));
JITDUMP("\n");
comp->fgMorphBlockStmt(newBlk, stmt DEBUGARG("Loop cloning condition"));

insertAfter = newBlk;
}
// N = conds.Size() branches must all be true to execute the fast loop.
// Use the N'th root....
//
const weight_t fastLikelihoodPerBlock = exp(log(fastLikelihood) / (weight_t)conds.Size());

return insertAfter;
}
else
for (unsigned i = 0; i < conds.Size(); ++i)
{
BasicBlock* newBlk = comp->fgNewBBafter(BBJ_COND, insertAfter, /*extendRegion*/ true);
newBlk->inheritWeight(insertAfter);

JITDUMP("Adding " FMT_BB " -> " FMT_BB "\n", newBlk->bbNum, slowPreheader->bbNum);
FlowEdge* const trueEdge = comp->fgAddRefPred(slowPreheader, newBlk);
newBlk->SetTrueEdge(trueEdge);
trueEdge->setLikelihood(1.0 - fastLikelihood);
trueEdge->setLikelihood(1 - fastLikelihoodPerBlock);

if (insertAfter->KindIs(BBJ_COND))
{
JITDUMP("Adding " FMT_BB " -> " FMT_BB "\n", insertAfter->bbNum, newBlk->bbNum);
FlowEdge* const falseEdge = comp->fgAddRefPred(newBlk, insertAfter);
insertAfter->SetFalseEdge(falseEdge);
falseEdge->setLikelihood(fastLikelihood);
}

JITDUMP("Adding conditions to " FMT_BB "\n", newBlk->bbNum);

// Get the first condition.
GenTree* cond = conds[0].ToGenTree(comp, newBlk, /* invert */ false);
for (unsigned i = 1; i < conds.Size(); ++i)
{
// Append all conditions using AND operator.
cond = comp->gtNewOperNode(GT_AND, TYP_INT, cond, conds[i].ToGenTree(comp, newBlk, /* invert */ false));
falseEdge->setLikelihood(fastLikelihoodPerBlock);
}

// Add "cond == 0" node
cond = comp->gtNewOperNode(GT_EQ, TYP_INT, cond, comp->gtNewIconNode(0));
JITDUMP("Adding conditions %u to " FMT_BB "\n", i, newBlk->bbNum);

// Add jmpTrue "cond == 0"
GenTree* cond = conds[i].ToGenTree(comp, newBlk, /* invert */ true);
cond->gtFlags |= (GTF_RELOP_JMP_USED | GTF_DONT_CSE);
Copy link
Member Author

Choose a reason for hiding this comment

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

this is our regular routine for conditions inside JTRUE (fgMorphBlockStmt call used to set these flags for us).

GenTree* jmpTrueTree = comp->gtNewOperNode(GT_JTRUE, TYP_VOID, cond);
Statement* stmt = comp->fgNewStmtFromTree(jmpTrueTree);

comp->fgInsertStmtAtEnd(newBlk, stmt);

// Remorph.
JITDUMP("Loop cloning condition tree before morphing:\n");
DBEXEC(comp->verbose, comp->gtDispTree(jmpTrueTree));
JITDUMP("\n");
comp->fgMorphBlockStmt(newBlk, stmt DEBUGARG("Loop cloning condition"));

return newBlk;
insertAfter = newBlk;
}

return insertAfter;
}

//--------------------------------------------------------------------------------------------------
Expand Down
Loading