Skip to content

RyuJIT: Inlined "is class statically inited" check #47901

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

Closed
EgorBo wants to merge 21 commits into from
Closed

RyuJIT: Inlined "is class statically inited" check #47901

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c91495e
Insert checks in a later phase
EgorBo Mar 3, 2021
0e1585d
Add comments
EgorBo Mar 3, 2021
6cc18c6
fix bugs
EgorBo Mar 3, 2021
7acf8e5
Formatting
EgorBo Mar 3, 2021
b4adf00
Formatting
EgorBo Mar 3, 2021
c0c2cf3
Fix 32bit, clean up
EgorBo Mar 4, 2021
1093a1e
Add tests
EgorBo Mar 4, 2021
0c3bcba
Address Jan's feedback
EgorBo Mar 5, 2021
5e6124f
JIT-TP optimization
EgorBo Mar 5, 2021
af0bc3e
Add comments/logs
EgorBo Mar 5, 2021
89f198c
Formatting
EgorBo Mar 5, 2021
6658639
Clean up
EgorBo Mar 5, 2021
ae412d2
Clean up
EgorBo Mar 5, 2021
a3857e4
Use fgSplitBlockAfterStatement
EgorBo Mar 5, 2021
147860c
Clean up
EgorBo Mar 5, 2021
85b27fe
Add CORINFO_HELP_CLASSINIT_SHARED_DYNAMICCLASS
EgorBo Mar 5, 2021
468b4e7
Update flowgraph.cpp
EgorBo Mar 5, 2021
e6ea83b
Update flowgraph.cpp
EgorBo Mar 6, 2021
667ba3d
fix failures
EgorBo Mar 7, 2021
a3ca77d
Merge branch 'main' of github.com:dotnet/runtime into jit-inlined-is-…
EgorBo Mar 7, 2021
15318fa
Move fgHasOptStaticInit to morph
EgorBo Mar 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
Next Next commit
Use fgSplitBlockAfterStatement
  • Loading branch information
@EgorBo
EgorBo committed Mar 5, 2021
commit a3857e4ffdc14ba8f0fc806878f605f1404c73c8
111 changes: 57 additions & 54 deletions src/coreclr/jit/flowgraph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ static bool blockNeedsGCPoll(BasicBlock* block)

