diff options
author | Swaroop Sridhar <swaroops@microsoft.com> | 2016-07-20 16:50:22 -0700 |
---|---|---|
committer | Swaroop Sridhar <swaroops@microsoft.com> | 2016-08-05 14:05:55 -0700 |
commit | d302e64bcb4ea445f6702c529f8a964df20ab494 (patch) | |
tree | 6fda2c392acf1d44aa4222ed6d9813533c455a0a /src/gcinfo | |
parent | 5b0953d50e9d0c6e388643210476d6a95a55a247 (diff) | |
download | coreclr-d302e64bcb4ea445f6702c529f8a964df20ab494.tar.gz coreclr-d302e64bcb4ea445f6702c529f8a964df20ab494.tar.bz2 coreclr-d302e64bcb4ea445f6702c529f8a964df20ab494.zip |
Implement GcInfo v2
Ref #4379
This change implements GcInfo version 2 for all platforms that use the
GcInfo library (all architectures other than X86).
Changes are:
1) Defines ReturnKind enumeration for all platforms
2) Change the GcInfo encoder library to encode the ReturnKind and ReversePInvokeFrame slot
3) Change the CM's GcInfo decoder to encode the ReturnKind and ReversePInvokeFrame slot for GCINFO_VERSION 2
4) Some corrections to GCINFO_MEASUREments
5) Changes to RYU Jit to provide the correct information to the encoder
6) Changes to the VM to use the ReturnKind information while hijacking a thread
- If ReturnKind is available from GcInfo, new hijack routines are used
- Otherwise, fall back to old method (for compatibility)
7) Rework and simplify the thread hijack routines by scanning HijackFrames directly for gcroots
8) Supporting code to implement the above features.
Returning Structs in multiple registers
Hijacking for StructInRegs is currently only implemented for
Unix SystemV ABI Multi-reg struct returns. However, the hijack-workers that use
ReturnKind are ready to handle other platforms (ex: ARM/ARM64 Windows)
once the corresponding HijackTripThread() assembly routines are defined.
The New feature flag: FEATURE_MULTIREG_RETURN is set for platforms where a struct value
can be returned in multiple registers [ex: Windows/Unix ARM/ARM64, Unix-AMD64]
FEATURE_UNIX_AMD64_STRUCT_PASSING is a specific kind of FEATURE_MULTIREG_RETURN
specified by SystemV ABI for AMD64
Compatibility with other JITs
- All new GCInfo generated by RYU Jit is in GcInfo version 2
- All Ngen images must be regenerated with the new GcInfo version.
- Ready-to-run images with old GcInfo will continue to work.
- Jit64/X64 uses the GcInfo library, so it generates GcInfo version 2.
However, it doesn't (yet) provide the data to encode the correct ReturnKind
Similar is the case for ARM32 code running on JIT32, and any other JITs
that may be using GcInfo library but not yet modified to use the new API.
So, compatibility is achived using RT_Unset flag.
When ReturnKind is RT_Unset, it means that the JIT did not set
the ReturnKind in the GCInfo, and therefore the VM cannot rely on it,
and must use other mechanisms (similar to GcInfo ver 1) to determine
the Return type's GC information.
Implement GC root scanning for Hijack-frames
This change implements GCScanRoots() method for Hijacke-frames
based on the ReturnKind information available from the GcInfo.
If the exact ReturnKind is not available in the GcInfo, the
thread-suspension logic will compute the ReturnKind based on
the method-signature.
As a result of this change, several hijack-helpers in the VM
are cleaned up. There's only one implementation of HijackWorker()
to handle all returnKinds.
This change also simplifies the thread-hijack logic by using a
single assembly helper OnHijackTripThread() in most cases.
The only other helper used is for X86 floating point return values
for save/restoring the top of the FP stack.
ARM64
Only GcIndfo v2 is reliably supported for ARM64 platform.
The changes to thread-hijack mechanism fixes #6494 for ARM64.
No measurable change in JIT throughput, performance or native-image
size from this change.
Diffstat (limited to 'src/gcinfo')
-rw-r--r-- | src/gcinfo/gcinfoencoder.cpp | 63 |
1 files changed, 57 insertions, 6 deletions
diff --git a/src/gcinfo/gcinfoencoder.cpp b/src/gcinfo/gcinfoencoder.cpp index 514a3c96be..3e587ea5ef 100644 --- a/src/gcinfo/gcinfoencoder.cpp +++ b/src/gcinfo/gcinfoencoder.cpp @@ -324,13 +324,17 @@ typedef SimplerHashTable<const BitArray *, LiveStateFuncs, UINT32, GcInfoHashBeh // Pi = partially-interruptible; methods with zero fully-interruptible ranges GcInfoSize g_FiGcInfoSize; GcInfoSize g_PiGcInfoSize; +// Number of methods with GcInfo that have SlimHeader +size_t g_NumSlimHeaders = 0; +// Number of methods with GcInfo that have FatHeader +size_t g_NumFatHeaders = 0; GcInfoSize::GcInfoSize() { memset(this, 0, sizeof(*this)); } -GcInfoSize& operator+=(const GcInfoSize& other) +GcInfoSize& GcInfoSize::operator+=(const GcInfoSize& other) { TotalSize += other.TotalSize; @@ -351,7 +355,7 @@ GcInfoSize& operator+=(const GcInfoSize& other) GenericsCtxSize += other.GenericsCtxSize; PspSymSize += other.PspSymSize; StackBaseSize += other.StackBaseSize; - FrameMarkerSize += other.FrameMarkerSize; + ReversePInvokeFrameSize += other.ReversePInvokeFrameSize; FixedAreaSize += other.FixedAreaSize; NumCallSitesSize += other.NumCallSitesSize; NumRangesSize += other.NumRangesSize; @@ -398,8 +402,9 @@ void GcInfoSize::Log(DWORD level, const char * header) LogSpew(LF_GCINFO, level, "GsCookie: %Iu\n", GsCookieSize); LogSpew(LF_GCINFO, level, "PspSym: %Iu\n", PspSymSize); LogSpew(LF_GCINFO, level, "GenericsCtx: %Iu\n", GenericsCtxSize); - LogSpew(LF_GCINFO, level, "FrameMarker: %Iu\n", FrameMarkerSize); + LogSpew(LF_GCINFO, level, "StackBase: %Iu\n", StackBaseSize); LogSpew(LF_GCINFO, level, "FixedArea: %Iu\n", FixedAreaSize); + LogSpew(LF_GCINFO, level, "ReversePInvokeFrame: %Iu\n", ReversePInvokeFrameSize); LogSpew(LF_GCINFO, level, "NumCallSites: %Iu\n", NumCallSitesSize); LogSpew(LF_GCINFO, level, "NumRanges: %Iu\n", NumRangesSize); LogSpew(LF_GCINFO, level, "CallSiteOffsets: %Iu\n", CallSitePosSize); @@ -488,17 +493,27 @@ GcInfoEncoder::GcInfoEncoder( m_StackBaseRegister = NO_STACK_BASE_REGISTER; m_SizeOfEditAndContinuePreservedArea = NO_SIZE_OF_EDIT_AND_CONTINUE_PRESERVED_AREA; + m_ReversePInvokeFrameSlot = NO_REVERSE_PINVOKE_FRAME; m_WantsReportOnlyLeaf = false; m_IsVarArg = false; m_pLastInterruptibleRange = NULL; #ifdef _DEBUG m_IsSlotTableFrozen = FALSE; +#endif //_DEBUG + +#ifndef _TARGET_X86_ + // If the compiler doesn't set the GCInfo, report RT_Unset. + // This is used for compatibility with JITs that aren't updated to use the new API. + m_ReturnKind = RT_Unset; +#else + m_ReturnKind = RT_Illegal; +#endif // _TARGET_X86_ m_CodeLength = 0; #ifdef FIXED_STACK_PARAMETER_SCRATCH_AREA m_SizeOfStackOutgoingAndScratchArea = -1; #endif // FIXED_STACK_PARAMETER_SCRATCH_AREA -#endif //_DEBUG + } #ifdef PARTIALLY_INTERRUPTIBLE_GC_SUPPORTED @@ -758,6 +773,17 @@ void GcInfoEncoder::SetSizeOfStackOutgoingAndScratchArea( UINT32 size ) } #endif // FIXED_STACK_PARAMETER_SCRATCH_AREA +void GcInfoEncoder::SetReversePInvokeFrameSlot(INT32 spOffset) +{ + m_ReversePInvokeFrameSlot = spOffset; +} + +void GcInfoEncoder::SetReturnKind(ReturnKind returnKind) +{ + _ASSERTE(IsValidReturnKind(returnKind)); + + m_ReturnKind = returnKind; +} struct GcSlotDescAndId { @@ -765,7 +791,6 @@ struct GcSlotDescAndId UINT32 m_SlotId; }; - int __cdecl CompareSlotDescAndIdBySlotDesc(const void* p1, const void* p2) { const GcSlotDesc* pFirst = &reinterpret_cast<const GcSlotDescAndId*>(p1)->m_SlotDesc; @@ -985,20 +1010,26 @@ void GcInfoEncoder::Build() // Method header /////////////////////////////////////////////////////////////////////// + UINT32 hasSecurityObject = (m_SecurityObjectStackSlot != NO_SECURITY_OBJECT); UINT32 hasGSCookie = (m_GSCookieStackSlot != NO_GS_COOKIE); UINT32 hasContextParamType = (m_GenericsInstContextStackSlot != NO_GENERICS_INST_CONTEXT); + UINT32 hasReversePInvokeFrame = (m_ReversePInvokeFrameSlot != NO_REVERSE_PINVOKE_FRAME); BOOL slimHeader = (!m_IsVarArg && !hasSecurityObject && !hasGSCookie && (m_PSPSymStackSlot == NO_PSP_SYM) && - !hasContextParamType && !m_WantsReportOnlyLeaf && (m_InterruptibleRanges.Count() == 0) && + !hasContextParamType && !m_WantsReportOnlyLeaf && (m_InterruptibleRanges.Count() == 0) && !hasReversePInvokeFrame && ((m_StackBaseRegister == NO_STACK_BASE_REGISTER) || (NORMALIZE_STACK_BASE_REGISTER(m_StackBaseRegister) == 0))) && (m_SizeOfEditAndContinuePreservedArea == NO_SIZE_OF_EDIT_AND_CONTINUE_PRESERVED_AREA); + // All new code is generated for the latest GCINFO_VERSION. + // So, always encode RetunrKind and encode ReversePInvokeFrameSlot where applicable. if (slimHeader) { // Slim encoding means nothing special, partially interruptible, maybe a default frame register GCINFO_WRITE(m_Info1, 0, 1, FlagsSize); // Slim encoding GCINFO_WRITE(m_Info1, (m_StackBaseRegister == NO_STACK_BASE_REGISTER) ? 0 : 1, 1, FlagsSize); + + GCINFO_WRITE(m_Info1, m_ReturnKind, SIZE_OF_RETURN_KIND_IN_SLIM_HEADER, RetKindSize); } else { @@ -1011,6 +1042,9 @@ void GcInfoEncoder::Build() GCINFO_WRITE(m_Info1, ((m_StackBaseRegister != NO_STACK_BASE_REGISTER) ? 1 : 0), 1, FlagsSize); GCINFO_WRITE(m_Info1, (m_WantsReportOnlyLeaf ? 1 : 0), 1, FlagsSize); GCINFO_WRITE(m_Info1, ((m_SizeOfEditAndContinuePreservedArea != NO_SIZE_OF_EDIT_AND_CONTINUE_PRESERVED_AREA) ? 1 : 0), 1, FlagsSize); + GCINFO_WRITE(m_Info1, (hasReversePInvokeFrame ? 1 : 0), 1, FlagsSize); + + GCINFO_WRITE(m_Info1, m_ReturnKind, SIZE_OF_RETURN_KIND_IN_FAT_HEADER, RetKindSize); } _ASSERTE( m_CodeLength > 0 ); @@ -1109,6 +1143,12 @@ void GcInfoEncoder::Build() GCINFO_WRITE_VARL_U(m_Info1, m_SizeOfEditAndContinuePreservedArea, SIZE_OF_EDIT_AND_CONTINUE_PRESERVED_AREA_ENCBASE, EncPreservedSlots); } + if (hasReversePInvokeFrame) + { + _ASSERTE(!slimHeader); + GCINFO_WRITE_VARL_S(m_Info1, NORMALIZE_STACK_SLOT(m_ReversePInvokeFrameSlot), REVERSE_PINVOKE_FRAME_ENCBASE, ReversePInvokeFrameSize); + } + #ifdef FIXED_STACK_PARAMETER_SCRATCH_AREA if (!slimHeader) { @@ -2305,6 +2345,15 @@ lExitSuccess:; //------------------------------------------------------------------- #ifdef MEASURE_GCINFO + if (slimHeader) + { + g_NumSlimHeaders++; + } + else + { + g_NumFatHeaders++; + } + m_CurrentMethodSize.NumMethods = 1; #ifdef PARTIALLY_INTERRUPTIBLE_GC_SUPPORTED m_CurrentMethodSize.NumCallSites = m_NumCallSites; @@ -2331,6 +2380,8 @@ lExitSuccess:; m_CurrentMethodSize.Log(LL_INFO100, "=== PartiallyInterruptible method breakdown ===\r\n"); g_PiGcInfoSize.Log(LL_INFO10, "=== PartiallyInterruptible global breakdown ===\r\n"); } + LogSpew(LF_GCINFO, LL_INFO10, "Total SlimHeaders: %Iu\n", g_NumSlimHeaders); + LogSpew(LF_GCINFO, LL_INFO10, "NumMethods: %Iu\n", g_NumFatHeaders); #endif } |