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

Skip to content

JIT: Split out call importation into new importercalls.cpp #76792

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 10 commits into from
Oct 10, 2022
Merged

JIT: Split out call importation into new importercalls.cpp #76792

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
01a7a38
JIT: Add importercalls.cpp for upcoming split, remove underscores fro…
jakobbotsch Oct 9, 2022
404b3d2
JIT: Move impImportCall, impImportJitTestLabelMark, impFixupCallStruc…
jakobbotsch Oct 9, 2022
15415a9
JIT: Move impImportIndirectCall, impPopArgsForUnmanagedCall
jakobbotsch Oct 9, 2022
a90d2ff
JIT: Move impInitializeArrayIntrinsic, impCreateSpanIntrinsic, impInt…
jakobbotsch Oct 9, 2022
bb8aee1
JIT: Move impPopCallArgs, impPopReverseCallArgs
jakobbotsch Oct 9, 2022
9c99434
JIT: Move impTransformThis, impCanPInvokeInline, impCanPInvokeInlineC…
jakobbotsch Oct 9, 2022
0af3741
JIT: Move SpillRetExprHelper, addFatPointerCandidate, pickGDV, isComp…
jakobbotsch Oct 9, 2022
96af210
JIT: Move impMarkInlineCandidate, impMarkInlineCandidateHelper, IsTar…
jakobbotsch Oct 9, 2022
e1f51c2
JIT: Move impTailCallRetTypeCompatible, impCheckCanInline
jakobbotsch Oct 9, 2022
66cca97
JIT: Move impMathIntrinsic, lookupNamedIntrinsic, impUnsupportedNamed…
jakobbotsch Oct 9, 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
Prev Previous commit
Next Next commit
JIT: Move impPopCallArgs, impPopReverseCallArgs
  • Loading branch information
@jakobbotsch
jakobbotsch committed Oct 10, 2022
commit bb8aee12e63883ee18692981980a1e3520174cb0
147 changes: 0 additions & 147 deletions src/coreclr/jit/importer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,138 +801,6 @@ void Compiler::impAssignTempGen(unsigned tmpNum,
}
}

//------------------------------------------------------------------------
// impPopCallArgs:
// Pop the given number of values from the stack and return a list node with
// their values.
//
// Parameters:
// sig - Signature used to figure out classes the runtime must load, and
// also to record exact receiving argument types that may be needed for ABI
// purposes later.
// call - The call to pop arguments into.
//
void Compiler::impPopCallArgs(CORINFO_SIG_INFO* sig, GenTreeCall* call)
{
assert(call->gtArgs.IsEmpty());

if (impStackHeight() < sig->numArgs)
{
BADCODE("not enough arguments for call");
}

struct SigParamInfo
{
CorInfoType CorType;
CORINFO_CLASS_HANDLE ClassHandle;
};

SigParamInfo inlineParams[16];
SigParamInfo* params = sig->numArgs <= 16 ? inlineParams : new (this, CMK_CallArgs) SigParamInfo[sig->numArgs];

// We will iterate and pop the args in reverse order as we sometimes need
// to spill some args. However, we need signature information and the
// JIT-EE interface only allows us to iterate the signature forwards. We
// will collect the needed information here and at the same time notify the
// EE that the signature types need to be loaded.
CORINFO_ARG_LIST_HANDLE sigArg = sig->args;
for (unsigned i = 0; i < sig->numArgs; i++)
{
params[i].CorType = strip(info.compCompHnd->getArgType(sig, sigArg, &params[i].ClassHandle));

if (params[i].CorType != CORINFO_TYPE_CLASS && params[i].CorType != CORINFO_TYPE_BYREF &&
params[i].CorType != CORINFO_TYPE_PTR && params[i].CorType != CORINFO_TYPE_VAR)
{
CORINFO_CLASS_HANDLE argRealClass = info.compCompHnd->getArgClass(sig, sigArg);
if (argRealClass != nullptr)
{
// Make sure that all valuetypes (including enums) that we push are loaded.
// This is to guarantee that if a GC is triggered from the prestub of this methods,
// all valuetypes in the method signature are already loaded.
// We need to be able to find the size of the valuetypes, but we cannot
// do a class-load from within GC.
info.compCompHnd->classMustBeLoadedBeforeCodeIsRun(argRealClass);
}
}

sigArg = info.compCompHnd->getArgNext(sigArg);
}

if ((sig->retTypeSigClass != nullptr) && (sig->retType != CORINFO_TYPE_CLASS) &&
(sig->retType != CORINFO_TYPE_BYREF) && (sig->retType != CORINFO_TYPE_PTR) &&
(sig->retType != CORINFO_TYPE_VAR))
{
// Make sure that all valuetypes (including enums) that we push are loaded.
// This is to guarantee that if a GC is triggered from the prestub of this methods,
// all valuetypes in the method signature are already loaded.
// We need to be able to find the size of the valuetypes, but we cannot
// do a class-load from within GC.
info.compCompHnd->classMustBeLoadedBeforeCodeIsRun(sig->retTypeSigClass);
}

// Now create the arguments in reverse.
for (unsigned i = sig->numArgs; i > 0; i--)
{
StackEntry se = impPopStack();
typeInfo ti = se.seTypeInfo;
GenTree* argNode = se.val;

var_types jitSigType = JITtype2varType(params[i - 1].CorType);
CORINFO_CLASS_HANDLE classHnd = params[i - 1].ClassHandle;

if (!impCheckImplicitArgumentCoercion(jitSigType, argNode->TypeGet()))
{
BADCODE("the call argument has a type that can't be implicitly converted to the signature type");
}

if (varTypeIsStruct(argNode))
{
// Morph trees that aren't already OBJs or MKREFANY to be OBJs
assert(ti.IsType(TI_STRUCT));

JITDUMP("Calling impNormStructVal on:\n");
DISPTREE(argNode);

argNode = impNormStructVal(argNode, classHnd, CHECK_SPILL_ALL);
// For SIMD types the normalization can normalize TYP_STRUCT to
// e.g. TYP_SIMD16 which we keep (along with the class handle) in
// the CallArgs.
jitSigType = argNode->TypeGet();

JITDUMP("resulting tree:\n");
DISPTREE(argNode);
}
else
{
// insert implied casts (from float to double or double to float)
if ((jitSigType == TYP_DOUBLE) && argNode->TypeIs(TYP_FLOAT))
{
argNode = gtNewCastNode(TYP_DOUBLE, argNode, false, TYP_DOUBLE);
}
else if ((jitSigType == TYP_FLOAT) && argNode->TypeIs(TYP_DOUBLE))
{
argNode = gtNewCastNode(TYP_FLOAT, argNode, false, TYP_FLOAT);
}

// insert any widening or narrowing casts for backwards compatibility
argNode = impImplicitIorI4Cast(argNode, jitSigType);
}

NewCallArg arg;
if (varTypeIsStruct(jitSigType))
{
arg = NewCallArg::Struct(argNode, jitSigType, classHnd);
}
else
{
arg = NewCallArg::Primitive(argNode, jitSigType);
}

call->gtArgs.PushFront(this, arg);
call->gtFlags |= argNode->gtFlags & GTF_GLOB_EFFECT;
}
}

