Clean up

src/coreclr/inc/clrconfigvalues.h

@@ -594,11 +594,6 @@ RETAIL_CONFIG_DWORD_INFO(INTERNAL_TC_CallCounting, W("TC_CallCounting"), 1, "Ena
 RETAIL_CONFIG_DWORD_INFO(INTERNAL_TC_UseCallCountingStubs, W("TC_UseCallCountingStubs"), 1, "Uses call counting stubs for faster call counting.")
 RETAIL_CONFIG_DWORD_INFO(INTERNAL_TC_DeleteCallCountingStubsAfter, W("TC_DeleteCallCountingStubsAfter"), 0, "Deletes call counting stubs after this many have completed. Zero to disable deleting.")
 
-// Optimized instrumented tier produces less accurate profile, but it's faster and is able to inline code, otherwise for:
-// R2R -> Tier0 inst -> Tier1
-// we start to produce a lot of small redundant first-time compilations and delay promotion for tier1 pending methods
-// each new compilation delays promotion by TC_CallCountingDelayMs
-RETAIL_CONFIG_DWORD_INFO(UNSUPPORTED_TC_InstrumentOptimizedCode, W("TC_InstrumentOptimizedCode"), 1, "Instrumented tier should use optimized code")
 #undef TC_BackgroundWorkerTimeoutMs
 #undef TC_CallCountThreshold
 #undef TC_CallCountingDelayMs
@@ -623,7 +618,15 @@ CONFIG_DWORD_INFO(INTERNAL_OSR_HighId, W("OSR_HighId"), 10000000, "High end of e
 RETAIL_CONFIG_STRING_INFO(INTERNAL_PGODataPath, W("PGODataPath"), "Read/Write PGO data from/to the indicated file.")
 RETAIL_CONFIG_DWORD_INFO(INTERNAL_ReadPGOData, W("ReadPGOData"), 0, "Read PGO data")
 RETAIL_CONFIG_DWORD_INFO(INTERNAL_WritePGOData, W("WritePGOData"), 0, "Write PGO data")
-RETAIL_CONFIG_DWORD_INFO(INTERNAL_TieredPGO, W("TieredPGO"), 0, "Instrument Tier0 code and make counts available to Tier1")
+
+// Enabled for CI tests
+RETAIL_CONFIG_DWORD_INFO(INTERNAL_TieredPGO, W("TieredPGO"), 1, "Instrument Tier0 code and make counts available to Tier1")
+
+// Optimized instrumented tier produces less accurate profile, but it's faster and is able to inline code, otherwise for:
+// R2R -> Tier0 inst -> Tier1
+// we start to produce a lot of small redundant first-time compilations and delay promotion for tier1 pending methods
+// each new compilation delays promotion by TC_CallCountingDelayMs
+RETAIL_CONFIG_DWORD_INFO(UNSUPPORTED_TC_OptimizedInstrumentedTier, W("TC_OptimizedInstrumentedTier"), 1, "Instrumented tier should be optimized")
 #endif
 
 ///

src/coreclr/vm/eeconfig.cpp

@@ -741,11 +741,11 @@ HRESULT EEConfig::sync()
         }
 
         if (CLRConfig::GetConfigValue(CLRConfig::INTERNAL_TieredPGO) != 0 &&
-            CLRConfig::GetConfigValue(CLRConfig::UNSUPPORTED_TC_InstrumentOptimizedCode) == 0)
+            CLRConfig::GetConfigValue(CLRConfig::UNSUPPORTED_TC_OptimizedInstrumentedTier) == 0)
         {
-            // When we're not using optimizations in the instrumentation tier we produce a lot of new 
-            // first-time compilation due to disabled inlining - such first-time compilations delay promotions
-            // by tieredCompilation_CallCountingDelayMs
+            // When we're not using optimizations in the instrumented tier we produce a lot of new first-time compilation 
+            // due to disabled inlining even for very small methods - such first-time compilations delay promotions by
+            // tieredCompilation_CallCountingDelayMs
             tieredCompilation_CallCountingDelayMs /= 3;
             tieredCompilation_CallCountingDelayMs = max(1, tieredCompilation_CallCountingDelayMs);
         }

src/coreclr/vm/tieredcompilation.cpp

@@ -1046,7 +1046,7 @@ CORJIT_FLAGS TieredCompilationManager::GetJitFlags(PrepareCodeConfig *config)
                 if (nativeCodeVersion.GetOptimizationTier() == NativeCodeVersion::OptimizationTier::OptimizationTier0Instrumented)
                 {
                     flags.Set(CORJIT_FLAGS::CORJIT_FLAG_BBINSTR);
-                    if (CLRConfig::GetConfigValue(CLRConfig::UNSUPPORTED_TC_InstrumentOptimizedCode) != 0)
+                    if (CLRConfig::GetConfigValue(CLRConfig::UNSUPPORTED_TC_OptimizedInstrumentedTier) != 0)
                     {
                         flags.Set(CORJIT_FLAGS::CORJIT_FLAG_TIER1);
                     }
@@ -1083,7 +1083,7 @@ CORJIT_FLAGS TieredCompilationManager::GetJitFlags(PrepareCodeConfig *config)
             if (g_pConfig->TieredCompilation_QuickJit())
             {
                 flags.Set(CORJIT_FLAGS::CORJIT_FLAG_BBINSTR);
-                if (CLRConfig::GetConfigValue(CLRConfig::UNSUPPORTED_TC_InstrumentOptimizedCode) != 0)
+                if (CLRConfig::GetConfigValue(CLRConfig::UNSUPPORTED_TC_OptimizedInstrumentedTier) != 0)
                 {
                     flags.Set(CORJIT_FLAGS::CORJIT_FLAG_TIER1);
                 }