<!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>[192006] 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/192006">192006</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-03 17:58:34 -0800 (Tue, 03 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add graphics benchmark to performance bot
https://bugs.webkit.org/show_bug.cgi?id=150450
Patch by Said Abou-Hallawa <sabouhallawa@apple.com> on 2015-11-03
Reviewed by Chris Dumez.
* Scripts/webkitpy/benchmark_runner/data/patches/Animometer.patch: Added.
* Scripts/webkitpy/benchmark_runner/data/plans/animometer.plan: Added.
Add a patch and a plan to set the defaults of the benchmark, run it,
collect the result and report it to the benchmark runner.</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_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 (192005 => 192006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-11-04 01:48:47 UTC (rev 192005)
+++ trunk/Tools/ChangeLog 2015-11-04 01:58:34 UTC (rev 192006)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-11-03 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ Add graphics benchmark to performance bot
+ https://bugs.webkit.org/show_bug.cgi?id=150450
+
+ Reviewed by Chris Dumez.
+
+ * Scripts/webkitpy/benchmark_runner/data/patches/Animometer.patch: Added.
+ * Scripts/webkitpy/benchmark_runner/data/plans/animometer.plan: Added.
+ Add a patch and a plan to set the defaults of the benchmark, run it,
+ collect the result and report it to the benchmark runner.
+
</ins><span class="cx"> 2015-11-03 Jason Marcell <jmarcell@apple.com>
</span><span class="cx">
</span><span class="cx"> run-webkit-test should look in --root directory for LayoutTestRelay
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerdatapatchesAnimometerpatch"></a>
<div class="addfile"><h4>Added: trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/Animometer.patch (0 => 192006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/Animometer.patch (rev 0)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/Animometer.patch 2015-11-04 01:58:34 UTC (rev 192006)
</span><span class="lines">@@ -0,0 +1,96 @@
</span><ins>+diff --git a/runner/resources/animometer.js b/runner/resources/animometer.js
+index e567681..ba0ab0f 100644
+--- a/runner/resources/animometer.js
++++ b/runner/resources/animometer.js
+@@ -41,14 +41,62 @@ window.benchmarkRunnerClient = {
+ this._resultsDashboard.push(suitesSamplers);
+ },
+
++ _computeTestReport: function(testName, testResults)
++ {
++ return [testResults[Strings["JSON_SCORE"][0]]];
++ },
++
++ _computeSuiteReports: function(suiteName, suiteResults)
++ {
++ var testsReports = {};
++
++ for (var testName in suiteResults[Strings["JSON_RESULTS"][2]]) {
++ var testReports = this._computeTestReport(testName, suiteResults[Strings["JSON_RESULTS"][2]][testName]);
++ testsReports[testName] = { "metrics": { "Score": { "current": testReports } } };
++ }
++
++ return testsReports;
++ },
++
++ _computeIterationReports: function(iterationResults)
++ {
++ var suitesReports = {};
++
++ for (var suiteName in iterationResults[Strings["JSON_RESULTS"][1]]) {
++ var testsReports = this._computeSuiteReports(suiteName, iterationResults[Strings["JSON_RESULTS"][1]][suiteName]);
++ suitesReports[suiteName] = { "metrics": { "Score": ["Geometric"] }, "tests": testsReports };
++ }
++
++ return suitesReports;
++ },
++
++ computeResultsReports: function()
++ {
++ var json = this._resultsDashboard.toJSON(false, false);
++ var iterationReports = this._computeIterationReports(json[Strings["JSON_RESULTS"][0]][0])
++ return {"Animometer": {"metrics" : {"Score" : ["Geometric"]}, "tests" : iterationReports } };
++ },
++
+ didFinishLastIteration: function ()
+ {
+- var json = this._resultsDashboard.toJSON(true, true);
+- 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]);
+- benchmarkController.showResults();
++ // submit result to server
++ var results = JSON.stringify(this.computeResultsReports());
++ var xhr = new XMLHttpRequest();
++ xhr.open("POST", "/report");
++
++ xhr.setRequestHeader("Content-type", "application/json");
++ xhr.setRequestHeader("Content-length", results.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(results);
+ }
+ }
+
+@@ -307,6 +355,10 @@ window.suitesManager =
+
+ suite.tests.forEach(function(test) {
+ var testElement = this._createTestElement(listElement, test, suiteCheckbox);
++ if (index < 4) {
++ var testCheckbox = this._checkboxElement(testElement);
++ testCheckbox.checked = true;
++ }
+ }, this);
+ }, this);
+ },
+@@ -408,10 +460,8 @@ window.benchmarkController =
+ initialize: function()
+ {
+ sectionsManager.setupSectionStyle();
+- optionsManager.updateUIFromLocalStorage();
+ suitesManager.createElements();
+- suitesManager.updateUIFromLocalStorage();
+- suitesManager.updateEditsElementsState();
++ setTimeout(this.startTest.bind(this), 3000);
+ },
+
+ onChangeAdaptiveTestCheckbox: function()
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerdataplansanimometerplan"></a>
<div class="addfile"><h4>Added: trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/animometer.plan (0 => 192006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/animometer.plan (rev 0)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/animometer.plan 2015-11-04 01:58:34 UTC (rev 192006)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+{
+ "timeout": 1800,
+ "count": 1,
+ "svn_source": "https://svn.webkit.org/repository/webkit/trunk/PerformanceTests/Animometer/@r191873",
+ "benchmark_patch": "data/patches/Animometer.patch",
+ "entry_point": "runner/animometer.html",
+ "output_file": "animometer.result"
+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>