<!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>[196299] 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/196299">196299</a></dd>
<dt>Author</dt> <dd>jonlee@apple.com</dd>
<dt>Date</dt> <dd>2016-02-08 19:30:52 -0800 (Mon, 08 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Teach Controller to measure intervals, and turn off the frame length estimator.
* Animometer/tests/resources/main.js: Default interval length is 100 ms.
(start): Set the first interval.
(_measureAndResetInterval): Reports the average frame length of the interval that just
completed, and sets up the next interval.
(update): If there is no length, then just use the estimator per frame, otherwise the
estimator measures per interval. Add a didFinishInterval for subclasses to process
prior to recording the sample. Update tune() to include whether an interval had
finished.
(StepController): Step controllers don't measure on an interval basis.</pre>
<h3>Modified Paths</h3>
<ul>
<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="trunkPerformanceTestsAnimometertestsresourcesmainjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/resources/main.js (196298 => 196299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/resources/main.js 2016-02-09 03:30:49 UTC (rev 196298)
+++ trunk/PerformanceTests/Animometer/tests/resources/main.js 2016-02-09 03:30:52 UTC (rev 196299)
</span><span class="lines">@@ -10,14 +10,23 @@
</span><span class="cx"> this._marks = {};
</span><span class="cx">
</span><span class="cx"> this._frameLengthEstimator = new SimpleKalmanEstimator(options["kalman-process-error"], options["kalman-measurement-error"]);
</span><ins>+ this._isFrameLengthEstimatorEnabled = true;
</ins><span class="cx">
</span><ins>+ // Length of subsequent intervals; a value of 0 means use no intervals
+ this._intervalLength = options["interval-length"] || 100;
+
</ins><span class="cx"> this.initialComplexity = 0;
</span><span class="cx"> }, {
</span><span class="cx">
</span><ins>+ set isFrameLengthEstimatorEnabled(enabled) {
+ this._isFrameLengthEstimatorEnabled = enabled;
+ },
+
</ins><span class="cx"> start: function(startTimestamp, stage)
</span><span class="cx"> {
</span><span class="cx"> this._startTimestamp = startTimestamp;
</span><span class="cx"> this._endTimestamp += startTimestamp;
</span><ins>+ this._measureAndResetInterval(startTimestamp);
</ins><span class="cx"> this.recordFirstSample(startTimestamp, stage);
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -38,18 +47,54 @@
</span><span class="cx"> return comment in this._marks;
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ _measureAndResetInterval: function(currentTimestamp)
+ {
+ var sampleCount = this._sampler.sampleCount;
+ var averageFrameLength = 0;
+
+ if (this._intervalEndTimestamp) {
+ var intervalStartTimestamp = this._sampler.samples[0][this._intervalStartIndex];
+ averageFrameLength = (currentTimestamp - intervalStartTimestamp) / (sampleCount - this._intervalStartIndex);
+ }
+
+ this._intervalStartIndex = sampleCount;
+ this._intervalEndTimestamp = currentTimestamp + this._intervalLength;
+
+ return averageFrameLength;
+ },
+
</ins><span class="cx"> update: function(timestamp, stage)
</span><span class="cx"> {
</span><del>- this._frameLengthEstimator.sample(timestamp - this._sampler.samples[0][this._sampler.sampleCount - 1]);
- this._sampler.record(timestamp, stage.complexity(), this._frameLengthEstimator.estimate);
</del><ins>+ var frameLengthEstimate = -1;
+ var didFinishInterval = false;
+ if (!this._intervalLength) {
+ if (this._isFrameLengthEstimatorEnabled) {
+ this._frameLengthEstimator.sample(timestamp - this._sampler.samples[0][this._sampler.sampleCount - 1]);
+ frameLengthEstimate = this._frameLengthEstimator.estimate;
+ }
+ } else if (timestamp >= this._intervalEndTimestamp) {
+ var intervalStartTimestamp = this._sampler.samples[0][this._intervalStartIndex];
+ intervalAverageFrameLength = this._measureAndResetInterval(timestamp);
+ if (this._isFrameLengthEstimatorEnabled) {
+ this._frameLengthEstimator.sample(intervalAverageFrameLength);
+ frameLengthEstimate = this._frameLengthEstimator.estimate;
+ }
+ didFinishInterval = true;
+ this.didFinishInterval(timestamp, stage, intervalAverageFrameLength);
+ }
</ins><span class="cx">
</span><del>- this.tune(timestamp, stage);
</del><ins>+ this._sampler.record(timestamp, stage.complexity(), frameLengthEstimate);
+ this.tune(timestamp, stage, didFinishInterval);
</ins><span class="cx"> },
</span><span class="cx">
</span><del>- tune: function(timestamp, stage)
</del><ins>+ didFinishInterval: function(timestamp, stage, intervalAverageFrameLength)
</ins><span class="cx"> {
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ tune: function(timestamp, stage, didFinishInterval)
+ {
+ },
+
</ins><span class="cx"> shouldStop: function(timestamp)
</span><span class="cx"> {
</span><span class="cx"> return timestamp > this._endTimestamp;
</span><span class="lines">@@ -123,6 +168,7 @@
</span><span class="cx"> StepController = Utilities.createSubclass(Controller,
</span><span class="cx"> function(benchmark, options)
</span><span class="cx"> {
</span><ins>+ options["interval-length"] = 0;
</ins><span class="cx"> Controller.call(this, benchmark, options);
</span><span class="cx"> this.initialComplexity = options["complexity"];
</span><span class="cx"> this._stepped = false;
</span></span></pre></div>
<a id="trunkPerformanceTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/ChangeLog (196298 => 196299)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/ChangeLog 2016-02-09 03:30:49 UTC (rev 196298)
+++ trunk/PerformanceTests/ChangeLog 2016-02-09 03:30:52 UTC (rev 196299)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2016-02-07 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><ins>+ Teach Controller to measure intervals, and turn off the frame length estimator.
+
+ * Animometer/tests/resources/main.js: Default interval length is 100 ms.
+ (start): Set the first interval.
+ (_measureAndResetInterval): Reports the average frame length of the interval that just
+ completed, and sets up the next interval.
+ (update): If there is no length, then just use the estimator per frame, otherwise the
+ estimator measures per interval. Add a didFinishInterval for subclasses to process
+ prior to recording the sample. Update tune() to include whether an interval had
+ finished.
+ (StepController): Step controllers don't measure on an interval basis.
+
+2016-02-07 Jon Lee <jonlee@apple.com>
+
</ins><span class="cx"> Minor refactoring. Rename Controller._estimator to Controller._frameLengthEstimator
</span><span class="cx"> and switch the parameters for start(), update(), and tune(), so that the timestamp
</span><span class="cx"> is first and stage is second.
</span></span></pre>
</div>
</div>
</body>
</html>