Changeset 112303 in webkit

Timestamp:

Mar 27, 2012 12:36:20 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Show image diffs for gpu_tests on flakiness dashboard
​https://bugs.webkit.org/show_bug.cgi?id=81848

Patch by Dave Tu <​dtu@chromium.org> on 2012-03-27
Reviewed by Ojan Vafai.

Add a new results layout for gpu_tests that pulls the image diffs in
addition to the text output. Also add new gpu_tests builders.

• Tools/TestResultServer/static-dashboards/builders.js: Update

gpu_tests builders.

• Tools/TestResultServer/static-dashboards/dashboard_base.js: Add a

function to check for GPU test type.

• Tools/TestResultServer/static-dashboards/flakiness_dashboard.html:

Add new GPU results layout.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Tools/TestResultServer/static-dashboards/builders.js (modified) (2 diffs)
• Tools/TestResultServer/static-dashboards/dashboard_base.js (modified) (1 diff)
• Tools/TestResultServer/static-dashboards/flakiness_dashboard.html (modified) (8 diffs)

trunk/ChangeLog

@@ +1 @@
+2012-03-27  Dave Tu  <dtu@chromium.org>
+
+        Show image diffs for gpu_tests on flakiness dashboard
+        https://bugs.webkit.org/show_bug.cgi?id=81848
+
+        Reviewed by Ojan Vafai.
+
+        Add a new results layout for gpu_tests that pulls the image diffs in
+        addition to the text output. Also add new gpu_tests builders.
+
+        * Tools/TestResultServer/static-dashboards/builders.js: Update
+        gpu_tests builders.
+        * Tools/TestResultServer/static-dashboards/dashboard_base.js: Add a
+        function to check for GPU test type.
+        * Tools/TestResultServer/static-dashboards/flakiness_dashboard.html:
+        Add new GPU results layout.
+
 2012-03-26  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Tools/TestResultServer/static-dashboards/builders.js

@@ -52 +52 @@
     'ChromiumChromiumOS': '@DEPS CrOS - chromium.org',
     'ChromiumGPU': '@DEPS - chromium.org',
+    'ChromiumGPUFYI': '@DEPS FYI - chromium.org',
     'ChromiumWebkit': '@ToT - chromium.org',
     'webkit.org': '@ToT - webkit.org'
@@ -162 +163 @@
     ['Linux Release (ATI)'],
     ['Linux Release (Intel)'],
