<!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>[183685] trunk</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/183685">183685</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-01 12:42:35 -0700 (Fri, 01 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update speedometer patch to provide better UI, fix merge result bug and add "Score" metric to speedometer benchmark.
https://bugs.webkit.org/show_bug.cgi?id=144487
Patch by Dewei Zhu <dewei_zhu@apple.com> on 2015-05-01
Reviewed by Ryosuke Niwa.
* Scripts/webkitpy/benchmark_runner/benchmark_runner.py:
(BenchmarkRunner.merge): Fix bug.
* Scripts/webkitpy/benchmark_runner/data/patches/Speedometer.patch: Update appearance and add "Score" metric.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkPerformanceTestsSpeedometerresourcesmainjs">trunk/PerformanceTests/Speedometer/resources/main.js</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbenchmark_runnerpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerdatapatchesSpeedometerpatch">trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/Speedometer.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkPerformanceTestsSpeedometerresourcesmainjs"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/Speedometer/resources/main.js (183684 => 183685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/Speedometer/resources/main.js 2015-05-01 19:39:28 UTC (rev 183684)
+++ trunk/PerformanceTests/Speedometer/resources/main.js 2015-05-01 19:42:35 UTC (rev 183685)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> function totalTimeInDisplayUnit(time) {
</span><span class="cx"> if (displayUnit == 'ms')
</span><span class="cx"> return time;
</span><del>- return 60 * 1000 * suitesCount / time;
</del><ins>+ return computerScore(time);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function sigFigFromPercentDelta(percentDelta) {
</span><span class="lines">@@ -158,6 +158,10 @@
</span><span class="cx"> runner.runMultipleIterations(benchmarkClient.iterationCount);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function computeScore(time) {
+ return 60 * 1000 * benchmarkClient.suitesCount / time;
+}
+
</ins><span class="cx"> function showSection(sectionIdentifier, pushState) {
</span><span class="cx"> var currentSectionElement = document.querySelector('section.selected');
</span><span class="cx"> console.assert(currentSectionElement);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (183684 => 183685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-05-01 19:39:28 UTC (rev 183684)
+++ trunk/Tools/ChangeLog 2015-05-01 19:42:35 UTC (rev 183685)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-05-01 Dewei Zhu <dewei_zhu@apple.com>
+
+ Update speedometer patch to provide better UI, fix merge result bug and add "Score" metric to speedometer benchmark.
+ https://bugs.webkit.org/show_bug.cgi?id=144487
+
+ Reviewed by Ryosuke Niwa.
+
+ * Scripts/webkitpy/benchmark_runner/benchmark_runner.py:
+ (BenchmarkRunner.merge): Fix bug.
+ * Scripts/webkitpy/benchmark_runner/data/patches/Speedometer.patch: Update appearance and add "Score" metric.
+
</ins><span class="cx"> 2015-05-01 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Add API to disable meta refreshes.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbenchmark_runnerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py (183684 => 183685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py 2015-05-01 19:39:28 UTC (rev 183684)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py 2015-05-01 19:42:35 UTC (rev 183685)
</span><span class="lines">@@ -96,9 +96,7 @@
</span><span class="cx"> assert(isinstance(a, type(b)))
</span><span class="cx"> argType = type(a)
</span><span class="cx"> # special handle for list type, and should be handle before equal check
</span><del>- if argType == types.ListType:
- return a + b
- if a == b:
</del><ins>+ if argType == types.ListType and len(a) and (type(a[0]) == types.StringType or type(a[0]) == types.UnicodeType):
</ins><span class="cx"> return a
</span><span class="cx"> if argType == types.DictType:
</span><span class="cx"> result = {}
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerdatapatchesSpeedometerpatch"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/Speedometer.patch (183684 => 183685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/Speedometer.patch 2015-05-01 19:39:28 UTC (rev 183684)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/Speedometer.patch 2015-05-01 19:42:35 UTC (rev 183685)
</span><span class="lines">@@ -11,10 +11,10 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> diff --git a/Speedometer/resources/benchmark-report.js b/Speedometer/resources/benchmark-report.js
</span><del>-index c4b4c64..c4453cd 100644
</del><ins>+index c4b4c64..874f597 100644
</ins><span class="cx"> --- a/Speedometer/resources/benchmark-report.js
</span><span class="cx"> +++ b/Speedometer/resources/benchmark-report.js
</span><del>-@@ -1,16 +1,9 @@
</del><ins>+@@ -1,30 +1,26 @@
</ins><span class="cx"> // This file can be customized to report results as needed.
</span><span class="cx">
</span><span class="cx"> (function () {
</span><span class="lines">@@ -28,10 +28,32 @@
</span><span class="cx"> - scriptElement.src = '../resources/runner.js';
</span><span class="cx"> - document.head.appendChild(scriptElement);
</span><span class="cx"> -
</span><del>- var styleElement = document.createElement('style');
- styleElement.textContent = 'pre { padding-top: 600px; }';
- document.head.appendChild(styleElement);
-@@ -36,10 +29,8 @@
</del><ins>+- var styleElement = document.createElement('style');
+- styleElement.textContent = 'pre { padding-top: 600px; }';
+- document.head.appendChild(styleElement);
+-
++ showSection('running')
+ var createTest;
+ var valuesByIteration = new Array;
++ var timeValues = new Array;
+
+ window.onload = function () {
+- document.body.removeChild(document.querySelector('main'));
+ startBenchmark();
+ }
+
+ window.benchmarkClient = {
+ iterationCount: 5, // Use 4 different instances of DRT/WTR to run 5 iterations.
++ willAddTestFrame: function (frame) {
++ var main = document.querySelector('main');
++ var style = getComputedStyle(main);
++ frame.style.left = main.offsetLeft + parseInt(style.borderLeftWidth) + parseInt(style.paddingLeft) + 'px';
++ frame.style.top = main.offsetTop + parseInt(style.borderTopWidth) + parseInt(style.paddingTop) + 'px';
++ },
+ willStartFirstIteration: function (iterationCount) {
+ createTest = function (name, aggregator, isLastTest) {
+ return {
+@@ -36,15 +32,12 @@
</ins><span class="cx"> name: name,
</span><span class="cx"> aggregator: aggregator};
</span><span class="cx"> }
</span><span class="lines">@@ -40,22 +62,28 @@
</span><span class="cx"> didRunSuites: function (measuredValues) {
</span><span class="cx"> - PerfTestRunner.measureValueAsync(measuredValues.total);
</span><span class="cx"> valuesByIteration.push(measuredValues.tests);
</span><ins>++ timeValues.push(measuredValues.total);
</ins><span class="cx"> },
</span><span class="cx"> didFinishLastIteration: function () {
</span><del>-@@ -52,19 +43,30 @@
</del><ins>+- document.head.removeChild(document.querySelector('style'));
+-
+ var measuredValuesByFullName = {};
+ function addToMeasuredValue(value, fullName, aggregator) {
+ var values = measuredValuesByFullName[fullName] || new Array;
+@@ -52,19 +45,30 @@
</ins><span class="cx"> values.push(value);
</span><span class="cx"> values.aggregator = aggregator;
</span><span class="cx"> }
</span><span class="cx"> -
</span><span class="cx"> + var dict = {}
</span><ins>++ var scores= timeValues.map(computeScore);
</ins><span class="cx"> + function addToDictionaryValue(value, suiteName, testName, subtestName) {
</span><del>-+ dict["Speedometer"] = dict["Speedometer"] || { "metrics" : { "Time" : [ "Total", ] }, "tests" : {}};
</del><ins>++ dict["Speedometer"] = dict["Speedometer"] || { "metrics" : { "Time" : [ "Total", ], "Score": { "current" : [scores] } }, "tests" : {}};
</ins><span class="cx"> + dict["Speedometer"]["tests"][suiteName] = dict["Speedometer"]["tests"][suiteName] || {"metrics" : { "Time" : [ "Total", ] }, "tests" : {}};
</span><span class="cx"> + dict["Speedometer"]["tests"][suiteName]["tests"][testName] = dict["Speedometer"]["tests"][suiteName]["tests"][testName] || { "metrics" : { "Time" : [ "Total", ] }, "tests" : {}};
</span><span class="cx"> + dict["Speedometer"]["tests"][suiteName]["tests"][testName]["tests"][subtestName] = dict["Speedometer"]["tests"][suiteName]["tests"][testName]["tests"][subtestName] || { "metrics" : { "Time" : { "current" : [[]] } }};
</span><span class="cx"> + dict["Speedometer"]["tests"][suiteName]["tests"][testName]["tests"][subtestName]["metrics"]["Time"]["current"][0].push(value);
</span><span class="cx"> + }
</span><del>-+
</del><span class="cx"> valuesByIteration.forEach(function (measuredValues) {
</span><span class="cx"> for (var suiteName in measuredValues) {
</span><span class="cx"> var suite = measuredValues[suiteName];
</span><span class="lines">@@ -75,7 +103,7 @@
</span><span class="cx">
</span><span class="cx"> var fullNames = new Array;
</span><span class="cx"> for (var fullName in measuredValuesByFullName)
</span><del>-@@ -72,8 +74,22 @@
</del><ins>+@@ -72,8 +76,22 @@
</ins><span class="cx">
</span><span class="cx"> for (var i = 0; i < fullNames.length; i++) {
</span><span class="cx"> var values = measuredValuesByFullName[fullNames[i]];
</span><span class="lines">@@ -83,11 +111,11 @@
</span><span class="cx"> }
</span><span class="cx"> + var xhr = new XMLHttpRequest();
</span><span class="cx"> + xhr.open("POST", "/report");
</span><del>-+
</del><ins>++
</ins><span class="cx"> + xhr.setRequestHeader("Content-type", "application/json");
</span><span class="cx"> + xhr.setRequestHeader("Content-length", results.length);
</span><span class="cx"> + xhr.setRequestHeader("Connection", "close");
</span><del>-+
</del><ins>++
</ins><span class="cx"> + xhr.onreadystatechange = function() {
</span><span class="cx"> + if(xhr.readyState == XMLHttpRequest.DONE && xhr.status == 200) {
</span><span class="cx"> + var closeRequest = new XMLHttpRequest();
</span></span></pre>
</div>
</div>
</body>
</html>