<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[215119] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/215119">215119</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2017-04-07 14:52:22 -0700 (Fri, 07 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerdatapatchesARES6patch">trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/ARES-6.patch</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerdataplansares6plan">trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/ares6.plan</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerdatapatchesES6SampleBenchpatch">trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/ES6SampleBench.patch</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerdataplanses6benchplan">trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/es6bench.plan</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (215118 => 215119)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-04-07 21:45:45 UTC (rev 215118)
+++ trunk/Tools/ChangeLog 2017-04-07 21:52:22 UTC (rev 215119)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-04-07 Ryosuke Niwa <rniwa@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.
+
</ins><span class="cx"> 2017-04-07 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r211382): Complex text with justification erroneously overflows containers
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerdatapatchesARES6patchfromrev215118trunkToolsScriptswebkitpybenchmark_runnerdatapatchesES6SampleBenchpatch"></a>
<div class="copfile"><h4>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)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+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="driver.js"></script>
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerdatapatchesES6SampleBenchpatch"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/ES6SampleBench.patch (215118 => 215119)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,48 +0,0 @@
</span><del>-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>
</del></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerdataplansares6planfromrev215118trunkToolsScriptswebkitpybenchmark_runnerdataplanses6benchplan"></a>
<div class="copfile"><h4>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)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+{
+ "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"
+}
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerdataplanses6benchplan"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/es6bench.plan (215118 => 215119)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,8 +0,0 @@
</span><del>-{
- "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"
-}
</del></span></pre>
</div>
</div>
</body>
</html>