From c7564266f6709dadb7a2c2f94d52f316cf572f2d Mon Sep 17 00:00:00 2001 From: noahfalk Date: Mon, 27 Mar 2017 02:46:14 -0700 Subject: [PATCH] Change define name from FITJIT to TIERED_COMPILATION --- clr.coreclr.props | 2 +- clr.defines.targets | 2 +- clrdefinitions.cmake | 2 +- src/inc/clrconfigvalues.h | 2 +- src/vm/appdomain.cpp | 4 ++-- src/vm/appdomain.hpp | 4 ++-- src/vm/callcounter.cpp | 4 ++-- src/vm/callcounter.h | 4 ++-- src/vm/eeconfig.cpp | 4 ++-- src/vm/eeconfig.h | 4 ++-- src/vm/i386/stublinkerx86.cpp | 2 +- src/vm/method.hpp | 4 ++-- src/vm/methodtablebuilder.cpp | 2 +- src/vm/prestub.cpp | 10 +++++----- src/vm/tieredcompilation.cpp | 4 ++-- src/vm/tieredcompilation.h | 4 ++-- 16 files changed, 29 insertions(+), 29 deletions(-) diff --git a/clr.coreclr.props b/clr.coreclr.props index 726274224f9c..c72428699b51 100644 --- a/clr.coreclr.props +++ b/clr.coreclr.props @@ -13,7 +13,7 @@ true true true - true + true true true true diff --git a/clr.defines.targets b/clr.defines.targets index 1f9553c1f1fb..8958c304bddd 100644 --- a/clr.defines.targets +++ b/clr.defines.targets @@ -20,7 +20,7 @@ $(CDefines);FEATURE_DBG_PUBLISH $(CDefines);FEATURE_EVENT_TRACE $(CDefines);FEATURE_EVENTSOURCE_XPLAT - $(CDefines);FEATURE_FITJIT + $(CDefines);FEATURE_TIERED_COMPILATION $(CDefines);FEATURE_FULL_NGEN $(CDefines);FEATURE_HIJACK $(CDefines);FEATURE_INTEROP_DEBUGGING diff --git a/clrdefinitions.cmake b/clrdefinitions.cmake index 67107d205db3..9ca67decaff9 100644 --- a/clrdefinitions.cmake +++ b/clrdefinitions.cmake @@ -125,7 +125,7 @@ endif(FEATURE_EVENT_TRACE) if(CLR_CMAKE_PLATFORM_UNIX) add_definitions(-DFEATURE_EVENTSOURCE_XPLAT=1) endif(CLR_CMAKE_PLATFORM_UNIX) -add_definitions(-DFEATURE_FITJIT) +add_definitions(-DFEATURE_TIERED_COMPILATION) # NetBSD doesn't implement this feature if(NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD) add_definitions(-DFEATURE_HIJACK) diff --git a/src/inc/clrconfigvalues.h b/src/inc/clrconfigvalues.h index 3fecdf45f30b..0a285a173e29 100644 --- a/src/inc/clrconfigvalues.h +++ b/src/inc/clrconfigvalues.h @@ -973,7 +973,7 @@ RETAIL_CONFIG_DWORD_INFO(INTERNAL_HillClimbing_GainExponent, // // Tiered Compilation // -#ifdef FEATURE_FITJIT +#ifdef FEATURE_TIERED_COMPILATION RETAIL_CONFIG_DWORD_INFO(UNSUPPORTED_TieredCompilation, W("EXPERIMENTAL_TieredCompilation"), 0, "Enables tiered compilation") #endif diff --git a/src/vm/appdomain.cpp b/src/vm/appdomain.cpp index f3b0cf0cf2e9..4e149c3b8474 100644 --- a/src/vm/appdomain.cpp +++ b/src/vm/appdomain.cpp @@ -4333,7 +4333,7 @@ void AppDomain::Init() } #endif //FEATURE_COMINTEROP -#ifdef FEATURE_FITJIT +#ifdef FEATURE_TIERED_COMPILATION m_callCounter.SetTieredCompilationManager(&GetTieredCompilationManager()); m_tieredCompilationManager.Init(GetId()); #endif @@ -8266,7 +8266,7 @@ void AppDomain::Exit(BOOL fRunFinalizers, BOOL fAsyncExit) // and then the UnwindThreads() call below is where blocking will occur to ensure the threads // have exited the domain. // -#ifdef FEATURE_FITJIT +#ifdef FEATURE_TIERED_COMPILATION m_tieredCompilationManager.OnAppDomainShutdown(); #endif diff --git a/src/vm/appdomain.hpp b/src/vm/appdomain.hpp index b77b33f04a14..3f922cac0b46 100644 --- a/src/vm/appdomain.hpp +++ b/src/vm/appdomain.hpp @@ -43,7 +43,7 @@ #include "appxutil.h" -#ifdef FEATURE_FITJIT +#ifdef FEATURE_TIERED_COMPILATION #include "tieredcompilation.h" #include "callcounter.h" #endif @@ -3828,7 +3828,7 @@ class AppDomain : public BaseDomain #endif -#if defined(FEATURE_FITJIT) +#if defined(FEATURE_TIERED_COMPILATION) public: TieredCompilationManager & GetTieredCompilationManager() diff --git a/src/vm/callcounter.cpp b/src/vm/callcounter.cpp index 094414b1d51e..5f82175c1f62 100644 --- a/src/vm/callcounter.cpp +++ b/src/vm/callcounter.cpp @@ -14,7 +14,7 @@ #include "tieredcompilation.h" #include "callcounter.h" -#ifdef FEATURE_FITJIT +#ifdef FEATURE_TIERED_COMPILATION CallCounter::CallCounter() { @@ -98,4 +98,4 @@ BOOL CallCounter::OnMethodCalled(MethodDesc* pMethodDesc) return pCallCounterSink->OnMethodCalled(pMethodDesc, callCount); } -#endif // FEATURE_FITJIT +#endif // FEATURE_TIERED_COMPILATION diff --git a/src/vm/callcounter.h b/src/vm/callcounter.h index fcc1a4913422..3de2b1cc359e 100644 --- a/src/vm/callcounter.h +++ b/src/vm/callcounter.h @@ -10,7 +10,7 @@ #ifndef CALL_COUNTER_H #define CALL_COUNTER_H -#ifdef FEATURE_FITJIT +#ifdef FEATURE_TIERED_COMPILATION // One entry in our dictionary mapping methods to the number of times they // have been invoked @@ -80,6 +80,6 @@ class CallCounter CallCounterHash m_methodToCallCount; }; -#endif // FEATURE_FITJIT +#endif // FEATURE_TIERED_COMPILATION #endif // CALL_COUNTER_H diff --git a/src/vm/eeconfig.cpp b/src/vm/eeconfig.cpp index ab3158c9a5dd..812d1df671f9 100644 --- a/src/vm/eeconfig.cpp +++ b/src/vm/eeconfig.cpp @@ -403,7 +403,7 @@ HRESULT EEConfig::Init() bDiagnosticSuspend = false; #endif -#if defined(FEATURE_FITJIT) +#if defined(FEATURE_TIERED_COMPILATION) fTieredCompilation = false; #endif @@ -1281,7 +1281,7 @@ HRESULT EEConfig::sync() dwSleepOnExit = CLRConfig::GetConfigValue(CLRConfig::UNSUPPORTED_SleepOnExit); -#if defined(FEATURE_FITJIT) +#if defined(FEATURE_TIERED_COMPILATION) fTieredCompilation = CLRConfig::GetConfigValue(CLRConfig::UNSUPPORTED_TieredCompilation) != 0; #endif diff --git a/src/vm/eeconfig.h b/src/vm/eeconfig.h index bee0856fcd29..e97385e3da07 100644 --- a/src/vm/eeconfig.h +++ b/src/vm/eeconfig.h @@ -295,7 +295,7 @@ class EEConfig bool JitMinOpts(void) const {LIMITED_METHOD_CONTRACT; return fJitMinOpts; } // Tiered Compilation config -#if defined(FEATURE_FITJIT) +#if defined(FEATURE_TIERED_COMPILATION) bool TieredCompilation(void) const {LIMITED_METHOD_CONTRACT; return fTieredCompilation; } #endif @@ -1187,7 +1187,7 @@ class EEConfig DWORD testThreadAbort; #endif -#if defined(FEATURE_FITJIT) +#if defined(FEATURE_TIERED_COMPILATION) bool fTieredCompilation; #endif diff --git a/src/vm/i386/stublinkerx86.cpp b/src/vm/i386/stublinkerx86.cpp index a69e7f377d28..d95131467632 100644 --- a/src/vm/i386/stublinkerx86.cpp +++ b/src/vm/i386/stublinkerx86.cpp @@ -6713,7 +6713,7 @@ BOOL FixupPrecode::SetTargetInterlocked(TADDR target, TADDR expected) } else if (pOldValue[OFFSETOF_PRECODE_TYPE_CALL_OR_JMP] == FixupPrecode::Type) { -#ifdef FEATURE_FITJIT +#ifdef FEATURE_TIERED_COMPILATION // No change needed, jmp is already in place #else // Setting the target more than once is unexpected diff --git a/src/vm/method.hpp b/src/vm/method.hpp index ac11e73e5602..ef07be4f363b 100644 --- a/src/vm/method.hpp +++ b/src/vm/method.hpp @@ -1290,7 +1290,7 @@ class MethodDesc public: -#ifdef FEATURE_FITJIT +#ifdef FEATURE_TIERED_COMPILATION // Is this method allowed to be recompiled and the entrypoint redirected so that we // can optimize its performance? Eligibility is invariant for the lifetime of a method. BOOL IsEligibleForTieredCompilation() @@ -1325,7 +1325,7 @@ class MethodDesc { LIMITED_METHOD_DAC_CONTRACT; return -#ifdef FEATURE_FITJIT +#ifdef FEATURE_TIERED_COMPILATION !IsEligibleForTieredCompilation() && #endif !IsEnCMethod(); diff --git a/src/vm/methodtablebuilder.cpp b/src/vm/methodtablebuilder.cpp index 8791961f4141..4efc587fecab 100644 --- a/src/vm/methodtablebuilder.cpp +++ b/src/vm/methodtablebuilder.cpp @@ -7032,7 +7032,7 @@ MethodTableBuilder::NeedsNativeCodeSlot(bmtMDMethod * pMDMethod) LIMITED_METHOD_CONTRACT; -#ifdef FEATURE_FITJIT +#ifdef FEATURE_TIERED_COMPILATION // Keep in-sync with MethodDesc::IsEligibleForTieredCompilation() if (g_pConfig->TieredCompilation() && !GetModule()->HasNativeOrReadyToRunImage() && diff --git a/src/vm/prestub.cpp b/src/vm/prestub.cpp index 86bcb5c7d8d5..28c127ed66a8 100644 --- a/src/vm/prestub.cpp +++ b/src/vm/prestub.cpp @@ -48,7 +48,7 @@ #include "perfmap.h" #endif -#ifdef FEATURE_FITJIT +#ifdef FEATURE_TIERED_COMPILATION #include "callcounter.h" #endif @@ -271,7 +271,7 @@ PCODE MethodDesc::MakeJitWorker(COR_ILMETHOD_DECODER* ILHeader, CORJIT_FLAGS fla PCODE pCode = NULL; ULONG sizeOfCode = 0; -#if defined(FEATURE_INTERPRETER) || defined(FEATURE_FITJIT) +#if defined(FEATURE_INTERPRETER) || defined(FEATURE_TIERED_COMPILATION) BOOL fStable = TRUE; // True iff the new code address (to be stored in pCode), is a stable entry point. #endif #ifdef FEATURE_INTERPRETER @@ -287,7 +287,7 @@ PCODE MethodDesc::MakeJitWorker(COR_ILMETHOD_DECODER* ILHeader, CORJIT_FLAGS fla // If this is the first stage of a tiered compilation progression, use min-opt, otherwise // use default compilation options -#ifdef FEATURE_FITJIT +#ifdef FEATURE_TIERED_COMPILATION if (!IsEligibleForTieredCompilation()) { fStable = TRUE; @@ -1307,7 +1307,7 @@ PCODE MethodDesc::DoPrestub(MethodTable *pDispatchingMT) // in place so that we can continue intercepting method invocations. // When the TieredCompilationManager has received enough call notifications // for this method only then do we back-patch it. -#ifdef FEATURE_FITJIT +#ifdef FEATURE_TIERED_COMPILATION PCODE pNativeCode = GetNativeCode(); if (pNativeCode && IsEligibleForTieredCompilation()) { @@ -1623,7 +1623,7 @@ PCODE MethodDesc::DoPrestub(MethodTable *pDispatchingMT) // in place so that we can continue intercepting method invocations. // When the TieredCompilationManager has received enough call notifications // for this method only then do we back-patch it. -#ifdef FEATURE_FITJIT +#ifdef FEATURE_TIERED_COMPILATION if (pCode && IsEligibleForTieredCompilation()) { CallCounter & callCounter = GetAppDomain()->GetCallCounter(); diff --git a/src/vm/tieredcompilation.cpp b/src/vm/tieredcompilation.cpp index 8adbf3b03247..b88775884b78 100644 --- a/src/vm/tieredcompilation.cpp +++ b/src/vm/tieredcompilation.cpp @@ -80,7 +80,7 @@ // errors are limited to OS resource exhaustion or poorly behaved managed code // (for example within an AssemblyResolve event or static constructor triggered by the JIT). -#ifdef FEATURE_FITJIT +#ifdef FEATURE_TIERED_COMPILATION // Called at AppDomain construction TieredCompilationManager::TieredCompilationManager() : @@ -374,4 +374,4 @@ MethodDesc* TieredCompilationManager::GetNextMethodToOptimize() return NULL; } -#endif // FEATURE_FITJIT +#endif // FEATURE_TIERED_COMPILATION diff --git a/src/vm/tieredcompilation.h b/src/vm/tieredcompilation.h index 27fe49a32a59..71236c5374aa 100644 --- a/src/vm/tieredcompilation.h +++ b/src/vm/tieredcompilation.h @@ -10,7 +10,7 @@ #ifndef TIERED_COMPILATION_H #define TIERED_COMPILATION_H -#ifdef FEATURE_FITJIT +#ifdef FEATURE_TIERED_COMPILATION // TieredCompilationManager determines which methods should be recompiled and // how they should be recompiled to best optimize the running code. It then @@ -46,6 +46,6 @@ class TieredCompilationManager DWORD m_optimizationQuantumMs; }; -#endif // FEATURE_FITJIT +#endif // FEATURE_TIERED_COMPILATION #endif // TIERED_COMPILATION_H