+    ['Win7 Audio'],
+    ['Linux Audio'],
 ];
 associateBuildersWithMaster(CHROMIUM_GPU_FYI_GTESTS_DEPS_BUILDERS, CHROMIUM_GPU_FYI_BUILDER_MASTER);
 
 var CHROMIUM_GPU_GTESTS_TOT_BUILDERS = [
-    ['GPU Win7 (dbg) (NVIDIA)', BuilderGroup.DEFAULT_BUILDER],
+    ['GPU Win7 (NVIDIA)', BuilderGroup.DEFAULT_BUILDER],
+    ['GPU Win7 (dbg) (NVIDIA)'],
+    ['GPU Mac'],
     ['GPU Mac (dbg)'],
     ['GPU Linux (dbg) (NVIDIA)'],

trunk/Tools/TestResultServer/static-dashboards/dashboard_base.js

@@ -421 +421 @@
 {
     return g_currentState.testType == 'layout-tests';
+}
+
+function isGPUTestResults()
+{
+    return g_currentState.testType == 'gpu_tests';
 }
 

trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.html

@@ -262 +262 @@
 .non-webkit-results {
     width: 99%;
+}
+.gpu-test-results {
+    width: 400px;
 }
 .used-platform {
@@ -1214 +1217 @@
 }
 
-// Returns an array of buildNumbers for all builds where this test failed.
-function buildNumbersForFailures(builder, testName)
+// Returns an array of indexes for all builds where this test failed.
+function indexesForFailures(builder, testName)
 {
     var rawResults = g_resultsByBuilder[builder].tests[testName].results;
@@ -1225 +1228 @@
         if (isFailingResult(rawResults[i][RLE.VALUE])) {
             for (var j = 0; j < numResults; j++)
-                failures.push(buildNumbers[index + j]);
+                failures.push(index + j);
         }
         index += numResults;
@@ -1830 +1833 @@
         linkHTMLToToggleState('showExpectations', 'results')
 
-    if (isLayoutTestResults()) {
-        html += ' | ' + linkHTMLToToggleState('showLargeExpectations', 'large thumbnails');
+    if (isLayoutTestResults() || isGPUTestResults()) {
+        if (isLayoutTestResults())
+            html += ' | ' + linkHTMLToToggleState('showLargeExpectations', 'large thumbnails');
         if (master == WEBKIT_BUILDER_MASTER) {
             var revision = g_currentState.revision || '';
@@ -1838 +1842 @@
                 '<input name=revision placeholder="e.g. 65540" value="' + revision +
                 '" id=revision-input></form>';
-      } else
-        html += ' | <b>Only shows actual results/diffs from the most recent *failure* on each bot.</b>';
+        } else
+            html += ' | <b>Only shows actual results/diffs from the most recent *failure* on each bot.</b>';
     } else {
       html += ' | <span>Results height:<input ' +
@@ -2115 +2119 @@
 function loadExpectations(expectationsContainer)
 {
+    var test = expectationsContainer.getAttribute('test');
     if (isLayoutTestResults())
-        loadExpectationsLayoutTests(expectationsContainer);
+        loadExpectationsLayoutTests(test, expectationsContainer);
     else {
-        var test = expectationsContainer.getAttribute('test');
         var results = g_testToResultsMap[test];
         for (var i = 0; i < results.length; i++)
-            loadNonWebKitResultsForBuilder(results[i].builder, test, expectationsContainer);
-    }
+            if (isGPUTestResults())
+                loadGPUResultsForBuilder(results[i].builder, test, expectationsContainer);
+            else
+                loadNonWebKitResultsForBuilder(results[i].builder, test, expectationsContainer);
+    }
+}
+
+function loadGPUResultsForBuilder(builder, test, expectationsContainer)
+{
+    var container = document.createElement('div');
+    container.className = 'expectations-container';
+    container.innerHTML = '<div><b>' + builder + '</b></div>';
+    expectationsContainer.appendChild(container);
+
+    var baseUrl = 'http://chromium-browser-gpu-tests.commondatastorage.googleapis.com/runs/'
+    var failureIndex = indexesForFailures(builder, test)[0];
+
+    var buildNumber = g_resultsByBuilder[builder].buildNumbers[failureIndex];
+    var pathToLog = builderMaster(builder).getLogPath(builder, buildNumber) + pathToFailureLog(test);
+
+    var chromeRevision = g_resultsByBuilder[builder].chromeRevision[failureIndex];
+    var builderName = builder.replace(/[^A-Za-z0-9 ]/g, '').replace(/ /g, '_');
+    var resultsUrl = baseUrl + chromeRevision + '_' + builderName + '_/';
+    var filename = test.split(/\./)[1] + '.png';
+
+    appendNonWebKitResults(container, pathToLog, 'non-webkit-results');
+    appendNonWebKitResults(container, resultsUrl + 'gen/' + filename, 'gpu-test-results', 'Generated');
+    appendNonWebKitResults(container, resultsUrl + 'ref/' + filename, 'gpu-test-results', 'Reference');
+    appendNonWebKitResults(container, resultsUrl + 'diff/' + filename, 'gpu-test-results', 'Diff');
 }
 
 function loadNonWebKitResultsForBuilder(builder, test, expectationsContainer)
 {
-    var failures = buildNumbersForFailures(builder, test);
+    var failureIndexes = indexesForFailures(builder, test);
     var container = document.createElement('div');
     container.innerHTML = '<div><b>' + builder + '</b></div>';
     expectationsContainer.appendChild(container);
-    for (var i = 0; i < failures.length; i++) {
+    for (var i = 0; i < failureIndexes.length; i++) {
         // FIXME: This doesn't seem to work anymore. Did the paths change?
         // Once that's resolved, see if we need to try each GTEST_MODIFIERS prefix as well.
-        var pathToLog = builderMaster(builder).getLogPath(builder, failures[i]) + pathToFailureLog(test);
-        appendNonWebKitResults(container, pathToLog);
-    }
-}
-
-function appendNonWebKitResults(container, url)
+        var buildNumber = g_resultsByBuilder[builder].buildNumbers[failureIndexes[i]];
+        var pathToLog = builderMaster(builder).getLogPath(builder, buildNumber) + pathToFailureLog(test);
+        appendNonWebKitResults(container, pathToLog, 'non-webkit-results');
+    }
+}
+
+function appendNonWebKitResults(container, url, itemClassName, opt_title)
 {
     // Use a script tag to detect whether the URL 404s.
@@ -2149 +2181 @@
         var item = document.createElement('iframe');
         item.src = dummyNode.src;
-        item.className = 'non-webkit-results';
+        item.className = itemClassName;
         item.style.height = g_currentState.resultsHeight + 'px';
-        container.appendChild(item);
+
+        if (opt_title) {
+            var childContainer = document.createElement('div');
+            childContainer.style.display = 'inline-block';
+            var title = document.createElement('div');
+            title.textContent = opt_title;
+            childContainer.appendChild(title);
+            childContainer.appendChild(item);
+            container.replaceChild(childContainer, dummyNode);
+        } else
+            container.replaceChild(item, dummyNode);
     }
     dummyNode.onerror = function() {
-        container.parentNode.removeChild(childContainer);
+        container.removeChild(dummyNode);
     }
 
@@ -2219 +2261 @@
 }
 
-function loadExpectationsLayoutTests(expectationsContainer)
+function loadExpectationsLayoutTests(test, expectationsContainer)
 {
     // Map from file extension to container div for expectations of that type.
     var expectationsContainers = {};
-    var test = expectationsContainer.getAttribute('test');
 
     var revisionContainer = document.createElement('div');