<!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>[191586] trunk/PerformanceTests</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/191586">191586</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-26 09:44:54 -0700 (Mon, 26 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add an option to output the results of the graphics benchmark in JSON format
https://bugs.webkit.org/show_bug.cgi?id=150484
<rdar://problem/23243721>
Patch by Said Abou-Hallawa <sabouhallawa@apple.com> on 2015-10-26
Reviewed by Darin Adler.
* Animometer/resources/extensions.js:
(ResultsDashboard): A new class to hold the iterations results.
(ResultsDashboard.prototype.push): Appends an iteration results;
(ResultsDashboard.prototype.toJSON): Converts the iterations results to JSON format.
(RecordTable.prototype.clear): Clears the results table.
(RecordTable.prototype._showTitles): Shows the header titles and appends the sub-titles to a queue.
(RecordTable.prototype._showHeader): Shows the table header titles.
(RecordTable.prototype._showEmpty): Shows an empty table cell.
(RecordTable.prototype._showValue): Shows a number value in the results table.
(RecordTable.prototype._showSamples): Shows a button for the sampled data graph.
(RecordTable.prototype._showTest): Shows the results of a single test.
(RecordTable.prototype._showSuite): Shows the results of a single suite.
(RecordTable.prototype.showRecord): Shows a single iteration for a single test.
(RecordTable.prototype.showIterations): Shows the results of all the suites of the iterations.
(ResultsTable): RecordTable was renamed to ResultsTable.
(ResultsTable.prototype.clear): Clears the table element.
(ResultsTable.prototype._showHeaderRow): Shows a row in the results table header.
(ResultsTable.prototype._showHeader): Shows the results table header.
(ResultsTable.prototype._showEmpty): Shows an empty table cell.
(ResultsTable.prototype._showText): Shows a string in a new table cell.
(ResultsTable.prototype._showFixedNumber): Shows a number in a new table cell.
(ResultsTable.prototype._showGraph): Shows a button for the sampled data graph.
(ResultsTable.prototype._showJSON): Shows a button for the sampled data JSON.
(ResultsTable.prototype._showTest): Shows the results of a single test.
(ResultsTable.prototype._showSuite): Shows the results of a single suite.
(ResultsTable.prototype._showIteration): Shows the results of a single iteration.
(ResultsTable.prototype.showRecord): Shows a single iteration for a single test.
(ResultsTable.prototype.showIterations): Shows all the results.
(RecordTable): Deleted.
(RecordTable.prototype.clear): Deleted.
(RecordTable.prototype._showTitles): Deleted.
(RecordTable.prototype._showHeader): Deleted.
(RecordTable.prototype._showEmpty): Deleted.
(RecordTable.prototype._showValue): Deleted.
(RecordTable.prototype._showSamples): Deleted.
(RecordTable.prototype._showTest): Deleted.
(RecordTable.prototype._showSuite): Deleted.
(RecordTable.prototype.showRecord): Deleted.
(RecordTable.prototype.showIterations): Deleted.
* Animometer/resources/sampler.js:
(Sampler.prototype.startSampling): Use forEach.
(Sampler.prototype.sample): Use forEach.
(Sampler.prototype.toJSON): Converts the sampler data to JSON format.
* Animometer/resources/strings.js: Added.
This new file will be used to associate the strings used by the benchmark
with IDs. A string can be changed in one place without having to change
all the instances of this string in multiple files. There two groups of
strings in this file. The first one is used by the UI elements and the second
group is used when constructing the results JSON.
* Animometer/runner/animometer.html:
* Animometer/runner/resources/animometer.css:
* Animometer/runner/resources/animometer.js:
(window.benchmarkRunnerClient.willAddTestFrame):
(window.benchmarkRunnerClient.willStartFirstIteration):
(window.benchmarkRunnerClient.didRunSuites):
(window.benchmarkRunnerClient.didFinishLastIteration):
Make benchmarkRunnerClient uses ResultsDashboard instead of _iterationsSamplers
Get the JSON from ResultsDashboard.toJSON() and pass it to ResultsTable.showIterations().
Also set the textContent of the "#json" textarea with the results JSON.
(showResults): Delete unneeded code.
(showJson): Shows the "json" section.
(showTestGraph): Rename showGraph() to be showTestGraph().
(showTestJSON): Shows the JSON of a single testResults.
(showGraph): Deleted.
* Animometer/runner/resources/tests.js:
Use the string table instead of putting literal strings.
* Animometer/tests/resources/stage.js:
(StageBenchmark.prototype.showResults):
Fix the parameters which are passed to RecordTable.showRecord().
* Animometer/tests/bouncing-particles/bouncing-canvas-images.html:
* Animometer/tests/bouncing-particles/bouncing-canvas-shapes.html:
* Animometer/tests/bouncing-particles/bouncing-css-images.html:
* Animometer/tests/bouncing-particles/bouncing-css-shapes.html:
* Animometer/tests/bouncing-particles/bouncing-svg-images.html:
* Animometer/tests/bouncing-particles/bouncing-svg-shapes.html:
* Animometer/tests/examples/canvas-electrons.html:
* Animometer/tests/examples/canvas-stars.html:
* Animometer/tests/simple/simple-canvas-paths.html:
* Animometer/tests/template/template-canvas.html:
* Animometer/tests/template/template-css.html:
* Animometer/tests/template/template-svg.html:
* Animometer/tests/text/layering-text.html:
Include the new strings.js file in all the test files.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkPerformanceTestsAnimometerresourcesextensionsjs">trunk/PerformanceTests/Animometer/resources/extensions.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometerresourcessamplerjs">trunk/PerformanceTests/Animometer/resources/sampler.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometerrunneranimometerhtml">trunk/PerformanceTests/Animometer/runner/animometer.html</a></li>
<li><a href="#trunkPerformanceTestsAnimometerrunnerresourcesanimometercss">trunk/PerformanceTests/Animometer/runner/resources/animometer.css</a></li>
<li><a href="#trunkPerformanceTestsAnimometerrunnerresourcesanimometerjs">trunk/PerformanceTests/Animometer/runner/resources/animometer.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometerrunnerresourcestestsjs">trunk/PerformanceTests/Animometer/runner/resources/tests.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsbouncingparticlesbouncingcanvasimageshtml">trunk/PerformanceTests/Animometer/tests/bouncing-particles/bouncing-canvas-images.html</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsbouncingparticlesbouncingcanvasshapeshtml">trunk/PerformanceTests/Animometer/tests/bouncing-particles/bouncing-canvas-shapes.html</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsbouncingparticlesbouncingcssimageshtml">trunk/PerformanceTests/Animometer/tests/bouncing-particles/bouncing-css-images.html</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsbouncingparticlesbouncingcssshapeshtml">trunk/PerformanceTests/Animometer/tests/bouncing-particles/bouncing-css-shapes.html</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsbouncingparticlesbouncingsvgimageshtml">trunk/PerformanceTests/Animometer/tests/bouncing-particles/bouncing-svg-images.html</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsbouncingparticlesbouncingsvgshapeshtml">trunk/PerformanceTests/Animometer/tests/bouncing-particles/bouncing-svg-shapes.html</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsexamplescanvaselectronshtml">trunk/PerformanceTests/Animometer/tests/examples/canvas-electrons.html</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsexamplescanvasstarshtml">trunk/PerformanceTests/Animometer/tests/examples/canvas-stars.html</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsresourcesstagejs">trunk/PerformanceTests/Animometer/tests/resources/stage.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestssimplesimplecanvaspathshtml">trunk/PerformanceTests/Animometer/tests/simple/simple-canvas-paths.html</a></li>
<li><a href="#trunkPerformanceTestsAnimometerteststemplatetemplatecanvashtml">trunk/PerformanceTests/Animometer/tests/template/template-canvas.html</a></li>
<li><a href="#trunkPerformanceTestsAnimometerteststemplatetemplatecsshtml">trunk/PerformanceTests/Animometer/tests/template/template-css.html</a></li>
<li><a href="#trunkPerformanceTestsAnimometerteststemplatetemplatesvghtml">trunk/PerformanceTests/Animometer/tests/template/template-svg.html</a></li>
<li><a href="#trunkPerformanceTestsAnimometerteststextlayeringtexthtml">trunk/PerformanceTests/Animometer/tests/text/layering-text.html</a></li>
<li><a href="#trunkPerformanceTestsChangeLog">trunk/PerformanceTests/ChangeLog</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkPerformanceTestsAnimometerresourcesstringsjs">trunk/PerformanceTests/Animometer/resources/strings.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkPerformanceTestsAnimometerresourcesextensionsjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/resources/extensions.js (191585 => 191586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/resources/extensions.js 2015-10-26 15:59:17 UTC (rev 191585)
+++ trunk/PerformanceTests/Animometer/resources/extensions.js 2015-10-26 16:44:54 UTC (rev 191586)
</span><span class="lines">@@ -141,42 +141,96 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function RecordTable(element)
</del><ins>+function ResultsDashboard()
</ins><span class="cx"> {
</span><ins>+ this._iterationsSamplers = [];
+}
+
+ResultsDashboard.prototype =
+{
+ push: function(suitesSamplers)
+ {
+ this._iterationsSamplers.push(suitesSamplers);
+ },
+
+ toJSON: function(statistics, graph)
+ {
+ var iterationsResults = [];
+ var iterationsScores = [];
+
+ this._iterationsSamplers.forEach(function(iterationSamplers, index) {
+ var suitesResults = {};
+ var suitesScores = [];
+
+ for (var suiteName in iterationSamplers) {
+ var suite = suiteFromName(suiteName);
+ var suiteSamplers = iterationSamplers[suiteName];
+
+ var testsResults = {};
+ var testsScores = [];
+
+ for (var testName in suiteSamplers) {
+ var sampler = suiteSamplers[testName];
+ testsResults[testName] = sampler.toJSON(statistics, graph);
+ testsScores.push(testsResults[testName][Strings["JSON_SCORE"]]);
+ }
+
+ suitesResults[suiteName] = {};
+ suitesResults[suiteName][Strings["JSON_SCORE"]] = Statistics.geometricMean(testsScores);
+ suitesResults[suiteName][Strings["JSON_RESULTS"][2]] = testsResults;
+ suitesScores.push(suitesResults[suiteName][Strings["JSON_SCORE"]]);
+ }
+
+ iterationsResults[index] = {};
+ iterationsResults[index][Strings["JSON_SCORE"]] = Statistics.geometricMean(suitesScores);
+ iterationsResults[index][Strings["JSON_RESULTS"][1]] = suitesResults;
+ iterationsScores.push(iterationsResults[index][Strings["JSON_SCORE"]]);
+ });
+
+ var json = {};
+ json[Strings["JSON_SCORE"]] = Statistics.sampleMean(iterationsScores.length, iterationsScores.reduce(function(a, b) { return a * b; }));
+ json[Strings["JSON_RESULTS"][0]] = iterationsResults;
+ return json;
+ }
+}
+
+function ResultsTable(element, headers)
+{
</ins><span class="cx"> this.element = element;
</span><ins>+ this._headers = headers;
</ins><span class="cx"> this.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RecordTable.prototype =
</del><ins>+ResultsTable.prototype =
</ins><span class="cx"> {
</span><span class="cx"> clear: function()
</span><span class="cx"> {
</span><span class="cx"> this.element.innerHTML = "";
</span><span class="cx"> },
</span><del>-
- _showTitles: function(row, queue, titles, message)
</del><ins>+
+ _showHeaderRow: function(row, queue, headers, message)
</ins><span class="cx"> {
</span><del>- titles.forEach(function (title) {
</del><ins>+ headers.forEach(function (header) {
</ins><span class="cx"> var th = document.createElement("th");
</span><del>- th.textContent = title.text;
</del><ins>+ th.textContent = header.text;
</ins><span class="cx"> if (typeof message != "undefined" && message.length) {
</span><span class="cx"> th.appendChild(document.createElement('br'));
</span><span class="cx"> th.appendChild(document.createTextNode('[' + message +']'));
</span><span class="cx"> message = "";
</span><span class="cx"> }
</span><del>- if ("width" in title)
- th.width = title.width + "%";
</del><ins>+ if ("width" in header)
+ th.width = header.width + "%";
</ins><span class="cx"> row.appendChild(th);
</span><del>- queue.push({element: th, titles: title.children });
</del><ins>+ queue.push({element: th, headers: header.children });
</ins><span class="cx"> });
</span><span class="cx"> },
</span><del>-
- _showHeader: function(suiteName, titles, message)
</del><ins>+
+ _showHeader: function(message)
</ins><span class="cx"> {
</span><span class="cx"> var row = document.createElement("tr");
</span><span class="cx">
</span><span class="cx"> var queue = [];
</span><del>- this._showTitles(row, queue, titles, message);
</del><ins>+ this._showHeaderRow(row, queue, this._headers, message);
</ins><span class="cx"> this.element.appendChild(row);
</span><span class="cx">
</span><span class="cx"> while (queue.length) {
</span><span class="lines">@@ -186,7 +240,7 @@
</span><span class="cx"> for (var i = 0, len = queue.length; i < len; ++i) {
</span><span class="cx"> var entry = queue.shift();
</span><span class="cx">
</span><del>- if (!entry.titles.length) {
</del><ins>+ if (!entry.headers.length) {
</ins><span class="cx"> entries.push(entry.element);
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="lines">@@ -194,8 +248,8 @@
</span><span class="cx"> if (!row)
</span><span class="cx"> var row = document.createElement("tr");
</span><span class="cx">
</span><del>- this._showTitles(row, queue, entry.titles, "");
- entry.element.colSpan = entry.titles.length;
</del><ins>+ this._showHeaderRow(row, queue, entry.headers, "");
+ entry.element.colSpan = entry.headers.length;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (row) {
</span><span class="lines">@@ -207,100 +261,132 @@
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><del>- _showEmpty: function(row, testName)
</del><ins>+ _showEmpty: function(row)
</ins><span class="cx"> {
</span><span class="cx"> var td = document.createElement("td");
</span><span class="cx"> row.appendChild(td);
</span><span class="cx"> },
</span><del>-
- _showValue: function(row, testName, value)
</del><ins>+
+ _showText: function(row, text)
</ins><span class="cx"> {
</span><span class="cx"> var td = document.createElement("td");
</span><del>- td.textContent = value.toFixed(2);
</del><ins>+ td.textContent = text;
</ins><span class="cx"> row.appendChild(td);
</span><span class="cx"> },
</span><ins>+
+ _showFixedNumber: function(row, value, digits)
+ {
+ var td = document.createElement("td");
+ td.textContent = value.toFixed(digits || 2);
+ row.appendChild(td);
+ },
</ins><span class="cx">
</span><del>- _showSamples: function(row, testName, axes, samples, samplingTimeOffset)
</del><ins>+ _showGraph: function(row, testName, testResults)
</ins><span class="cx"> {
</span><ins>+ var data = testResults[Strings["JSON_SAMPLES"][0]];
+ if (!data) {
+ this._showEmpty(row);
+ return;
+ }
+
</ins><span class="cx"> var td = document.createElement("td");
</span><span class="cx"> var button = document.createElement("div");
</span><span class="cx"> button.className = "small-button";
</span><ins>+
+ button.addEventListener("click", function() {
+ var samples = data[Strings["JSON_GRAPH"][0]];
+ var samplingTimeOffset = data[Strings["JSON_GRAPH"][1]];
+ var axes = Strings["TEXT_EXPERIMENTS"];
+ window.showTestGraph(testName, axes, samples, samplingTimeOffset);
+ });
</ins><span class="cx">
</span><ins>+ button.textContent = Strings["TEXT_RESULTS"][1] + "...";
+ td.appendChild(button);
+ row.appendChild(td);
+ },
+
+ _showJSON: function(row, testName, testResults)
+ {
+ var data = testResults[Strings["JSON_SAMPLES"][0]];
+ if (!data) {
+ this._showEmpty(row);
+ return;
+ }
+
+ var td = document.createElement("td");
+ var button = document.createElement("div");
+ button.className = "small-button";
+
</ins><span class="cx"> button.addEventListener("click", function() {
</span><del>- window.showGraph(testName, axes, samples, samplingTimeOffset);
</del><ins>+ window.showTestJSON(testName, testResults);
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- button.textContent = "Graph...";
</del><ins>+ button.textContent = Strings["TEXT_RESULTS"][2] + "...";
</ins><span class="cx"> td.appendChild(button);
</span><span class="cx"> row.appendChild(td);
</span><span class="cx"> },
</span><del>-
- _showTest: function(testName, titles, sampler, finalResults)
</del><ins>+
+ _showTest: function(testName, testResults)
</ins><span class="cx"> {
</span><span class="cx"> var row = document.createElement("tr");
</span><del>- var td = document.createElement("td");
</del><span class="cx">
</span><del>- td.textContent = testName;
- row.appendChild(td);
-
- var axes = [];
- sampler.experiments.forEach(function(experiment, index) {
- this._showValue(row, testName, experiment.mean());
- this._showValue(row, testName, experiment.concern(Experiment.defaults.CONCERN));
- this._showValue(row, testName, experiment.standardDeviation());
- this._showValue(row, testName, experiment.percentage());
- axes.push(titles[index + 1].text);
-
- }, this);
</del><ins>+ for (var index = 0; index < this._headers.length; ++index) {
</ins><span class="cx">
</span><del>- this._showValue(row, testName, sampler.experiments[0].score(Experiment.defaults.CONCERN));
</del><ins>+ switch (index) {
+ case 0:
+ this._showText(row, testName);
+ break;
</ins><span class="cx">
</span><del>- if (finalResults)
- this._showSamples(row, testName, axes, sampler.samples, sampler.samplingTimeOffset);
- else
- this._showEmpty(row, testName);
-
</del><ins>+ case 1:
+ var data = testResults[Strings["JSON_SCORE"][0]];
+ this._showFixedNumber(row, data, 2);
+ break;
+
+ case 2:
+ case 3:
+ var data = testResults[Strings["JSON_EXPERIMENTS"][index - 2]];
+ for (var measurement in data)
+ this._showFixedNumber(row, data[measurement], 2);
+ break;
+
+ case 4:
+ this._showGraph(row, testName, testResults);
+ this._showJSON(row, testName, testResults);
+ break;
+ }
+ }
+
</ins><span class="cx"> this.element.appendChild(row);
</span><span class="cx"> },
</span><del>-
- _showSuite: function(suite, suiteSamplers)
</del><ins>+
+ _showSuite: function(suiteName, suiteResults)
</ins><span class="cx"> {
</span><del>- var scores = [];
- for (var testName in suiteSamplers) {
- var test = testFromName(suite, testName);
- var sampler = suiteSamplers[testName];
- this._showTest(testName, suite.titles, sampler, true);
- scores.push(sampler.experiments[0].score(Experiment.defaults.CONCERN));
</del><ins>+ for (var testName in suiteResults[Strings["JSON_RESULTS"][2]]) {
+ this._showTest(testName, suiteResults[Strings["JSON_RESULTS"][2]][testName]);
</ins><span class="cx"> }
</span><del>- return scores;
</del><span class="cx"> },
</span><span class="cx">
</span><del>- showRecord: function(suite, test, sampler, message)
</del><ins>+ _showIteration : function(iterationResults)
</ins><span class="cx"> {
</span><del>- this.clear();
- this._showHeader("", suite.titles, message);
- this._showTest(test.name, suite.titles, sampler, false);
</del><ins>+ for (var suiteName in iterationResults[Strings["JSON_RESULTS"][1]]) {
+ this._showSuite(suiteName, iterationResults[Strings["JSON_RESULTS"][1]][suiteName]);
+ }
</ins><span class="cx"> },
</span><span class="cx">
</span><del>- showIterations: function(iterationsSamplers)
</del><ins>+ showRecord: function(testName, message, testResults)
</ins><span class="cx"> {
</span><span class="cx"> this.clear();
</span><ins>+ this._showHeader(message);
+ this._showTest(testName, testResults);
+ },
</ins><span class="cx">
</span><del>- var scores = [];
- var titles = null;
- iterationsSamplers.forEach(function(suitesSamplers) {
- for (var suiteName in suitesSamplers) {
- var suite = suiteFromName(suiteName);
- if (titles != suite.titles) {
- titles = suite.titles;
- this._showHeader(suiteName, titles, "");
- }
-
- var suiteScores = this._showSuite(suite, suitesSamplers[suiteName]);
- scores.push.apply(scores, suiteScores);
- }
</del><ins>+ showIterations: function(iterationsResults)
+ {
+ this.clear();
+ this._showHeader("");
+
+ iterationsResults.forEach(function(iterationResults) {
+ this._showIteration(iterationResults);
</ins><span class="cx"> }, this);
</span><del>-
- return Statistics.geometricMean(scores);
</del><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometerresourcessamplerjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/resources/sampler.js (191585 => 191586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/resources/sampler.js 2015-10-26 15:59:17 UTC (rev 191585)
+++ trunk/PerformanceTests/Animometer/resources/sampler.js 2015-10-26 16:44:54 UTC (rev 191586)
</span><span class="lines">@@ -103,22 +103,49 @@
</span><span class="cx">
</span><span class="cx"> Sampler.prototype =
</span><span class="cx"> {
</span><del>- startSampling: function(timeOffset)
</del><ins>+ startSampling: function(samplingTimeOffset)
</ins><span class="cx"> {
</span><del>- for (var index = 0; index < this.experiments.length; ++index)
- this.experiments[index].startSampling();
</del><ins>+ this.experiments.forEach(function(experiment) {
+ experiment.startSampling();
+ });
</ins><span class="cx">
</span><del>- this.samplingTimeOffset = timeOffset / 1000;
</del><ins>+ this.samplingTimeOffset = samplingTimeOffset / 1000;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> sample: function(timeOffset, values)
</span><span class="cx"> {
</span><span class="cx"> if (values.length < this.experiments.length)
</span><span class="cx"> throw "Not enough sample points";
</span><ins>+
+ this.experiments.forEach(function(experiment, index) {
+ experiment.sample(values[index]);
+ });
</ins><span class="cx">
</span><del>- for (var index = 0; index < this.experiments.length; ++index)
- this.experiments[index].sample(values[index]);
-
</del><span class="cx"> this.samples.push({ timeOffset: timeOffset / 1000, values: values });
</span><ins>+ },
+
+ toJSON: function(statistics, graph)
+ {
+ var results = {};
+
+ results[Strings["JSON_SCORE"]] = this.experiments[0].score(Experiment.defaults.CONCERN);
+
+ if (statistics) {
+ this.experiments.forEach(function(experiment, index) {
+ results[Strings["JSON_EXPERIMENTS"][index]] = {};
+ results[Strings["JSON_EXPERIMENTS"][index]][Strings["JSON_MEASUREMENTS"][0]] = experiment.mean();
+ results[Strings["JSON_EXPERIMENTS"][index]][Strings["JSON_MEASUREMENTS"][1]] = experiment.concern(Experiment.defaults.CONCERN);
+ results[Strings["JSON_EXPERIMENTS"][index]][Strings["JSON_MEASUREMENTS"][2]] = experiment.standardDeviation();
+ results[Strings["JSON_EXPERIMENTS"][index]][Strings["JSON_MEASUREMENTS"][3]] = experiment.percentage();
+ });
+ }
+
+ if (graph) {
+ results[Strings["JSON_SAMPLES"][0]] = {};
+ results[Strings["JSON_SAMPLES"][0]][Strings["JSON_GRAPH"][0]] = this.samples;
+ results[Strings["JSON_SAMPLES"][0]][Strings["JSON_GRAPH"][1]] = this.samplingTimeOffset;
+ }
+
+ return results;
</ins><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometerresourcesstringsjs"></a>
<div class="addfile"><h4>Added: trunk/PerformanceTests/Animometer/resources/strings.js (0 => 191586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/resources/strings.js (rev 0)
+++ trunk/PerformanceTests/Animometer/resources/strings.js 2015-10-26 16:44:54 UTC (rev 191586)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+var Strings = {
+ TEXT_TESTNAME: [ "Test Name" ],
+ TEXT_EXPERIMENTS: [ "Complexity", "FPS" ],
+ TEXT_MEASUREMENTS: [ "Avg.", "W.5%", "Std.", "%" ],
+ TEXT_SCORE: [ "Score" ],
+ TEXT_SAMPLES: [ "Samples" ],
+ TEXT_RESULTS: [ "Results", "Graph", "JSON" ],
+
+ JSON_EXPERIMENTS: [ "complexity", "frameRate" ],
+ JSON_MEASUREMENTS: [ "average", "concern", "stdev", "percent" ],
+ JSON_SCORE: [ "score" ],
+ JSON_SAMPLES: [ "samples" ],
+ JSON_GRAPH: [ "points", "samplingTimeOffset" ],
+ JSON_RESULTS: [ "iterationsResults", "suitesResults", "testsResults" ],
+};
</ins></span></pre></div>
<a id="trunkPerformanceTestsAnimometerrunneranimometerhtml"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/runner/animometer.html (191585 => 191586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/runner/animometer.html 2015-10-26 15:59:17 UTC (rev 191585)
+++ trunk/PerformanceTests/Animometer/runner/animometer.html 2015-10-26 16:44:54 UTC (rev 191586)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><span class="cx"> <link rel="stylesheet" href="resources/animometer.css">
</span><ins>+ <script src="../resources/strings.js" defer></script>
</ins><span class="cx"> <script src="../resources/sampler.js" defer></script>
</span><span class="cx"> <script src="../resources/extensions.js" defer></script>
</span><span class="cx"> <script src="resources/tests.js" defer=""></script>
</span><span class="lines">@@ -43,20 +44,37 @@
</span><span class="cx"> </div>
</span><span class="cx"> </section>
</span><span class="cx"> <section id="results">
</span><del>- <h1>Results</h1>
</del><ins>+ <h1>Results:</h1>
</ins><span class="cx"> <table class="results-table"></table>
</span><span class="cx"> <div class="buttons">
</span><ins>+ <button onclick="showJson()">JSON</button>
</ins><span class="cx"> <button onclick="startTest()">Test Again</button>
</span><span class="cx"> </div>
</span><span class="cx"> </section>
</span><del>- <section id="graph">
- <h1>Graph</h1>
</del><ins>+ <section id="json">
+ <h1>JSON:</h1>
+ <textarea class="results-json"></textarea>
+ <div class="buttons">
+ <button onclick="showResults()">Results</button>
+ <button onclick="startTest()">Test Again</button>
+ </div>
+ </section>
+ <section id="test-graph">
+ <h1>Graph:</h1>
</ins><span class="cx"> <div id="graphContainer"></div>
</span><span class="cx"> <div class="buttons">
</span><span class="cx"> <button onclick="showResults()">Results</button>
</span><span class="cx"> <button onclick="startTest()">Test Again</button>
</span><span class="cx"> </div>
</span><span class="cx"> </section>
</span><ins>+ <section id="test-json">
+ <h1>JSON:</h1>
+ <textarea class="results-json"></textarea>
+ <div class="buttons">
+ <button onclick="showResults()">Results</button>
+ <button onclick="startTest()">Test Again</button>
+ </div>
+ </section>
</ins><span class="cx"> </main>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometerrunnerresourcesanimometercss"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/runner/resources/animometer.css (191585 => 191586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/runner/resources/animometer.css 2015-10-26 15:59:17 UTC (rev 191585)
+++ trunk/PerformanceTests/Animometer/runner/resources/animometer.css 2015-10-26 16:44:54 UTC (rev 191586)
</span><span class="lines">@@ -117,6 +117,17 @@
</span><span class="cx"> text-align: center;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+section#test-json > textarea,
+section#json > textarea {
+ width: 800px;
+ height: 460px;
+ background-color: rgb(128, 128, 128);
+ border: 1px solid rgb(235, 235, 235);
+ color: white;
+ white-space: pre;
+ overflow: scroll;
+}
+
</ins><span class="cx"> .options {
</span><span class="cx"> margin:0 auto;
</span><span class="cx"> margin-top: 30px;
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometerrunnerresourcesanimometerjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/runner/resources/animometer.js (191585 => 191586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/runner/resources/animometer.js 2015-10-26 15:59:17 UTC (rev 191585)
+++ trunk/PerformanceTests/Animometer/runner/resources/animometer.js 2015-10-26 16:44:54 UTC (rev 191586)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> recordTable: null,
</span><span class="cx"> options: { testInterval: 30000, frameRate: 50, estimatedFrameRate: true, fixTestComplexity : false },
</span><span class="cx"> score: 0,
</span><del>- _iterationsSamplers: [],
</del><ins>+ _resultsDashboard: null,
</ins><span class="cx"> _resultsTable: null,
</span><span class="cx">
</span><span class="cx"> willAddTestFrame: function (frame)
</span><span class="lines">@@ -23,21 +23,31 @@
</span><span class="cx">
</span><span class="cx"> willStartFirstIteration: function ()
</span><span class="cx"> {
</span><del>- this._iterationsSamplers = [];
- this._resultsTable = new RecordTable(document.querySelectorAll(".results-table")[0]);
</del><ins>+ this._resultsDashboard = new ResultsDashboard();
+ this._resultsTable = new ResultsTable(document.querySelector(".results-table"), Headers);
</ins><span class="cx">
</span><span class="cx"> this.progressBar = new ProgressBar(document.getElementById("progress-completed"), this.testsCount);
</span><del>- this.recordTable = new RecordTable(document.querySelectorAll(".record-table")[0]);
</del><ins>+ this.recordTable = new ResultsTable(document.querySelector(".record-table"), Headers);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> didRunSuites: function (suitesSamplers)
</span><span class="cx"> {
</span><del>- this._iterationsSamplers.push(suitesSamplers);
</del><ins>+ this._resultsDashboard.push(suitesSamplers);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> didFinishLastIteration: function ()
</span><span class="cx"> {
</span><del>- this.score = this._resultsTable.showIterations(this._iterationsSamplers, "");
</del><ins>+ var json = this._resultsDashboard.toJSON(true, true);
+ this._resultsTable.showIterations(json[Strings["JSON_RESULTS"][0]]);
+
+ var element = document.querySelector("#json > textarea");
+ element.innerHTML = JSON.stringify(json[Strings["JSON_RESULTS"][0]][0], function(key, value) {
+ if (typeof value == "number")
+ return value.toFixed(2);
+ return value;
+ }, 4);
+
+ this.score = json[Strings["JSON_SCORE"]];
</ins><span class="cx"> showResults();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -92,10 +102,10 @@
</span><span class="cx"> startBenchmark();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function showResults(score)
</del><ins>+function showResults()
</ins><span class="cx"> {
</span><span class="cx"> var element = document.querySelector("#results > h1");
</span><del>- element.textContent = "Results:"
</del><ins>+ element.textContent = Strings["TEXT_RESULTS"][0] + ":";
</ins><span class="cx">
</span><span class="cx"> var score = benchmarkRunnerClient.score.toFixed(2);
</span><span class="cx"> element.textContent += " [Score = " + score + "]";
</span><span class="lines">@@ -103,18 +113,47 @@
</span><span class="cx"> showSection("results", true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function showGraph(testName, axes, samples, samplingTimeOffset)
</del><ins>+function showJson()
</ins><span class="cx"> {
</span><del>- var element = document.querySelector("#graph > h1");
- element.textContent = "Graph:"
</del><ins>+ var element = document.querySelector("#json > h1");
+ element.textContent = Strings["TEXT_RESULTS"][2] + ":";
+
+ var score = benchmarkRunnerClient.score.toFixed(2);
+ element.textContent += " [Score = " + score + "]";
</ins><span class="cx">
</span><ins>+ showSection("json", true);
+}
+
+function showTestGraph(testName, axes, samples, samplingTimeOffset)
+{
+ var element = document.querySelector("#test-graph > h1");
+ element.textContent = Strings["TEXT_RESULTS"][1] + ":";
+
</ins><span class="cx"> if (testName.length)
</span><span class="cx"> element.textContent += " [test = " + testName + "]";
</span><span class="cx">
</span><span class="cx"> graph("#graphContainer", new Point(700, 400), new Insets(20, 50, 20, 50), axes, samples, samplingTimeOffset);
</span><del>- showSection("graph", true);
</del><ins>+ showSection("test-graph", true);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+function showTestJSON(testName, testResults)
+{
+ var element = document.querySelector("#test-json > h1");
+ element.textContent = Strings["TEXT_RESULTS"][2] + ":";
+
+ if (testName.length)
+ element.textContent += " [test = " + testName + "]";
+
+ var element = document.querySelector("#test-json > textarea");
+ element.innerHTML = JSON.stringify(testResults, function(key, value) {
+ if (typeof value == "number")
+ return value.toFixed(2);
+ return value;
+ }, 4);
+
+ showSection("test-json", true);
+}
+
</ins><span class="cx"> function populateSettings() {
</span><span class="cx"> var suitesDiv = document.getElementById("suites");
</span><span class="cx"> Suites.forEach(function(suite) {
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometerrunnerresourcestestsjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/runner/resources/tests.js (191585 => 191586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/runner/resources/tests.js 2015-10-26 15:59:17 UTC (rev 191585)
+++ trunk/PerformanceTests/Animometer/runner/resources/tests.js 2015-10-26 16:44:54 UTC (rev 191586)
</span><span class="lines">@@ -1,46 +1,49 @@
</span><del>-var Titles = [
</del><ins>+var Headers = [
</ins><span class="cx"> {
</span><del>- text: "Test Name",
- width: 28,
</del><ins>+ text: Strings["TEXT_TESTNAME"][0],
+ width: 27,
</ins><span class="cx"> children: []
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- text: "Animated Items",
- width: 28,
</del><ins>+ text: Strings["TEXT_SCORE"][0],
+ width: 7,
+ children: []
+ },
+ {
+ text: Strings["TEXT_EXPERIMENTS"][0],
+ width: 27,
</ins><span class="cx"> children:
</span><span class="cx"> [
</span><del>- { text: "Avg.", width: 7, children: [] },
- { text: "W.5%", width: 7, children: [] },
- { text: "Std.", width: 7, children: [] },
- { text: "%", width: 7, children: [] },
</del><ins>+ { text: Strings["TEXT_MEASUREMENTS"][0], width: 7, children: [] },
+ { text: Strings["TEXT_MEASUREMENTS"][1], width: 7, children: [] },
+ { text: Strings["TEXT_MEASUREMENTS"][2], width: 7, children: [] },
+ { text: Strings["TEXT_MEASUREMENTS"][3], width: 6, children: [] },
</ins><span class="cx"> ]
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- text: "FPS",
- width: 28,
</del><ins>+ text: Strings["TEXT_EXPERIMENTS"][1],
+ width: 24,
</ins><span class="cx"> children:
</span><span class="cx"> [
</span><del>- { text: "Avg.", width: 7, children: [] },
- { text: "W.5%", width: 7, children: [] },
- { text: "Std.", width: 7, children: [] },
- { text: "%", width: 7, children: [] },
</del><ins>+ { text: Strings["TEXT_MEASUREMENTS"][0], width: 6, children: [] },
+ { text: Strings["TEXT_MEASUREMENTS"][1], width: 6, children: [] },
+ { text: Strings["TEXT_MEASUREMENTS"][2], width: 6, children: [] },
+ { text: Strings["TEXT_MEASUREMENTS"][3], width: 6, children: [] },
</ins><span class="cx"> ]
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- text: "Score",
- width: 8,
- children: []
- },
- {
- text: "Samples",
- width: 8,
- children: []
</del><ins>+ text: Strings["TEXT_SAMPLES"][0],
+ width: 15,
+ children:
+ [
+ { text: Strings["TEXT_RESULTS"][1], width: 8, children: [] },
+ { text: Strings["TEXT_RESULTS"][2], width: 7, children: [] },
+ ]
</ins><span class="cx"> }
</span><span class="cx"> ];
</span><span class="cx">
</span><span class="cx"> var Suite = function(name, tests) {
</span><span class="cx"> this.name = name;
</span><del>- this.titles = Titles;
</del><span class="cx"> this.tests = tests;
</span><span class="cx"> };
</span><span class="cx"> Suite.prototype.prepare = function(runner, contentWindow, contentDocument)
</span><span class="lines">@@ -54,7 +57,6 @@
</span><span class="cx"> return contentWindow.runBenchmark(this, test, options, recordTable, progressBar);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-
</del><span class="cx"> var Suites = [];
</span><span class="cx">
</span><span class="cx"> Suites.push(new Suite("HTML suite",
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsbouncingparticlesbouncingcanvasimageshtml"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/bouncing-particles/bouncing-canvas-images.html (191585 => 191586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/bouncing-particles/bouncing-canvas-images.html 2015-10-26 15:59:17 UTC (rev 191585)
+++ trunk/PerformanceTests/Animometer/tests/bouncing-particles/bouncing-canvas-images.html 2015-10-26 16:44:54 UTC (rev 191586)
</span><span class="lines">@@ -9,6 +9,7 @@
</span><span class="cx"> </style>
</span><span class="cx"> <link rel="stylesheet" type="text/css" href="../resources/stage.css">
</span><span class="cx"> <script src="../../resources/algorithm.js"></script>
</span><ins>+ <script src="../../resources/strings.js"></script>
</ins><span class="cx"> <script src="../../resources/sampler.js"></script>
</span><span class="cx"> <script src="../../resources/extensions.js"></script>
</span><span class="cx"> <script src="../resources/math.js"></script>
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsbouncingparticlesbouncingcanvasshapeshtml"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/bouncing-particles/bouncing-canvas-shapes.html (191585 => 191586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/bouncing-particles/bouncing-canvas-shapes.html 2015-10-26 15:59:17 UTC (rev 191585)
+++ trunk/PerformanceTests/Animometer/tests/bouncing-particles/bouncing-canvas-shapes.html 2015-10-26 16:44:54 UTC (rev 191586)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> <head>
</span><span class="cx"> <link rel="stylesheet" type="text/css" href="../resources/stage.css">
</span><span class="cx"> <script src="../../resources/algorithm.js"></script>
</span><ins>+ <script src="../../resources/strings.js"></script>
</ins><span class="cx"> <script src="../../resources/sampler.js"></script>
</span><span class="cx"> <script src="../../resources/extensions.js"></script>
</span><span class="cx"> <script src="../resources/math.js"></script>
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsbouncingparticlesbouncingcssimageshtml"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/bouncing-particles/bouncing-css-images.html (191585 => 191586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/bouncing-particles/bouncing-css-images.html 2015-10-26 15:59:17 UTC (rev 191585)
+++ trunk/PerformanceTests/Animometer/tests/bouncing-particles/bouncing-css-images.html 2015-10-26 16:44:54 UTC (rev 191586)
</span><span class="lines">@@ -8,6 +8,7 @@
</span><span class="cx"> </style>
</span><span class="cx"> <link rel="stylesheet" type="text/css" href="../resources/stage.css">
</span><span class="cx"> <script src="../../resources/algorithm.js"></script>
</span><ins>+ <script src="../../resources/strings.js"></script>
</ins><span class="cx"> <script src="../../resources/sampler.js"></script>
</span><span class="cx"> <script src="../../resources/extensions.js"></script>
</span><span class="cx"> <script src="../resources/math.js"></script>
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsbouncingparticlesbouncingcssshapeshtml"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/bouncing-particles/bouncing-css-shapes.html (191585 => 191586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/bouncing-particles/bouncing-css-shapes.html 2015-10-26 15:59:17 UTC (rev 191585)
+++ trunk/PerformanceTests/Animometer/tests/bouncing-particles/bouncing-css-shapes.html 2015-10-26 16:44:54 UTC (rev 191586)
</span><span class="lines">@@ -19,6 +19,7 @@
</span><span class="cx"> </style>
</span><span class="cx"> <link rel="stylesheet" type="text/css" href="../resources/stage.css">
</span><span class="cx"> <script src="../../resources/algorithm.js"></script>
</span><ins>+ <script src="../../resources/strings.js"></script>
</ins><span class="cx"> <script src="../../resources/sampler.js"></script>
</span><span class="cx"> <script src="../../resources/extensions.js"></script>
</span><span class="cx"> <script src="../resources/math.js"></script>
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsbouncingparticlesbouncingsvgimageshtml"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/bouncing-particles/bouncing-svg-images.html (191585 => 191586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/bouncing-particles/bouncing-svg-images.html 2015-10-26 15:59:17 UTC (rev 191585)
+++ trunk/PerformanceTests/Animometer/tests/bouncing-particles/bouncing-svg-images.html 2015-10-26 16:44:54 UTC (rev 191586)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> <head>
</span><span class="cx"> <link rel="stylesheet" type="text/css" href="../resources/stage.css">
</span><span class="cx"> <script src="../../resources/algorithm.js"></script>
</span><ins>+ <script src="../../resources/strings.js"></script>
</ins><span class="cx"> <script src="../../resources/sampler.js"></script>
</span><span class="cx"> <script src="../../resources/extensions.js"></script>
</span><span class="cx"> <script src="../resources/math.js"></script>
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsbouncingparticlesbouncingsvgshapeshtml"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/bouncing-particles/bouncing-svg-shapes.html (191585 => 191586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/bouncing-particles/bouncing-svg-shapes.html 2015-10-26 15:59:17 UTC (rev 191585)
+++ trunk/PerformanceTests/Animometer/tests/bouncing-particles/bouncing-svg-shapes.html 2015-10-26 16:44:54 UTC (rev 191586)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> <head>
</span><span class="cx"> <link rel="stylesheet" type="text/css" href="../resources/stage.css">
</span><span class="cx"> <script src="../../resources/algorithm.js"></script>
</span><ins>+ <script src="../../resources/strings.js"></script>
</ins><span class="cx"> <script src="../../resources/sampler.js"></script>
</span><span class="cx"> <script src="../../resources/extensions.js"></script>
</span><span class="cx"> <script src="../resources/math.js"></script>
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsexamplescanvaselectronshtml"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/examples/canvas-electrons.html (191585 => 191586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/examples/canvas-electrons.html 2015-10-26 15:59:17 UTC (rev 191585)
+++ trunk/PerformanceTests/Animometer/tests/examples/canvas-electrons.html 2015-10-26 16:44:54 UTC (rev 191586)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> <head>
</span><span class="cx"> <link rel="stylesheet" type="text/css" href="../resources/stage.css">
</span><span class="cx"> <script src="../../resources/algorithm.js"></script>
</span><ins>+ <script src="../../resources/strings.js"></script>
</ins><span class="cx"> <script src="../../resources/sampler.js"></script>
</span><span class="cx"> <script src="../../resources/extensions.js"></script>
</span><span class="cx"> <script src="../resources/math.js"></script>
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsexamplescanvasstarshtml"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/examples/canvas-stars.html (191585 => 191586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/examples/canvas-stars.html 2015-10-26 15:59:17 UTC (rev 191585)
+++ trunk/PerformanceTests/Animometer/tests/examples/canvas-stars.html 2015-10-26 16:44:54 UTC (rev 191586)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> <head>
</span><span class="cx"> <link rel="stylesheet" type="text/css" href="../resources/stage.css">
</span><span class="cx"> <script src="../../resources/algorithm.js"></script>
</span><ins>+ <script src="../../resources/strings.js"></script>
</ins><span class="cx"> <script src="../../resources/sampler.js"></script>
</span><span class="cx"> <script src="../../resources/extensions.js"></script>
</span><span class="cx"> <script src="../resources/math.js"></script>
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsresourcesstagejs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/resources/stage.js (191585 => 191586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/resources/stage.js 2015-10-26 15:59:17 UTC (rev 191585)
+++ trunk/PerformanceTests/Animometer/tests/resources/stage.js 2015-10-26 16:44:54 UTC (rev 191586)
</span><span class="lines">@@ -174,11 +174,11 @@
</span><span class="cx">
</span><span class="cx"> StageBenchmark.prototype.showResults = function(message, progress)
</span><span class="cx"> {
</span><del>- if (!this._recordTable || !this._progressBar || !this._suite || !this._test)
</del><ins>+ if (!this._recordTable || !this._progressBar || !this._test)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (this.options.showRunningResults)
</span><del>- this._recordTable.showRecord(this._suite, this._test, this._sampler, message);
</del><ins>+ this._recordTable.showRecord(this._test.name, message, this._sampler.toJSON(true, false));
</ins><span class="cx">
</span><span class="cx"> this._progressBar.setPos(progress);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestssimplesimplecanvaspathshtml"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/simple/simple-canvas-paths.html (191585 => 191586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/simple/simple-canvas-paths.html 2015-10-26 15:59:17 UTC (rev 191585)
+++ trunk/PerformanceTests/Animometer/tests/simple/simple-canvas-paths.html 2015-10-26 16:44:54 UTC (rev 191586)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> <head>
</span><span class="cx"> <link rel="stylesheet" type="text/css" href="../resources/stage.css">
</span><span class="cx"> <script src="../../resources/algorithm.js"></script>
</span><ins>+ <script src="../../resources/strings.js"></script>
</ins><span class="cx"> <script src="../../resources/sampler.js"></script>
</span><span class="cx"> <script src="../../resources/extensions.js"></script>
</span><span class="cx"> <script src="../resources/math.js"></script>
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometerteststemplatetemplatecanvashtml"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/template/template-canvas.html (191585 => 191586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/template/template-canvas.html 2015-10-26 15:59:17 UTC (rev 191585)
+++ trunk/PerformanceTests/Animometer/tests/template/template-canvas.html 2015-10-26 16:44:54 UTC (rev 191586)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> <head>
</span><span class="cx"> <link rel="stylesheet" type="text/css" href="../resources/stage.css">
</span><span class="cx"> <script src="../../resources/algorithm.js"></script>
</span><ins>+ <script src="../../resources/strings.js"></script>
</ins><span class="cx"> <script src="../../resources/sampler.js"></script>
</span><span class="cx"> <script src="../../resources/extensions.js"></script>
</span><span class="cx"> <script src="../resources/math.js"></script>
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometerteststemplatetemplatecsshtml"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/template/template-css.html (191585 => 191586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/template/template-css.html 2015-10-26 15:59:17 UTC (rev 191585)
+++ trunk/PerformanceTests/Animometer/tests/template/template-css.html 2015-10-26 16:44:54 UTC (rev 191586)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> <head>
</span><span class="cx"> <link rel="stylesheet" type="text/css" href="../resources/stage.css">
</span><span class="cx"> <script src="../../resources/algorithm.js"></script>
</span><ins>+ <script src="../../resources/strings.js"></script>
</ins><span class="cx"> <script src="../../resources/sampler.js"></script>
</span><span class="cx"> <script src="../../resources/extensions.js"></script>
</span><span class="cx"> <script src="../resources/math.js"></script>
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometerteststemplatetemplatesvghtml"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/template/template-svg.html (191585 => 191586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/template/template-svg.html 2015-10-26 15:59:17 UTC (rev 191585)
+++ trunk/PerformanceTests/Animometer/tests/template/template-svg.html 2015-10-26 16:44:54 UTC (rev 191586)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> <head>
</span><span class="cx"> <link rel="stylesheet" type="text/css" href="../resources/stage.css">
</span><span class="cx"> <script src="../../resources/algorithm.js"></script>
</span><ins>+ <script src="../../resources/strings.js"></script>
</ins><span class="cx"> <script src="../../resources/sampler.js"></script>
</span><span class="cx"> <script src="../../resources/extensions.js"></script>
</span><span class="cx"> <script src="../resources/math.js"></script>
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometerteststextlayeringtexthtml"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/text/layering-text.html (191585 => 191586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/text/layering-text.html 2015-10-26 15:59:17 UTC (rev 191585)
+++ trunk/PerformanceTests/Animometer/tests/text/layering-text.html 2015-10-26 16:44:54 UTC (rev 191586)
</span><span class="lines">@@ -13,6 +13,7 @@
</span><span class="cx"> </style>
</span><span class="cx"> <link rel="stylesheet" type="text/css" href="../resources/stage.css">
</span><span class="cx"> <script src="../../resources/algorithm.js"></script>
</span><ins>+ <script src="../../resources/strings.js"></script>
</ins><span class="cx"> <script src="../../resources/sampler.js"></script>
</span><span class="cx"> <script src="../../resources/extensions.js"></script>
</span><span class="cx"> <script src="../resources/math.js"></script>
</span></span></pre></div>
<a id="trunkPerformanceTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/ChangeLog (191585 => 191586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/ChangeLog 2015-10-26 15:59:17 UTC (rev 191585)
+++ trunk/PerformanceTests/ChangeLog 2015-10-26 16:44:54 UTC (rev 191586)
</span><span class="lines">@@ -1,3 +1,105 @@
</span><ins>+2015-10-26 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ Add an option to output the results of the graphics benchmark in JSON format
+ https://bugs.webkit.org/show_bug.cgi?id=150484
+ <rdar://problem/23243721>
+
+ Reviewed by Darin Adler.
+
+ * Animometer/resources/extensions.js:
+ (ResultsDashboard): A new class to hold the iterations results.
+ (ResultsDashboard.prototype.push): Appends an iteration results;
+ (ResultsDashboard.prototype.toJSON): Converts the iterations results to JSON format.
+
+ (RecordTable.prototype.clear): Clears the results table.
+ (RecordTable.prototype._showTitles): Shows the header titles and appends the sub-titles to a queue.
+ (RecordTable.prototype._showHeader): Shows the table header titles.
+ (RecordTable.prototype._showEmpty): Shows an empty table cell.
+ (RecordTable.prototype._showValue): Shows a number value in the results table.
+ (RecordTable.prototype._showSamples): Shows a button for the sampled data graph.
+ (RecordTable.prototype._showTest): Shows the results of a single test.
+ (RecordTable.prototype._showSuite): Shows the results of a single suite.
+ (RecordTable.prototype.showRecord): Shows a single iteration for a single test.
+ (RecordTable.prototype.showIterations): Shows the results of all the suites of the iterations.
+
+ (ResultsTable): RecordTable was renamed to ResultsTable.
+ (ResultsTable.prototype.clear): Clears the table element.
+ (ResultsTable.prototype._showHeaderRow): Shows a row in the results table header.
+ (ResultsTable.prototype._showHeader): Shows the results table header.
+ (ResultsTable.prototype._showEmpty): Shows an empty table cell.
+ (ResultsTable.prototype._showText): Shows a string in a new table cell.
+ (ResultsTable.prototype._showFixedNumber): Shows a number in a new table cell.
+ (ResultsTable.prototype._showGraph): Shows a button for the sampled data graph.
+ (ResultsTable.prototype._showJSON): Shows a button for the sampled data JSON.
+ (ResultsTable.prototype._showTest): Shows the results of a single test.
+ (ResultsTable.prototype._showSuite): Shows the results of a single suite.
+ (ResultsTable.prototype._showIteration): Shows the results of a single iteration.
+ (ResultsTable.prototype.showRecord): Shows a single iteration for a single test.
+ (ResultsTable.prototype.showIterations): Shows all the results.
+ (RecordTable): Deleted.
+ (RecordTable.prototype.clear): Deleted.
+ (RecordTable.prototype._showTitles): Deleted.
+ (RecordTable.prototype._showHeader): Deleted.
+ (RecordTable.prototype._showEmpty): Deleted.
+ (RecordTable.prototype._showValue): Deleted.
+ (RecordTable.prototype._showSamples): Deleted.
+ (RecordTable.prototype._showTest): Deleted.
+ (RecordTable.prototype._showSuite): Deleted.
+ (RecordTable.prototype.showRecord): Deleted.
+ (RecordTable.prototype.showIterations): Deleted.
+
+ * Animometer/resources/sampler.js:
+ (Sampler.prototype.startSampling): Use forEach.
+ (Sampler.prototype.sample): Use forEach.
+ (Sampler.prototype.toJSON): Converts the sampler data to JSON format.
+
+ * Animometer/resources/strings.js: Added.
+ This new file will be used to associate the strings used by the benchmark
+ with IDs. A string can be changed in one place without having to change
+ all the instances of this string in multiple files. There two groups of
+ strings in this file. The first one is used by the UI elements and the second
+ group is used when constructing the results JSON.
+
+ * Animometer/runner/animometer.html:
+ * Animometer/runner/resources/animometer.css:
+
+ * Animometer/runner/resources/animometer.js:
+ (window.benchmarkRunnerClient.willAddTestFrame):
+ (window.benchmarkRunnerClient.willStartFirstIteration):
+ (window.benchmarkRunnerClient.didRunSuites):
+ (window.benchmarkRunnerClient.didFinishLastIteration):
+ Make benchmarkRunnerClient uses ResultsDashboard instead of _iterationsSamplers
+ Get the JSON from ResultsDashboard.toJSON() and pass it to ResultsTable.showIterations().
+ Also set the textContent of the "#json" textarea with the results JSON.
+
+ (showResults): Delete unneeded code.
+ (showJson): Shows the "json" section.
+ (showTestGraph): Rename showGraph() to be showTestGraph().
+ (showTestJSON): Shows the JSON of a single testResults.
+ (showGraph): Deleted.
+
+ * Animometer/runner/resources/tests.js:
+ Use the string table instead of putting literal strings.
+
+ * Animometer/tests/resources/stage.js:
+ (StageBenchmark.prototype.showResults):
+ Fix the parameters which are passed to RecordTable.showRecord().
+
+ * Animometer/tests/bouncing-particles/bouncing-canvas-images.html:
+ * Animometer/tests/bouncing-particles/bouncing-canvas-shapes.html:
+ * Animometer/tests/bouncing-particles/bouncing-css-images.html:
+ * Animometer/tests/bouncing-particles/bouncing-css-shapes.html:
+ * Animometer/tests/bouncing-particles/bouncing-svg-images.html:
+ * Animometer/tests/bouncing-particles/bouncing-svg-shapes.html:
+ * Animometer/tests/examples/canvas-electrons.html:
+ * Animometer/tests/examples/canvas-stars.html:
+ * Animometer/tests/simple/simple-canvas-paths.html:
+ * Animometer/tests/template/template-canvas.html:
+ * Animometer/tests/template/template-css.html:
+ * Animometer/tests/template/template-svg.html:
+ * Animometer/tests/text/layering-text.html:
+ Include the new strings.js file in all the test files.
+
</ins><span class="cx"> 2015-10-12 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><span class="cx"> Add canvas line dash test
</span></span></pre>
</div>
</div>
</body>
</html>