From 275806ead0878d340070b6244a4d17860b8a75ce Mon Sep 17 00:00:00 2001 From: Guilherme Ottoni Date: Thu, 13 Aug 2015 10:47:20 -0700 Subject: [PATCH] Clean up initialization of Eval.JitLoops option Summary: Now that hotcfg is the default region selector, just set JitLoops to true directly. Reviewed By: @paulbiss Differential Revision: D2340892 --- hphp/runtime/base/runtime-option.cpp | 9 --------- hphp/runtime/base/runtime-option.h | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/hphp/runtime/base/runtime-option.cpp b/hphp/runtime/base/runtime-option.cpp index 6b4a404082e..223e87b4f3b 100644 --- a/hphp/runtime/base/runtime-option.cpp +++ b/hphp/runtime/base/runtime-option.cpp @@ -415,15 +415,6 @@ static inline std::string pgoRegionSelectorDefault() { #endif } -static inline bool loopsDefault() { -#ifdef HHVM_JIT_LOOPS_BY_DEFAULT - return true; -#else - return (RuntimeOption::EvalJitPGORegionSelector == "wholecfg" || - RuntimeOption::EvalJitPGORegionSelector == "hotcfg"); -#endif -} - static inline bool hhirConstrictGuardsDefault() { #ifdef HHVM_CONSTRICT_GUARDS_BY_DEFAULT return true; diff --git a/hphp/runtime/base/runtime-option.h b/hphp/runtime/base/runtime-option.h index 01f89de3b1b..bbf93e4804a 100644 --- a/hphp/runtime/base/runtime-option.h +++ b/hphp/runtime/base/runtime-option.h @@ -530,7 +530,7 @@ public: F(uint32_t, JitPGOMinBlockCountPercent, 0) \ F(double, JitPGOMinArcProbability, 0.0) \ F(uint32_t, JitPGOMaxFuncSizeDupBody, 80) \ - F(bool, JitLoops, loopsDefault()) \ + F(bool, JitLoops, true) \ F(uint32_t, HotFuncCount, 4100) \ F(bool, HHIRConstrictGuards, hhirConstrictGuardsDefault()) \ F(bool, HHIRRelaxGuards, hhirRelaxGuardsDefault()) \ -- 2.11.4.GIT