diff options
Diffstat (limited to 'src/jit/lclvars.cpp')
| -rw-r--r-- | src/jit/lclvars.cpp | 142 |
1 files changed, 123 insertions, 19 deletions
diff --git a/src/jit/lclvars.cpp b/src/jit/lclvars.cpp index 374f255173..b46948773c 100644 --- a/src/jit/lclvars.cpp +++ b/src/jit/lclvars.cpp @@ -235,6 +235,60 @@ void Compiler::lvaInitTypeRef() lvaInitArgs(&varDscInfo); +#if FEATURE_FASTTAILCALL + + //------------------------------------------------------------------------- + // Calculate the argument register usage. + // + // This will later be used for fastTailCall determination + //------------------------------------------------------------------------- + + unsigned argRegCount = 0; + unsigned floatingRegCount = 0; + size_t stackSize = 0; + + auto incrementRegCount = [&floatingRegCount, &argRegCount](LclVarDsc* varDsc) { + if (varDsc->lvIsHfa()) + { + floatingRegCount += varDsc->lvHfaSlots(); + } + else + { + varDsc->IsFloatRegType() ? ++floatingRegCount : ++argRegCount; + } + }; + + unsigned argNum; + LclVarDsc* curDsc; + + for (curDsc = lvaTable, argNum = 0; argNum < varDscInfo.varNum; argNum++, curDsc++) + { + if (curDsc->lvIsRegArg) + { + incrementRegCount(curDsc); +#if FEATURE_MULTIREG_ARGS + if (curDsc->lvOtherArgReg != REG_NA) + { + incrementRegCount(curDsc); + } +#endif // FEATURE_MULTIREG_ARGS + } + else + { + stackSize += curDsc->lvArgStackSize(); + } + } + + //------------------------------------------------------------------------- + // Save the register usage information and stack size. + //------------------------------------------------------------------------- + + info.compArgRegCount = argRegCount; + info.compFloatArgRegCount = floatingRegCount; + info.compArgStackSize = stackSize; + +#endif // FEATURE_FASTTAILCALL + //------------------------------------------------------------------------- // Finally the local variables //------------------------------------------------------------------------- @@ -247,15 +301,16 @@ void Compiler::lvaInitTypeRef() i++, varNum++, varDsc++, localsSig = info.compCompHnd->getArgNext(localsSig)) { CORINFO_CLASS_HANDLE typeHnd; - CorInfoTypeWithMod corInfoType = + CorInfoTypeWithMod corInfoTypeWithMod = info.compCompHnd->getArgType(&info.compMethodInfo->locals, localsSig, &typeHnd); + CorInfoType corInfoType = strip(corInfoTypeWithMod); - lvaInitVarDsc(varDsc, varNum, strip(corInfoType), typeHnd, localsSig, &info.compMethodInfo->locals); + lvaInitVarDsc(varDsc, varNum, corInfoType, typeHnd, localsSig, &info.compMethodInfo->locals); - varDsc->lvPinned = ((corInfoType & CORINFO_TYPE_MOD_PINNED) != 0); + varDsc->lvPinned = ((corInfoTypeWithMod & CORINFO_TYPE_MOD_PINNED) != 0); varDsc->lvOnFrame = true; // The final home for this local variable might be our local stack frame - if (strip(corInfoType) == CORINFO_TYPE_CLASS) + if (corInfoType == CORINFO_TYPE_CLASS) { CORINFO_CLASS_HANDLE clsHnd = info.compCompHnd->getArgClass(&info.compMethodInfo->locals, localsSig); lvaSetClass(varNum, clsHnd); @@ -1253,6 +1308,10 @@ void Compiler::lvaInitVarDsc(LclVarDsc* varDsc, #ifdef DEBUG varDsc->lvStkOffs = BAD_STK_OFFS; #endif + +#if FEATURE_MULTIREG_ARGS + varDsc->lvOtherArgReg = REG_NA; +#endif // FEATURE_MULTIREG_ARGS } /***************************************************************************** @@ -1477,14 +1536,13 @@ void Compiler::lvaCanPromoteStructType(CORINFO_CLASS_HANDLE typeHnd, #if 1 // TODO-Cleanup: Consider removing this entire #if block in the future -// This method has two callers. The one in Importer.cpp passes sortFields == false -// and the other passes sortFields == true. -// This is a workaround that leaves the inlining behavior the same as before while still -// performing extra struct promotions when compiling the method. +// This method has two callers. The one in Importer.cpp passes `sortFields == false` and the other passes +// `sortFields == true`. This is a workaround that leaves the inlining behavior the same as before while still +// performing extra struct promotion when compiling the method. // -// The x86 legacy back-end can't handle the more general RyuJIT struct promotion (notably structs -// with holes), in genPushArgList(), so in that case always check for custom layout. -#if FEATURE_FIXED_OUT_ARGS || !defined(LEGACY_BACKEND) +// The legacy back-end can't handle this more general struct promotion (notably structs with holes) in +// morph/genPushArgList()/SetupLateArgs, so in that case always check for custom layout. +#if !defined(LEGACY_BACKEND) if (!sortFields) // the condition "!sortFields" really means "we are inlining" #endif { @@ -2036,7 +2094,12 @@ void Compiler::lvaPromoteLongVars() fieldVarDsc->lvFldOffset = (unsigned char)(index * genTypeSize(TYP_INT)); fieldVarDsc->lvFldOrdinal = (unsigned char)index; fieldVarDsc->lvParentLcl = lclNum; - fieldVarDsc->lvIsParam = isParam; + // Currently we do not support enregistering incoming promoted aggregates with more than one field. + if (isParam) + { + fieldVarDsc->lvIsParam = true; + lvaSetVarDoNotEnregister(varNum DEBUGARG(DNER_LongParamField)); + } } } @@ -2171,6 +2234,11 @@ void Compiler::lvaSetVarDoNotEnregister(unsigned varNum DEBUGARG(DoNotEnregister assert(varDsc->lvPinned); break; #endif +#if !defined(LEGACY_BACKEND) && !defined(_TARGET_64BIT_) + case DNER_LongParamField: + JITDUMP("it is a decomposed field of a long parameter\n"); + break; +#endif default: unreached(); break; @@ -3441,6 +3509,48 @@ void LclVarDsc::lvaDisqualifyVar() } #endif // ASSERTION_PROP +/********************************************************************************** +* Get stack size of the varDsc. +*/ +const size_t LclVarDsc::lvArgStackSize() const +{ + // Make sure this will have a stack size + assert(!this->lvIsRegArg); + + size_t stackSize = 0; + if (varTypeIsStruct(this)) + { +#if defined(WINDOWS_AMD64_ABI) + // Structs are either passed by reference or can be passed by value using one pointer + stackSize = TARGET_POINTER_SIZE; +#elif defined(_TARGET_ARM64_) || defined(FEATURE_UNIX_AMD64_STRUCT_PASSING) + // lvSize performs a roundup. + stackSize = this->lvSize(); + +#if defined(_TARGET_ARM64_) + if ((stackSize > TARGET_POINTER_SIZE * 2) && (!this->lvIsHfa())) + { + // If the size is greater than 16 bytes then it will + // be passed by reference. + stackSize = TARGET_POINTER_SIZE; + } +#endif // defined(_TARGET_ARM64_) + +#else // !_TARGET_ARM64_ !WINDOWS_AMD64_ABI !FEATURE_UNIX_AMD64_STRUCT_PASSING + + NYI("Unsupported target."); + unreached(); + +#endif // !_TARGET_ARM64_ !WINDOWS_AMD64_ABI !FEATURE_UNIX_AMD64_STRUCT_PASSING + } + else + { + stackSize = TARGET_POINTER_SIZE; + } + + return stackSize; +} + #ifndef LEGACY_BACKEND /********************************************************************************** * Get type of a variable when passed as an argument. @@ -4478,7 +4588,7 @@ unsigned Compiler::lvaGetMaxSpillTempSize() void Compiler::lvaAssignFrameOffsets(FrameLayoutState curState) { - noway_assert(lvaDoneFrameLayout < curState); + noway_assert((lvaDoneFrameLayout < curState) || (curState == REGALLOC_FRAME_LAYOUT)); lvaDoneFrameLayout = curState; @@ -5643,13 +5753,7 @@ void Compiler::lvaAssignVirtualFrameOffsetsToLocals() bool tempsAllocated = false; -#ifdef _TARGET_ARM_ - // On ARM, SP based offsets use smaller encoding. Since temps are relatively - // rarer than lcl usage, allocate them farther from SP. - if (!opts.MinOpts() && !compLocallocUsed) -#else if (lvaTempsHaveLargerOffsetThanVars() && !codeGen->isFramePointerUsed()) -#endif { // Because we want the temps to have a larger offset than locals // and we're not using a frame pointer, we have to place the temps |