Add VisualBench switch to extra_config

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1533523003

Review URL: https://codereview.chromium.org/1533523003

2 files changed, 280 insertions, 24 deletions

diff --git a/tools/buildbot_spec.json b/tools/buildbot_spec.json
index d5b85cfa02..5aea202735 100644
--- a/tools/buildbot_spec.json
+++ b/tools/buildbot_spec.json
@@ -179,10 +179,7 @@
       "_", 
       "image", 
       "decode", 
-      "inc14.png", 
-      "--match", 
-      "~tabl_mozilla_0", 
-      "~desk_yahoonews_0"
+      "inc14.png"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": false, 
@@ -407,10 +404,7 @@
       "_", 
       "image", 
       "decode", 
-      "inc14.png", 
-      "--match", 
-      "~tabl_mozilla_0", 
-      "~desk_yahoonews_0"
+      "inc14.png"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": false, 
@@ -633,10 +627,7 @@
       "_", 
       "image", 
       "decode", 
-      "inc14.png", 
-      "--match", 
-      "~tabl_mozilla_0", 
-      "~desk_yahoonews_0"
+      "inc14.png"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": false, 
@@ -2783,10 +2774,7 @@
       "_", 
       "image", 
       "decode", 
-      "inc14.png", 
-      "--match", 
-      "~tabl_mozilla_0", 
-      "~desk_yahoonews_0"
+      "inc14.png"
     ], 
     "do_perf_steps": true, 
     "do_test_steps": false, 
@@ -2795,6 +2783,8 @@
     }, 
     "nanobench_flags": [
       "--images", 
+      "--gpuStatsDump", 
+      "true", 
       "--match", 
       "~blurroundrect", 
       "~patch_grid", 
@@ -2822,6 +2812,255 @@
     "upload_dm_results": true, 
     "upload_perf_results": true
   }, 
