Thanks to visit codestin.com
Credit goes to github.com

Skip to content

JIT: in minimal profiling mode, ignore impact of conditional throws #81972

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
merged 1 commit into from
Feb 11, 2023
Merged

JIT: in minimal profiling mode, ignore impact of conditional throws #81972

Show file tree
Hide file tree
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
10 changes: 5 additions & 5 deletions src/coreclr/jit/fgbasic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3416,7 +3416,7 @@ void Compiler::fgFindBasicBlocks()

/* Now create the basic blocks */

unsigned retBlocks = fgMakeBasicBlocks(info.compCode, info.compILCodeSize, jumpTarget);
fgReturnCount = fgMakeBasicBlocks(info.compCode, info.compILCodeSize, jumpTarget);

if (compIsForInlining())
{
Expand All @@ -3425,7 +3425,7 @@ void Compiler::fgFindBasicBlocks()
// If fgFindJumpTargets marked the call as "no return" there
// really should be no BBJ_RETURN blocks in the method.
bool markedNoReturn = (impInlineInfo->iciCall->gtCallMoreFlags & GTF_CALL_M_DOES_NOT_RETURN) != 0;
assert((markedNoReturn && (retBlocks == 0)) || (!markedNoReturn && (retBlocks >= 1)));
assert((markedNoReturn && (fgReturnCount == 0)) || (!markedNoReturn && (fgReturnCount >= 1)));
#endif // DEBUG

if (compInlineResult->IsFailure())
Expand All @@ -3442,7 +3442,7 @@ void Compiler::fgFindBasicBlocks()

// Use a spill temp for the return value if there are multiple return blocks,
// or if the inlinee has GC ref locals.
if ((info.compRetNativeType != TYP_VOID) && ((retBlocks > 1) || impInlineInfo->HasGcRefLocals()))
if ((info.compRetNativeType != TYP_VOID) && ((fgReturnCount > 1) || impInlineInfo->HasGcRefLocals()))
{
// If we've spilled the ret expr to a temp we can reuse the temp
// as the inlinee return spill temp.
Expand All @@ -3461,7 +3461,7 @@ void Compiler::fgFindBasicBlocks()
// We may have co-opted an existing temp for the return spill.
// We likely assumed it was single-def at the time, but now
// we can see it has multiple definitions.
if ((retBlocks > 1) && (lvaTable[lvaInlineeReturnSpillTemp].lvSingleDef == 1))
if ((fgReturnCount > 1) && (lvaTable[lvaInlineeReturnSpillTemp].lvSingleDef == 1))
{
// Make sure it is no longer marked single def. This is only safe
// to do if we haven't ever updated the type.
Expand All @@ -3483,7 +3483,7 @@ void Compiler::fgFindBasicBlocks()
if (info.compRetType == TYP_REF)
{
// The return spill temp is single def only if the method has a single return block.
if (retBlocks == 1)
if (fgReturnCount == 1)
{
lvaTable[lvaInlineeReturnSpillTemp].lvSingleDef = 1;
JITDUMP("Marked return spill temp V%02u as a single def temp\n", lvaInlineeReturnSpillTemp);
Expand Down
17 changes: 16 additions & 1 deletion src/coreclr/jit/fgprofile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,8 +859,23 @@ void Compiler::WalkSpanningTree(SpanningTreeVisitor* visitor)
}
break;

case BBJ_RETURN:
case BBJ_THROW:

// Ignore impact of throw blocks on flow, if we're doing minimal
// method profiling, and it appears the method can return without throwing.
//
// fgReturnCount is provisionally set in fgFindBasicBlocks based on
// the raw IL stream prescan.
//
if (JitConfig.JitMinimalJitProfiling() && (fgReturnCount > 0))
{
break;
}

__fallthrough;

case BBJ_RETURN:

{
// Pseudo-edge back to method entry.
//
Expand Down