static bool TypeIs(var_types type1, var_types type2)
{
return type1 == type2;
Expand Down Expand Up @@ -1038,21 +906,6 @@ bool Compiler::impCheckImplicitArgumentCoercion(var_types sigType, var_types nod
return false;
}

/*****************************************************************************
*
* Pop the given number of values from the stack in reverse order (STDCALL/CDECL etc.)
* The first "skipReverseCount" items are not reversed.
*/

void Compiler::impPopReverseCallArgs(CORINFO_SIG_INFO* sig, GenTreeCall* call, unsigned skipReverseCount)
{
assert(skipReverseCount <= sig->numArgs);

impPopCallArgs(sig, call);

call->gtArgs.Reverse(skipReverseCount, sig->numArgs - skipReverseCount);
}

//------------------------------------------------------------------------
// impAssignStruct: Create a struct assignment
//
Expand Down
147 changes: 147 additions & 0 deletions src/coreclr/jit/importercalls.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4069,3 +4069,150 @@ GenTree* Compiler::impSRCSUnsafeIntrinsic(NamedIntrinsic intrinsic,
}
}
}

//------------------------------------------------------------------------
// impPopCallArgs:
// Pop the given number of values from the stack and return a list node with
// their values.
//
// Parameters:
// sig - Signature used to figure out classes the runtime must load, and
// also to record exact receiving argument types that may be needed for ABI
// purposes later.
// call - The call to pop arguments into.
//
void Compiler::impPopCallArgs(CORINFO_SIG_INFO* sig, GenTreeCall* call)
{
assert(call->gtArgs.IsEmpty());

if (impStackHeight() < sig->numArgs)
{
BADCODE("not enough arguments for call");
}

struct SigParamInfo
{
CorInfoType CorType;
CORINFO_CLASS_HANDLE ClassHandle;
};

SigParamInfo inlineParams[16];
SigParamInfo* params = sig->numArgs <= 16 ? inlineParams : new (this, CMK_CallArgs) SigParamInfo[sig->numArgs];

// We will iterate and pop the args in reverse order as we sometimes need
// to spill some args. However, we need signature information and the
// JIT-EE interface only allows us to iterate the signature forwards. We
// will collect the needed information here and at the same time notify the
// EE that the signature types need to be loaded.
CORINFO_ARG_LIST_HANDLE sigArg = sig->args;
for (unsigned i = 0; i < sig->numArgs; i++)
{
params[i].CorType = strip(info.compCompHnd->getArgType(sig, sigArg, &params[i].ClassHandle));

if (params[i].CorType != CORINFO_TYPE_CLASS && params[i].CorType != CORINFO_TYPE_BYREF &&
params[i].CorType != CORINFO_TYPE_PTR && params[i].CorType != CORINFO_TYPE_VAR)
{
CORINFO_CLASS_HANDLE argRealClass = info.compCompHnd->getArgClass(sig, sigArg);
if (argRealClass != nullptr)
{
// Make sure that all valuetypes (including enums) that we push are loaded.
// This is to guarantee that if a GC is triggered from the prestub of this methods,
// all valuetypes in the method signature are already loaded.
// We need to be able to find the size of the valuetypes, but we cannot
// do a class-load from within GC.
info.compCompHnd->classMustBeLoadedBeforeCodeIsRun(argRealClass);
}
}

sigArg = info.compCompHnd->getArgNext(sigArg);
}

if ((sig->retTypeSigClass != nullptr) && (sig->retType != CORINFO_TYPE_CLASS) &&
(sig->retType != CORINFO_TYPE_BYREF) && (sig->retType != CORINFO_TYPE_PTR) &&
(sig->retType != CORINFO_TYPE_VAR))
{
// Make sure that all valuetypes (including enums) that we push are loaded.
// This is to guarantee that if a GC is triggered from the prestub of this methods,
// all valuetypes in the method signature are already loaded.
// We need to be able to find the size of the valuetypes, but we cannot
// do a class-load from within GC.
info.compCompHnd->classMustBeLoadedBeforeCodeIsRun(sig->retTypeSigClass);
}

// Now create the arguments in reverse.
for (unsigned i = sig->numArgs; i > 0; i--)
{
StackEntry se = impPopStack();
typeInfo ti = se.seTypeInfo;
GenTree* argNode = se.val;

var_types jitSigType = JITtype2varType(params[i - 1].CorType);
CORINFO_CLASS_HANDLE classHnd = params[i - 1].ClassHandle;

if (!impCheckImplicitArgumentCoercion(jitSigType, argNode->TypeGet()))
{
BADCODE("the call argument has a type that can't be implicitly converted to the signature type");
}

if (varTypeIsStruct(argNode))
{
// Morph trees that aren't already OBJs or MKREFANY to be OBJs
assert(ti.IsType(TI_STRUCT));

JITDUMP("Calling impNormStructVal on:\n");
DISPTREE(argNode);

argNode = impNormStructVal(argNode, classHnd, CHECK_SPILL_ALL);
// For SIMD types the normalization can normalize TYP_STRUCT to
// e.g. TYP_SIMD16 which we keep (along with the class handle) in
// the CallArgs.
jitSigType = argNode->TypeGet();

JITDUMP("resulting tree:\n");
DISPTREE(argNode);
}
else
{
// insert implied casts (from float to double or double to float)
if ((jitSigType == TYP_DOUBLE) && argNode->TypeIs(TYP_FLOAT))
{
argNode = gtNewCastNode(TYP_DOUBLE, argNode, false, TYP_DOUBLE);
}
else if ((jitSigType == TYP_FLOAT) && argNode->TypeIs(TYP_DOUBLE))
{
argNode = gtNewCastNode(TYP_FLOAT, argNode, false, TYP_FLOAT);
}

// insert any widening or narrowing casts for backwards compatibility
argNode = impImplicitIorI4Cast(argNode, jitSigType);
}

NewCallArg arg;
if (varTypeIsStruct(jitSigType))
{
arg = NewCallArg::Struct(argNode, jitSigType, classHnd);
}
else
{
arg = NewCallArg::Primitive(argNode, jitSigType);
}

call->gtArgs.PushFront(this, arg);
call->gtFlags |= argNode->gtFlags & GTF_GLOB_EFFECT;
}
}

/*****************************************************************************
*
* Pop the given number of values from the stack in reverse order (STDCALL/CDECL etc.)
* The first "skipReverseCount" items are not reversed.
*/

void Compiler::impPopReverseCallArgs(CORINFO_SIG_INFO* sig, GenTreeCall* call, unsigned skipReverseCount)
{
assert(skipReverseCount <= sig->numArgs);

impPopCallArgs(sig, call);

call->gtArgs.Reverse(skipReverseCount, sig->numArgs - skipReverseCount);
}