Back out changeset 16a18faa5363 (bug 1273955) for causing frequent timeouts in browser_wa_destroy-node-01.js
authorPhil Ringnalda <philringnalda@gmail.com>
Mon, 23 May 2016 18:59:27 -0700
changeset 323036 a94bd69a86169a16b818795845e8d75ab5ea2ffd
parent 323035 589b2826c6c5875717f653d2ed4e0bdf7c2b6b3f
child 323037 200726fdfb53829ef6dd3e538964367e95196144
push id9671
push userraliiev@mozilla.com
push dateMon, 06 Jun 2016 20:27:52 +0000
treeherdermozilla-aurora@cea65ca3d0bd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1273955
milestone49.0a1
backs out16a18faa536392f4a263a1470f177bbeb338c324
Back out changeset 16a18faa5363 (bug 1273955) for causing frequent timeouts in browser_wa_destroy-node-01.js CLOSED TREE
js/src/jit/IonOptimizationLevels.cpp
js/src/jit/JitOptions.cpp
--- a/js/src/jit/IonOptimizationLevels.cpp
+++ b/js/src/jit/IonOptimizationLevels.cpp
@@ -35,21 +35,21 @@ OptimizationInfo::initNormalOptimization
     gvn_ = true;
     rangeAnalysis_ = true;
     reordering_ = true;
     sincos_ = true;
     sink_ = true;
 
     registerAllocator_ = RegisterAllocator_Backtracking;
 
-    inlineMaxBytecodePerCallSiteMainThread_ = 550;
-    inlineMaxBytecodePerCallSiteOffThread_ = 1100;
-    inlineMaxCalleeInlinedBytecodeLength_ = 3550;
-    inlineMaxTotalBytecodeLength_ = 85000;
-    inliningMaxCallerBytecodeLength_ = 1600;
+    inlineMaxBytecodePerCallSiteMainThread_ = 500;
+    inlineMaxBytecodePerCallSiteOffThread_ = 1000;
+    inlineMaxCalleeInlinedBytecodeLength_ = 3350;
+    inlineMaxTotalBytecodeLength_ = 80000;
+    inliningMaxCallerBytecodeLength_ = 1500;
     maxInlineDepth_ = 3;
     scalarReplacement_ = true;
     smallFunctionMaxInlineDepth_ = 10;
     compilerWarmUpThreshold_ = CompilerWarmupThreshold;
     compilerSmallFunctionWarmUpThreshold_ = CompilerSmallFunctionWarmupThreshold;
     inliningWarmUpThresholdFactor_ = 0.125;
     inliningRecompileThresholdFactor_ = 4;
 }
--- a/js/src/jit/JitOptions.cpp
+++ b/js/src/jit/JitOptions.cpp
@@ -161,17 +161,17 @@ DefaultJitOptions::DefaultJitOptions()
     // How many actual arguments are accepted on the C stack.
     SET_DEFAULT(maxStackArgs, 4096);
 
     // How many times we will try to enter a script via OSR before
     // invalidating the script.
     SET_DEFAULT(osrPcMismatchesBeforeRecompile, 6000);
 
     // The bytecode length limit for small function.
-    SET_DEFAULT(smallFunctionMaxBytecodeLength_, 130);
+    SET_DEFAULT(smallFunctionMaxBytecodeLength_, 120);
 
     // An artificial testing limit for the maximum supported offset of
     // pc-relative jump and call instructions.
     SET_DEFAULT(jumpThreshold, UINT32_MAX);
 
     // Force how many invocation or loop iterations are needed before compiling
     // a function with the highest ionmonkey optimization level.
     // (i.e. OptimizationLevel_Normal)