Skip to content

JIT: Improve wrapper method inliner heuristic #113266

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
wants to merge 7 commits into from
Closed

JIT: Improve wrapper method inliner heuristic #113266

Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
813139a
Improve wrapper method inliner heuristic
hez2010 Mar 7, 2025
79a5c59
Unify
hez2010 Mar 7, 2025
b5fedb3
JIT format
hez2010 Mar 7, 2025
5bbc21a
Correct comment
hez2010 Mar 7, 2025
9d9b90f
Merge branch 'main' into inline-wrapper
EgorBo Apr 21, 2025
9b18372
Merge branch 'main' into inline-wrapper
hez2010 May 31, 2025
2054ee2
Merge branch 'inline-wrapper' of github.com:hez2010/runtime into inli…
hez2010 May 31, 2025
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
45 changes: 42 additions & 3 deletions src/coreclr/jit/fgbasic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -969,6 +969,35 @@ void Compiler::fgFindJumpTargets(const BYTE* codeAddr, IL_OFFSET codeSize, Fixed
compInlineResult->Note(InlineObservation::CALLEE_BEGIN_OPCODE_SCAN);
}

auto doesMethodLookLikeWrapper = [](const BYTE* codeAddrNext, const BYTE* codeEndp) -> bool {
OPCODE opcodeNext = (OPCODE)getU1LittleEndian(codeAddrNext);
if (opcodeNext == CEE_LDLOC_0 || opcodeNext == CEE_LDLOC_1 || opcodeNext == CEE_LDLOC_2 ||
opcodeNext == CEE_LDLOC_3 || opcodeNext == CEE_LDLOC_S)
{
codeAddrNext += opcodeSizes[opcodeNext] + sizeof(int8_t);
if (codeAddrNext >= codeEndp)
{
return false;
}
opcodeNext = (OPCODE)getU1LittleEndian(codeAddrNext);
}
if (opcodeNext == CEE_BOX)
{
codeAddrNext += opcodeSizes[opcodeNext] + sizeof(int8_t);
if (codeAddrNext >= codeEndp)
{
return false;
}
opcodeNext = (OPCODE)getU1LittleEndian(codeAddrNext);
}
if (opcodeNext == CEE_RET)
{
// Assume it is a wrapper method if it is followed by {ldloc, box}, ret.
return true;
}
return false;
};

CORINFO_RESOLVED_TOKEN resolvedToken;

OPCODE opcode = CEE_NOP;
Expand Down Expand Up @@ -1608,10 +1637,8 @@ void Compiler::fgFindJumpTargets(const BYTE* codeAddr, IL_OFFSET codeSize, Fixed
}
}

if ((codeAddr < codeEndp - sz) && (OPCODE)getU1LittleEndian(codeAddr + sz) == CEE_RET)
if ((codeAddr < codeEndp - sz) && doesMethodLookLikeWrapper(codeAddr + sz, codeEndp))
Copy link
Member

@EgorBo EgorBo May 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given it's called only here, it only supports

call
ldloc
box
ret

?

is this some specific pattern we need to support?

Copy link
Contributor Author

@hez2010 hez2010 May 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nope. it's just that doesMethodLookLikeWrapper can return true for a single ret so that it can be reused here.

{
// If the method has a call followed by a ret, assume that
// it is a wrapper method.
compInlineResult->Note(InlineObservation::CALLEE_LOOKS_LIKE_WRAPPER);
}

Expand All @@ -1624,6 +1651,18 @@ void Compiler::fgFindJumpTargets(const BYTE* codeAddr, IL_OFFSET codeSize, Fixed
}
break;

case CEE_NEWARR:
case CEE_NEWOBJ:
case CEE_INITOBJ:
{
if (makeInlineObservations && (codeAddr < codeEndp - sz) &&
doesMethodLookLikeWrapper(codeAddr + sz, codeEndp))
{
compInlineResult->Note(InlineObservation::CALLEE_LOOKS_LIKE_WRAPPER);
}
break;
}

case CEE_LDIND_I1:
case CEE_LDIND_U1:
case CEE_LDIND_I2:
Expand Down
Loading