PhaseStatus Compiler::fgInsertClsInitChecks()
{
if (!opts.OptimizationEnabled() || opts.IsReadyToRun())
if (!opts.OptimizationEnabled())
{
return PhaseStatus::MODIFIED_NOTHING;
}
Expand All @@ -80,6 +80,7 @@ PhaseStatus Compiler::fgInsertClsInitChecks()
{
if (!block->isRunRarely())
{
Statement* prevStmt = nullptr;
for (Statement* stmt : block->Statements())
{
for (GenTree* tree = stmt->GetTreeList(); tree != nullptr; tree = tree->gtNext)
Expand Down Expand Up @@ -187,13 +188,45 @@ PhaseStatus Compiler::fgInsertClsInitChecks()
// ...
//

// Insert a no-op statement that we can use as a splitter in fgSplitBlockAfterStatement
// in case if we're on the first statement.
if (prevStmt == nullptr)
{
prevStmt = fgNewStmtFromTree(gtNewNothingNode());
fgInsertStmtAtBeg(block, prevStmt);
}

BasicBlock* newBlock = fgSplitBlockAfterStatement(block, prevStmt);
newBlock->bbFlags |= (BBF_HAS_LABEL | BBF_INTERNAL);

prevBb = block;
block = newBlock;

// BB1 "isInitedBb"
BasicBlock* isInitedBb = fgNewBBafter(BBJ_COND, prevBb, true);
isInitedBb->inheritWeight(prevBb);
isInitedBb->bbFlags |= (BBF_INTERNAL | BBF_HAS_LABEL | BBF_HAS_JMP);

GenTree* isInitAdrNode = gtNewIndOfIconHandleNode(TYP_UBYTE, isInitAddr, GTF_ICON_CONST_PTR, true);
GenTree* isInitedMaskNode = gtNewOperNode(GT_AND, TYP_INT, isInitAdrNode, gtNewIconNode(isInitMask));
GenTree* isInitedCmp = gtNewOperNode(GT_NE, TYP_INT, isInitedMaskNode, gtNewIconNode(0));
isInitedCmp->gtFlags |= (GTF_RELOP_JMP_USED | GTF_DONT_CSE);
gtSetEvalOrder(isInitedCmp);

Statement* isInitedStmt = fgNewStmtFromTree(gtNewOperNode(GT_JTRUE, TYP_VOID, isInitedCmp));
gtSetStmtInfo(isInitedStmt);
fgSetStmtSeq(isInitedStmt);

fgInsertStmtAtEnd(isInitedBb, isInitedStmt);
isInitedBb->bbJumpDest = block;
block->bbFlags |= BBF_JMP_TARGET;

// Let's start from emitting that BB2 "callInitBb"
BasicBlock* callInitBb = fgNewBBbefore(BBJ_NONE, block, true);
BasicBlock* callInitBb = fgNewBBafter(BBJ_ALWAYS, isInitedBb, true);
// it's executed only once so can be marked as cold
callInitBb->bbSetRunRarely();
callInitBb->bbFlags |= (BBF_INTERNAL | BBF_HAS_CALL | BBF_HAS_LABEL);
callInitBb->bbFlags |= (BBF_INTERNAL | BBF_HAS_CALL | BBF_HAS_LABEL | BBF_HAS_JMP);
callInitBb->bbJumpDest = block;

// Replace the helper call with a slower CORINFO_HELP_INITCLASS
// it accepts a single argument instead of two so we can save some space.
Expand All @@ -210,75 +243,45 @@ PhaseStatus Compiler::fgInsertClsInitChecks()
gtSetStmtInfo(callStmt);
fgSetStmtSeq(callStmt);
fgInsertStmtAtEnd(callInitBb, callStmt);
gtUpdateStmtSideEffects(callStmt);

// BB1 "isInitedBb"
BasicBlock* isInitedBb = fgNewBBbefore(BBJ_COND, callInitBb, true);
isInitedBb->inheritWeight(block);
isInitedBb->bbFlags |= (BBF_INTERNAL | BBF_HAS_LABEL | BBF_HAS_JMP);

GenTree* isInitedMaskNode =
gtNewOperNode(GT_AND, TYP_INT, gtNewCastNode(TYP_INT, isInitAdrNode, true, TYP_INT),
gtNewIconNode(isInitMask));

GenTree* isInitedCmp = gtNewOperNode(GT_NE, TYP_INT, isInitedMaskNode, gtNewIconNode(0));
isInitedCmp->gtFlags |= (GTF_RELOP_JMP_USED | GTF_DONT_CSE);
gtSetEvalOrder(isInitedCmp);

Statement* isInitedStmt = fgNewStmtFromTree(gtNewOperNode(GT_JTRUE, TYP_VOID, isInitedCmp));
gtSetStmtInfo(isInitedStmt);
fgSetStmtSeq(isInitedStmt);

fgInsertStmtAtEnd(isInitedBb, isInitedStmt);
isInitedBb->bbJumpDest = block;
block->bbFlags |= BBF_JMP_TARGET;

// Now we can remove the call from the current block
// We're going to replace the call with the "moduleId" node.
// Replace the call with the "moduleId" node.
gtReplaceTree(stmt, call, gtClone(moduleIdArg));

// Now we need to fix all the connections to predecessors and successors:

// isInitedBb is a predecessor of callInitBb
// Fix all the connections to predecessors and successors:
fgAddRefPred(block, callInitBb);
fgAddRefPred(block, isInitedBb);
fgAddRefPred(isInitedBb, prevBb);
fgAddRefPred(callInitBb, isInitedBb);
for (flowList* pred = block->bbPreds; pred != nullptr; pred = pred->flNext)
{
// Redirect all the predecessors from the current block to isInitedBb
BasicBlock* predBlock = pred->getBlock();
assert((predBlock->bbJumpKind == BBJ_NONE) || (predBlock->bbJumpKind == BBJ_ALWAYS) ||
(predBlock->bbJumpKind == BBJ_COND));
fgRemoveRefPred(block, prevBb);

if (predBlock->bbJumpDest == block)
{
predBlock->bbJumpDest = isInitedBb;
isInitedBb->bbFlags |= BBF_JMP_TARGET;
}
if (predBlock->bbNext == block)
{
predBlock->bbNext = isInitedBb;
}
fgRemoveRefPred(block, predBlock);
fgAddRefPred(isInitedBb, predBlock);
// Convert the prevBB (it used to be the current block before fgSplitBlockAfterStatement)
// to BBJ_ALWAYS
if (prevBb->bbJumpKind == BBJ_NONE)
{
prevBb->bbJumpDest = isInitedBb;
prevBb->bbJumpKind = BBJ_ALWAYS;
isInitedBb->bbFlags |= BBF_JMP_TARGET;
prevBb->bbFlags |= BBF_HAS_JMP;
}
// Both callInitBb and isInitedBb are predecessors of block now
fgAddRefPred(block, callInitBb);
fgAddRefPred(block, isInitedBb);

// Make sure all three basic blocks are in the same EH region:
// Make sure all four basic blocks are in the same EH region:
assert(BasicBlock::sameEHRegion(prevBb, block));
assert(BasicBlock::sameEHRegion(callInitBb, block));
assert(BasicBlock::sameEHRegion(isInitedBb, block));

assert(isInitedBb->bbJumpDest == block);
assert(isInitedBb->bbNext == callInitBb);
assert(callInitBb->bbNext == block);
assert((isInitedBb->bbJumpDest == block) && (isInitedBb->bbNext == callInitBb));
assert((callInitBb->bbJumpDest == block) && (callInitBb->bbNext == block));
assert((prevBb->bbNext == isInitedBb) && (prevBb->bbJumpDest == isInitedBb));

modified = true;
break;
}
if (modified)
{
// Clear potential leftover GTF_CALL and GTF_EXC flags in the current stmt
gtUpdateStmtSideEffects(stmt);
}
prevStmt = stmt;
}
}
prevBb = block;
Expand Down