<!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>[192107] 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/192107">192107</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-06 09:55:08 -0800 (Fri, 06 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Initialize the graphics benchmark's Kalman filter with estimated 60 FPS
https://bugs.webkit.org/show_bug.cgi?id=150965
Patch by Said Abou-Hallawa <sabouhallawa@apple.com> on 2015-11-06
Reviewed by Darin Adler.
This should give the benchmark more accurate reading at warmup time. And
hence we can safely reduce the test running time to be 10 seconds.
* Animometer/runner/animometer.html:
Add "defer" back when loading resources/animometer.js since this script
depends on many other scripts and we need to wait till the page is parsed.
Also change the default test interval to be 10 seconds.
* Animometer/runner/resources/graph.js:
(graph): Make the test results curves smoother.
* Animometer/tests/resources/main.js:
(Animator): Initialize the Kalman filter with 60 FPS which should be true
if the test page is empty.
(Animator.prototype.animate):
* Animometer/tests/resources/math.js:
(KalmanEstimator): Fix the initial value of _vecX_est.
_vecX_est[0] = current FPS (= 60FPS when the test page is empty)
_vecX_est[1] = first time derivative of FPS (=0; FPS has been constant).
_vecX_est[2] = second time derivative of FPS (=0; since _vecX_est[1]=0).
(KalmanEstimator.prototype.estimate): Add some comments.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkPerformanceTestsAnimometerrunneranimometerhtml">trunk/PerformanceTests/Animometer/runner/animometer.html</a></li>
<li><a href="#trunkPerformanceTestsAnimometerrunnerresourcesgraphjs">trunk/PerformanceTests/Animometer/runner/resources/graph.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsresourcesmainjs">trunk/PerformanceTests/Animometer/tests/resources/main.js</a></li>
<li><a href="#trunkPerformanceTestsAnimometertestsresourcesmathjs">trunk/PerformanceTests/Animometer/tests/resources/math.js</a></li>
<li><a href="#trunkPerformanceTestsChangeLog">trunk/PerformanceTests/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkPerformanceTestsAnimometerrunneranimometerhtml"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/runner/animometer.html (192106 => 192107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/runner/animometer.html 2015-11-06 16:58:31 UTC (rev 192106)
+++ trunk/PerformanceTests/Animometer/runner/animometer.html 2015-11-06 17:55:08 UTC (rev 192107)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> <script src="../resources/extensions.js"></script>
</span><span class="cx"> <script src="resources/tests.js"></script>
</span><span class="cx"> <script src="resources/benchmark-runner.js"></script>
</span><del>- <script src="resources/animometer.js"></script>
</del><ins>+ <script src="resources/animometer.js" defer></script>
</ins><span class="cx"> <script src="resources/d3.min.js"></script>
</span><span class="cx"> <script src="resources/graph.js"></script>
</span><span class="cx"> </head>
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> </suites>
</span><span class="cx"> <options>
</span><span class="cx"> <h2>Options:</h2>
</span><del>- <label>Test interval: <input id="test-interval" type="number" value="30"> seconds</label><br>
</del><ins>+ <label>Test interval: <input id="test-interval" type="number" value="10"> seconds</label><br>
</ins><span class="cx"> <label>Frame rate: <input id="frame-rate" type="number" value="50"> fps</label><br>
</span><span class="cx"> <label><input id="estimated-frame-rate" type="checkbox" checked> Estimated Frame Rate</label><br>
</span><span class="cx"> <label><input id="fix-test-complexity" type="checkbox"> Fix test complexity after warmup</label><br>
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometerrunnerresourcesgraphjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/runner/resources/graph.js (192106 => 192107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/runner/resources/graph.js 2015-11-06 16:58:31 UTC (rev 192106)
+++ trunk/PerformanceTests/Animometer/runner/resources/graph.js 2015-11-06 17:55:08 UTC (rev 192107)
</span><span class="lines">@@ -30,10 +30,12 @@
</span><span class="cx"> .orient("right");
</span><span class="cx">
</span><span class="cx"> var lineLeft = d3.svg.line()
</span><ins>+ .interpolate("basis")
</ins><span class="cx"> .x(function(d) { return x(d.timeOffset); })
</span><span class="cx"> .y(function(d) { return yLeft(d.values[0]); });
</span><span class="cx">
</span><span class="cx"> var lineRight = d3.svg.line()
</span><ins>+ .interpolate("basis")
</ins><span class="cx"> .x(function(d) { return x(d.timeOffset); })
</span><span class="cx"> .y(function(d) { return yRight(d.values[1]); });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsresourcesmainjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/resources/main.js (192106 => 192107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/resources/main.js 2015-11-06 16:58:31 UTC (rev 192106)
+++ trunk/PerformanceTests/Animometer/tests/resources/main.js 2015-11-06 17:55:08 UTC (rev 192107)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> this._measureFrameCount = 3;
</span><span class="cx"> this._referenceTime = 0;
</span><span class="cx"> this._currentTimeOffset = 0;
</span><del>- this._estimator = new KalmanEstimator();
</del><ins>+ this._estimator = new KalmanEstimator(60);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Animator.prototype =
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx">
</span><span class="cx"> // Use Kalman filter to get a more non-fluctuating frame rate.
</span><span class="cx"> if (this._benchmark.options["estimated-frame-rate"])
</span><del>- currentFrameRate = this._estimator.estimate(measureTimeDelta, currentFrameRate);
</del><ins>+ currentFrameRate = this._estimator.estimate(currentFrameRate);
</ins><span class="cx">
</span><span class="cx"> // Adjust the test to reach the desired FPS.
</span><span class="cx"> var result = this._benchmark.update(this._currentTimeOffset, this.timeDelta(), currentFrameRate);
</span></span></pre></div>
<a id="trunkPerformanceTestsAnimometertestsresourcesmathjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Animometer/tests/resources/math.js (192106 => 192107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Animometer/tests/resources/math.js 2015-11-06 16:58:31 UTC (rev 192106)
+++ trunk/PerformanceTests/Animometer/tests/resources/math.js 2015-11-06 17:55:08 UTC (rev 192107)
</span><span class="lines">@@ -233,42 +233,55 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function KalmanEstimator()
</del><ins>+function KalmanEstimator(initX)
</ins><span class="cx"> {
</span><ins>+ // Initialize state transition matrix
</ins><span class="cx"> this._matA = Matrix3.identity();
</span><ins>+ this._matA[Matrix3.pos(0, 2)] = 1;
</ins><span class="cx">
</span><ins>+ // Initialize measurement matrix
</ins><span class="cx"> this._vecH = Vector3.zeros();
</span><span class="cx"> this._vecH[0] = 1;
</span><span class="cx">
</span><span class="cx"> this._matQ = Matrix3.identity();
</span><span class="cx"> this._R = 1000;
</span><span class="cx">
</span><del>- this._vecX_est = Vector3.ones();
</del><ins>+ // Initial state conditions
+ this._vecX_est = Vector3.zeros();
+ this._vecX_est[0] = initX;
</ins><span class="cx"> this._matP_est = Matrix3.zeros();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> KalmanEstimator.prototype =
</span><span class="cx"> {
</span><del>- estimate: function(timeDelta, current)
</del><ins>+ estimate: function(current)
</ins><span class="cx"> {
</span><del>- // Update the transition matrix.
- this._matA[Matrix3.pos(0, 2)] = 1;
-
- // Predicted state and covariance.
</del><ins>+ // Project the state ahead
+ // X_prd(k) = A * X_est(k-1)
</ins><span class="cx"> var vecX_prd = Matrix3.multiplyVector3(this._matA, this._vecX_est);
</span><ins>+
+ // Project the error covariance ahead
+ // P_prd(k) = A * P_est(k-1) * A' + Q
</ins><span class="cx"> var matP_prd = Matrix3.add(Matrix3.multiplyMatrix3(Matrix3.multiplyMatrix3(this._matA, this._matP_est), Matrix3.transpose(this._matA)), this._matQ);
</span><span class="cx">
</span><del>- // Estimation.
</del><ins>+ // Compute Kalman gain
+ // B = H * P_prd(k)';
+ // S = B * H' + R;
+ // K(k) = (S \ B)';
</ins><span class="cx"> var vecB = Vector3.multiplyMatrix3(this._vecH, Matrix3.transpose(matP_prd));
</span><span class="cx"> var S = Vector3.multiplyVector3(vecB, this._vecH) + this._R;
</span><del>-
</del><span class="cx"> var vecGain = Vector3.scale(1/S, vecB);
</span><span class="cx">
</span><del>- // Estimated state and covariance.
</del><ins>+ // Update the estimate via z(k)
+ // X_est(k) = x_prd + K(k) * (z(k) - H * X_prd(k));
</ins><span class="cx"> this._vecX_est = Vector3.add(vecX_prd, Vector3.scale(current - Vector3.multiplyVector3(this._vecH, vecX_prd), vecGain));
</span><ins>+
+ // Update the error covariance
+ // P_est(k) = P_prd(k) - K(k) * H * P_prd(k);
</ins><span class="cx"> this._matP_est = Matrix3.subtract(matP_prd, Matrix3.scale(Vector3.multiplyVector3(vecGain, this._vecH), matP_prd));
</span><span class="cx">
</span><span class="cx"> // Compute the estimated measurement.
</span><ins>+ // y = H * X_est(k);
</ins><span class="cx"> return Vector3.multiplyVector3(this._vecH, this._vecX_est);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkPerformanceTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/ChangeLog (192106 => 192107)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/ChangeLog 2015-11-06 16:58:31 UTC (rev 192106)
+++ trunk/PerformanceTests/ChangeLog 2015-11-06 17:55:08 UTC (rev 192107)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2015-11-06 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ Initialize the graphics benchmark's Kalman filter with estimated 60 FPS
+ https://bugs.webkit.org/show_bug.cgi?id=150965
+
+ Reviewed by Darin Adler.
+
+ This should give the benchmark more accurate reading at warmup time. And
+ hence we can safely reduce the test running time to be 10 seconds.
+
+ * Animometer/runner/animometer.html:
+ Add "defer" back when loading resources/animometer.js since this script
+ depends on many other scripts and we need to wait till the page is parsed.
+ Also change the default test interval to be 10 seconds.
+
+ * Animometer/runner/resources/graph.js:
+ (graph): Make the test results curves smoother.
+
+ * Animometer/tests/resources/main.js:
+ (Animator): Initialize the Kalman filter with 60 FPS which should be true
+ if the test page is empty.
+
+ (Animator.prototype.animate):
+ * Animometer/tests/resources/math.js:
+ (KalmanEstimator): Fix the initial value of _vecX_est.
+ _vecX_est[0] = current FPS (= 60FPS when the test page is empty)
+ _vecX_est[1] = first time derivative of FPS (=0; FPS has been constant).
+ _vecX_est[2] = second time derivative of FPS (=0; since _vecX_est[1]=0).
+ (KalmanEstimator.prototype.estimate): Add some comments.
+
</ins><span class="cx"> 2015-11-04 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove "defer" from the scripts' references in the graphics benchmark home page
</span></span></pre>
</div>
</div>
</body>
</html>