More efficient executable allocator

src/coreclr/debug/daccess/dacdbiimpl.cpp

@@ -3617,11 +3617,7 @@ void DacDbiInterfaceImpl::EnumerateMemRangesForLoaderAllocator(PTR_LoaderAllocat
     if (pVcsMgr)
     {
         if (pVcsMgr->indcell_heap != NULL) heapsToEnumerate.Push(pVcsMgr->indcell_heap);
-        if (pVcsMgr->lookup_heap != NULL) heapsToEnumerate.Push(pVcsMgr->lookup_heap);
-        if (pVcsMgr->resolve_heap != NULL) heapsToEnumerate.Push(pVcsMgr->resolve_heap);
-        if (pVcsMgr->dispatch_heap != NULL) heapsToEnumerate.Push(pVcsMgr->dispatch_heap);
         if (pVcsMgr->cache_entry_heap != NULL) heapsToEnumerate.Push(pVcsMgr->cache_entry_heap);
-        if (pVcsMgr->vtable_heap != NULL) heapsToEnumerate.Push(pVcsMgr->vtable_heap);
     }
 
     TADDR rangeAccumAsTaddr = TO_TADDR(rangeAcummulator);

src/coreclr/debug/daccess/fntableaccess.h

@@ -41,6 +41,7 @@ struct FakeHeapList
     DWORD_PTR           pHdrMap;        // changed from DWORD*
     size_t              maxCodeHeapSize;
     size_t              reserveForJumpStubs;
+    DWORD_PTR           pLoaderAllocator;
 #if defined(TARGET_AMD64) || defined(TARGET_ARM64)
     DWORD_PTR           CLRPersonalityRoutine;
 #endif

src/coreclr/debug/daccess/request.cpp

@@ -3519,26 +3519,10 @@ ClrDataAccess::TraverseVirtCallStubHeap(CLRDATA_ADDRESS pAppDomain, VCSHeapType
                 pLoaderHeap = pVcsMgr->indcell_heap;
                 break;
 
-            case LookupHeap:
-                pLoaderHeap = pVcsMgr->lookup_heap;
-                break;
-
-            case ResolveHeap:
-                pLoaderHeap = pVcsMgr->resolve_heap;
-                break;
-
-            case DispatchHeap:
-                pLoaderHeap = pVcsMgr->dispatch_heap;
-                break;
-
             case CacheEntryHeap:
                 pLoaderHeap = pVcsMgr->cache_entry_heap;
                 break;
 
-            case VtableHeap:
-                pLoaderHeap = pVcsMgr->vtable_heap;
-                break;
-
             default:
                 hr = E_INVALIDARG;
         }
@@ -3585,11 +3569,7 @@ static const char *LoaderAllocatorLoaderHeapNames[] =
     "FixupPrecodeHeap",
     "NewStubPrecodeHeap",
     "IndcellHeap",
-    "LookupHeap",
-    "ResolveHeap",
-    "DispatchHeap",
     "CacheEntryHeap",
-    "VtableHeap",
 };
 
 
