Run SVGs through nanobench on all Perf bots

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',
@@ skipping 35 matching lines @@
   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 'Android' in bot and 'GPU' in bot:
+    # Add additional scales for Android GPU bots (mainly for SVGs).
+    args.extend(['2.0', '4.0'])
 
   if 'iOS' in bot:
     args.extend(['--skps', 'ignore_skps'])
 
   config = ['8888', 'gpu', 'nonrendering', 'angle', 'hwui' ]
   if 'AndroidOne' not in bot:
     config += [ 'f16', 'srgb' ]
   if '-GCE-' in bot:
     config += [ '565' ]
   # The S4 crashes and the NP produces a long error stream when we run with
@@ skipping 115 matching lines @@
     ])
 
   target = 'nanobench'
   if 'VisualBench' in api.vars.builder_name:
     target = 'visualbench'
   args = [
       target,
       '--undefok',   # This helps branches that may not know new flags.
       '-i',       api.flavor.device_dirs.resource_dir,
       '--skps',   api.flavor.device_dirs.skp_dir,
+      '--svgs',   api.flavor.device_dirs.svg_dir,
       '--images', api.flavor.device_path_join(
           api.flavor.device_dirs.images_dir, 'nanobench'),
   ]
 
   skip_flag = None
   if api.vars.builder_cfg.get('cpu_or_gpu') == 'CPU':
     skip_flag = '--nogpu'
   elif api.vars.builder_cfg.get('cpu_or_gpu') == 'GPU':
     skip_flag = '--nocpu'
   if skip_flag:
@@ skipping 146 matching lines @@
           buildername='Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-' +
                       'Valgrind-Trybot',
           mastername='client.skia',
           slavename='skiabot-linux-swarm-000',
           buildnumber=5,
           path_config='kitchen',
           swarm_out_dir='[SWARM_OUT_DIR]',
           revision='abc123',
           **gerrit_kwargs)
   )