Reviewed by Adam.

        - rebalance new tests

        Scaled the new tests so they take 400-600ms on a reasonably normal user setup:

        Internet Explorer 7, Window XP, Dell Latitude D810 with a 2.13GHz Pentium M

        This balances them with the existing tests.

        * tests/access-binary-trees.js:
        * tests/access-nsieve.js:
        * tests/bitops-nsieve-bits.js:
        * tests/math-partial-sums.js:
        * tests/math-spectral-norm.js:
        * tests/string-fasta.js:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@26855 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/SunSpider/ChangeLog b/SunSpider/ChangeLog
index 17a5abc..d963b22 100644 (file)
--- a/SunSpider/ChangeLog
+++ b/SunSpider/ChangeLog
@@ -1,3 +1,22 @@
+2007-10-21  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Adam.
+        
+        - rebalance new tests
+        
+        Scaled the new tests so they take 400-600ms on a reasonably normal user setup:
+        
+        Internet Explorer 7, Window XP, Dell Latitude D810 with a 2.13GHz Pentium M
+
+        This balances them with the existing tests.
+
+        * tests/access-binary-trees.js:
+        * tests/access-nsieve.js:
+        * tests/bitops-nsieve-bits.js:
+        * tests/math-partial-sums.js:
+        * tests/math-spectral-norm.js:
+        * tests/string-fasta.js:
+
 2007-10-20  Eric Seidel  <eric@webkit.org>
 
         Reviewed by darin.

diff --git a/SunSpider/tests/access-binary-trees.js b/SunSpider/tests/access-binary-trees.js
index e293815..2f24e7d 100644 (file)
--- a/SunSpider/tests/access-binary-trees.js
+++ b/SunSpider/tests/access-binary-trees.js
@@ -28,7 +28,7 @@ function bottomUpTree(item,depth){
 
 var ret;
 
-for ( var n = 2; n <= 8; n *= 2 ) {
+for ( var n = 4; n <= 7; n += 1 ) {
     var minDepth = 4;
     var maxDepth = Math.max(minDepth + 2, n);
     var stretchDepth = maxDepth + 1;

diff --git a/SunSpider/tests/access-nsieve.js b/SunSpider/tests/access-nsieve.js
index 78b6478..70fdf1a 100644 (file)
--- a/SunSpider/tests/access-nsieve.js
+++ b/SunSpider/tests/access-nsieve.js
@@ -28,11 +28,11 @@ function nsieve(m, isPrime){
 }
 
 function sieve() {
-    for (var i = 1; i <= 4; i++ ) {
+    for (var i = 1; i <= 3; i++ ) {
         var m = (1<<i)*10000;
         var flags = Array(m+1);
         nsieve(m, flags);
     }
 }
 
-sieve();
\ No newline at end of file
+sieve();

diff --git a/SunSpider/tests/bitops-nsieve-bits.js b/SunSpider/tests/bitops-nsieve-bits.js
index b8e7db6..6ef0ddb 100644 (file)
--- a/SunSpider/tests/bitops-nsieve-bits.js
+++ b/SunSpider/tests/bitops-nsieve-bits.js
@@ -23,7 +23,7 @@ function primes(isPrime, n) {
 }
 
 function sieve() {
-    for (var i = 1; i <= 4; i++) {
+    for (var i = 4; i <= 4; i++) {
         var isPrime = new Array((10000<<i)+31>>5);
         primes(isPrime, i);
     }

diff --git a/SunSpider/tests/math-partial-sums.js b/SunSpider/tests/math-partial-sums.js
index bb5378c..d082d79 100644 (file)
--- a/SunSpider/tests/math-partial-sums.js
+++ b/SunSpider/tests/math-partial-sums.js
@@ -27,7 +27,7 @@ function partial(n){
     }
 }
 
-for (var i = 1024; i <= 8192; i *= 2) {
+for (var i = 1024; i <= 16384; i *= 2) {
     partial(i);
 }
 

diff --git a/SunSpider/tests/math-spectral-norm.js b/SunSpider/tests/math-spectral-norm.js
index f2ce571..8139ef3 100644 (file)
--- a/SunSpider/tests/math-spectral-norm.js
+++ b/SunSpider/tests/math-spectral-norm.js
@@ -46,6 +46,6 @@ function spectralnorm(n) {
   return Math.sqrt(vBv/vv);
 }
 
-for (var i = 8; i <= 64; i *= 2) {
+for (var i = 6; i <= 48; i *= 2) {
     spectralnorm(i);
 }

diff --git a/SunSpider/tests/string-fasta.js b/SunSpider/tests/string-fasta.js
index ae96ebd..14a81f3 100644 (file)
--- a/SunSpider/tests/string-fasta.js
+++ b/SunSpider/tests/string-fasta.js
@@ -78,8 +78,8 @@ function fastaRandom(n, table) {
 
 var ret;
 
-for (var n = 2; n <= 16; n *= 2) {
-    ret = fastaRepeat(2*n*100000, ALU);
-    ret = fastaRandom(3*n*1000, IUB);
-    ret = fastaRandom(5*n*1000, HomoSap);
-}
+var count = 7;
+ret = fastaRepeat(2*count*100000, ALU);
+ret = fastaRandom(3*count*1000, IUB);
+ret = fastaRandom(5*count*1000, HomoSap);
+