Skip to content

JIT: Remove loop-related VN quirks #95729

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
jakobbotsch merged 2 commits into from
Dec 13, 2023
Merged

JIT: Remove loop-related VN quirks #95729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24e7710
JIT: Remove loop-related VN quirks
jakobbotsch Dec 7, 2023
f7679e1
Merge branch 'main' of github.com:dotnet/runtime into vn-remove-loop-…
jakobbotsch Dec 12, 2023
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
21 changes: 2 additions & 19 deletions src/coreclr/jit/optimizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6952,14 +6952,6 @@ void Compiler::optRecordLoopMemoryDependence(GenTree* tree, BasicBlock* block, V
return;
}

// TODO-Quirk: Remove
if (m_newToOldLoop[updateLoop->GetIndex()] == nullptr)
{
return;
}

assert(!m_newToOldLoop[updateLoop->GetIndex()]->lpIsRemoved());

// If the update block is not the header of a loop containing
// block, we can also ignore the update.
//
Expand Down Expand Up @@ -8365,17 +8357,8 @@ void Compiler::optComputeLoopSideEffects()
// limited treatment assignments it has seen the value of.
loop->VisitLoopBlocksReversePostOrder([=](BasicBlock* loopBlock) {
FlowGraphNaturalLoop* loop = m_blockToLoop->GetLoop(loopBlock);

// TODO-Quirk: Remove
while ((loop != nullptr) && (m_newToOldLoop[loop->GetIndex()] == nullptr))
{
loop = loop->GetParent();
}

if (loop != nullptr)
{
optComputeLoopSideEffectsOfBlock(loopBlock, loop);
}
assert(loop != nullptr);
optComputeLoopSideEffectsOfBlock(loopBlock, loop);

return BasicBlockVisit::Continue;
});
Expand Down
24 changes: 5 additions & 19 deletions src/coreclr/jit/valuenum.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2765,16 +2765,9 @@ ValueNum ValueNumStore::VNForMapStore(ValueNum map, ValueNum index, ValueNum val
{
assert(MapIsPrecise(map));

BasicBlock* const bb = m_pComp->compCurBB;
FlowGraphNaturalLoop* bbLoop = m_pComp->m_blockToLoop->GetLoop(bb);

// TODO-Quirk: Remove
while ((bbLoop != nullptr) && (m_pComp->m_newToOldLoop[bbLoop->GetIndex()] == nullptr))
{
bbLoop = bbLoop->GetParent();
}

unsigned loopIndex = bbLoop == nullptr ? UINT_MAX : bbLoop->GetIndex();
BasicBlock* const bb = m_pComp->compCurBB;
FlowGraphNaturalLoop* bbLoop = m_pComp->m_blockToLoop->GetLoop(bb);
unsigned loopIndex = bbLoop == nullptr ? UINT_MAX : bbLoop->GetIndex();

ValueNum const result = VNForFunc(TypeOfVN(map), VNF_MapStore, map, index, value, loopIndex);

Expand Down Expand Up @@ -5229,14 +5222,7 @@ ValueNum ValueNumStore::VNForExpr(BasicBlock* block, var_types type)
if (block != nullptr)
{
FlowGraphNaturalLoop* loop = m_pComp->m_blockToLoop->GetLoop(block);

// TODO-Quirk: Remove
while ((loop != nullptr) && (m_pComp->m_newToOldLoop[loop->GetIndex()] == nullptr))
{
loop = loop->GetParent();
}

loopIndex = loop == nullptr ? ValueNumStore::NoLoop : loop->GetIndex();
loopIndex = loop == nullptr ? ValueNumStore::NoLoop : loop->GetIndex();
}

// VNForFunc(typ, func, vn) but bypasses looking in the cache
Expand Down Expand Up @@ -10038,7 +10024,7 @@ void Compiler::fgValueNumberBlock(BasicBlock* blk)

ValueNum newMemoryVN;
FlowGraphNaturalLoop* loop = m_blockToLoop->GetLoop(blk);
if ((loop != nullptr) && (loop->GetHeader() == blk) && (m_newToOldLoop[loop->GetIndex()] != nullptr))
if ((loop != nullptr) && (loop->GetHeader() == blk))
{
newMemoryVN = fgMemoryVNForLoopSideEffects(memoryKind, blk, loop);
}
Expand Down