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.

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

JIT: boost inlining when callee unboxes an arg #110596

Merged
merged 2 commits into from
Feb 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 18 additions & 0 deletions src/coreclr/jit/fgbasic.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1056,6 +1056,24 @@ void Compiler::fgFindJumpTargets(const BYTE* codeAddr, IL_OFFSET codeSize, Fixed
break;
}

case CEE_UNBOX:
case CEE_UNBOX_ANY:
{
if (makeInlineObservations)
{
FgStack::FgSlot slot = pushedStack.Top();
if (FgStack::IsExactArgument(slot, impInlineInfo))
{
compInlineResult->Note(InlineObservation::CALLSITE_UNBOX_EXACT_ARG);
}
else if (FgStack::IsArgument(slot))
{
compInlineResult->Note(InlineObservation::CALLEE_UNBOX_ARG);
}
}
break;
}

case CEE_CASTCLASS:
case CEE_ISINST:
{
Expand Down
2 changes: 2 additions & 0 deletions src/coreclr/jit/inline.def
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ INLINE_OBSERVATION(NUMBER_OF_ARGUMENTS, int, "number of arguments",
INLINE_OBSERVATION(NUMBER_OF_BASIC_BLOCKS, int, "number of basic blocks", INFORMATION, CALLEE)
INLINE_OBSERVATION(NUMBER_OF_LOCALS, int, "number of locals", INFORMATION, CALLEE)
INLINE_OBSERVATION(RANDOM_ACCEPT, bool, "random accept", INFORMATION, CALLEE)
INLINE_OBSERVATION(UNBOX_ARG, int, "callee unboxes arg", INFORMATION, CALLEE)
INLINE_OBSERVATION(UNSUPPORTED_OPCODE, bool, "unsupported opcode", INFORMATION, CALLEE)

// ------ Caller Correctness -------
Expand Down Expand Up @@ -194,6 +195,7 @@ INLINE_OBSERVATION(LOG_REPLAY_ACCEPT, bool, "accepted by log replay",
INLINE_OBSERVATION(PROFILE_FREQUENCY, double, "frequency from profile data", INFORMATION, CALLSITE)
INLINE_OBSERVATION(RANDOM_ACCEPT, bool, "random accept", INFORMATION, CALLSITE)
INLINE_OBSERVATION(WEIGHT, int, "frequency from block weight", INFORMATION, CALLSITE)
INLINE_OBSERVATION(UNBOX_EXACT_ARG, int, "unbox of arg with exact class", INFORMATION, CALLSITE)

// ------ Final Sentinel -------

Expand Down
32 changes: 32 additions & 0 deletions src/coreclr/jit/inlinepolicy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1362,6 +1362,14 @@ void ExtendedDefaultPolicy::NoteBool(InlineObservation obs, bool value)
m_IsCallsiteInNoReturnRegion = value;
break;

case InlineObservation::CALLEE_UNBOX_ARG:
m_ArgUnbox++;
break;

case InlineObservation::CALLSITE_UNBOX_EXACT_ARG:
m_ArgUnboxExact++;
break;

default:
DefaultPolicy::NoteBool(obs, value);
break;
Expand Down Expand Up @@ -1716,6 +1724,30 @@ double ExtendedDefaultPolicy::DetermineMultiplier()
JITDUMP("\nPrejit root candidate has arg that feeds a conditional. Multiplier increased to %g.", multiplier);
}

if (m_ArgUnboxExact > 0)
Copy link
Member

@EgorBo EgorBo Feb 7, 2025

Choose a reason for hiding this comment

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

@AndyAyersMS I think you can also rely on existing m_ArgIsBoxedAtCallsite here, so if an arg is boxed on the callsite and unboxed in the callee - it should be quite profitable.

UPD: although, probably not - m_ArgIsBoxedAtCallsite alone is not telling which arg exactly is boxed 🙂

{
// Callee has unbox(arg), caller supplies exact type (a box)
// We can likely optimize
multiplier += 4.0;
JITDUMP("\nInline candidate has %d exact arg unboxes. Multiplier increased to %g.", m_ArgUnboxExact,
multiplier);
}

if (m_ArgUnbox > 0)
{
// Callee has unbox(arg), caller arg not known type
if (m_IsPrejitRoot)
{
// Assume these might be met with exact type args
multiplier += 4.0;
}
else
{
multiplier += 1.0;
}
JITDUMP("\nInline candidate has %d arg unboxes. Multiplier increased to %g.", m_ArgUnboxExact, multiplier);
}

switch (m_CallsiteFrequency)
{
case InlineCallsiteFrequency::RARE:
Expand Down
4 changes: 4 additions & 0 deletions src/coreclr/jit/inlinepolicy.h
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,8 @@ class ExtendedDefaultPolicy : public DefaultPolicy
, m_UnrollableMemop(0)
, m_Switch(0)
, m_DivByCns(0)
, m_ArgUnbox(0)
, m_ArgUnboxExact(0)
, m_ReturnsStructByValue(false)
, m_IsFromValueClass(false)
, m_NonGenericCallsGeneric(false)
Expand Down Expand Up @@ -272,6 +274,8 @@ class ExtendedDefaultPolicy : public DefaultPolicy
unsigned m_UnrollableMemop;
unsigned m_Switch;
unsigned m_DivByCns;
unsigned m_ArgUnbox;
unsigned m_ArgUnboxExact;
bool m_ReturnsStructByValue : 1;
bool m_IsFromValueClass : 1;
bool m_NonGenericCallsGeneric : 1;
Expand Down
Loading