+  "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-VisualBench": {
+    "build_targets": [
+      "visualbench"
+    ], 
+    "builder_cfg": {
+      "arch": "x86_64", 
+      "compiler": "GCC", 
+      "configuration": "Release", 
+      "cpu_or_gpu": "GPU", 
+      "cpu_or_gpu_value": "GTX660", 
+      "extra_config": "VisualBench", 
+      "is_trybot": false, 
+      "model": "ShuttleA", 
+      "os": "Ubuntu", 
+      "role": "Perf"
+    }, 
+    "configuration": "Release", 
+    "dm_flags": [
+      "--matrix", 
+      "0", 
+      "1", 
+      "1", 
+      "0", 
+      "--config", 
+      "565", 
+      "8888", 
+      "gpu", 
+      "upright-matrix-8888", 
+      "upright-matrix-gpu", 
+      "nvprmsaa16", 
+      "msaa16", 
+      "pdf", 
+      "pdf_poppler", 
+      "serialize-8888", 
+      "tiles_rt-8888", 
+      "pipe-8888", 
+      "--src", 
+      "tests", 
+      "gm", 
+      "--blacklist", 
+      "_", 
+      "image", 
+      "decode", 
+      "pal8os2v2.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "pal8v4.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "pal8v5.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "rgb16-565.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "rgb16-565pal.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "rgb32-111110.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "rgb32bf.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "rgba32.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "rgba32abf.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "rgb24largepal.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "pal8os2v2-16.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "pal8oversizepal.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "pal4rletrns.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "pal8rletrns.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "4bpp-pixeldata-cropped.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "8bpp-pixeldata-cropped.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "24bpp-pixeldata-cropped.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "32bpp-pixeldata-cropped.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "testcase7.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "Hopstarter-Mac-Folders-Apple.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "incInterlaced.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "incGray.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc2.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc12.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc13.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc14.png", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced1.png", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced2.png", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced3.png"
+    ], 
+    "do_perf_steps": true, 
+    "do_test_steps": false, 
+    "env": {
+      "GYP_DEFINES": "skia_arch_type=x86_64 skia_dump_stats=1 skia_use_sdl=1 skia_warnings_as_errors=0"
+    }, 
+    "nanobench_flags": [
+      "--images", 
+      "--gpuStatsDump", 
+      "true", 
+      "--scales", 
+      "1.0", 
+      "1.1", 
+      "--config", 
+      "565", 
+      "8888", 
+      "gpu", 
+      "nonrendering", 
+      "angle", 
+      "hwui", 
+      "msaa16", 
+      "nvprmsaa16", 
+      "--match", 
+      "~interlaced1.png", 
+      "~interlaced2.png", 
+      "~interlaced3.png", 
+      "~inc0.gif", 
+      "~inc1.gif", 
+      "~incInterlaced.gif", 
+      "~inc0.jpg", 
+      "~incGray.jpg", 
+      "~inc0.wbmp", 
+      "~inc1.wbmp", 
+      "~inc0.webp", 
+      "~inc1.webp", 
+      "~inc0.ico", 
+      "~inc1.ico", 
+      "~inc0.png", 
+      "~inc1.png", 
+      "~inc2.png", 
+      "~inc12.png", 
+      "~inc13.png", 
+      "~inc14.png", 
+      "~inc0.webp", 
+      "~inc1.webp"
+    ], 
+    "upload_dm_results": true, 
+    "upload_perf_results": true
+  }, 
   "Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot": {
     "build_targets": [
       "nanobench"
@@ -3032,6 +3271,8 @@
     }, 
     "nanobench_flags": [
       "--images", 
+      "--gpuStatsDump", 
+      "true", 
       "--scales", 
       "1.0", 
       "1.1", 
@@ -3251,8 +3492,6 @@
       "decode", 
       "inc14.png", 
       "--match", 
-      "~tabl_mozilla_0", 
-      "~desk_yahoonews_0", 
       "~imagefiltersclipped", 
       "~imagefilterscropexpand", 
       "~scaled_tilemodes_npot", 
@@ -3266,6 +3505,8 @@
     }, 
     "nanobench_flags": [
       "--images", 
+      "--gpuStatsDump", 
+      "true", 
       "--scales", 
       "1.0", 
       "1.1", 
@@ -3482,10 +3723,7 @@
       "_", 
       "image", 
       "decode", 
-      "inc14.png", 
-      "--match", 
-      "~tabl_mozilla_0", 
-      "~desk_yahoonews_0"
+      "inc14.png"
     ], 
     "do_perf_steps": true, 
     "do_test_steps": true, 
@@ -3494,6 +3732,8 @@
     }, 
     "nanobench_flags": [
       "--images", 
+      "--gpuStatsDump", 
+      "true", 
       "--scales", 
       "1.0", 
       "1.1", 
@@ -3992,6 +4232,8 @@
     }, 
     "nanobench_flags": [
       "--images", 
+      "--gpuStatsDump", 
+      "true", 
       "--scales", 
       "1.0", 
       "1.1", 
@@ -5265,6 +5507,8 @@
     }, 
     "nanobench_flags": [
       "--images", 
+      "--gpuStatsDump", 
+      "true", 
       "--scales", 
       "1.0", 
       "1.1", 
@@ -5769,6 +6013,8 @@
     }, 
     "nanobench_flags": [
       "--images", 
+      "--gpuStatsDump", 
+      "true", 
       "--scales", 
       "1.0", 
       "1.1", 
@@ -6025,6 +6271,8 @@
     }, 
     "nanobench_flags": [
       "--images", 
+      "--gpuStatsDump", 
+      "true", 
       "--scales", 
       "1.0", 
       "1.1", 
@@ -6045,6 +6293,7 @@
       "~desk_carsvg", 
       "~keymobi", 
       "~path_hairline", 
+      "~GLInstancedArraysBench", 
       "~inc0.gif", 
       "~inc1.gif", 
       "~incInterlaced.gif", 
diff --git a/tools/buildbot_spec.py b/tools/buildbot_spec.py
index b62fe61fc5..8049b61871 100755
--- a/tools/buildbot_spec.py
+++ b/tools/buildbot_spec.py
@@ -143,6 +143,10 @@ def gyp_defines(builder_dict):
       builder_dict.get('cpu_or_gpu_value') == 'Mesa'):
     gyp_defs['skia_mesa'] = '1'
 
+  # VisualBench
+  if builder_dict.get('extra_config') == 'VisualBench':
+    gyp_defs['skia_use_sdl'] = '1'
+
   # skia_use_android_framework_defines.
   if builder_dict.get('extra_config') == 'Android_FrameworkDefs':
     gyp_defs['skia_use_android_framework_defines'] = '1'
@@ -185,8 +189,10 @@ def build_targets_from_builder_dict(builder_dict, do_test_steps, do_perf_steps):
   t = []
   if do_test_steps:
     t.append('dm')
-  if do_perf_steps:
-    t.append('nanobench')
+  if do_perf_steps and builder_dict.get('extra_config') == 'VisualBench':
+      t.append('visualbench')
+  elif do_perf_steps:
+      t.append('nanobench')
   if t:
     return t
   else:
@@ -319,6 +325,7 @@ def self_test():
         'Build-Ubuntu-GCC-x86_64-Release-ANGLE',
         'Housekeeper-PerCommit',
         'Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot',
+        'Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-VisualBench',
         'Test-Android-GCC-GalaxyS4-GPU-SGX544-Arm7-Debug',
         'Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Release-Appurify',
         'Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug',