Modified: trunk/Source/_javascript_Core/ChangeLog (201847 => 201848)
--- trunk/Source/_javascript_Core/ChangeLog 2016-06-09 01:00:57 UTC (rev 201847)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-06-09 02:05:26 UTC (rev 201848)
@@ -1,5 +1,19 @@
2016-06-08 Benjamin Poulain <bpoul...@apple.com>
+ Change thresholdForOptimizeSoon to match thresholdForOptimizeAfterWarmUp
+
+ Unreviewed.
+
+ This adds back the assertion removed in r201845.
+ Making those threshold equal is completely perf neutral
+ (on Haswell rMBP with 20 runs).
+
+ * runtime/Options.cpp:
+ (JSC::Options::initialize):
+ * runtime/Options.h:
+
+2016-06-08 Benjamin Poulain <bpoul...@apple.com>
+
Tempory fix for the debug bots
Unreviewed.
Modified: trunk/Source/_javascript_Core/runtime/Options.cpp (201847 => 201848)
--- trunk/Source/_javascript_Core/runtime/Options.cpp 2016-06-09 01:00:57 UTC (rev 201847)
+++ trunk/Source/_javascript_Core/runtime/Options.cpp 2016-06-09 02:05:26 UTC (rev 201848)
@@ -449,6 +449,7 @@
// Do range checks where needed and make corrections to the options:
ASSERT(Options::thresholdForOptimizeAfterLongWarmUp() >= Options::thresholdForOptimizeAfterWarmUp());
+ ASSERT(Options::thresholdForOptimizeAfterWarmUp() >= Options::thresholdForOptimizeSoon());
ASSERT(Options::thresholdForOptimizeAfterWarmUp() >= 0);
dumpOptionsIfNeeded();
Modified: trunk/Source/_javascript_Core/runtime/Options.h (201847 => 201848)
--- trunk/Source/_javascript_Core/runtime/Options.h 2016-06-09 01:00:57 UTC (rev 201847)
+++ trunk/Source/_javascript_Core/runtime/Options.h 2016-06-09 02:05:26 UTC (rev 201848)
@@ -258,7 +258,7 @@
\
v(int32, thresholdForOptimizeAfterWarmUp, 511, Normal, nullptr) \
v(int32, thresholdForOptimizeAfterLongWarmUp, 885, Normal, nullptr) \
- v(int32, thresholdForOptimizeSoon, 853, Normal, nullptr) \
+ v(int32, thresholdForOptimizeSoon, 511, Normal, nullptr) \
v(int32, executionCounterIncrementForLoop, 2, Normal, nullptr) \
v(int32, executionCounterIncrementForEntry, 28, Normal, nullptr) \
\
