Remove some busy-OSR loops from tests using %OptimizeOsr().

R=mstarzinger@chromium.org
BUG=

Review URL: https://codereview.chromium.org/908863002

Cr-Commit-Position: refs/heads/master@{#26527}

test/mjsunit/count-based-osr.js

@@ -31,9 +31,8 @@
 
 function osr_this() {
   var a = 1;
-  // Trigger OSR. First check if optimization is disabled.
-  if (%GetOptimizationStatus(osr_this) == 4) return 1;
-  while (%GetOptimizationCount(osr_this) == 0) {}
+  while (%GetOptimizationCount(osr_this) == 2) ;
   return a;
 }
 assertEquals(1, osr_this());
+assertEquals(1, osr_this());

test/mjsunit/regress/binop-in-effect-context-deopt.js

@@ -31,7 +31,7 @@
   function f(a, deopt, osr) {
     var result = (a + 10, "result");
     var dummy = deopt + 0;
-    if (osr) while (%GetOptimizationStatus(f) == 2) {}
+    for (var i = 0; osr && i < 2; i++) %OptimizeOsr();
     return result;
   }
 

test/mjsunit/regress/call-function-in-effect-context-deopt.js

@@ -31,7 +31,7 @@ function f(deopt, osr) {
   var result = "result";
   %_CallFunction(0, 0, function() {});
   var dummy = deopt + 0;
-  if (osr) while (%GetOptimizationStatus(f) == 2) {}
+  for (var i = 0; osr && i < 2; i++) %OptimizeOsr();
   return result;
 }
 

test/mjsunit/regress/regress-1118.js

@@ -41,24 +41,10 @@ var o = new A();
 // inlined.
 function g() { try { return o.f(); } finally { }}
 
-// Optimization status (see runtime.cc):
-// 1 - yes, 2 - no, 3 - always, 4 - never.
-
 // This function should be optimized via OSR.
 function h() {
-  var optstatus = %GetOptimizationStatus(h);
-  if (optstatus == 4) {
-    // Optimizations are globally disabled; just run once.
-    g();
-  } else {
-    // Run for a bit as long as h is unoptimized.
-    if (%GetOptimizationStatus(h) != 4) {
-      while (%GetOptimizationCount(h) == 0) {
-        for (var j = 0; j < 100; j++) g();
-      }
-    }
-    g();
-  }
+  for (var i = 0; i < 10; i++) %OptimizeOsr();
+  g();
 }
 
 h();

test/mjsunit/regress/regress-2618.js

@@ -30,9 +30,7 @@
 function f() {
   do {
     do {
-      for (var i = 0; i < 10000000; i++) {
-        // This should run long enough to trigger OSR.
-      }
+      for (var i = 0; i < 10; i++) %OptimizeOsr();
     } while (false);
   } while (false);
 }
@@ -57,7 +55,7 @@ function g() {
             do {
               do {
                 do {
-                  for (var i = 0; i < 10000000; i++) { }
+                  for (var i = 0; i < 10; i++) %OptimizeOsr();
                 } while (false);
               } while (false);
             } while (false);

test/mjsunit/regress/regress-crbug-150545.js

@@ -45,10 +45,7 @@
 
   function outer() {
     inner(1,2,3);
-    // Trigger OSR, if optimization is not disabled.
-    if (%GetOptimizationStatus(outer) != 4) {
-      while (%GetOptimizationCount(outer) == 0) {}
-    }
+    for (var i = 0; i < 3; i++) %OptimizeOsr();
   }
 
   outer();

test/mjsunit/regress/string-set-char-deopt.js

@@ -36,7 +36,7 @@
     var world = " world";
     %_OneByteSeqStringSetChar(0, (deopt(), 0x48), string);
 
-    if (osr) while (%GetOptimizationStatus(f) == 2) {}
+    for (var i = 0; osr && i < 2; i++) %OptimizeOsr();
 
     return string + world;
   }