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: preliminary version of profile-based inline policy #44427

Merged
merged 2 commits into from
Nov 11, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
1 change: 1 addition & 0 deletions eng/pipelines/common/templates/runtimes/run-test-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,7 @@ jobs:
- jitehwritethru
- jitobjectstackallocation
- jitpgo
- jitpgo_inline
${{ if in(parameters.testGroup, 'ilasm') }}:
scenarios:
- ilasmroundtrip
Expand Down
19 changes: 19 additions & 0 deletions src/coreclr/src/jit/importer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18703,6 +18703,25 @@ void Compiler::impMakeDiscretionaryInlineObservations(InlineInfo* pInlineInfo, I

inlineResult->NoteInt(InlineObservation::CALLSITE_FREQUENCY, static_cast<int>(frequency));
inlineResult->NoteInt(InlineObservation::CALLSITE_WEIGHT, static_cast<int>(weight));

// If the call site has profile data, report the relative frequency of the site.
//
if ((pInlineInfo != nullptr) && pInlineInfo->iciBlock->hasProfileWeight())
{
double callSiteWeight = (double)pInlineInfo->iciBlock->bbWeight;
double entryWeight = (double)impInlineRoot()->fgFirstBB->bbWeight;

assert(callSiteWeight >= 0);
assert(entryWeight >= 0);

if (entryWeight != 0)
{
inlineResult->NoteBool(InlineObservation::CALLSITE_HAS_PROFILE, true);

double frequency = callSiteWeight / entryWeight;
inlineResult->NoteDouble(InlineObservation::CALLSITE_PROFILE_FREQUENCY, frequency);
}
}
}

/*****************************************************************************
Expand Down
3 changes: 2 additions & 1 deletion src/coreclr/src/jit/inline.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,8 @@ void InlineContext::Dump(unsigned indent)
if (m_Parent == nullptr)
{
// Root method
printf("Inlines into %08X %s\n", calleeToken, calleeName);
InlinePolicy* policy = InlinePolicy::GetPolicy(compiler, true);
printf("Inlines into %08X [via %s] %s\n", calleeToken, policy->GetName(), calleeName);
}
else
{
Expand Down
4 changes: 3 additions & 1 deletion src/coreclr/src/jit/inline.def
Original file line number Diff line number Diff line change
Expand Up @@ -165,14 +165,16 @@ INLINE_OBSERVATION(RARE_GC_STRUCT, bool, "rarely called, has gc str
INLINE_OBSERVATION(CONSTANT_ARG_FEEDS_TEST, bool, "constant argument feeds test", INFORMATION, CALLSITE)
INLINE_OBSERVATION(DEPTH, int, "depth", INFORMATION, CALLSITE)
INLINE_OBSERVATION(FREQUENCY, int, "rough call site frequency", INFORMATION, CALLSITE)
INLINE_OBSERVATION(HAS_PROFILE, bool, "profile data is available", INFORMATION, CALLSITE)
INLINE_OBSERVATION(IN_LOOP, bool, "call site is in a loop", INFORMATION, CALLSITE)
INLINE_OBSERVATION(IN_TRY_REGION, bool, "call site is in a try region", INFORMATION, CALLSITE)
INLINE_OBSERVATION(IS_PROFITABLE_INLINE, bool, "profitable inline", INFORMATION, CALLSITE)
INLINE_OBSERVATION(IS_SAME_THIS, bool, "same this as root caller", INFORMATION, CALLSITE)
INLINE_OBSERVATION(IS_SIZE_DECREASING_INLINE, bool, "size decreasing inline", INFORMATION, CALLSITE)
INLINE_OBSERVATION(LOG_REPLAY_ACCEPT, bool, "accepted by log replay", INFORMATION, CALLSITE)
INLINE_OBSERVATION(PROFILE_FREQUENCY, double, "frequency from profile data", INFORMATION, CALLSITE)
INLINE_OBSERVATION(RANDOM_ACCEPT, bool, "random accept", INFORMATION, CALLSITE)
INLINE_OBSERVATION(WEIGHT, int, "call site frequency", INFORMATION, CALLSITE)
INLINE_OBSERVATION(WEIGHT, int, "frequency from block weight", INFORMATION, CALLSITE)

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

Expand Down
9 changes: 8 additions & 1 deletion src/coreclr/src/jit/inline.h
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,8 @@ class InlinePolicy
virtual void NoteSuccess() = 0;
virtual void NoteBool(InlineObservation obs, bool value) = 0;
virtual void NoteFatal(InlineObservation obs) = 0;
virtual void NoteInt(InlineObservation obs, int value) = 0;
virtual void NoteInt(InlineObservation obs, int value) = 0;
virtual void NoteDouble(InlineObservation obs, double value) = 0;

// Optional observations. Most policies ignore these.
virtual void NoteContext(InlineContext* context)
Expand Down Expand Up @@ -395,6 +396,12 @@ class InlineResult
m_Policy->NoteInt(obs, value);
}

// Make an observation with a double value
void NoteDouble(InlineObservation obs, double value)
{
m_Policy->NoteDouble(obs, value);
}

#if defined(DEBUG) || defined(INLINE_DATA)

// Record observation from an earlier failure.
Expand Down
Loading