<!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>[196293] 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/196293">196293</a></dd>
<dt>Author</dt> <dd>jonlee@apple.com</dd>
<dt>Date</dt> <dd>2016-02-08 19:30:32 -0800 (Mon, 08 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make the fixed controller a step controller instead. Halfway through the test
it will bump up the complexity 4-fold. Calculate the step timestamp using options
instead of a separate parameter to the Controller constructor.
* Animometer/developer.html: Change value to "step"
* Animometer/resources/debug-runner/animometer.js:
(window.suitesManager.updateEditsElementsState): Show number inputs when set to "step".
* Animometer/tests/resources/main.js:
(update): Provide a hook for subclasses to tune.
(StepController): Maintain a flag determining whether we've stepped, and the time
we should step.
(Benchmark): Use the new StepController.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkPerformanceTestsAnimometerdeveloperhtml">trunk/PerformanceTests/Animometer/developer.html</a></li>
<li><a href="#trunkPerformanceTestsAnimometerresourcesdebugrunneranimometerjs">trunk/PerformanceTests/Animometer/resources/debug-runner/animometer.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="trunkPerformanceTestsAnimometerdeveloperhtml"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/developer.html (196292 => 196293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/developer.html 2016-02-09 03:30:29 UTC (rev 196292)
+++ trunk/PerformanceTests/Animometer/developer.html 2016-02-09 03:30:32 UTC (rev 196293)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> <li>
</span><span class="cx"> <h3>Adjusting the test complexity:</h3>
</span><span class="cx"> <ul>
</span><del>- <li><label><input name="adjustment" type="radio" value="fixed"> Keep at a fixed complexity</label></li>
</del><ins>+ <li><label><input name="adjustment" type="radio" value="step"> Keep at a fixed complexity, then make a big step</label></li>
</ins><span class="cx"> <li><label><input name="adjustment" type="radio" value="adaptive" checked> Maintain target FPS</label></li>
</span><span class="cx"> </ul>
</span><span class="cx"> </li>
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometerresourcesdebugrunneranimometerjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/resources/debug-runner/animometer.js (196292 => 196293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/resources/debug-runner/animometer.js 2016-02-09 03:30:29 UTC (rev 196292)
+++ trunk/PerformanceTests/Animometer/resources/debug-runner/animometer.js 2016-02-09 03:30:32 UTC (rev 196293)
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> updateEditsElementsState: function()
</span><span class="cx"> {
</span><span class="cx"> var editsElements = this._editsElements();
</span><del>- var showComplexityInputs = optionsManager.valueForOption("adjustment") == "fixed";
</del><ins>+ var showComplexityInputs = optionsManager.valueForOption("adjustment") == "step";
</ins><span class="cx">
</span><span class="cx"> for (var i = 0; i < editsElements.length; ++i) {
</span><span class="cx"> var editElement = editsElements[i];
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsresourcesmainjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/resources/main.js (196292 => 196293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/resources/main.js 2016-02-09 03:30:29 UTC (rev 196292)
+++ trunk/PerformanceTests/Animometer/tests/resources/main.js 2016-02-09 03:30:32 UTC (rev 196293)
</span><span class="lines">@@ -1,12 +1,12 @@
</span><span class="cx"> Controller = Utilities.createClass(
</span><del>- function(testLength, benchmark, options)
</del><ins>+ function(benchmark, options)
</ins><span class="cx"> {
</span><span class="cx"> // Initialize timestamps relative to the start of the benchmark
</span><span class="cx"> // In start() the timestamps are offset by the start timestamp
</span><span class="cx"> this._startTimestamp = 0;
</span><del>- this._endTimestamp = testLength;
</del><ins>+ this._endTimestamp = options["test-interval"];
</ins><span class="cx"> // Default data series: timestamp, complexity, estimatedFrameLength
</span><del>- this._sampler = new Sampler(options["series-count"] || 3, 60 * testLength, this);
</del><ins>+ this._sampler = new Sampler(options["series-count"] || 3, (60 * options["test-interval"] / 1000), this);
</ins><span class="cx"> this._estimator = new SimpleKalmanEstimator(options["kalman-process-error"], options["kalman-measurement-error"]);
</span><span class="cx"> this._marks = {};
</span><span class="cx">
</span><span class="lines">@@ -41,8 +41,14 @@
</span><span class="cx"> {
</span><span class="cx"> this._estimator.sample(timestamp - this._sampler.samples[0][this._sampler.sampleCount - 1]);
</span><span class="cx"> this._sampler.record(timestamp, stage.complexity(), this._estimator.estimate);
</span><ins>+
+ this.tune(stage, timestamp);
</ins><span class="cx"> },
</span><span class="cx">
</span><ins>+ tune: function(stage, timestamp)
+ {
+ },
+
</ins><span class="cx"> shouldStop: function(timestamp)
</span><span class="cx"> {
</span><span class="cx"> return timestamp > this._endTimestamp;
</span><span class="lines">@@ -113,22 +119,40 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><del>-FixedComplexityController = Utilities.createSubclass(Controller,
- function(testInterval, benchmark, options)
</del><ins>+StepController = Utilities.createSubclass(Controller,
+ function(benchmark, options)
</ins><span class="cx"> {
</span><del>- Controller.call(this, testInterval, benchmark, options);
</del><ins>+ Controller.call(this, benchmark, options);
</ins><span class="cx"> this.initialComplexity = options["complexity"];
</span><ins>+ this._stepped = false;
+ this._stepTime = options["test-interval"] / 2;
+ }, {
+
+ start: function(stage, startTimestamp)
+ {
+ Controller.prototype.start.call(this, stage, startTimestamp);
+ this._stepTime += startTimestamp;
+ },
+
+ tune: function(stage, timestamp)
+ {
+ if (this._stepped || timestamp < this._stepTime)
+ return;
+
+ this.mark(Strings.json.samplingEndTimeOffset, timestamp);
+ this._stepped = true;
+ stage.tune(stage.complexity() * 3);
</ins><span class="cx"> }
</span><del>-);
</del><ins>+});
</ins><span class="cx">
</span><span class="cx"> AdaptiveController = Utilities.createSubclass(Controller,
</span><del>- function(testInterval, benchmark, options)
</del><ins>+ function(benchmark, options)
</ins><span class="cx"> {
</span><span class="cx"> // Data series: timestamp, complexity, estimatedIntervalFrameLength
</span><del>- Controller.call(this, testInterval, benchmark, options);
</del><ins>+ Controller.call(this, benchmark, options);
</ins><span class="cx">
</span><span class="cx"> // All tests start at 0, so we expect to see 60 fps quickly.
</span><del>- this._samplingTimestamp = testInterval / 2;
</del><ins>+ this._samplingTimestamp = options["test-interval"] / 2;
</ins><span class="cx"> this._startedSampling = false;
</span><span class="cx"> this._targetFrameRate = options["frame-rate"];
</span><span class="cx"> this._pid = new PIDController(this._targetFrameRate);
</span><span class="lines">@@ -337,15 +361,15 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var testIntervalMilliseconds = options["test-interval"] * 1000;
</del><ins>+ options["test-interval"] *= 1000;
</ins><span class="cx"> switch (options["adjustment"])
</span><span class="cx"> {
</span><del>- case "fixed":
- this._controller = new FixedComplexityController(testIntervalMilliseconds, this, options);
</del><ins>+ case "step":
+ this._controller = new StepController(this, options);
</ins><span class="cx"> break;
</span><span class="cx"> case "adaptive":
</span><span class="cx"> default:
</span><del>- this._controller = new AdaptiveController(testIntervalMilliseconds, this, options);
</del><ins>+ this._controller = new AdaptiveController(this, options);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }, {
</span></span></pre></div>
<a id="trunkPerformanceTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/ChangeLog (196292 => 196293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/ChangeLog 2016-02-09 03:30:29 UTC (rev 196292)
+++ trunk/PerformanceTests/ChangeLog 2016-02-09 03:30:32 UTC (rev 196293)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2016-02-07 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><ins>+ Make the fixed controller a step controller instead. Halfway through the test
+ it will bump up the complexity 4-fold. Calculate the step timestamp using options
+ instead of a separate parameter to the Controller constructor.
+
+ * Animometer/developer.html: Change value to "step"
+ * Animometer/resources/debug-runner/animometer.js:
+ (window.suitesManager.updateEditsElementsState): Show number inputs when set to "step".
+ * Animometer/tests/resources/main.js:
+ (update): Provide a hook for subclasses to tune.
+ (StepController): Maintain a flag determining whether we've stepped, and the time
+ we should step.
+ (Benchmark): Use the new StepController.
+
+2016-02-07 Jon Lee <jonlee@apple.com>
+
</ins><span class="cx"> Adjust the FPS graph scale.
</span><span class="cx">
</span><span class="cx"> Instead of making the FPS graph linearly scale, scale it based on the frame length,
</span></span></pre>
</div>
</div>
</body>
</html>