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: Use BitVec with bbPostorderNum key to track visited blocks during value numbering #108943

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+11 −10
Open

JIT: Use BitVec with bbPostorderNum key to track visited blocks during value numbering #108943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5f56ee
Use BitVec
amanasifkhalid Oct 16, 2024
947dd22
Style
amanasifkhalid Oct 16, 2024
f49aeeb
Fix comment formatting
amanasifkhalid Oct 17, 2024
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
2 changes: 1 addition & 1 deletion src/coreclr/jit/compiler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5798,7 +5798,7 @@ class Compiler
// Utility functions for fgValueNumber.

// Value number a block or blocks in a loop
void fgValueNumberBlocks(BasicBlock* block, BlockSet& visitedBlocks);
void fgValueNumberBlocks(BasicBlock* block, BitVec& visitedBlocks, BitVecTraits* traits);

// Perform value-numbering for the trees in "blk".
void fgValueNumberBlock(BasicBlock* blk);
Expand Down
19 changes: 10 additions & 9 deletions src/coreclr/jit/valuenum.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10888,14 +10888,14 @@ PhaseStatus Compiler::fgValueNumber()
// Visiting that in reverse will ensure we visit a block's predecessors
// before itself whenever possible.
//
EnsureBasicBlockEpoch();
BlockSet visitedBlocks(BlockSetOps::MakeEmpty(this));
BitVecTraits traits = m_dfsTree->PostOrderTraits();
BitVec visitedBlocks(BitVecOps::MakeEmpty(&traits));
BasicBlock** postOrder = m_dfsTree->GetPostOrder();
unsigned postOrderCount = m_dfsTree->GetPostOrderCount();
for (unsigned i = postOrderCount; i != 0; i--)
{
BasicBlock* const block = postOrder[i - 1];
fgValueNumberBlocks(block, visitedBlocks);
fgValueNumberBlocks(block, visitedBlocks, &traits);
}

#ifdef DEBUG
Expand All @@ -10912,8 +10912,9 @@ PhaseStatus Compiler::fgValueNumber()
// fgValueNumberBlocks: Run value numbering for a block or blocks in a loop
//
// Arguments:
// block -- block to value number (may already have been numbered)
// visitedBlocks -- blocks that have already had VNs assigned
// block - block to value number (may already have been numbered)
// visitedBlocks - blocks that have already had VNs assigned
// traits - pointer to BitVecTraits describing visitedBlocks
//
// Notes:
//
Expand All @@ -10922,11 +10923,11 @@ PhaseStatus Compiler::fgValueNumber()
// header, we switch to visiting the loop blocks in RPO, and once we finish
// that visitation, we try and refine loop header PHIs.
//
void Compiler::fgValueNumberBlocks(BasicBlock* block, BlockSet& visitedBlocks)
void Compiler::fgValueNumberBlocks(BasicBlock* block, BitVec& visitedBlocks, BitVecTraits* traits)
{
// Because we're not following the strict RPO, we may have already visisted this block.
//
if (BlockSetOps::IsMember(this, visitedBlocks, block->bbNum))
if (BitVecOps::IsMember(traits, visitedBlocks, block->bbPostorderNum))
{
return;
}
Expand Down Expand Up @@ -10961,7 +10962,7 @@ void Compiler::fgValueNumberBlocks(BasicBlock* block, BlockSet& visitedBlocks)

// Mark block as visited
//
BlockSetOps::AddElemD(this, visitedBlocks, block->bbNum);
BitVecOps::AddElemD(traits, visitedBlocks, block->bbPostorderNum);

// Is block the head of a loop?
//
Expand All @@ -10971,7 +10972,7 @@ void Compiler::fgValueNumberBlocks(BasicBlock* block, BlockSet& visitedBlocks)
// Yes. Visit all other loop blocks using the within-loop RPO.
//
loop->VisitLoopBlocksReversePostOrder([&](BasicBlock* block) {
fgValueNumberBlocks(block, visitedBlocks);
fgValueNumberBlocks(block, visitedBlocks, traits);
return BasicBlockVisit::Continue;
});

Expand Down
Loading