Add separate GPU BENCH builder for 10k SKPs

scripts/slave/recipes/skia/ct_skps.py

 # Copyright 2015 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.
 
 from common.skia import global_constants
 
 
 DEPS = [
   'ct',
   'file',
@@ skipping 118 matching lines @@
         api.path['slave_build'].join('skps'))
 
     # Create this slave's isolated.gen.json file to use for batcharchiving.
     isolate_dir = chromium_checkout.join('chrome')
     isolate_path = isolate_dir.join(CT_SKPS_ISOLATE)
     extra_variables = {
         'SLAVE_NUM': str(slave_num),
         'TOOL_NAME': skia_tool,
         'GIT_HASH': skia_hash,
         'CONFIGURATION': configuration,
+        'BUILDER': buildername,
     }
     api.skia_swarming.create_isolated_gen_json(
         isolate_path, isolate_dir, 'linux', 'ct-%s-%s' % (skia_tool, slave_num),
         extra_variables)
 
   # Batcharchive everything on the isolate server for efficiency.
   max_slaves_to_batcharchive = MAX_SLAVES_TO_BATCHARCHIVE
   if '1m' in buildername:
     # Break up the "isolate tests" step into batches with <100k files due to
     # https://github.com/luci/luci-go/issues/9
     max_slaves_to_batcharchive = 5
   tasks_to_swarm_hashes = []
   for slave_start_num in xrange(1, ct_num_slaves+1, max_slaves_to_batcharchive):
     m = min(max_slaves_to_batcharchive, ct_num_slaves)
     batcharchive_output = api.skia_swarming.batcharchive(
         targets=['ct-' + skia_tool + '-%s' % num for num in range(
             slave_start_num, slave_start_num + m)])
     tasks_to_swarm_hashes.extend(batcharchive_output)
   # Sort the list to go through tasks in order.
   tasks_to_swarm_hashes.sort()
 
   # Trigger all swarming tasks.
   dimensions={'os': 'Ubuntu-14.04', 'cpu': 'x86-64', 'pool': 'Chrome'}
-  if skia_tool == 'nanobench':
-    # Run on GPU bots for nanobench.
+  if 'GPU' in buildername:
     dimensions['gpu'] = '10de:104a'
   tasks = api.skia_swarming.trigger_swarming_tasks(
       tasks_to_swarm_hashes, dimensions=dimensions)
 
   # Now collect all tasks.
   failed_tasks = []
   for task in tasks:
     try:
       api.skia_swarming.collect_swarming_task(task)
 
@@ skipping 38 matching lines @@
     api.test('CT_IMG_DECODE_10k_SKPs') +
     api.properties(
         buildername='Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_'
                     '10k_SKPs',
         ct_num_slaves=ct_num_slaves,
         revision=skia_revision,
     )
   )
 
   yield(
-    api.test('CT_BENCH_10k_SKPs') +
+    api.test('CT_CPU_BENCH_10k_SKPs') +
     api.properties(
         buildername=
             'Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs',
         ct_num_slaves=ct_num_slaves,
         revision=skia_revision,
     ) +
     api.path.exists(
         api.path['slave_build'].join('skia'),
         api.path['slave_build'].join('src')
     )
   )
 
   yield(
+    api.test('CT_GPU_BENCH_10k_SKPs') +
+    api.properties(
+        buildername=
+            'Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs',
+        ct_num_slaves=ct_num_slaves,
+        revision=skia_revision,
+    ) +
+    api.path.exists(
+        api.path['slave_build'].join('skia'),
+        api.path['slave_build'].join('src')
+    )
+  )
+
+  yield(
     api.test('CT_DM_1m_SKPs') +
     api.properties(
         buildername='Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs',
         ct_num_slaves=ct_num_slaves,
         revision=skia_revision,
     )
   )
 
   yield (
     api.test('CT_DM_SKPs_UnknownBuilder') +
@@ skipping 52 matching lines @@
 
   yield(
     api.test('CT_IMG_DECODE_10k_SKPs_Trybot') +
     api.properties(
         buildername='Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_'
                     '10k_SKPs_Trybot',
         ct_num_slaves=ct_num_slaves,
         revision=skia_revision,
     )
   )