@@ -3632,11 +3612,7 @@ HRESULT ClrDataAccess::GetLoaderAllocatorHeaps(CLRDATA_ADDRESS loaderAllocatorAd
             else
             {
                 pLoaderHeaps[i++] = HOST_CDADDR(pVcsMgr->indcell_heap);
-                pLoaderHeaps[i++] = HOST_CDADDR(pVcsMgr->lookup_heap);
-                pLoaderHeaps[i++] = HOST_CDADDR(pVcsMgr->resolve_heap);
-                pLoaderHeaps[i++] = HOST_CDADDR(pVcsMgr->dispatch_heap);
                 pLoaderHeaps[i++] = HOST_CDADDR(pVcsMgr->cache_entry_heap);
-                pLoaderHeaps[i++] = HOST_CDADDR(pVcsMgr->vtable_heap);
             }
 
             // All of the above are "LoaderHeap" and not the ExplicitControl version.

src/coreclr/inc/executableallocator.h

@@ -20,6 +20,16 @@
 // This class is responsible for allocation of all the executable memory in the runtime.
 class ExecutableAllocator
 {
+public:
+
+    enum CacheableMapping
+    {
+        AddToCache,
+        DoNotAddToCache,
+    };
+
+private:
+
     // RX address range block descriptor
     struct BlockRX
     {
@@ -61,6 +71,11 @@ class ExecutableAllocator
 
     static int64_t g_releaseCount;
     static int64_t g_reserveCount;
+
+    static int64_t g_MapRW_Calls;
+    static int64_t g_MapRW_CallsWithCacheMiss;
+    static int64_t g_MapRW_LinkedListWalkDepth;
+    static int64_t g_LinkedListTotalDepth;
 #endif
     // Instance of the allocator
     static ExecutableAllocator* g_instance;
@@ -102,9 +117,19 @@ class ExecutableAllocator
     // for platforms that don't use shared memory.
     size_t m_freeOffset = 0;
 
-    // Last RW mapping cached so that it can be reused for the next mapping
+// Uncomment these to gather information to better choose caching parameters
+//#define VARIABLE_SIZED_CACHEDMAPPING_SIZE
+
+    // Last RW mappings cached so that it can be reused for the next mapping
     // request if it goes into the same range.
-    BlockRW* m_cachedMapping = NULL;
+    // This is handled as a 3 element cache with an LRU replacement policy
+#ifdef VARIABLE_SIZED_CACHEDMAPPING_SIZE
+    // If variable sized mappings enabled, make the cache physically big enough to cover all interesting sizes
+    static int g_cachedMappingSize;
+    BlockRW* m_cachedMapping[16] = { 0 };
+#else
+    BlockRW* m_cachedMapping[3] = { 0 };
+#endif
 
     // Synchronization of the public allocator methods
     CRITSEC_COOKIE m_CriticalSection;
@@ -114,15 +139,18 @@ class ExecutableAllocator
     // and replaces it by the passed in one.
     void UpdateCachedMapping(BlockRW *pBlock);
 
-    // Remove the cached mapping
-    void RemoveCachedMapping();
+    // Remove the cached mapping (1 based indexing)
+    void RemoveCachedMapping(size_t indexToRemove);
+
+    // Find an overlapped cached mapping with pBlock, or return 0
+    size_t FindOverlappingCachedMapping(BlockRX* pBlock);
 
     // Find existing RW block that maps the whole specified range of RX memory.
     // Return NULL if no such block exists.
-    void* FindRWBlock(void* baseRX, size_t size);
+    void* FindRWBlock(void* baseRX, size_t size, CacheableMapping cacheMapping);
 
     // Add RW block to the list of existing RW blocks
-    bool AddRWBlock(void* baseRW, void* baseRX, size_t size);
+    bool AddRWBlock(void* baseRW, void* baseRX, size_t size, CacheableMapping cacheMapping);
 
     // Remove RW block from the list of existing RW blocks and return the base
     // address and size the underlying memory was mapped at.
@@ -230,7 +258,7 @@ class ExecutableAllocator
     void Release(void* pRX);
 
     // Map the specified block of executable memory as RW
-    void* MapRW(void* pRX, size_t size);
+    void* MapRW(void* pRX, size_t size, CacheableMapping cacheMapping);
 
     // Unmap the RW mapping at the specified address
     void UnmapRW(void* pRW);
@@ -290,14 +318,14 @@ class ExecutableWriterHolder
     {
     }
 
-    ExecutableWriterHolder(T* addressRX, size_t size)
+    ExecutableWriterHolder(T* addressRX, size_t size, ExecutableAllocator::CacheableMapping cacheMapping = ExecutableAllocator::AddToCache)
     {
         m_addressRX = addressRX;
 #if defined(HOST_OSX) && defined(HOST_ARM64)
         m_addressRW = addressRX;
         PAL_JitWriteProtect(true);
 #else
-        m_addressRW = (T *)ExecutableAllocator::Instance()->MapRW((void*)addressRX, size);
+        m_addressRW = (T *)ExecutableAllocator::Instance()->MapRW((void*)addressRX, size, cacheMapping);
 #endif
     }
 
@@ -320,7 +348,7 @@ class ExecutableWriterHolder
 
 #ifdef LOG_EXECUTABLE_ALLOCATOR_STATISTICS
 #undef ExecutableWriterHolder
-#ifdef TARGET_UNIX
+#ifdef HOST_UNIX
 #define ExecutableWriterHolder ExecutableAllocator::LogUsage(__FILE__, __LINE__, __PRETTY_FUNCTION__); ExecutableWriterHolderNoLog
 #define AssignExecutableWriterHolder(addressRX, size) AssignExecutableWriterHolder(addressRX, size); ExecutableAllocator::LogUsage(__FILE__, __LINE__, __PRETTY_FUNCTION__); 
 #else

src/coreclr/inc/holder.h

@@ -946,7 +946,7 @@ FORCEINLINE void StubRelease(TYPE* value)
     if (value)
     {
 #ifdef LOG_EXECUTABLE_ALLOCATOR_STATISTICS
-#ifdef TARGET_UNIX
+#ifdef HOST_UNIX
         LOGGER::LogUsage(__FILE__, __LINE__, __PRETTY_FUNCTION__);
 #else
         LOGGER::LogUsage(__FILE__, __LINE__, __FUNCTION__);

src/coreclr/inc/loaderheap.h

@@ -154,6 +154,17 @@ struct LoaderHeapEvent;
 
 
 
+// When an interleaved LoaderHeap is constructed, this is the interleaving size
+inline UINT32 GetStubCodePageSize()
+{
+#if defined(TARGET_ARM64) && defined(TARGET_UNIX)
+    return max(16*1024, GetOsPageSize());
+#elif defined(TARGET_ARM)
+    return 4096; // ARM is special as the 32bit instruction set does not easily permit a 16KB offset
+#else
+    return 16*1024;
+#endif
+}
 
 
 
@@ -185,6 +196,7 @@ class UnlockedLoaderHeap
 {
 #ifdef _DEBUG
     friend class LoaderHeapSniffer;
+    friend struct LoaderHeapFreeBlock;
 #endif
 
 #ifdef DACCESS_COMPILE
@@ -276,7 +288,7 @@ class UnlockedLoaderHeap
 
 public:
     BOOL                m_fExplicitControl;  // Am I a LoaderHeap or an ExplicitControlLoaderHeap?
-    void                (*m_codePageGenerator)(BYTE* pageBase, BYTE* pageBaseRX);
+    void                (*m_codePageGenerator)(BYTE* pageBase, BYTE* pageBaseRX, SIZE_T size);
 
 #ifdef DACCESS_COMPILE
 public:
@@ -298,7 +310,7 @@ class UnlockedLoaderHeap
                        SIZE_T dwReservedRegionSize,
                        RangeList *pRangeList = NULL,
                        HeapKind kind = HeapKind::Data,
-                       void (*codePageGenerator)(BYTE* pageBase, BYTE* pageBaseRX) = NULL,
+                       void (*codePageGenerator)(BYTE* pageBase, BYTE* pageBaseRX, SIZE_T size) = NULL,
                        DWORD dwGranularity = 1);
 
     ~UnlockedLoaderHeap();
@@ -467,7 +479,7 @@ class LoaderHeap : public UnlockedLoaderHeap, public ILoaderHeapBackout
                RangeList *pRangeList = NULL,
                UnlockedLoaderHeap::HeapKind kind = UnlockedLoaderHeap::HeapKind::Data,
                BOOL fUnlocked = FALSE,
-               void (*codePageGenerator)(BYTE* pageBase, BYTE* pageBaseRX) = NULL,
+               void (*codePageGenerator)(BYTE* pageBase, BYTE* pageBaseRX, SIZE_T size) = NULL,
                DWORD dwGranularity = 1
                )
       : UnlockedLoaderHeap(dwReserveBlockSize,
@@ -491,7 +503,7 @@ class LoaderHeap : public UnlockedLoaderHeap, public ILoaderHeapBackout
                RangeList *pRangeList = NULL,
                UnlockedLoaderHeap::HeapKind kind = UnlockedLoaderHeap::HeapKind::Data,
                BOOL fUnlocked = FALSE,
-               void (*codePageGenerator)(BYTE* pageBase, BYTE* pageBaseRX) = NULL,
+               void (*codePageGenerator)(BYTE* pageBase, BYTE* pageBaseRX, SIZE_T size) = NULL,
                DWORD dwGranularity = 1
                )
       : UnlockedLoaderHeap(dwReserveBlockSize,