<!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>[192559] 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/192559">192559</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-17 17:29:15 -0800 (Tue, 17 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reorganize the graphics benchmark string table
https://bugs.webkit.org/show_bug.cgi?id=151334
Patch by Said Abou-Hallawa <sabouhallawa@apple.com> on 2015-11-17
Reviewed by Simon Fraser.
Make the graphics benchmark string table be an object of sub-objects. Each
sub-object represents an associative array, the key is the string name and
the value is the string data.
* Animometer/resources/extensions.js:
(ResultsDashboard.prototype.toJSON):
(ResultsTable.prototype._showGraph):
(ResultsTable.prototype._showJSON):
(ResultsTable.prototype._isNoisyMeasurement):
(ResultsTable.prototype._isNoisyTest):
(ResultsTable.prototype._showTest):
(ResultsTable.prototype._showSuite):
(ResultsTable.prototype._showIteration):
* Animometer/resources/sampler.js:
(Sampler.prototype.toJSON):
* Animometer/resources/strings.js:
* Animometer/runner/resources/animometer.js:
(window.benchmarkRunnerClient.didFinishLastIteration):
(window.suitesManager.updateLocalStorageFromJSON):
(window.benchmarkController.showResults):
(window.benchmarkController.showJson):
(window.benchmarkController.showTestGraph):
(window.benchmarkController.showTestJSON):
* Animometer/runner/resources/tests.js:
* Animometer/tests/resources/main.js:</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="#trunkPerformanceTestsAnimometerresourcesstringsjs">trunk/PerformanceTests/Animometer/resources/strings.js</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="#trunkPerformanceTestsAnimometertestsresourcesmainjs">trunk/PerformanceTests/Animometer/tests/resources/main.js</a></li>
<li><a href="#trunkPerformanceTestsChangeLog">trunk/PerformanceTests/ChangeLog</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 (192558 => 192559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/resources/extensions.js 2015-11-18 01:27:28 UTC (rev 192558)
+++ trunk/PerformanceTests/Animometer/resources/extensions.js 2015-11-18 01:29:15 UTC (rev 192559)
</span><span class="lines">@@ -219,24 +219,24 @@
</span><span class="cx"> for (var testName in suiteSamplers) {
</span><span class="cx"> var sampler = suiteSamplers[testName];
</span><span class="cx"> testsResults[testName] = sampler.toJSON(statistics, graph);
</span><del>- testsScores.push(testsResults[testName][Strings["JSON_SCORE"]]);
</del><ins>+ testsScores.push(testsResults[testName][Strings.json.score]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> suitesResults[suiteName] = {};
</span><del>- suitesResults[suiteName][Strings["JSON_SCORE"]] = Statistics.geometricMean(testsScores);
- suitesResults[suiteName][Strings["JSON_RESULTS"][2]] = testsResults;
- suitesScores.push(suitesResults[suiteName][Strings["JSON_SCORE"]]);
</del><ins>+ suitesResults[suiteName][Strings.json.score] = Statistics.geometricMean(testsScores);
+ suitesResults[suiteName][Strings.json.results.tests] = testsResults;
+ suitesScores.push(suitesResults[suiteName][Strings.json.score]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> iterationsResults[index] = {};
</span><del>- iterationsResults[index][Strings["JSON_SCORE"]] = Statistics.geometricMean(suitesScores);
- iterationsResults[index][Strings["JSON_RESULTS"][1]] = suitesResults;
- iterationsScores.push(iterationsResults[index][Strings["JSON_SCORE"]]);
</del><ins>+ iterationsResults[index][Strings.json.score] = Statistics.geometricMean(suitesScores);
+ iterationsResults[index][Strings.json.results.suites] = suitesResults;
+ iterationsScores.push(iterationsResults[index][Strings.json.score]);
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> var json = {};
</span><del>- json[Strings["JSON_SCORE"]] = Statistics.sampleMean(iterationsScores.length, iterationsScores.reduce(function(a, b) { return a * b; }));
- json[Strings["JSON_RESULTS"][0]] = iterationsResults;
</del><ins>+ json[Strings.json.score] = Statistics.sampleMean(iterationsScores.length, iterationsScores.reduce(function(a, b) { return a * b; }));
+ json[Strings.json.results.iterations] = iterationsResults;
</ins><span class="cx"> return json;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -324,7 +324,7 @@
</span><span class="cx">
</span><span class="cx"> _showGraph: function(row, testName, testResults)
</span><span class="cx"> {
</span><del>- var data = testResults[Strings["JSON_SAMPLES"][0]];
</del><ins>+ var data = testResults[Strings.json.samples];
</ins><span class="cx"> if (!data) {
</span><span class="cx"> this._showEmptyCell(row, "");
</span><span class="cx"> return;
</span><span class="lines">@@ -334,18 +334,18 @@
</span><span class="cx"> var button = DocumentExtension.createElement("button", { class: "small-button" }, td);
</span><span class="cx">
</span><span class="cx"> button.addEventListener("click", function() {
</span><del>- var samples = data[Strings["JSON_GRAPH"][0]];
- var samplingTimeOffset = data[Strings["JSON_GRAPH"][1]];
- var axes = Strings["TEXT_EXPERIMENTS"];
</del><ins>+ var samples = data[Strings.json.graph.points];
+ var samplingTimeOffset = data[Strings.json.graph.samplingTimeOffset];
+ var axes = [Strings.text.experiments.complexity, Strings.text.experiments.frameRate];
</ins><span class="cx"> benchmarkController.showTestGraph(testName, axes, samples, samplingTimeOffset);
</span><span class="cx"> });
</span><span class="cx">
</span><del>- button.textContent = Strings["TEXT_RESULTS"][1] + "...";
</del><ins>+ button.textContent = Strings.text.results.graph + "...";
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _showJSON: function(row, testName, testResults)
</span><span class="cx"> {
</span><del>- var data = testResults[Strings["JSON_SAMPLES"][0]];
</del><ins>+ var data = testResults[Strings.json.samples];
</ins><span class="cx"> if (!data) {
</span><span class="cx"> this._showEmptyCell(row, "");
</span><span class="cx"> return;
</span><span class="lines">@@ -358,29 +358,29 @@
</span><span class="cx"> benchmarkController.showTestJSON(testName, testResults);
</span><span class="cx"> });
</span><span class="cx">
</span><del>- button.textContent = Strings["TEXT_RESULTS"][2] + "...";
</del><ins>+ button.textContent = Strings.text.results.json + "...";
</ins><span class="cx"> },
</span><span class="cx">
</span><del>- _isNoisyMeasurement: function(index, data, measurement, options)
</del><ins>+ _isNoisyMeasurement: function(experiment, data, measurement, options)
</ins><span class="cx"> {
</span><span class="cx"> const percentThreshold = 10;
</span><span class="cx"> const averageThreshold = 2;
</span><span class="cx">
</span><del>- if (measurement == Strings["JSON_MEASUREMENTS"][3])
- return data[Strings["JSON_MEASUREMENTS"][3]] >= percentThreshold;
</del><ins>+ if (measurement == Strings.json.measurements.percent)
+ return data[Strings.json.measurements.percent] >= percentThreshold;
</ins><span class="cx">
</span><del>- if (index == 1 && measurement == Strings["JSON_MEASUREMENTS"][0])
- return Math.abs(data[Strings["JSON_MEASUREMENTS"][0]] - options["frame-rate"]) >= averageThreshold;
</del><ins>+ if (experiment == Strings.json.experiments.frameRate && measurement == Strings.json.measurements.average)
+ return Math.abs(data[Strings.json.measurements.average] - options["frame-rate"]) >= averageThreshold;
</ins><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _isNoisyTest: function(testResults, options)
</span><span class="cx"> {
</span><del>- for (var index = 0; index < 2; ++index) {
- var data = testResults[Strings["JSON_EXPERIMENTS"][index]];
</del><ins>+ for (var experiment in testResults) {
+ var data = testResults[experiment];
</ins><span class="cx"> for (var measurement in data) {
</span><del>- if (this._isNoisyMeasurement(index, data, measurement, options))
</del><ins>+ if (this._isNoisyMeasurement(experiment, data, measurement, options))
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -416,13 +416,13 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 1:
</span><del>- var data = testResults[Strings["JSON_SCORE"][0]];
</del><ins>+ var data = testResults[Strings.json.score];
</ins><span class="cx"> this._showFixedNumber(row, data, 2);
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 2:
</span><span class="cx"> case 3:
</span><del>- var data = testResults[Strings["JSON_EXPERIMENTS"][index - 2]];
</del><ins>+ var data = testResults[index == 2 ? Strings.json.experiments.complexity : Strings.json.experiments.frameRate];
</ins><span class="cx"> for (var measurement in data)
</span><span class="cx"> this._showFixedNumber(row, data[measurement], 2, this._isNoisyMeasurement(index - 2, data, measurement, options) ? className : "");
</span><span class="cx"> break;
</span><span class="lines">@@ -437,17 +437,17 @@
</span><span class="cx">
</span><span class="cx"> _showSuite: function(suiteName, suiteResults, options)
</span><span class="cx"> {
</span><del>- for (var testName in suiteResults[Strings["JSON_RESULTS"][2]]) {
- this._showTest(testName, suiteResults[Strings["JSON_RESULTS"][2]][testName], options);
</del><ins>+ for (var testName in suiteResults[Strings.json.results.tests]) {
+ this._showTest(testName, suiteResults[Strings.json.results.tests][testName], options);
</ins><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _showIteration : function(iterationResults, options)
</span><span class="cx"> {
</span><del>- for (var suiteName in iterationResults[Strings["JSON_RESULTS"][1]]) {
- if (suiteName != Object.keys(iterationResults[Strings["JSON_RESULTS"][1]])[0])
</del><ins>+ for (var suiteName in iterationResults[Strings.json.results.suites]) {
+ if (suiteName != Object.keys(iterationResults[Strings.json.results.suites])[0])
</ins><span class="cx"> this._showEmptyRow();
</span><del>- this._showSuite(suiteName, iterationResults[Strings["JSON_RESULTS"][1]][suiteName], options);
</del><ins>+ this._showSuite(suiteName, iterationResults[Strings.json.results.suites][suiteName], options);
</ins><span class="cx"> }
</span><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 (192558 => 192559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/resources/sampler.js 2015-11-18 01:27:28 UTC (rev 192558)
+++ trunk/PerformanceTests/Animometer/resources/sampler.js 2015-11-18 01:29:15 UTC (rev 192559)
</span><span class="lines">@@ -128,22 +128,23 @@
</span><span class="cx"> {
</span><span class="cx"> var results = {};
</span><span class="cx">
</span><del>- results[Strings["JSON_SCORE"]] = this.experiments[0].score(Experiment.defaults.CONCERN);
</del><ins>+ results[Strings.json.score] = this.experiments[0].score(Experiment.defaults.CONCERN);
</ins><span class="cx">
</span><span class="cx"> if (statistics) {
</span><span class="cx"> this.experiments.forEach(function(experiment, index) {
</span><del>- 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();
</del><ins>+ var jsonExperiment = !index ? Strings.json.experiments.complexity : Strings.json.experiments.frameRate;
+ results[jsonExperiment] = {};
+ results[jsonExperiment][Strings.json.measurements.average] = experiment.mean();
+ results[jsonExperiment][Strings.json.measurements.concern] = experiment.concern(Experiment.defaults.CONCERN);
+ results[jsonExperiment][Strings.json.measurements.stdev] = experiment.standardDeviation();
+ results[jsonExperiment][Strings.json.measurements.percent] = experiment.percentage()
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (graph) {
</span><del>- 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;
</del><ins>+ results[Strings.json.samples] = {};
+ results[Strings.json.samples][Strings.json.graph.points] = this.samples;
+ results[Strings.json.samples][Strings.json.graph.samplingTimeOffset] = this.samplingTimeOffset;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return results;
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometerresourcesstringsjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/resources/strings.js (192558 => 192559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/resources/strings.js 2015-11-18 01:27:28 UTC (rev 192558)
+++ trunk/PerformanceTests/Animometer/resources/strings.js 2015-11-18 01:29:15 UTC (rev 192559)
</span><span class="lines">@@ -1,15 +1,59 @@
</span><span class="cx"> var Strings = {
</span><del>- 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" ],
</del><ins>+ text: {
+ testName: "Test Name",
+ score: "Score",
+ samples: "Samples",
+
+ runningState: {
+ warmingup: "Warming up",
+ sampling: "Sampling",
+ finished: "Finished"
+ },
+
+ experiments: {
+ complexity: "Complexity",
+ frameRate: "FPS"
+ },
+
+ measurements: {
+ average: "Avg.",
+ concern: "W.5%",
+ stdev: "Std.",
+ percent: "%"
+ },
+
+ results: {
+ results: "Results",
+ graph: "Graph",
+ json: "JSON"
+ }
+ },
+ json: {
+ score: "score",
+ samples: "samples",
+
+ experiments: {
+ complexity: "complexity",
+ frameRate: "frameRate"
+ },
+
+ measurements: {
+ average: "average",
+ concern: "concern",
+ stdev: "stdev",
+ percent: "percent"
+ },
+
+ results: {
+ iterations: "iterationsResults",
+ suites: "suitesResults",
+ tests: "testsResults"
+ },
+
+ graph: {
+ points: "points",
+ samplingTimeOffset: "samplingTimeOffset"
+ }
+ }
+
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometerrunnerresourcesanimometerjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/runner/resources/animometer.js (192558 => 192559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/runner/resources/animometer.js 2015-11-18 01:27:28 UTC (rev 192558)
+++ trunk/PerformanceTests/Animometer/runner/resources/animometer.js 2015-11-18 01:29:15 UTC (rev 192559)
</span><span class="lines">@@ -44,10 +44,10 @@
</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]], this.options);
- 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"> }
</span><span class="cx"> }
</span><span class="lines">@@ -368,13 +368,13 @@
</span><span class="cx">
</span><span class="cx"> updateLocalStorageFromJSON: function(iterationResults)
</span><span class="cx"> {
</span><del>- for (var suiteName in iterationResults[Strings["JSON_RESULTS"][1]]) {
- var suiteResults = iterationResults[Strings["JSON_RESULTS"][1]][suiteName];
</del><ins>+ for (var suiteName in iterationResults[Strings.json.results.suites]) {
+ var suiteResults = iterationResults[Strings.json.results.suites][suiteName];
</ins><span class="cx">
</span><del>- for (var testName in suiteResults[Strings["JSON_RESULTS"][2]]) {
- var testResults = suiteResults[Strings["JSON_RESULTS"][2]][testName];
- var data = testResults[Strings["JSON_EXPERIMENTS"][0]]
- var complexity = Math.round(data[Strings["JSON_MEASUREMENTS"][0]]);
</del><ins>+ for (var testName in suiteResults[Strings.json.results.tests]) {
+ var testResults = suiteResults[Strings.json.results.tests][testName];
+ var data = testResults[Strings.json.experiments.complexity];
+ var complexity = Math.round(data[Strings.json.measurements.average]);
</ins><span class="cx">
</span><span class="cx"> var value = { checked: true, complexity: complexity };
</span><span class="cx"> localStorage.setItem(this._localStorageNameForTest(suiteName, testName), JSON.stringify(value));
</span><span class="lines">@@ -417,26 +417,26 @@
</span><span class="cx">
</span><span class="cx"> showResults: function()
</span><span class="cx"> {
</span><del>- sectionsManager.showScore("results", Strings["TEXT_RESULTS"][0]);
</del><ins>+ sectionsManager.showScore("results", Strings.text.results.results);
</ins><span class="cx"> sectionsManager.showSection("results", true);
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> showJson: function()
</span><span class="cx"> {
</span><del>- sectionsManager.showScore("json", Strings["TEXT_RESULTS"][0]);
</del><ins>+ sectionsManager.showScore("json", Strings.text.results.results);
</ins><span class="cx"> sectionsManager.showSection("json", true);
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> showTestGraph: function(testName, axes, samples, samplingTimeOffset)
</span><span class="cx"> {
</span><del>- sectionsManager.showTestName("test-graph", Strings["TEXT_RESULTS"][1], testName);
</del><ins>+ sectionsManager.showTestName("test-graph", Strings.text.results.graph, testName);
</ins><span class="cx"> sectionsManager.showSection("test-graph", true);
</span><span class="cx"> graph("section#test-graph > data", new Insets(20, 50, 20, 50), axes, samples, samplingTimeOffset);
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> showTestJSON: function(testName, json)
</span><span class="cx"> {
</span><del>- sectionsManager.showTestName("test-json", Strings["TEXT_RESULTS"][1], testName);
</del><ins>+ sectionsManager.showTestName("test-json", Strings.text.results.graph, testName);
</ins><span class="cx"> sectionsManager.showJSON("test-json", json);
</span><span class="cx"> sectionsManager.showSection("test-json", true);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometerrunnerresourcestestsjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/runner/resources/tests.js (192558 => 192559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/runner/resources/tests.js 2015-11-18 01:27:28 UTC (rev 192558)
+++ trunk/PerformanceTests/Animometer/runner/resources/tests.js 2015-11-18 01:29:15 UTC (rev 192559)
</span><span class="lines">@@ -1,43 +1,43 @@
</span><span class="cx"> var Headers = [
</span><span class="cx"> {
</span><del>- text: Strings["TEXT_TESTNAME"][0],
</del><ins>+ text: Strings.text.testName,
</ins><span class="cx"> width: 27,
</span><span class="cx"> children: []
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- text: Strings["TEXT_SCORE"][0],
</del><ins>+ text: Strings.text.score,
</ins><span class="cx"> width: 7,
</span><span class="cx"> children: []
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- text: Strings["TEXT_EXPERIMENTS"][0],
</del><ins>+ text: Strings.text.experiments.complexity,
</ins><span class="cx"> width: 27,
</span><span class="cx"> children:
</span><span class="cx"> [
</span><del>- { 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: [] },
</del><ins>+ { text: Strings.text.measurements.average, width: 7, children: [] },
+ { text: Strings.text.measurements.concern, width: 7, children: [] },
+ { text: Strings.text.measurements.stdev, width: 7, children: [] },
+ { text: Strings.text.measurements.percent, width: 6, children: [] },
</ins><span class="cx"> ]
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- text: Strings["TEXT_EXPERIMENTS"][1],
</del><ins>+ text: Strings.text.experiments.frameRate,
</ins><span class="cx"> width: 24,
</span><span class="cx"> children:
</span><span class="cx"> [
</span><del>- { 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: [] },
</del><ins>+ { text: Strings.text.measurements.average, width: 6, children: [] },
+ { text: Strings.text.measurements.concern, width: 6, children: [] },
+ { text: Strings.text.measurements.stdev, width: 6, children: [] },
+ { text: Strings.text.measurements.percent, width: 6, children: [] },
</ins><span class="cx"> ]
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- text: Strings["TEXT_SAMPLES"][0],
</del><ins>+ text: Strings.text.samples,
</ins><span class="cx"> width: 15,
</span><span class="cx"> children:
</span><span class="cx"> [
</span><del>- { text: Strings["TEXT_RESULTS"][1], width: 8, children: [] },
- { text: Strings["TEXT_RESULTS"][2], width: 7, children: [] },
</del><ins>+ { text: Strings.text.results.graph, width: 8, children: [] },
+ { text: Strings.text.results.json, width: 7, children: [] },
</ins><span class="cx"> ]
</span><span class="cx"> }
</span><span class="cx"> ];
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsresourcesmainjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/resources/main.js (192558 => 192559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/resources/main.js 2015-11-18 01:27:28 UTC (rev 192558)
+++ trunk/PerformanceTests/Animometer/tests/resources/main.js 2015-11-18 01:29:15 UTC (rev 192559)
</span><span class="lines">@@ -9,7 +9,11 @@
</span><span class="cx"> WARMING_UP: 0,
</span><span class="cx"> SAMPLING: 1,
</span><span class="cx"> FINISHED: 2,
</span><del>- messages: [ "Warming up", "Sampling", "Finished" ]
</del><ins>+ messages: [
+ Strings.text.runningState.warmingup,
+ Strings.text.runningState.sampling,
+ Strings.text.runningState.finished
+ ]
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> BenchmarkState.prototype =
</span></span></pre></div>
<a id="trunkPerformanceTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/ChangeLog (192558 => 192559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/ChangeLog 2015-11-18 01:27:28 UTC (rev 192558)
+++ trunk/PerformanceTests/ChangeLog 2015-11-18 01:29:15 UTC (rev 192559)
</span><span class="lines">@@ -1,5 +1,38 @@
</span><span class="cx"> 2015-11-17 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><ins>+ Reorganize the graphics benchmark string table
+ https://bugs.webkit.org/show_bug.cgi?id=151334
+
+ Reviewed by Simon Fraser.
+
+ Make the graphics benchmark string table be an object of sub-objects. Each
+ sub-object represents an associative array, the key is the string name and
+ the value is the string data.
+
+ * Animometer/resources/extensions.js:
+ (ResultsDashboard.prototype.toJSON):
+ (ResultsTable.prototype._showGraph):
+ (ResultsTable.prototype._showJSON):
+ (ResultsTable.prototype._isNoisyMeasurement):
+ (ResultsTable.prototype._isNoisyTest):
+ (ResultsTable.prototype._showTest):
+ (ResultsTable.prototype._showSuite):
+ (ResultsTable.prototype._showIteration):
+ * Animometer/resources/sampler.js:
+ (Sampler.prototype.toJSON):
+ * Animometer/resources/strings.js:
+ * Animometer/runner/resources/animometer.js:
+ (window.benchmarkRunnerClient.didFinishLastIteration):
+ (window.suitesManager.updateLocalStorageFromJSON):
+ (window.benchmarkController.showResults):
+ (window.benchmarkController.showJson):
+ (window.benchmarkController.showTestGraph):
+ (window.benchmarkController.showTestJSON):
+ * Animometer/runner/resources/tests.js:
+ * Animometer/tests/resources/main.js:
+
+2015-11-17 Said Abou-Hallawa <sabouhallawa@apple.com>
+
</ins><span class="cx"> Disable flattening the stage iframe of the graphics benchmark when running on iOS
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151361
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>