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.

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

Jump to bottom

Allow the inliner to substitute for small arguments #69068

Merged
merged 4 commits into from
May 17, 2022
Merged

Allow the inliner to substitute for small arguments #69068

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e040c32
Allow the inliner to substitute for small arguments
jakobbotsch May 9, 2022
154cf95
More work to enable this
jakobbotsch May 9, 2022
3d0cdb2
Revert previous commit, should no longer be necessary
jakobbotsch May 13, 2022
e64a5dc
Merge branch 'main' of github.com:dotnet/runtime into inliner-substit…
jakobbotsch May 13, 2022
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
14 changes: 1 addition & 13 deletions src/coreclr/jit/fginline.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1535,17 +1535,6 @@ Statement* Compiler::fgInlinePrependStatements(InlineInfo* inlineInfo)
CallArg* arg = argInfo.arg;
GenTree* argNode = arg->GetNode();

// TODO-ARGS: This can probably be relaxed, the old comment was:
// argHasPutArg disqualifies the arg from a direct substitution because we don't have information about
// its user. For example: replace `LCL_VAR short` with `PUTARG_TYPE short->LCL_VAR int`,
// we should keep `PUTARG_TYPE` iff the user is a call that needs `short` and delete it otherwise.
//
// Today we no longer have this contextual PUTARG_TYPE and morph
// should properly handle substituting a TYP_INT node for a
// TYP_SHORT LCL_VAR (at least for a call arg).
bool argHasPutArg = !varTypeIsStruct(arg->GetSignatureType()) &&
(genTypeSize(argNode) != genTypeSize(arg->GetSignatureType()));

assert(!argNode->OperIs(GT_RET_EXPR));

if (argInfo.argHasTmp)
Expand All @@ -1566,8 +1555,7 @@ Statement* Compiler::fgInlinePrependStatements(InlineInfo* inlineInfo)

GenTree* argSingleUseNode = argInfo.argBashTmpNode;

if ((argSingleUseNode != nullptr) && !(argSingleUseNode->gtFlags & GTF_VAR_CLONED) && argIsSingleDef &&
!argHasPutArg)
if ((argSingleUseNode != nullptr) && !(argSingleUseNode->gtFlags & GTF_VAR_CLONED) && argIsSingleDef)
{
// Change the temp in-place to the actual argument.
// We currently do not support this for struct arguments, so it must not be a GT_OBJ.
Expand Down