Modified: trunk/PerformanceTests/Speedometer/resources/main.js (183684 => 183685)
--- 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)
@@ -52,7 +52,7 @@
function totalTimeInDisplayUnit(time) {
if (displayUnit == 'ms')
return time;
- return 60 * 1000 * suitesCount / time;
+ return computerScore(time);
}
function sigFigFromPercentDelta(percentDelta) {
@@ -158,6 +158,10 @@
runner.runMultipleIterations(benchmarkClient.iterationCount);
}
+function computeScore(time) {
+ return 60 * 1000 * benchmarkClient.suitesCount / time;
+}
+
function showSection(sectionIdentifier, pushState) {
var currentSectionElement = document.querySelector('section.selected');
console.assert(currentSectionElement);
Modified: trunk/Tools/ChangeLog (183684 => 183685)
--- trunk/Tools/ChangeLog 2015-05-01 19:39:28 UTC (rev 183684)
+++ trunk/Tools/ChangeLog 2015-05-01 19:42:35 UTC (rev 183685)
@@ -1,3 +1,14 @@
+2015-05-01 Dewei Zhu <[email protected]>
+
+ 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.
+
2015-05-01 Brady Eidson <[email protected]>
Add API to disable meta refreshes.
Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py (183684 => 183685)
--- 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)
@@ -96,9 +96,7 @@
assert(isinstance(a, type(b)))
argType = type(a)
# special handle for list type, and should be handle before equal check
- if argType == types.ListType:
- return a + b
- if a == b:
+ if argType == types.ListType and len(a) and (type(a[0]) == types.StringType or type(a[0]) == types.UnicodeType):
return a
if argType == types.DictType:
result = {}
Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/data/patches/Speedometer.patch (183684 => 183685)
--- 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)
@@ -11,10 +11,10 @@
</head>
<body>
diff --git a/Speedometer/resources/benchmark-report.js b/Speedometer/resources/benchmark-report.js
-index c4b4c64..c4453cd 100644
+index c4b4c64..874f597 100644
--- a/Speedometer/resources/benchmark-report.js
+++ b/Speedometer/resources/benchmark-report.js
-@@ -1,16 +1,9 @@
+@@ -1,30 +1,26 @@
// This file can be customized to report results as needed.
(function () {
@@ -28,10 +28,32 @@
- scriptElement.src = '';
- document.head.appendChild(scriptElement);
-
- var styleElement = document.createElement('style');
- styleElement.textContent = 'pre { padding-top: 600px; }';
- document.head.appendChild(styleElement);
-@@ -36,10 +29,8 @@
+- 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 @@
name: name,
aggregator: aggregator};
}
@@ -40,22 +62,28 @@
didRunSuites: function (measuredValues) {
- PerfTestRunner.measureValueAsync(measuredValues.total);
valuesByIteration.push(measuredValues.tests);
++ timeValues.push(measuredValues.total);
},
didFinishLastIteration: function () {
-@@ -52,19 +43,30 @@
+- document.head.removeChild(document.querySelector('style'));
+-
+ var measuredValuesByFullName = {};
+ function addToMeasuredValue(value, fullName, aggregator) {
+ var values = measuredValuesByFullName[fullName] || new Array;
+@@ -52,19 +45,30 @@
values.push(value);
values.aggregator = aggregator;
}
-
+ var dict = {}
++ var scores= timeValues.map(computeScore);
+ function addToDictionaryValue(value, suiteName, testName, subtestName) {
-+ dict["Speedometer"] = dict["Speedometer"] || { "metrics" : { "Time" : [ "Total", ] }, "tests" : {}};
++ dict["Speedometer"] = dict["Speedometer"] || { "metrics" : { "Time" : [ "Total", ], "Score": { "current" : [scores] } }, "tests" : {}};
+ dict["Speedometer"]["tests"][suiteName] = dict["Speedometer"]["tests"][suiteName] || {"metrics" : { "Time" : [ "Total", ] }, "tests" : {}};
+ dict["Speedometer"]["tests"][suiteName]["tests"][testName] = dict["Speedometer"]["tests"][suiteName]["tests"][testName] || { "metrics" : { "Time" : [ "Total", ] }, "tests" : {}};
+ dict["Speedometer"]["tests"][suiteName]["tests"][testName]["tests"][subtestName] = dict["Speedometer"]["tests"][suiteName]["tests"][testName]["tests"][subtestName] || { "metrics" : { "Time" : { "current" : [[]] } }};
+ dict["Speedometer"]["tests"][suiteName]["tests"][testName]["tests"][subtestName]["metrics"]["Time"]["current"][0].push(value);
+ }
-+
valuesByIteration.forEach(function (measuredValues) {
for (var suiteName in measuredValues) {
var suite = measuredValues[suiteName];
@@ -75,7 +103,7 @@
var fullNames = new Array;
for (var fullName in measuredValuesByFullName)
-@@ -72,8 +74,22 @@
+@@ -72,8 +76,22 @@
for (var i = 0; i < fullNames.length; i++) {
var values = measuredValuesByFullName[fullNames[i]];
@@ -83,11 +111,11 @@
}
+ var xhr = new XMLHttpRequest();
+ xhr.open("POST", "/report");
-+
++
+ xhr.setRequestHeader("Content-type", "application/json");
+ xhr.setRequestHeader("Content-length", results.length);
+ xhr.setRequestHeader("Connection", "close");
-+
++
+ xhr._onreadystatechange_ = function() {
+ if(xhr.readyState == XMLHttpRequest.DONE && xhr.status == 200) {
+ var closeRequest = new XMLHttpRequest();
