From fffa5b244f2d4ca6be8f5ea3d8c48479269b335f Mon Sep 17 00:00:00 2001 From: "sbarati@apple.com" Date: Wed, 7 Jun 2017 19:13:46 +0000 Subject: [PATCH] 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 --- PerformanceTests/ARES-6/glue.js | 2 +- PerformanceTests/ARES-6/results.js | 2 +- PerformanceTests/ChangeLog | 16 ++++++++++++++++ Websites/browserbench.org/ARES-6/glue.js | 2 +- Websites/browserbench.org/ARES-6/results.js | 2 +- Websites/browserbench.org/ChangeLog | 16 ++++++++++++++++ 6 files changed, 36 insertions(+), 4 deletions(-) diff --git a/PerformanceTests/ARES-6/glue.js b/PerformanceTests/ARES-6/glue.js index 745392a461a0..1e75d8c6f918 100644 --- 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 28563cd58501..f148d09a641f 100644 --- 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 83dcdbef1b47..7041811c334a 100644 --- a/PerformanceTests/ChangeLog +++ b/PerformanceTests/ChangeLog @@ -1,3 +1,19 @@ +2017-06-07 Saam Barati + + 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 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 745392a461a0..1e75d8c6f918 100644 --- 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 28563cd58501..f148d09a641f 100644 --- 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 b5ba9a0d6afa..14bab74ee0c0 100644 --- a/Websites/browserbench.org/ChangeLog +++ b/Websites/browserbench.org/ChangeLog @@ -1,3 +1,19 @@ +2017-06-07 Saam Barati + + 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 Add a version number to ARES-6 -- 2.36.0