[recipes] Increase test coverage

infra/bots/recipes/swarm_perf.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 # Recipe module for Skia Swarming perf.
 
 
 DEPS = [
   'build/file',
   'core',
   'recipe_engine/json',
   'recipe_engine/path',
   'recipe_engine/platform',
   'recipe_engine/properties',
   'recipe_engine/raw_io',
   'run',
   'flavor',
   'vars',
 ]
 
 
 TEST_BUILDERS = {
   'client.skia': {
     'skiabot-linux-swarm-000': [
-      #'Perf-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Release',
-      #'Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Debug',
-      #'Perf-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Release',
+      'Perf-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Release',
+      'Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Debug',
+      'Perf-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Release',
       'Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release',
-      #'Perf-Android-GCC-NexusPlayer-GPU-PowerVR-x86-Release',
-      #'Perf-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan',
-      #'Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug',
-      #'Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN',
+      'Perf-Android-GCC-NexusPlayer-GPU-PowerVR-x86-Release',
+      'Perf-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan',
+      'Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug',
+      'Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN',
       'Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind',
       'Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench',
       'Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release',
       'Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug',
       'Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot',
     ],
   },
 }
 
 
 def nanobench_flags(bot):
   args = ['--pre_log']
 
   if 'GPU' in bot:
     args.append('--images')
     args.extend(['--gpuStatsDump', 'true'])
 
   if 'Android' in bot and 'GPU' in bot:
     args.extend(['--useThermalManager', '1,1,10,1000'])
 
   args.extend(['--scales', '1.0', '1.1'])
 
   if 'iOS' in bot:
-    args.extend(['--skps', 'ignore_skps'])  # pragma: no cover
+    args.extend(['--skps', 'ignore_skps'])
 
   config = ['565', '8888', 'gpu', 'nonrendering', 'angle', 'hwui' ]
   config += [ 'f16', 'srgb' ]
   # 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:  # pragma: no cover
+      if 'TegraX1' in bot:
         config.remove('gpu')
         config.extend(['gl', 'glmsaa4', 'glnvpr4', 'glnvprdit4'])
       else:
         config.extend(['msaa4', 'nvpr4', 'nvprdit4'])
     else:
       config.extend(['msaa16', 'nvpr16', 'nvprdit16'])
 
   # Bench instanced rendering on a limited number of platforms
-  if 'Nexus6' in bot:  # pragma: no cover
+  if 'Nexus6' in bot:
     config.append('esinst') # esinst4 isn't working yet on Adreno.
   elif 'TegraX1' in bot:
-    config.extend(['glinst', 'glinst4'])  # pragma: no cover
+    config.extend(['glinst', 'glinst4'])
   elif 'MacMini6.2' in bot:
-    config.extend(['glinst', 'glinst16'])  # pragma: no cover
+    config.extend(['glinst', 'glinst16'])
 
   if 'Vulkan' in bot:
-    config = ['vk']  # pragma: no cover
+    config = ['vk']
 
   args.append('--config')
   args.extend(config)
 
   if 'Valgrind' in bot:
     # Don't care about Valgrind performance.
     args.extend(['--loops',   '1'])
     args.extend(['--samples', '1'])
     # Ensure that the bot framework does not think we have timed out.
     args.extend(['--keepAlive', 'true'])
 
   match = []
   if 'Android' in bot:
     # Segfaults when run as GPU bench. Very large texture?
     match.append('~blurroundrect')
     match.append('~patch_grid')  # skia:2847
     match.append('~desk_carsvg')
   if 'NexusPlayer' in bot:
-    match.append('~desk_unicodetable')  # pragma: no cover
-  if 'Nexus5' in bot:  # pragma: no cover
+    match.append('~desk_unicodetable')
+  if 'Nexus5' in bot:
     match.append('~keymobi_shop_mobileweb_ebay_com.skp')  # skia:5178
-  if 'iOS' in bot:  # pragma: no cover
+  if 'iOS' in bot:
     match.append('~blurroundrect')
     match.append('~patch_grid')  # skia:2847
     match.append('~desk_carsvg')
     match.append('~keymobi')
     match.append('~path_hairline')
     match.append('~GLInstancedArraysBench') # skia:4714
 
   # the 32-bit GCE bots run out of memory in DM when running these large images
   # so defensively disable them in nanobench, too.
   # FIXME (scroggo): This may have just been due to SkImageDecoder's
   # buildTileIndex leaking memory (https://bug.skia.org/4360). That is
   # disabled by default for nanobench, so we may not need this.
   # FIXME (scroggo): Share image blacklists between dm and nanobench?
   if 'x86' in bot and not 'x86-64' in bot:
     match.append('~interlaced1.png')
     match.append('~interlaced2.png')
     match.append('~interlaced3.png')
 
   # This low-end Android bot crashes about 25% of the time while running the
   # (somewhat intense) shapes benchmarks.
   if 'Perf-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Release' in bot:
-    match.append('~shapes_')  # pragma: no cover
+    match.append('~shapes_')
 
   # We do not need or want to benchmark the decodes of incomplete images.
   # In fact, in nanobench we assert that the full image decode succeeds.
   match.append('~inc0.gif')
   match.append('~inc1.gif')
   match.append('~incInterlaced.gif')
   match.append('~inc0.jpg')
   match.append('~incGray.jpg')
   match.append('~inc0.wbmp')
   match.append('~inc1.wbmp')
@@ skipping 175 matching lines @@
     api.path.exists(
         api.path['slave_build'].join('skia'),
         api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
                                      'skimage', 'VERSION'),
         api.path['slave_build'].join('skia', 'infra', 'bots', 'assets',
                                      'skp', 'VERSION'),
         api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
     ) +
     api.platform('win', 64)
   )