Skip to content

Loop alignment: Handle blocks added in loop as part of split edges of LSRA #55047

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

Merged
kunalspathak merged 4 commits into from
Jul 8, 2021
Merged

Loop alignment: Handle blocks added in loop as part of split edges of LSRA #55047

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2565e4d
Handle blocks added in loop as part of split edges of LSRA
kunalspathak Jul 1, 2021
5d777fa
Retain LOOP_ALIGN flag of loops whose start are same
kunalspathak Jul 2, 2021
aae9dcd
jit format
kunalspathak Jul 2, 2021
cd2004c
review feedback
kunalspathak Jul 8, 2021
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
Prev Previous commit
review feedback
  • Loading branch information
@kunalspathak
kunalspathak committed Jul 8, 2021
commit cd2004c9e256170540546b6b748a4204d4824902
24 changes: 12 additions & 12 deletions src/coreclr/jit/emit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4830,9 +4830,9 @@ unsigned emitter::getLoopSize(insGroup* igLoopHeader, unsigned maxLoopSize DEBUG
//
void emitter::emitSetLoopBackEdge(BasicBlock* loopTopBlock)
{
insGroup* dstIG = (insGroup*)loopTopBlock->bbEmitCookie;
bool noAlignCurrentLoop = false;
bool noAlignLastLoop = false;
insGroup* dstIG = (insGroup*)loopTopBlock->bbEmitCookie;
bool alignCurrentLoop = true;
bool alignLastLoop = true;

// With (dstIG != nullptr), ensure that only back edges are tracked.
// If there is forward jump, dstIG is not yet generated.
Expand Down Expand Up @@ -4871,30 +4871,30 @@ void emitter::emitSetLoopBackEdge(BasicBlock* loopTopBlock)
{
// if current loop completely encloses last loop,
// then current loop should not be aligned.
noAlignCurrentLoop = true;
alignCurrentLoop = false;
}
else if ((emitLastLoopStart < currLoopStart) && (currLoopEnd < emitLastLoopEnd))
{
// if last loop completely encloses current loop,
// then last loop should not be aligned.
noAlignLastLoop = true;
alignLastLoop = false;
}
else
{
// The loops intersect and should not align either of the loops
noAlignLastLoop = true;
noAlignCurrentLoop = true;
alignLastLoop = false;
alignCurrentLoop = false;
}

if (noAlignLastLoop || noAlignCurrentLoop)
if (!alignLastLoop || !alignCurrentLoop)
{
instrDescAlign* alignInstr = emitAlignList;
bool markedLastLoop = !noAlignLastLoop;
bool markedCurrLoop = !noAlignCurrentLoop;
bool markedLastLoop = alignLastLoop;
bool markedCurrLoop = alignCurrentLoop;
while ((alignInstr != nullptr))
{
// Find the IG before current loop and clear the IGF_LOOP_ALIGN flag
if (noAlignCurrentLoop && (alignInstr->idaIG->igNext == dstIG))
if (!alignCurrentLoop && (alignInstr->idaIG->igNext == dstIG))
{
assert(!markedCurrLoop);
alignInstr->idaIG->igFlags &= ~IGF_LOOP_ALIGN;
Expand All @@ -4905,7 +4905,7 @@ void emitter::emitSetLoopBackEdge(BasicBlock* loopTopBlock)
}

// Find the IG before the last loop and clear the IGF_LOOP_ALIGN flag
if (noAlignLastLoop && (alignInstr->idaIG->igNext != nullptr) &&
if (!alignLastLoop && (alignInstr->idaIG->igNext != nullptr) &&
(alignInstr->idaIG->igNext->igNum == emitLastLoopStart))
{
assert(!markedLastLoop);
Expand Down