Adding source side json for new mac laptops

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 231 matching lines @@
       {
        'gpu': '1002:9874',
        'os': 'Windows-10-10586',
        'device_ids': ['build171-b4', 'build186-b4']
       }
     ])
   return waterfall
 
 def get_waterfall_config():
   waterfall = {'builders':[], 'testers': {}}
+
   # These configurations are taken from chromium_perf.py in
   # build/scripts/slave/recipe_modules/chromium_tests and must be kept in sync
   # to generate the correct json for each tester
   waterfall = add_tester(
     waterfall, 'Android Galaxy S5 Perf',
     'android-galaxy-s5', 'android', target_bits=32,
     num_device_shards=7, num_host_shards=3)
   waterfall = add_tester(
     waterfall, 'Android Nexus5 Perf', 'android-nexus5',
     'android', target_bits=32, num_device_shards=7, num_host_shards=3)
@@ skipping 39 matching lines @@
     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)
   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=[
+      {
+       'gpu': '1002:6821',
+       'os': 'Mac-10.11',
+       'device_ids': [
+           'build128-b1', 'build129-b1',
+           'build130-b1', 'build131-b1', 'build132-b1'
+          ]
+      }
+    ])
+  waterfall = add_tester(
+    waterfall, 'Mac Air 10.11 Perf',
+    'chromium-rel-mac11-air', 'mac',
+    swarming=[
+      {
+       'gpu': '8086:1626',
+       'os': 'Mac-10.11',
+       'device_ids': [
+           'build123-b1', 'build124-b1',
+           'build125-b1', 'build126-b1', 'build127-b1'
+          ]
+      }
+    ])
 
   waterfall = add_tester(
     waterfall, 'Linux Perf', 'linux-release', 'linux', num_host_shards=5)
 
   return waterfall
 
 def generate_telemetry_test(swarming_dimensions, benchmark_name, browser):
   # The step name must end in 'test' or 'tests' in order for the
   # results to automatically show up on the flakiness dashboard.
   # (At least, this was true some time ago.) Continue to use this
@@ skipping 97 matching lines @@
 
 BENCHMARK_NAME_WHITELIST = set([
     u'smoothness.top_25_smooth',
     u'sunspider',
     u'system_health.webview_startup',
     u'page_cycler_v2.intl_hi_ru',
     u'dromaeo.cssqueryjquery',
 ])
 
 
-def current_benchmarks():
+def current_benchmarks(use_whitelist):
   current_dir = os.path.dirname(__file__)
   benchmarks_dir = os.path.join(current_dir, 'benchmarks')
   top_level_dir = os.path.dirname(benchmarks_dir)
 
   all_benchmarks = discover.DiscoverClasses(
       benchmarks_dir, top_level_dir, benchmark_module.Benchmark,
       index_by_class_name=True).values()
-  return sorted((
-      bench for bench in all_benchmarks
-      if bench.Name() in BENCHMARK_NAME_WHITELIST), key=lambda b: b.Name())
+  if use_whitelist:
+    all_benchmarks = (
+        bench for bench in all_benchmarks
+        if bench.Name() in BENCHMARK_NAME_WHITELIST)
+  return sorted(all_benchmarks, key=lambda b: b.Name())
 
 
-def generate_all_tests(waterfall):
+def generate_all_tests(waterfall, use_whitelist):
   tests = {}
   for builder in waterfall['builders']:
     tests[builder] = {}
-  all_benchmarks = current_benchmarks()
+  all_benchmarks = current_benchmarks(use_whitelist)
 
   for name, config in waterfall['testers'].iteritems():
     if config.get('swarming', False):
       # Right now we are only generating benchmarks for the fyi waterfall
       isolated_scripts = generate_telemetry_tests(config, all_benchmarks)
       tests[name] = {
         'isolated_scripts': sorted(isolated_scripts, key=lambda x: x['name'])
       }
     else:
       # scripts are only currently run in addition to the main waterfall.  They
@@ skipping 19 matching lines @@
     json.dump(tests, fp, indent=2, separators=(',', ': '), sort_keys=True)
     fp.write('\n')
 
 
 def main():
   waterfall = get_waterfall_config()
   waterfall['name'] = 'chromium.perf'
   fyi_waterfall = get_fyi_waterfall_config()
   fyi_waterfall['name'] = 'chromium.perf.fyi'
 
-  generate_all_tests(fyi_waterfall)
-  generate_all_tests(waterfall)
+  generate_all_tests(fyi_waterfall, True)
+  generate_all_tests(waterfall, False)
   return 0
 
 if __name__ == "__main__":
   sys.exit(main())