<!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>[206800] 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/206800">206800</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-04 17:42:37 -0700 (Tue, 04 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add the support for running ES6SampleBench to run-benchmark
https://bugs.webkit.org/show_bug.cgi?id=162890
Reviewed by Saam Barati.
Added the support for running ES6SampleBench as "es6bench".
e.g. ./Tools/Scripts/run-benchmark --platform osx --plan es6bench --browser safari
Instead of the default 10 iterations, run the test 4 iterations using 5 instances of browser
for the total of 20 iterations.
* Scripts/webkitpy/benchmark_runner/data/patches/ES6SampleBench.patch: Added.
* Scripts/webkitpy/benchmark_runner/data/plans/es6bench.plan: Added.
* Scripts/webkitpy/benchmark_runner/run_benchmark.py:
(start): Fixed the bug that the linter will complain about the presence of "debugOutput" by
removing it if it's present.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerrun_benchmarkpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/run_benchmark.py</a></li>
</ul>
<h3>Added 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 (206799 => 206800)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2016-10-05 00:40:25 UTC (rev 206799)
+++ trunk/Tools/ChangeLog        2016-10-05 00:42:37 UTC (rev 206800)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-10-04 Ryosuke Niwa <rniwa@webkit.org>
+
+ Add the support for running ES6SampleBench to run-benchmark
+ https://bugs.webkit.org/show_bug.cgi?id=162890
+
+ Reviewed by Saam Barati.
+
+ Added the support for running ES6SampleBench as "es6bench".
+ e.g. ./Tools/Scripts/run-benchmark --platform osx --plan es6bench --browser safari
+
+ Instead of the default 10 iterations, run the test 4 iterations using 5 instances of browser
+ for the total of 20 iterations.
+
+ * Scripts/webkitpy/benchmark_runner/data/patches/ES6SampleBench.patch: Added.
+ * Scripts/webkitpy/benchmark_runner/data/plans/es6bench.plan: Added.
+ * Scripts/webkitpy/benchmark_runner/run_benchmark.py:
+ (start): Fixed the bug that the linter will complain about the presence of "debugOutput" by
+ removing it if it's present.
+
</ins><span class="cx"> 2016-10-04 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WK2] Make it possible for a test to describe a user gesture as a stream of events in JSON format
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerdatapatchesES6SampleBenchpatch"></a>
<div class="addfile"><h4>Added: trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/ES6SampleBench.patch (0 => 206800)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/ES6SampleBench.patch         (rev 0)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/ES6SampleBench.patch        2016-10-05 00:42:37 UTC (rev 206800)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+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>
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerdataplanses6benchplan"></a>
<div class="addfile"><h4>Added: trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/es6bench.plan (0 => 206800)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/es6bench.plan         (rev 0)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/es6bench.plan        2016-10-05 00:42:37 UTC (rev 206800)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+{
+ "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"
+}
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerrun_benchmarkpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/run_benchmark.py (206799 => 206800)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/run_benchmark.py        2016-10-05 00:40:25 UTC (rev 206799)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/run_benchmark.py        2016-10-05 00:42:37 UTC (rev 206800)
</span><span class="lines">@@ -44,7 +44,10 @@
</span><span class="cx">
</span><span class="cx"> def start(args):
</span><span class="cx"> if args.json_file:
</span><del>- BenchmarkRunner.show_results(json.load(open(args.json_file, 'r')), args.scale_unit)
</del><ins>+ results_json = json.load(open(args.json_file, 'r'))
+ if 'debugOutput' in results_json:
+ del results_json['debugOutput']
+ BenchmarkRunner.show_results(results_json, args.scale_unit)
</ins><span class="cx"> return
</span><span class="cx"> if args.allplans:
</span><span class="cx"> failed = []
</span></span></pre>
</div>
</div>
</body>
</html>