<!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>[192704] 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/192704">192704</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-20 15:14:52 -0800 (Fri, 20 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update the patch and the plan files of the graphics benchmark with the latest revision
https://bugs.webkit.org/show_bug.cgi?id=151503
Patch by Said Abou-Hallawa <sabouhallawa@apple.com> on 2015-11-20
Reviewed by Ryosuke Niwa.
The time for each graphics test has been shortened from 30 seconds to 10
seconds. We need to update the graphics benchmark patch and plan files so
we can get the results faster. Also this will allow running the benchmark
also on the iOS performance bots.
* Scripts/webkitpy/benchmark_runner/data/patches/Animometer.patch:
* Scripts/webkitpy/benchmark_runner/data/plans/animometer.plan:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerdatapatchesAnimometerpatch">trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/Animometer.patch</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerdataplansanimometerplan">trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/animometer.plan</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (192703 => 192704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-11-20 23:10:57 UTC (rev 192703)
+++ trunk/Tools/ChangeLog 2015-11-20 23:14:52 UTC (rev 192704)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-11-20 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ Update the patch and the plan files of the graphics benchmark with the latest revision
+ https://bugs.webkit.org/show_bug.cgi?id=151503
+
+ Reviewed by Ryosuke Niwa.
+
+ The time for each graphics test has been shortened from 30 seconds to 10
+ seconds. We need to update the graphics benchmark patch and plan files so
+ we can get the results faster. Also this will allow running the benchmark
+ also on the iOS performance bots.
+
+ * Scripts/webkitpy/benchmark_runner/data/patches/Animometer.patch:
+ * Scripts/webkitpy/benchmark_runner/data/plans/animometer.plan:
+
</ins><span class="cx"> 2015-11-20 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, fix installation of ninja-build after the previous commit
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerdatapatchesAnimometerpatch"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/Animometer.patch (192703 => 192704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/Animometer.patch 2015-11-20 23:10:57 UTC (rev 192703)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/Animometer.patch 2015-11-20 23:14:52 UTC (rev 192704)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> diff --git a/runner/resources/animometer.js b/runner/resources/animometer.js
</span><del>-index e567681..ba0ab0f 100644
</del><ins>+index d3ac8db..230ac05 100644
</ins><span class="cx"> --- a/runner/resources/animometer.js
</span><span class="cx"> +++ b/runner/resources/animometer.js
</span><span class="cx"> @@ -41,14 +41,62 @@ window.benchmarkRunnerClient = {
</span><span class="lines">@@ -8,15 +8,15 @@
</span><span class="cx">
</span><span class="cx"> + _computeTestReport: function(testName, testResults)
</span><span class="cx"> + {
</span><del>-+ return [testResults[Strings["JSON_SCORE"][0]]];
</del><ins>++ return [testResults[Strings.json.score]];
</ins><span class="cx"> + },
</span><span class="cx"> +
</span><span class="cx"> + _computeSuiteReports: function(suiteName, suiteResults)
</span><span class="cx"> + {
</span><span class="cx"> + var testsReports = {};
</span><span class="cx"> +
</span><del>-+ for (var testName in suiteResults[Strings["JSON_RESULTS"][2]]) {
-+ var testReports = this._computeTestReport(testName, suiteResults[Strings["JSON_RESULTS"][2]][testName]);
</del><ins>++ for (var testName in suiteResults[Strings.json.results.tests]) {
++ var testReports = this._computeTestReport(testName, suiteResults[Strings.json.results.tests][testName]);
</ins><span class="cx"> + testsReports[testName] = { "metrics": { "Score": { "current": testReports } } };
</span><span class="cx"> + }
</span><span class="cx"> +
</span><span class="lines">@@ -27,31 +27,31 @@
</span><span class="cx"> + {
</span><span class="cx"> + var suitesReports = {};
</span><span class="cx"> +
</span><del>-+ for (var suiteName in iterationResults[Strings["JSON_RESULTS"][1]]) {
-+ var testsReports = this._computeSuiteReports(suiteName, iterationResults[Strings["JSON_RESULTS"][1]][suiteName]);
</del><ins>++ for (var suiteName in iterationResults[Strings.json.results.suites]) {
++ var testsReports = this._computeSuiteReports(suiteName, iterationResults[Strings.json.results.suites][suiteName]);
</ins><span class="cx"> + suitesReports[suiteName] = { "metrics": { "Score": ["Geometric"] }, "tests": testsReports };
</span><span class="cx"> + }
</span><span class="cx"> +
</span><span class="cx"> + return suitesReports;
</span><span class="cx"> + },
</span><span class="cx"> +
</span><del>-+ computeResultsReports: function()
</del><ins>++ _computeResultsReports: function()
</ins><span class="cx"> + {
</span><span class="cx"> + var json = this._resultsDashboard.toJSON(false, false);
</span><del>-+ var iterationReports = this._computeIterationReports(json[Strings["JSON_RESULTS"][0]][0])
</del><ins>++ var iterationReports = this._computeIterationReports(json[Strings.json.results.iterations][0])
</ins><span class="cx"> + return {"Animometer": {"metrics" : {"Score" : ["Geometric"]}, "tests" : iterationReports } };
</span><span class="cx"> + },
</span><span class="cx"> +
</span><span class="cx"> didFinishLastIteration: function ()
</span><span class="cx"> {
</span><span class="cx"> - var json = this._resultsDashboard.toJSON(true, true);
</span><del>-- this.score = json[Strings["JSON_SCORE"]];
-- this._resultsTable.showIterations(json[Strings["JSON_RESULTS"][0]]);
-- sectionsManager.showJSON("json", json[Strings["JSON_RESULTS"][0]][0]);
-- suitesManager.updateLocalStorageFromJSON(json[Strings["JSON_RESULTS"][0]][0]);
</del><ins>+- this.score = json[Strings.json.score];
+- this._resultsTable.showIterations(json[Strings.json.results.iterations], this.options);
+- sectionsManager.showJSON("json", json[Strings.json.results.iterations][0]);
+- suitesManager.updateLocalStorageFromJSON(json[Strings.json.results.iterations][0]);
</ins><span class="cx"> - benchmarkController.showResults();
</span><span class="cx"> + // submit result to server
</span><del>-+ var results = JSON.stringify(this.computeResultsReports());
</del><ins>++ var results = JSON.stringify(this._computeResultsReports());
</ins><span class="cx"> + var xhr = new XMLHttpRequest();
</span><span class="cx"> + xhr.open("POST", "/report");
</span><span class="cx"> +
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@@ -307,6 +355,10 @@ window.suitesManager =
</del><ins>+@@ -287,7 +335,13 @@ window.suitesManager =
</ins><span class="cx">
</span><span class="cx"> suite.tests.forEach(function(test) {
</span><span class="cx"> var testElement = this._createTestElement(listElement, test, suiteCheckbox);
</span><span class="lines">@@ -80,17 +80,29 @@
</span><span class="cx"> + testCheckbox.checked = true;
</span><span class="cx"> + }
</span><span class="cx"> }, this);
</span><ins>++
++ this._updateSuiteCheckboxState(suiteCheckbox);
</ins><span class="cx"> }, this);
</span><span class="cx"> },
</span><del>-@@ -408,10 +460,8 @@ window.benchmarkController =
</del><ins>+
+@@ -387,10 +441,8 @@ window.benchmarkController =
+ {
</ins><span class="cx"> initialize: function()
</span><span class="cx"> {
</span><del>- sectionsManager.setupSectionStyle();
</del><span class="cx"> - optionsManager.updateUIFromLocalStorage();
</span><span class="cx"> suitesManager.createElements();
</span><span class="cx"> - suitesManager.updateUIFromLocalStorage();
</span><span class="cx"> - suitesManager.updateEditsElementsState();
</span><del>-+ setTimeout(this.startTest.bind(this), 3000);
</del><ins>++ setTimeout(benchmarkController.startTest, 3000);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> onChangeAdaptiveTestCheckbox: function()
</span><ins>+@@ -411,7 +463,7 @@ window.benchmarkController =
+ var options = optionsManager.updateLocalStorageFromUI();
+ var suites = suitesManager.updateLocalStorageFromUI();
+ sectionsManager.setupRunningSectionStyle(options);
+- this._runBenchmark(suites, options);
++ benchmarkController._runBenchmark(suites, options);
+ sectionsManager.showSection("running");
+ },
+
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerdataplansanimometerplan"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/animometer.plan (192703 => 192704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/animometer.plan 2015-11-20 23:10:57 UTC (rev 192703)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/animometer.plan 2015-11-20 23:14:52 UTC (rev 192704)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> {
</span><del>- "timeout": 1800,
</del><ins>+ "timeout": 600,
</ins><span class="cx"> "count": 1,
</span><del>- "svn_source": "https://svn.webkit.org/repository/webkit/trunk/PerformanceTests/Animometer/@r191873",
</del><ins>+ "svn_source": "https://svn.webkit.org/repository/webkit/trunk/PerformanceTests/Animometer/@r192669",
</ins><span class="cx"> "benchmark_patch": "data/patches/Animometer.patch",
</span><span class="cx"> "entry_point": "runner/animometer.html",
</span><span class="cx"> "output_file": "animometer.result"
</span></span></pre>
</div>
</div>
</body>
</html>