Diff
Modified: trunk/Tools/ChangeLog (215118 => 215119)
--- trunk/Tools/ChangeLog 2017-04-07 21:45:45 UTC (rev 215118)
+++ trunk/Tools/ChangeLog 2017-04-07 21:52:22 UTC (rev 215119)
@@ -1,3 +1,16 @@
+2017-04-07 Ryosuke Niwa <rn...@webkit.org>
+
+ Replace ES6SampleBench by ARES-6 in run-benchmark
+ https://bugs.webkit.org/show_bug.cgi?id=170585
+
+ Reviewed by Saam Barati.
+
+ Updated the plan file for ES6SampleBench to run ARES-6 instead. Also increased the number of iterations
+ from 4 to 8 to match teh default, and reduced the number of browser instances to use from 5 to 3.
+
+ * Scripts/webkitpy/benchmark_runner/data/patches/ARES-6.patch: Renamed from ES6SampleBench.patch.
+ * Scripts/webkitpy/benchmark_runner/data/plans/ares6.plan: Renamed from es6bench.plan.
+
2017-04-07 Myles C. Maxfield <mmaxfi...@apple.com>
REGRESSION(r211382): Complex text with justification erroneously overflows containers
Copied: trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/ARES-6.patch (from rev 215118, trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/ES6SampleBench.patch) (0 => 215119)
--- trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/ARES-6.patch (rev 0)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/ARES-6.patch 2017-04-07 21:52:22 UTC (rev 215119)
@@ -0,0 +1,50 @@
+diff --git a/driver.js b/driver.js
+index 26394093758..f6496f970ee 100644
+--- a/driver.js
++++ b/driver.js
+@@ -136,6 +136,32 @@ class Driver {
+ this._benchmark = this._iterator ? this._iterator.next().value : null;
+ if (!this._benchmark) {
+ if (!this._numIterations) {
++
++ let tests = {};
++ for (let [benchmark, results] of this._benchmarks) {
++ let subtests = {};
++ for (let subResultName of Results.subResults)
++ subtests[subResultName] = {"metrics": {"Time": {"current": results[subResultName]._data}}};
++ tests[benchmark.name] = {"metrics": {"Time" : ["Geometric"]}, "tests": subtests};
++ }
++
++ let xhr = new XMLHttpRequest();
++ xhr.open("POST", "/report");
++ let content = JSON.stringify({"ARES-6": {"metrics" : {"Time" : ["Geometric"]}, "tests" : tests}});
++ xhr.setRequestHeader("Content-type", "application/json");
++ xhr.setRequestHeader("Content-length", content.length);
++ xhr.setRequestHeader("Connection", "close");
++
++ xhr._onreadystatechange_ = () => {
++ if (xhr.readyState == XMLHttpRequest.DONE && xhr.status == 200) {
++ closeRequest = new XMLHttpRequest();
++ closeRequest.open("GET", "/shutdown");
++ closeRequest.send();
++ }
++ }
++
++ xhr.send(content);
++
+ if (isInBrowser) {
+ this._statusCell.innerHTML =
+ (this._hadErrors ? "Failures encountered!" : "Restart");
+diff --git a/index.html b/index.html
+index 230657bac24..fb740f7f06d 100644
+--- a/index.html
++++ b/index.html
+@@ -11,6 +11,8 @@
+ document.getElementById("error").innerHTML = "ERROR: " + url + ":" + lineNumber + ": " + message;
+ }
+
++ window._onload_ = () => { setTimeout(() => driver.start(8), 3000); }
++
+ const isInBrowser = true;
+ </script>
+ <script src=""
Deleted: trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/ES6SampleBench.patch (215118 => 215119)
--- trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/ES6SampleBench.patch 2017-04-07 21:45:45 UTC (rev 215118)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/ES6SampleBench.patch 2017-04-07 21:52:22 UTC (rev 215119)
@@ -1,48 +0,0 @@
-diff --git a/driver.js b/driver.js
-index 609a562..afa4976 100644
---- a/driver.js
-+++ b/driver.js
-@@ -118,6 +118,31 @@ class Driver {
- this._benchmark = this._iterator ? this._iterator.next().value : null;
- if (!this._benchmark) {
- if (!this._numIterations) {
-+
-+ let tests = {};
-+ for (let [benchmark, results] of this._benchmarks) {
-+ let subtests = {};
-+ for (let subResultName of Results.subResults)
-+ subtests[subResultName] = {"metrics": {"Time": {"current": results[subResultName]._data}}};
-+ tests[benchmark.name] = {"metrics": {"Time" : ["Geometric"]}, "tests": subtests};
-+ }
-+
-+ let xhr = new XMLHttpRequest();
-+ xhr.open("POST", "/report");
-+ let content = JSON.stringify({"ES6SampleBench": {"metrics" : {"Time" : ["Geometric"]}, "tests" : tests}});
-+ xhr.setRequestHeader("Content-type", "application/json");
-+ xhr.setRequestHeader("Content-length", content.length);
-+ xhr.setRequestHeader("Connection", "close");
-+
-+ xhr._onreadystatechange_ = function() {
-+ if (xhr.readyState == XMLHttpRequest.DONE && xhr.status == 200) {
-+ closeRequest = new XMLHttpRequest();
-+ closeRequest.open("GET", "/shutdown");
-+ closeRequest.send();
-+ }
-+ }
-+ xhr.send(content);
-+
- if (isInBrowser) {
- this._triggerCell.innerHTML =
- (this._hadErrors ? "Failures encountered!" : "Success!") +
-diff --git a/index.html b/index.html
-index 5860e02..1a27c0c 100644
---- a/index.html
-+++ b/index.html
-@@ -8,6 +8,7 @@ window._onerror_ = function(message, url, lineNumber)
- {
- document.getElementById("trigger").innerHTML = "ERROR: " + url + ":" + lineNumber + ": " + message;
- }
-+window._onload_ = function () { driver.start(4); }
-
- const isInBrowser = true;
- </script>
Copied: trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/ares6.plan (from rev 215118, trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/es6bench.plan) (0 => 215119)
--- trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/ares6.plan (rev 0)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/ares6.plan 2017-04-07 21:52:22 UTC (rev 215119)
@@ -0,0 +1,8 @@
+{
+ "timeout": 600,
+ "count": 3,
+ "svn_source": "https://svn.webkit.org/repository/webkit/trunk/PerformanceTests/ARES-6/@r214828",
+ "benchmark_patch": "data/patches/ARES-6.patch",
+ "entry_point": "index.html",
+ "output_file": "ares6.result"
+}
Deleted: trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/es6bench.plan (215118 => 215119)
--- trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/es6bench.plan 2017-04-07 21:45:45 UTC (rev 215118)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/es6bench.plan 2017-04-07 21:52:22 UTC (rev 215119)
@@ -1,8 +0,0 @@
-{
- "timeout": 600,
- "count": 5,
- "svn_source": "https://svn.webkit.org/repository/webkit/trunk/PerformanceTests/ES6SampleBench/@r206760",
- "benchmark_patch": "data/patches/ES6SampleBench.patch",
- "entry_point": "index.html",
- "output_file": "es6bench.result"
-}
