Jitted Code Dropping Feature implemented

dotnet · Mar 27, 2017 · b4d51a5 · b4d51a5
1 parent 48e2448
commit b4d51a5
Show file tree

Hide file tree

Showing 16 changed files with 786 additions and 20 deletions.
diff --git a/src/debug/daccess/fntableaccess.h b/src/debug/daccess/fntableaccess.h
@@ -53,6 +53,9 @@ typedef struct _FakeHpRealCodeHdr
     LPVOID              phdrJitGCInfo;  // changed from BYTE*
 #if defined (FEATURE_GDBJIT)
     LPVOID              pCalledMethods;
+#endif
+#if defined(FEATURE_JIT_DROPPING)
+    LPVOID              phdrHeapList;
 #endif
     LPVOID              hdrMDesc;       // changed from MethodDesc*
     DWORD               nUnwindInfos;

diff --git a/src/inc/clrconfigvalues.h b/src/inc/clrconfigvalues.h
@@ -132,6 +132,13 @@ RETAIL_CONFIG_DWORD_INFO(EXTERNAL_FinalizeOnShutdown, W("FinalizeOnShutdown"), D
 // ARM
 //
 RETAIL_CONFIG_DWORD_INFO(UNSUPPORTED_ARMEnabled, W("ARMEnabled"), (DWORD)0, "Set it to 1 to enable ARM")
+RETAIL_CONFIG_DWORD_INFO(INTERNAL_JitDropEnabled, W("JitDropEnabled"), (DWORD)0, "Set it to 1 to enable Jit Dropping")
+RETAIL_CONFIG_DWORD_INFO(INTERNAL_JitDropMemThreshold, W("JitDropMemThreshold"), (DWORD)0, "Dropping jits when code heap usage is larger than this (in bytes)")
+RETAIL_CONFIG_DWORD_INFO(INTERNAL_JitDropMethodSizeThreshold, W("JitDropMethodSizeThreshold"), (DWORD)0, "Dropping jit for methods whose native code size larger than this (in bytes)")
+RETAIL_CONFIG_DWORD_INFO(INTERNAL_JitDropMaxLevel, W("JitDropMaxLevel"), (DWORD)0, "Dropping jits for all methods as it possible")
+RETAIL_CONFIG_DWORD_INFO(INTERNAL_JitDropPrintStat, W("JitDropPrintStat"), (DWORD)0, "Print statistics about Jit Dropping")
+RETAIL_CONFIG_DWORD_INFO(INTERNAL_JitDropMinVal, W("JitDropMinVal"), (DWORD)0, "Dropping jit if the value of the inner counter greater than this value (for debugging purpose only)")
+RETAIL_CONFIG_DWORD_INFO(INTERNAL_JitDropMaxVal, W("JitDropMaxVal"), (DWORD)0xffffffff, "Dropping jit the value of the inner counter less then this value (for debuggin purpose only)")
 
 //
 // Assembly Loader

diff --git a/src/inc/loaderheap.h b/src/inc/loaderheap.h
@@ -418,7 +418,7 @@ class UnlockedLoaderHeap
 #endif
 
 protected:
-    void *UnlockedAllocMemForCode_NoThrow(size_t dwHeaderSize, size_t dwCodeSize, DWORD dwCodeAlignment);
+    void *UnlockedAllocMemForCode_NoThrow(size_t dwHeaderSize, size_t dwCodeSize, DWORD dwCodeAlignment, bool updateAllocPtr = true);
 
     void UnlockedSetReservedRegion(BYTE* dwReservedRegionAddress, SIZE_T dwReservedRegionSize, BOOL fReleaseMemory);
 };
@@ -835,10 +835,10 @@ class ExplicitControlLoaderHeap : public UnlockedLoaderHeap
 
 
 public:
-    void *AllocMemForCode_NoThrow(size_t dwHeaderSize, size_t dwCodeSize, DWORD dwCodeAlignment)
+    void *AllocMemForCode_NoThrow(size_t dwHeaderSize, size_t dwCodeSize, DWORD dwCodeAlignment, bool updateAllocPtr = true)
     {
         WRAPPER_NO_CONTRACT;
-        return UnlockedAllocMemForCode_NoThrow(dwHeaderSize, dwCodeSize, dwCodeAlignment);
+        return UnlockedAllocMemForCode_NoThrow(dwHeaderSize, dwCodeSize, dwCodeAlignment, updateAllocPtr);
     }
 
     void SetReservedRegion(BYTE* dwReservedRegionAddress, SIZE_T dwReservedRegionSize, BOOL fReleaseMemory)

diff --git a/src/jit/codegencommon.cpp b/src/jit/codegencommon.cpp
@@ -3213,7 +3213,11 @@ void CodeGen::genGenerateCode(void** codePtr, ULONG* nativeSizeOfCode)
     }
 #endif // EMIT_TRACK_STACK_DEPTH
 
-    *nativeSizeOfCode                 = codeSize;
+    if (nativeSizeOfCode != nullptr)
+    {
+        *nativeSizeOfCode = codeSize;
+    }
+
     compiler->info.compNativeCodeSize = (UNATIVE_OFFSET)codeSize;
 
     // printf("%6u bytes of code generated for %s.%s\n", codeSize, compiler->info.compFullName);

diff --git a/src/utilcode/loaderheap.cpp b/src/utilcode/loaderheap.cpp
@@ -1720,7 +1720,7 @@ void *UnlockedLoaderHeap::UnlockedAllocAlignedMem(size_t  dwRequestedSize,
 
 
 
-void *UnlockedLoaderHeap::UnlockedAllocMemForCode_NoThrow(size_t dwHeaderSize, size_t dwCodeSize, DWORD dwCodeAlignment)
+void *UnlockedLoaderHeap::UnlockedAllocMemForCode_NoThrow(size_t dwHeaderSize, size_t dwCodeSize, DWORD dwCodeAlignment, bool updateAllocPtr)
 {
     CONTRACT(void*)
     {
@@ -1758,7 +1758,8 @@ void *UnlockedLoaderHeap::UnlockedAllocMemForCode_NoThrow(size_t dwHeaderSize, s
 
     BYTE *pResult = (BYTE *)ALIGN_UP(m_pAllocPtr + dwHeaderSize, dwCodeAlignment);
     EtwAllocRequest(this, pResult, (pResult + dwCodeSize) - m_pAllocPtr);
-    m_pAllocPtr = pResult + dwCodeSize;
+    if (updateAllocPtr)
+        m_pAllocPtr = pResult + dwCodeSize;
 
     RETURN pResult;
 }

diff --git a/src/vm/CMakeLists.txt b/src/vm/CMakeLists.txt
@@ -32,6 +32,10 @@ if(FEATURE_GDBJIT)
     add_definitions(-DFEATURE_GDBJIT)
 endif(FEATURE_GDBJIT)
 
+if(FEATURE_JIT_DROPPING)
+   add_definitions(-DFEATURE_JIT_DROPPING)
+endif(FEATURE_JIT_DROPPING)
+
 set(VM_SOURCES_DAC_AND_WKS_COMMON
     appdomain.cpp
     array.cpp