Changeset 130711 in webkit

Timestamp:

Oct 8, 2012 6:43:08 PM (12 years ago)

Author:

rniwa@webkit.org

Message:

Perf. test results page is broken when runs have different sets of tests
​https://bugs.webkit.org/show_bug.cgi?id=98691

Reviewed by Daniel Bates.

Add "missing" columns for tests that are missing some runs.

Also fix regressions from the previous patch:

• Make reference run switch work again
• Load jquery plugins from the remote server when the jquery is loaded from the remote server.

• resources/results-template.html:

Location:

trunk/PerformanceTests

Files:

• ChangeLog (modified) (1 diff)
• resources/results-template.html (modified) (8 diffs)

trunk/PerformanceTests/ChangeLog

@@ +1 @@
+2012-10-08  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Perf. test results page is broken when runs have different sets of tests
+        https://bugs.webkit.org/show_bug.cgi?id=98691
+
+        Reviewed by Daniel Bates.
+
+        Add "missing" columns for tests that are missing some runs.
+
+        Also fix regressions from the previous patch:
+        - Make reference run switch work again
+        - Load jquery plugins from the remote server when the jquery is loaded from the remote server.
+
+        * resources/results-template.html:
+
 2012-10-08  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/PerformanceTests/resources/results-template.html

@@ -93 +93 @@
 td.worse {
     color: #c66;
+}
+
+td.missing {
+    text-align: center;
 }
 
@@ -175 +179 @@
         function () {
             loadScript(remotePath + '/' + jQuery,
-                createLoadedJQuery(localPath),
+                createLoadedJQuery(remotePath),
                 function () { alert("Failed to load jQuery."); });
         });
@@ -395 +399 @@
         var test = tests[testName];
         if (test.isMemoryTest() != shouldIgnoreMemory)
-            createTableRow(test, test.results()[referenceIndex]);
+            createTableRow(runs, test, referenceIndex);
     });
 
@@ -439 +443 @@
     + '</svg>';
 
-function createTableRow(test, referenceResult) {
+function createTableRow(runs, test, referenceIndex) {
     var tableRow = $('<tr><td class="test">' + test.name() + '</td><td class="unit">' + test.unit() + '</td></tr>');
 
-    tableRow.append(test.results().map(function (result, index) {
-        var secondCell = '';
+    function markupForRun(result, referenceResult) {
+        var comparisonCell = '';
         var hiddenValue = '';
-        if (result !== referenceResult) {
+        var shouldCompare = result !== referenceResult;
+        if (shouldCompare && referenceResult) {
             var percentDifference = referenceResult.percentDifference(result);
             var better = test.smallerIsBetter() ? percentDifference < 0 : percentDifference > 0;
@@ -455 +460 @@
             }
             hiddenValue = '<span style="display: none">|' + comparison + '</span>';
-            secondCell = '</td><td class="' + className + '">' + comparison;
-        }
+            comparisonCell = '<td class="' + className + '">' + comparison + '</td>';
+        } else if (shouldCompare)
+            comparisonCell = '<td class="comparison"></td>';
 
         var values = result.values();
@@ -476 +482 @@
         return '<td class="result" title="' + statistics + '">' + toFixedWidthPrecision(result.mean()) + hiddenValue
             + '</td><td class="stdev" title="' + statistics + '">&plusmn; '
-            + formatPercentage(result.stdevRatio()) + warning + secondCell + '</td>';
-    }).reduce(function (markup, cell) { return markup + cell; }, ''));
+            + formatPercentage(result.stdevRatio()) + warning + '</td>' + comparisonCell;
+    }
+
+    function markupForMissingRun(isReference) {
+        return '<td colspan="' + (isReference ? 2 : 3) + '" class="missing">Missing</td>';
+    }
+
+    var runIndex = 0;
+    var results = test.results();
+    var referenceResult = undefined;
+    var resultIndexMap = {};
+    for (var i = 0; i < results.length; i++) {
+        while (runs[runIndex] !== results[i].run())
+            runIndex++;
+        if (runIndex == referenceIndex)
+            referenceResult = results[i];
+        resultIndexMap[runIndex] = i;
+    }
+    for (var i = 0; i < runs.length; i++) {
+        var resultIndex = resultIndexMap[i];
+        if (resultIndex == undefined)
+            tableRow.append(markupForMissingRun(i == referenceIndex));
+        else
+            tableRow.append(markupForRun(results[resultIndex], referenceResult));
+    }
 
     $('#container').children('tbody').last().append(tableRow);
@@ -506 +535 @@
 
 function init() {
-    $('.checkbox').each(function (index, checkbox) {
-        $(checkbox).children('span').click(function (event) {
-            if ($(this).hasClass('checked'))
-                return;
-            $(checkbox).children('span').removeClass('checked');
-            $(this).addClass('checked');
-            $(checkbox).trigger('change', $(this));
-        });
-    });
-
     $.tablesorter.addParser({
         id: 'comparison',
@@ -557 +576 @@
         createTable(tests, runs, shouldIgnoreMemory, referenceIndex);
     });
+
+    $('.checkbox').each(function (index, checkbox) {
+        $(checkbox).children('span').click(function (event) {
+            if ($(this).hasClass('checked'))
+                return;
+            $(checkbox).children('span').removeClass('checked');
+            $(this).addClass('checked');
+            $(checkbox).trigger('change', $(this));
+        });
+    });
 }