From 0aa81c5c6854bbd17d3957492078102818d8de5d Mon Sep 17 00:00:00 2001
From: Michael Bebenita <mbebenita@mozilla.com>
Date: Wed, 3 Apr 2013 11:24:53 -0700
Subject: [PATCH] Imcrease workload for benchmarks.

---
 .../sunspider-typed/bitops-bits-in-byte.as    |  2 +-
 .../sunspider-typed/bitops-bitwise-and.as     |  6 +++++-
 .../sunspider-typed/bitops-nsieve-bits.as     |  4 ++++
 .../sunspider-typed/controlflow-recursive.as  |  9 +++++++--
 .../sunspider-typed/math-cordic.as            |  4 ++++
 .../sunspider-typed/math-partial-sums.as      | 20 +++++++++++--------
 .../sunspider-typed/math-spectral-norm.as     |  7 +++++--
 .../performance/sunspider-typed/s3d-cube.as   |  2 ++
 .../performance/sunspider-typed/s3d-morph.as  |  4 +++-
 .../sunspider-typed/s3d-raytrace.as           |  5 +++--
 10 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/src/avm2/tests/performance/sunspider-typed/bitops-bits-in-byte.as b/src/avm2/tests/performance/sunspider-typed/bitops-bits-in-byte.as
index 57fee0f503..7cf2451ba5 100644
--- a/src/avm2/tests/performance/sunspider-typed/bitops-bits-in-byte.as
+++ b/src/avm2/tests/performance/sunspider-typed/bitops-bits-in-byte.as
@@ -40,7 +40,7 @@ package {
 
         function TimeFunc(func:Function):int {
         var res:int, x:int, y:int, t:int;
-        var xMax: int = 500 * 4;
+        var xMax: int = 5000 * 4;
         var yMax: int = 256 * 4;
         for(x=0; x<xMax; x++)
           for(y=0; y<yMax; y++)
diff --git a/src/avm2/tests/performance/sunspider-typed/bitops-bitwise-and.as b/src/avm2/tests/performance/sunspider-typed/bitops-bitwise-and.as
index 43b95bd127..d026345862 100644
--- a/src/avm2/tests/performance/sunspider-typed/bitops-bitwise-and.as
+++ b/src/avm2/tests/performance/sunspider-typed/bitops-bitwise-and.as
@@ -50,7 +50,7 @@
 package {
         function runBitopsBitwiseAnd():int {
           var bitwiseAndValue:int = 4294967296;
-          var maxI: int = 600000 * 1000;
+          var maxI: int = 60000 * 1000;
           for (var i:int = 0; i < maxI; i++)
             bitwiseAndValue = bitwiseAndValue & i;
           return bitwiseAndValue;
@@ -60,6 +60,10 @@ package {
             var res:int = runBitopsBitwiseAnd();
             var totaltime:Number = new Date() - start;
 
+        for (var i = 0; i < 2; i++) {
+          // runBitopsBitwiseAnd();
+        }
+
         if (res==0)
           print("PASSED res=" + res);
         else
diff --git a/src/avm2/tests/performance/sunspider-typed/bitops-nsieve-bits.as b/src/avm2/tests/performance/sunspider-typed/bitops-nsieve-bits.as
index 7a4ee9172d..4ebc90c583 100644
--- a/src/avm2/tests/performance/sunspider-typed/bitops-nsieve-bits.as
+++ b/src/avm2/tests/performance/sunspider-typed/bitops-nsieve-bits.as
@@ -61,6 +61,10 @@ var start=new Date();
 var res=sieve();
 var totaltime=new Date()-start;
 
+for (var i = 0; i < 100; i++) {
+  sieve();
+}
+
 if (res==2488465)
   print("PASSED res=" + res);
 else
diff --git a/src/avm2/tests/performance/sunspider-typed/controlflow-recursive.as b/src/avm2/tests/performance/sunspider-typed/controlflow-recursive.as
index 73d7a1ba6f..48b5345b18 100644
--- a/src/avm2/tests/performance/sunspider-typed/controlflow-recursive.as
+++ b/src/avm2/tests/performance/sunspider-typed/controlflow-recursive.as
@@ -47,13 +47,18 @@ package {
     
     
         var start:Number = new Date();
-    
+
     for ( var i:int = 3; i <= 6 /*7*/; i++ ) {
         results['ack'+i]=ack(3,i);
         results['fib'+(17+i)]=fib(17.0+i);
         results['tak'+i]=tak(3*i+3,2*i+2,i+1);
     }
-    
+
+    for (var k = 0; k < 10; k++) {
+      ack(3,k);
+      fib(17.0+k);
+      tak(3*k+3,2*k+2,k+1);
+    }
         var totaltime:Number = new Date() - start;
     
 
diff --git a/src/avm2/tests/performance/sunspider-typed/math-cordic.as b/src/avm2/tests/performance/sunspider-typed/math-cordic.as
index 893117ebe2..3b92c00dcb 100644
--- a/src/avm2/tests/performance/sunspider-typed/math-cordic.as
+++ b/src/avm2/tests/performance/sunspider-typed/math-cordic.as
@@ -128,6 +128,10 @@ package {
     return _sunSpiderInterval;
   }
 
+  for (var i = 0; i < 5000000; i++) {
+    cordicsincos();
+  }
+
   if (Math.abs(cordicsincos() - 1834995.3515519998) < 0.00001) {
     print("PASSED ");
   } else {
diff --git a/src/avm2/tests/performance/sunspider-typed/math-partial-sums.as b/src/avm2/tests/performance/sunspider-typed/math-partial-sums.as
index b8aa119bc9..1c45fd45d4 100644
--- a/src/avm2/tests/performance/sunspider-typed/math-partial-sums.as
+++ b/src/avm2/tests/performance/sunspider-typed/math-partial-sums.as
@@ -60,7 +60,7 @@ package {
       a1 = a2 = a3 = a4 = a5 = a6 = a7 = a8 = a9 = 0.0;
       var twothirds:Number = 2.0/3.0;
       var alt:Number = -1.0;
-      var k2:Number = k3 = sk = ck= 0.0;
+      var k2:Number = 0.0, k3:Number = 0.0, sk:Number = 0.0, ck:Number = 0.0;
       
       for (var k:int = 1; k <= n; k++){
           k2 = k*k;
@@ -102,17 +102,21 @@ package {
   }
 
 
+  for (var i = 0; i < 5000; i++) {
+    verifyTest();
+  }
+
   if(verifyTest()) {
     print("PASSED");
   } else {
     print("FAILED");
   }
 
-/*
-  if(verifyTest()) {
-    print("metric time " + runMathPartialSums());
-  } else {
-    print("Test validation failed.");
-  }
-*/ 
+//
+//  if(verifyTest()) {
+//    print("metric time " + runMathPartialSums());
+//  } else {
+//    print("Test validation failed.");
+//  }
+
 }
diff --git a/src/avm2/tests/performance/sunspider-typed/math-spectral-norm.as b/src/avm2/tests/performance/sunspider-typed/math-spectral-norm.as
index 77a072e307..18299a96e9 100644
--- a/src/avm2/tests/performance/sunspider-typed/math-spectral-norm.as
+++ b/src/avm2/tests/performance/sunspider-typed/math-spectral-norm.as
@@ -90,7 +90,10 @@ package {
 
   
   function verifyTest():Boolean {
-    var result:Number = spectralnorm(10);
+    for (var i = 0; i < 10000; i++) {
+      var result:Number = spectralnorm(10);
+    }
+    print(result);
     var expectedResult:Number = 1.2718440192507248;
     if (result !== expectedResult) {
       print('Test verification failed. spectralnorm(10):  Expected: '+expectedResult+' Got: '+result);
@@ -99,7 +102,7 @@ package {
     return true;
   }
 
-  print("PASSED");
+  print("HERE");
   if (verifyTest()) {
     print("PASSED");
   } else {
diff --git a/src/avm2/tests/performance/sunspider-typed/s3d-cube.as b/src/avm2/tests/performance/sunspider-typed/s3d-cube.as
index 21d6520440..9c138236c4 100644
--- a/src/avm2/tests/performance/sunspider-typed/s3d-cube.as
+++ b/src/avm2/tests/performance/sunspider-typed/s3d-cube.as
@@ -436,5 +436,7 @@ package {
     */
   }
 
+for (var i = 0; i < 50; i++) {
 run3dCube();
+}
 
diff --git a/src/avm2/tests/performance/sunspider-typed/s3d-morph.as b/src/avm2/tests/performance/sunspider-typed/s3d-morph.as
index 698a072553..1cebaf6210 100644
--- a/src/avm2/tests/performance/sunspider-typed/s3d-morph.as
+++ b/src/avm2/tests/performance/sunspider-typed/s3d-morph.as
@@ -75,6 +75,8 @@ package {
   */
   }
 
-run3dMorph();
+for (var i = 0; i < 30; i++) {
+  run3dMorph();
+}
 
 }
diff --git a/src/avm2/tests/performance/sunspider-typed/s3d-raytrace.as b/src/avm2/tests/performance/sunspider-typed/s3d-raytrace.as
index 70f7501613..8d856ebcc3 100644
--- a/src/avm2/tests/performance/sunspider-typed/s3d-raytrace.as
+++ b/src/avm2/tests/performance/sunspider-typed/s3d-raytrace.as
@@ -489,7 +489,6 @@ package {
   }
 
   function run3dRaytrace():int {
-    
     var _sunSpiderStartDate:int = (new Date).getTime();
     var pixels:Array = raytraceScene();
     var testOutput:String = arrayToCanvasCommands(pixels);
@@ -514,6 +513,8 @@ package {
     */
   }
 
-  run3dRaytrace();
+  for (var i = 0; i < 30; i++) {
+    run3dRaytrace();
+  }
 
 }
\ No newline at end of file