Run the Vulkan config on nanobench for Vulkan bots

BUG=skia:5513
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2145633002

Review-Url: https://codereview.chromium.org/2145633002

2 files changed, 58 insertions, 19 deletions

diff --git a/tools/nanobench_flags.json b/tools/nanobench_flags.json
index e391c54548..091e979791 100644
--- a/tools/nanobench_flags.json
+++ b/tools/nanobench_flags.json
@@ -88,6 +88,42 @@
     "~inc0.webp", 
     "~inc1.webp"
   ], 
+  "Perf-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Release-Vulkan": [
+    "--pre_log", 
+    "--images", 
+    "--gpuStatsDump", 
+    "true", 
+    "--useThermalManager", 
+    "1,1,10,1000", 
+    "--scales", 
+    "1.0", 
+    "1.1", 
+    "--config", 
+    "vk", 
+    "--match", 
+    "~blurroundrect", 
+    "~patch_grid", 
+    "~desk_carsvg", 
+    "~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"
+  ], 
   "Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Release": [
     "--pre_log", 
     "--images", 
diff --git a/tools/nanobench_flags.py b/tools/nanobench_flags.py
index f93268be02..085d30dc62 100755
--- a/tools/nanobench_flags.py
+++ b/tools/nanobench_flags.py
@@ -36,30 +36,32 @@ def get_args(bot):
   if 'Android' in bot and 'GPU' in bot:
     args.extend(['--useThermalManager', '1,1,10,1000'])
 
-  if 'Appurify' not in bot:
-    args.extend(['--scales', '1.0', '1.1'])
+  args.extend(['--scales', '1.0', '1.1'])
 
   if 'iOS' in bot:
     args.extend(['--skps', 'ignore_skps'])
 
-  if 'Appurify' not in bot:
-    config = ['565', '8888', 'gpu', 'nonrendering', 'angle', 'hwui']
-    # The S4 crashes and the NP produces a long error stream when we run with
-    # MSAA.
-    if ('GalaxyS4'    not in bot and
-        'NexusPlayer' not in bot):
-      if 'Android' in bot:
-        # The TegraX1 has a regular OpenGL implementation. We bench that instead
-        # of ES.
-        if 'TegraX1' in bot:
-          config.remove('gpu')
-          config.extend(['gl', 'glmsaa4', 'glnvpr4', 'glnvprdit4'])
-        else:
-          config.extend(['msaa4', 'nvpr4', 'nvprdit4'])
+  config = ['565', '8888', 'gpu', 'nonrendering', 'angle', 'hwui']
+  # The S4 crashes and the NP produces a long error stream when we run with
+  # MSAA.
+  if ('GalaxyS4'    not in bot and
+      'NexusPlayer' not in bot):
+    if 'Android' in bot:
+      # The TegraX1 has a regular OpenGL implementation. We bench that instead
+      # of ES.
+      if 'TegraX1' in bot:
+        config.remove('gpu')
+        config.extend(['gl', 'glmsaa4', 'glnvpr4', 'glnvprdit4'])
       else:
-        config.extend(['msaa16', 'nvpr16', 'nvprdit16'])
-    args.append('--config')
-    args.extend(config)
+        config.extend(['msaa4', 'nvpr4', 'nvprdit4'])
+    else:
+      config.extend(['msaa16', 'nvpr16', 'nvprdit16'])
+
+  if 'Vulkan' in bot:
+    config = ['vk']
+
+  args.append('--config')
+  args.extend(config)
 
   if 'Valgrind' in bot:
     # Don't care about Valgrind performance.
@@ -158,6 +160,7 @@ def self_test():
     'Test-Android-GCC-GalaxyS4-GPU-SGX544-Arm7-Release',
     'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-Trybot',
     'Perf-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Release',
+    'Perf-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Release-Vulkan',
     'Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Release',
   ]