ARES-6 incorrectly measures Worst 4 Iterations

https://bugs.webkit.org/show_bug.cgi?id=172960

Reviewed by Mark Lam.

Version 1.0 of ARES-6 was accidentally measuring the first
4 iterations, instead of the worst 4. This patch fixes the
bug and bumps the version to 1.0.1.

* ARES-6/glue.js:
(driver.reportResult):
* ARES-6/results.js:
(Results.prototype.reportResult):

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

diff --git a/PerformanceTests/ARES-6/glue.js b/PerformanceTests/ARES-6/glue.js
index 745392a461a01c44be3a7f856a03622eb06d4eb8..1e75d8c6f918cdbe69a3d50868bfa7d1a9dd42cb 100644 (file)
--- a/PerformanceTests/ARES-6/glue.js
+++ b/PerformanceTests/ARES-6/glue.js
@@ -39,7 +39,7 @@ function reportResult(...args) {
 }
 
 {
-    const title = "ARES-6 1.0";
+    const title = "ARES-6 1.0.1";
     if (isInBrowser) {
         document.title = title;
     } else {

diff --git a/PerformanceTests/ARES-6/results.js b/PerformanceTests/ARES-6/results.js
index 28563cd5850113388eaff738cc0fe74f904e20ec..f148d09a641fe1a8425b526dde9b81df9f761e29 100644 (file)
--- a/PerformanceTests/ARES-6/results.js
+++ b/PerformanceTests/ARES-6/results.js
@@ -59,7 +59,7 @@ class Results {
 
         this.firstIteration.add(times[0]);
         let steadyTimes = times.slice(1).sort((a, b) => b - a); // Sort in reverse order.
-        this.averageWorstCase.add((times[0] + times[1] + times[2] + times[3]) / 4);
+        this.averageWorstCase.add((steadyTimes[0] + steadyTimes[1] + steadyTimes[2] + steadyTimes[3]) / 4);
         this.steadyState.add(steadyTimes.reduce((previous, current) => previous + current) / steadyTimes.length);
         this.reportDone();
     }

diff --git a/PerformanceTests/ChangeLog b/PerformanceTests/ChangeLog
index 83dcdbef1b476011de365f6aee09ebea5dffd0e2..7041811c334a4a8e8dcd3b6d5df2ba029934a5ac 100644 (file)
--- a/PerformanceTests/ChangeLog
+++ b/PerformanceTests/ChangeLog
@@ -1,3 +1,19 @@
+2017-06-07  Saam Barati  <sbarati@apple.com>
+
+        ARES-6 incorrectly measures Worst 4 Iterations
+        https://bugs.webkit.org/show_bug.cgi?id=172960
+
+        Reviewed by Mark Lam.
+
+        Version 1.0 of ARES-6 was accidentally measuring the first
+        4 iterations, instead of the worst 4. This patch fixes the
+        bug and bumps the version to 1.0.1.
+
+        * ARES-6/glue.js:
+        (driver.reportResult):
+        * ARES-6/results.js:
+        (Results.prototype.reportResult):
+
 2017-06-06  Saam Barati  <sbarati@apple.com>
 
         Add a version number to ARES-6

diff --git a/Websites/browserbench.org/ARES-6/glue.js b/Websites/browserbench.org/ARES-6/glue.js
index 745392a461a01c44be3a7f856a03622eb06d4eb8..1e75d8c6f918cdbe69a3d50868bfa7d1a9dd42cb 100644 (file)
--- a/Websites/browserbench.org/ARES-6/glue.js
+++ b/Websites/browserbench.org/ARES-6/glue.js
@@ -39,7 +39,7 @@ function reportResult(...args) {
 }
 
 {
-    const title = "ARES-6 1.0";
+    const title = "ARES-6 1.0.1";
     if (isInBrowser) {
         document.title = title;
     } else {

diff --git a/Websites/browserbench.org/ARES-6/results.js b/Websites/browserbench.org/ARES-6/results.js
index 28563cd5850113388eaff738cc0fe74f904e20ec..f148d09a641fe1a8425b526dde9b81df9f761e29 100644 (file)
--- a/Websites/browserbench.org/ARES-6/results.js
+++ b/Websites/browserbench.org/ARES-6/results.js
@@ -59,7 +59,7 @@ class Results {
 
         this.firstIteration.add(times[0]);
         let steadyTimes = times.slice(1).sort((a, b) => b - a); // Sort in reverse order.
-        this.averageWorstCase.add((times[0] + times[1] + times[2] + times[3]) / 4);
+        this.averageWorstCase.add((steadyTimes[0] + steadyTimes[1] + steadyTimes[2] + steadyTimes[3]) / 4);
         this.steadyState.add(steadyTimes.reduce((previous, current) => previous + current) / steadyTimes.length);
         this.reportDone();
     }

diff --git a/Websites/browserbench.org/ChangeLog b/Websites/browserbench.org/ChangeLog
index b5ba9a0d6afa2b29a4ef5e905ad1e9792f8c09ff..14bab74ee0c06accf15f3d41c6e13039d1d77a20 100644 (file)
--- a/Websites/browserbench.org/ChangeLog
+++ b/Websites/browserbench.org/ChangeLog
@@ -1,3 +1,19 @@
+2017-06-07  Saam Barati  <sbarati@apple.com>
+
+        ARES-6 incorrectly measures Worst 4 Iterations
+        https://bugs.webkit.org/show_bug.cgi?id=172960
+
+        Reviewed by Mark Lam.
+
+        Version 1.0 of ARES-6 was accidentally measuring the first
+        4 iterations, instead of the worst 4. This patch fixes the
+        bug and bumps the version to 1.0.1.
+
+        * ARES-6/glue.js:
+        (driver.reportResult):
+        * ARES-6/results.js:
+        (Results.prototype.reportResult):
+
 2017-06-06  Saam Barati  <sbarati@apple.com>
 
         Add a version number to ARES-6