Buildbot json for swarming Mac 10.10 Perf on perf waterfall

tools/perf/generate_perf_json.py

 #!/usr/bin/env python
 # 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.
 
 """Script to generate chromium.perf.json and chromium.perf.fyi.json in
 the src/testing/buildbot directory. Maintaining these files by hand is
 too unwieldy.
 """
 
@@ skipping 300 matching lines @@
     'chromium-rel-win7-gpu-intel', 'win', num_host_shards=5)
   waterfall = add_tester(
     waterfall, 'Win 7 Nvidia GPU Perf',
     'chromium-rel-win7-gpu-nvidia', 'win', num_host_shards=5)
 
   waterfall = add_tester(
     waterfall, 'Mac 10.11 Perf', 'chromium-rel-mac11',
     'mac', num_host_shards=5)
   waterfall = add_tester(
     waterfall, 'Mac 10.10 Perf', 'chromium-rel-mac10',
-    'mac', num_host_shards=5)
+    'mac',
+    swarming=[
+      {
+       'os': 'Mac-10.10',
+       'device_ids': [
+           'build158-m1', 'build159-m1', 'build160-m1',
+           'build161-m1', 'build162-m1']
+      }
+    ])
   waterfall = add_tester(
     waterfall, 'Mac Retina Perf',
     'chromium-rel-mac-retina', 'mac', num_host_shards=5)
   waterfall = add_tester(
     waterfall, 'Mac HDD Perf', 'chromium-rel-mac-hdd', 'mac', num_host_shards=5)
   waterfall = add_tester(
     waterfall, 'Mac Pro 10.11 Perf',
     'chromium-rel-mac11-pro', 'mac',
     swarming=[
       {
@@ skipping 108 matching lines @@
       if not sharding_map:
         raise Exception('Invalid number of shards, generate new sharding map')
       device_affinity = sharding_map.get(benchmark.Name(), None)
       if device_affinity is None:
         raise Exception('Device affinity for benchmark %s not found'
           % benchmark.Name())
 
       device_id = dimension['device_ids'][device_affinity]
       # Id is unique within the swarming pool so it is the only needed
       # identifier for the bot to run the test on
-      swarming_dimensions.append({
+      complete_dimension = {
         'id': device_id,
-        'gpu': dimension['gpu'],
         'os': dimension['os'],
         'pool': 'Chrome-perf',
-      })
+      }
+      if 'gpu' in dimension:
+        complete_dimension['gpu'] = dimension['gpu']
+      swarming_dimensions.append(complete_dimension)
 
     test = generate_telemetry_test(
       swarming_dimensions, benchmark.Name(), browser_name)
     isolated_scripts.append(test)
     # Now create another executable for this benchmark on the reference browser
     reference_test = generate_telemetry_test(
       swarming_dimensions, benchmark.Name(),'reference')
     isolated_scripts.append(reference_test)
 
   return isolated_scripts
@@ skipping 141 matching lines @@
   waterfall['name'] = 'chromium.perf'
   fyi_waterfall = get_fyi_waterfall_config()
   fyi_waterfall['name'] = 'chromium.perf.fyi'
 
   generate_all_tests(fyi_waterfall, True)
   generate_all_tests(waterfall, False)
   return 0
 
 if __name__ == '__main__':
   sys.exit(main())