Change define name from FITJIT to TIERED_COMPILATION

clr.coreclr.props

@@ -13,7 +13,7 @@
     <FeatureDbiOopDebugging_HostOneCorex86 Condition="'$(TargetArch)' == 'i386' or '$(TargetArch)' == 'arm'">true</FeatureDbiOopDebugging_HostOneCorex86>
     <FeatureDbiOopDebugging_HostOneCoreamd64 Condition="'$(TargetArch)' == 'amd64'">true</FeatureDbiOopDebugging_HostOneCoreamd64>
     <FeatureEventTrace>true</FeatureEventTrace>
-    <FeatureFitJit>true</FeatureFitJit>
+    <FeatureTieredCompilation>true</FeatureTieredCompilation>
     <FeatureFrameworkInternal>true</FeatureFrameworkInternal>
     <FeatureHijack>true</FeatureHijack>
     <FeatureInteropDebugging Condition="('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'amd64')">true</FeatureInteropDebugging>

clr.defines.targets

@@ -20,7 +20,7 @@
         <CDefines Condition="'$(FeatureDbgPublish)' == 'true'">$(CDefines);FEATURE_DBG_PUBLISH</CDefines>
         <CDefines Condition="'$(FeatureEventTrace)' == 'true'">$(CDefines);FEATURE_EVENT_TRACE</CDefines>
         <CDefines Condition="'$(FeatureXplatEventSource)' == 'true'">$(CDefines);FEATURE_EVENTSOURCE_XPLAT</CDefines>
-        <CDefines Condition="'$(FeatureFitJit)' == 'true'">$(CDefines);FEATURE_FITJIT</CDefines>
+        <CDefines Condition="'$(FeatureTieredCompilation)' == 'true'">$(CDefines);FEATURE_TIERED_COMPILATION</CDefines>
         <CDefines Condition="'$(FeatureFullNGen)' == 'true'">$(CDefines);FEATURE_FULL_NGEN</CDefines>
         <CDefines Condition="'$(FeatureHijack)' == 'true'">$(CDefines);FEATURE_HIJACK</CDefines>
         <CDefines Condition="'$(FeatureInteropDebugging)' == 'true'">$(CDefines);FEATURE_INTEROP_DEBUGGING</CDefines>

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)

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
 

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
 

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()

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

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

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
 

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
 

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

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();

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() &&

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();

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

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