Diff
Modified: trunk/LayoutTests/ChangeLog (143646 => 143647)
--- trunk/LayoutTests/ChangeLog 2013-02-21 21:11:22 UTC (rev 143646)
+++ trunk/LayoutTests/ChangeLog 2013-02-21 21:22:55 UTC (rev 143647)
@@ -1,3 +1,18 @@
+2013-02-21 Filip Pizlo <fpi...@apple.com>
+
+ Rebalance the running times of JSRegress somewhat.
+
+ Rubber stamped by Mark Hahnenberg.
+
+ * fast/js/regress/script-tests/adapt-to-double-divide.js:
+ (foo):
+ * fast/js/regress/script-tests/array-access-polymorphic-structure.js:
+ * fast/js/regress/script-tests/int-overflow-local.js:
+ * fast/js/regress/script-tests/method-on-number.js:
+ (foo):
+ * fast/js/regress/script-tests/rare-osr-exit-on-local.js:
+ * fast/js/regress/script-tests/slow-convergence.js:
+
2013-02-21 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r143419.
Modified: trunk/LayoutTests/fast/js/regress/script-tests/adapt-to-double-divide.js (143646 => 143647)
--- trunk/LayoutTests/fast/js/regress/script-tests/adapt-to-double-divide.js 2013-02-21 21:11:22 UTC (rev 143646)
+++ trunk/LayoutTests/fast/js/regress/script-tests/adapt-to-double-divide.js 2013-02-21 21:22:55 UTC (rev 143647)
@@ -1,7 +1,7 @@
function foo(a,b) {
var c = (a + b) / 2;
var d = a - b;
- for (var i = 0; i < 100000; ++i) {
+ for (var i = 0; i < 50000; ++i) {
c *= d;
c += d;
c /= d;
@@ -10,13 +10,11 @@
}
var result = 0;
-for (var i = 0; i < 100; ++i) {
+for (var i = 0; i < 50; ++i) {
result += foo(5,6);
}
-if (result != 10000650) {
- print("Bad result: " + result);
+if (result != 2500325)
throw "Bad result: " + result;
-}
Modified: trunk/LayoutTests/fast/js/regress/script-tests/array-access-polymorphic-structure.js (143646 => 143647)
--- trunk/LayoutTests/fast/js/regress/script-tests/array-access-polymorphic-structure.js 2013-02-21 21:11:22 UTC (rev 143646)
+++ trunk/LayoutTests/fast/js/regress/script-tests/array-access-polymorphic-structure.js 2013-02-21 21:22:55 UTC (rev 143647)
@@ -13,12 +13,12 @@
var result = 0;
-for (var i = 0; i < 1000000; ++i) {
+for (var i = 0; i < 100000; ++i) {
var array = [1, 2, 3, 4, 5];
if (i & 1)
array.f = 42;
result += foo(array);
}
-if (result != 15000000)
+if (result != 1500000)
throw "Error: bad result: " + result;
Modified: trunk/LayoutTests/fast/js/regress/script-tests/int-overflow-local.js (143646 => 143647)
--- trunk/LayoutTests/fast/js/regress/script-tests/int-overflow-local.js 2013-02-21 21:11:22 UTC (rev 143646)
+++ trunk/LayoutTests/fast/js/regress/script-tests/int-overflow-local.js 2013-02-21 21:22:55 UTC (rev 143647)
@@ -14,12 +14,10 @@
var bigNumber = 2147483647;
var result = 0;
-for (var i = 0; i < 10000000; ++i)
+for (var i = 0; i < 500000; ++i)
result = (result + foo(i, bigNumber - i, i%2)) | 0;
-if (result != -2014260032) {
- print("Got a bad result: " + result);
- throw "Bad result";
-}
+if (result != 445698416)
+ throw "Bad result: " + result;
Modified: trunk/LayoutTests/fast/js/regress/script-tests/method-on-number.js (143646 => 143647)
--- trunk/LayoutTests/fast/js/regress/script-tests/method-on-number.js 2013-02-21 21:11:22 UTC (rev 143646)
+++ trunk/LayoutTests/fast/js/regress/script-tests/method-on-number.js 2013-02-21 21:22:55 UTC (rev 143647)
@@ -1,13 +1,11 @@
function foo(a) {
var result = 0;
- for (var i = 0 ; i < 5000000; ++i)
+ for (var i = 0 ; i < 500000; ++i)
result += a.valueOf();
return result;
}
var result = foo(5);
-if (result != 25000000) {
- print("Bad result: " + result);
+if (result != 2500000)
throw "Bad result: " + result;
-}
Modified: trunk/LayoutTests/fast/js/regress/script-tests/rare-osr-exit-on-local.js (143646 => 143647)
--- trunk/LayoutTests/fast/js/regress/script-tests/rare-osr-exit-on-local.js 2013-02-21 21:11:22 UTC (rev 143646)
+++ trunk/LayoutTests/fast/js/regress/script-tests/rare-osr-exit-on-local.js 2013-02-21 21:22:55 UTC (rev 143647)
@@ -36,7 +36,7 @@
var result = 0;
-for (var i = 0; i < 3000; ++i) {
+for (var i = 0; i < 300; ++i) {
var v = i;
if (i <= 100 || (i%4))
v = {f:{h:v}, g:{h:v+1}, h:array};
@@ -45,9 +45,7 @@
result += foo(v,(i%2)==0);
}
-if (result != 165000483) {
- print("Bad result: " + result);
+if (result != 16500033)
throw "Bad result: " + result;
-}
Modified: trunk/LayoutTests/fast/js/regress/script-tests/slow-convergence.js (143646 => 143647)
--- trunk/LayoutTests/fast/js/regress/script-tests/slow-convergence.js 2013-02-21 21:11:22 UTC (rev 143646)
+++ trunk/LayoutTests/fast/js/regress/script-tests/slow-convergence.js 2013-02-21 21:22:55 UTC (rev 143647)
@@ -23,7 +23,7 @@
for (var i = 0; i < 20; ++i)
array.push(i);
-var limit = 1000000;
+var limit = 20000;
var phases = 4;
var result = 0;
for (var i = 0; i < limit; ++i) {
@@ -31,9 +31,7 @@
result += foo(i % (phase + 1), ((i % array.length) / 2) | 0, array.length - (((i % array.length) / 2) | 0), array);
}
-if (result != 153620752) {
- print(result);
- throw "Bad result";
-}
+if (result != 3072367)
+ throw "Bad result: " + result;
