diff options
| author | Pat Gavlin <pagavlin@microsoft.com> | 2017-02-10 14:36:03 -0800 |
|---|---|---|
| committer | Pat Gavlin <pagavlin@microsoft.com> | 2017-02-10 14:46:43 -0800 |
| commit | bc3280b9d6d56ada0e9c4604aa7838fcbe40a278 (patch) | |
| tree | 802f729503c79241d8662a6a6cd345beb53cd4fc | |
| parent | dede051708f6651e4b50a2b3b7af72193285d27c (diff) | |
| download | coreclr-bc3280b9d6d56ada0e9c4604aa7838fcbe40a278.tar.gz coreclr-bc3280b9d6d56ada0e9c4604aa7838fcbe40a278.tar.bz2 coreclr-bc3280b9d6d56ada0e9c4604aa7838fcbe40a278.zip | |
Fix the release build with OPT_CONFIG and address PR feedback.
| -rw-r--r-- | src/jit/compiler.cpp | 4 | ||||
| -rw-r--r-- | src/jit/compiler.h | 5 | ||||
| -rw-r--r-- | src/jit/jitconfigvalues.h | 3 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/jit/compiler.cpp b/src/jit/compiler.cpp index 22bb4d9906..3c662b91cc 100644 --- a/src/jit/compiler.cpp +++ b/src/jit/compiler.cpp @@ -3892,10 +3892,6 @@ void Compiler::compSetOptimizationLevel() } } #else // !DEBUG -#if defined(OPT_CONFIG) - theMinOptsValue = JitConfig.JitMinOpts() != 0; -#endif // OPT_CONFIG - // Retail check if we should force Minopts due to the complexity of the method // For PREJIT we never drop down to MinOpts // unless unless CLFLG_MINOPT is set diff --git a/src/jit/compiler.h b/src/jit/compiler.h index 4239cf613b..2189324762 100644 --- a/src/jit/compiler.h +++ b/src/jit/compiler.h @@ -7790,8 +7790,11 @@ public: bool genFPopt; // Can we do frame-pointer-omission optimization? bool altJit; // True if we are an altjit and are compiling this method -#ifdef DEBUG +#ifdef OPT_CONFIG bool optRepeat; // Repeat optimizer phases k times +#endif + +#ifdef DEBUG bool compProcedureSplittingEH; // Separate cold code from hot code for functions with EH bool dspCode; // Display native code generated bool dspEHTable; // Display the EH table reported to the VM diff --git a/src/jit/jitconfigvalues.h b/src/jit/jitconfigvalues.h index 8e69c5e7b8..ea6a3aac23 100644 --- a/src/jit/jitconfigvalues.h +++ b/src/jit/jitconfigvalues.h @@ -68,6 +68,7 @@ CONFIG_INTEGER(JitInlineDepth, W("JITInlineDepth"), DEFAULT_MAX_INLINE_DEPTH) CONFIG_INTEGER(JitLongAddress, W("JitLongAddress"), 0) // Force using the large pseudo instruction form for long address CONFIG_INTEGER(JitMaxTempAssert, W("JITMaxTempAssert"), 1) CONFIG_INTEGER(JitMaxUncheckedOffset, W("JitMaxUncheckedOffset"), 8) +CONFIG_INTEGER(JitMinOpts, W("JITMinOpts"), 0) // Forces MinOpts CONFIG_INTEGER(JitMinOptsBbCount, W("JITMinOptsBbCount"), DEFAULT_MIN_OPTS_BB_COUNT) // Internal jit control of MinOpts CONFIG_INTEGER(JitMinOptsCodeSize, W("JITMinOptsCodeSize"), DEFAULT_MIN_OPTS_CODE_SIZE) // Internal jit control of // MinOpts @@ -239,8 +240,6 @@ CONFIG_INTEGER(JitDoRangeAnalysis, W("JitDoRangeAnalysis"), 1) // Perform range CONFIG_INTEGER(JitDoSsa, W("JitDoSsa"), 1) // Perform Static Single Assignment (SSA) numbering on the variables CONFIG_INTEGER(JitDoValueNumber, W("JitDoValueNumber"), 1) // Perform value numbering on method expressions -CONFIG_INTEGER(JitMinOpts, W("JITMinOpts"), 0) // Forces MinOpts - CONFIG_METHODSET(JitOptRepeat, W("JitOptRepeat")) // Runs optimizer multiple times on the method CONFIG_INTEGER(JitOptRepeatCount, W("JitOptRepeatCount"), 2) // Number of times to repeat opts when repeating #endif // defined(OPT_CONFIG) |