Re-enable tests on MacBook Pro Retina with NVIDIA GPUs.

content/test/gpu/generate_buildbot_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.gpu.json and chromium.gpu.fyi.json in
 the src/testing/buildbot directory. Maintaining these files by hand is
 too unwieldy.
 """
 
@@ skipping 55 matching lines @@
     },
     'Mac 10.10 Debug (Intel)': {
       'swarming_dimensions': {
         'gpu': '8086:0a2e',
         'os': 'Mac-10.10'
       },
       'build_config': 'Debug',
       'swarming': True,
       'os_type': 'mac',
     },
-    'Mac Retina Release': {
-      'swarming_dimensions': {
-        'gpu': '10de:0fe9',
-        'hidpi': '1',
-        'os': 'Mac'
-      },
-      'build_config': 'Release',
-      'swarming': True,
-      'os_type': 'mac',
-    },
-    'Mac Retina Debug': {
-      'swarming_dimensions': {
-        'gpu': '10de:0fe9',
-        'hidpi': '1',
-        'os': 'Mac'
-      },
-      'build_config': 'Debug',
-      'swarming': True,
-      'os_type': 'mac',
-    },
     'Mac 10.10 Retina Release (AMD)': {
       'swarming_dimensions': {
         'gpu': '1002:6821',
         'hidpi': '1',
         'os': 'Mac-10.10'
       },
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'mac',
     },
@@ skipping 482 matching lines @@
       'expiration': 7200
     }
   },
 
   # Until we have more capacity, run angle_end2end_tests only on the
   # FYI waterfall, the ANGLE trybots (which mirror the FYI waterfall),
   # and the optional trybots (mainly used during ANGLE rolls).
   'angle_end2end_tests': {
     'tester_configs': [
       {
-        'allow_on_mac_nvidia': True,
         'fyi_only': True,
         'run_on_optional': True,
       },
     ],
     'args': ['--use-gpu-in-tests']
   },
   'angle_unittests': {'args': ['--use-gpu-in-tests']},
   # Until the media-only tests are extracted from content_unittests,
   # and audio_unittests and content_unittests can be run on the commit
   # queue with --require-audio-hardware-for-testing, run them only on
@@ skipping 103 matching lines @@
   }
 }
 
 TELEMETRY_TESTS = {
   'context_lost': {},
   'gpu_process_launch_tests': {'target_name': 'gpu_process'},
   'gpu_rasterization': {},
   'hardware_accelerated_feature': {},
   'maps_pixel_test': {
     'target_name': 'maps',
-    'tester_configs': [
-      {
-        'allow_on_mac_nvidia': True,
-      },
-    ],
   },
   'memory_test': {},
   'pixel_test': {
     'target_name': 'pixel',
     'args': [
       '--refimg-cloud-storage-bucket',
       'chromium-gpu-archive/reference-images',
       '--os-type',
       '${os_type}',
       '--build-revision',
       '${got_revision}',
       '--test-machine-name',
       '${buildername}',
     ],
     'non_precommit_args': [
       '--upload-refimg-to-cloud-storage',
     ],
     'precommit_args': [
       '--download-refimg-from-cloud-storage',
     ],
-    'tester_configs': [
-      {
-        'allow_on_mac_nvidia': True,
-      },
-    ],
   },
   'screenshot_sync': {},
   'trace_test': {},
   'webgl_conformance': {
-    'tester_configs': [
-      {
-        'allow_on_mac_nvidia': True,
-      },
-    ],
   },
   'webgl_conformance_d3d9_tests': {
     'tester_configs': [
       {
         'fyi_only': True,
         'os_types': ['win'],
         'run_on_optional': True,
       }
     ],
     'target_name': 'webgl_conformance',
@@ skipping 42 matching lines @@
       }
     ],
     'target_name': 'webgl_conformance',
     'extra_browser_args': [
       '--use-gl=angle',
     ],
   },
   'webgl2_conformance_tests': {
     'tester_configs': [
       {
-        'allow_on_mac_nvidia': True,
          # The WebGL 2.0 conformance tests take over an hour to run on
          # the Debug bots, which is too long.
         'build_configs': ['Release', 'Release_x64'],
         'fyi_only': True,
         'run_on_optional': True,
       },
     ],
     'disabled_tester_configs': [
       {
         'names': [
@@ skipping 24 matching lines @@
   }
   return [string.Template(arg).safe_substitute(substitutions) for arg in args]
 
 def matches_swarming_dimensions(tester_config, dimension_sets):
   for dimensions in dimension_sets:
     if set(dimensions.items()).issubset(
         tester_config['swarming_dimensions'].items()):
       return True
   return False
 
-def is_mac_nvidia_retina(tester_config):
-  dims = tester_config['swarming_dimensions']
-  return (dims['gpu'] == '10de:0fe9' and
-          dims['hidpi'] == '1' and
-          dims['os'] == 'Mac')
-
 def is_android(tester_config):
   return tester_config['os_type'] == 'android'
 
 def tester_config_matches_tester(tester_name, tester_config, tc, is_fyi,
                                  check_waterfall):
   if check_waterfall:
     if tc.get('fyi_only', False) and not is_fyi:
       return False
     # Handle the optional tryservers with the 'run_on_optional' flag.
     # Only a subset of the tests run on these tryservers.
     if tester_name.startswith('Optional') and not tc.get(
         'run_on_optional', False):
       return False
 
   if 'names' in tc:
     if not tester_name in tc['names']:
       return False
   if 'os_types' in tc:
     if not tester_config['os_type'] in tc['os_types']:
       return False
   if 'build_configs' in tc:
     if not tester_config['build_config'] in tc['build_configs']:
       return False
   if 'swarming_dimension_sets' in tc:
     if not matches_swarming_dimensions(tester_config,
                                        tc['swarming_dimension_sets']):
       return False
-  # The NVIDIA based MacBook Pro Retinas are oversubscribed and this
-  # is causing severe problems with Chromium's commit queue
-  # (http://crbug.com/572793). As a short-term strategy, run only
-  # critical tests on this configuration; this means removing
-  # everything except the ANGLE end-to-end tests and WebGL 1.0 and 2.0
-  # conformance tests. This also disables all tests on the Debug
-  # NVIDIA bots, because they will effectively lock up some 3 Swarming
-  # bots permanently due to repeatedly launching WebGL 1.0 conformance
-  # tests on the chromium.gpu waterfall, and WebGL 1.0 and 2.0
-  # conformance tests on the chromium.gpu.fyi waterfall.
-  if is_mac_nvidia_retina(tester_config):
-    # Disable all tests on the Debug NVIDIA Retina bots for now. Even
-    # though these aren't part of the highest-volume
-    # mac_chromium_rel_ng tryserver configuration, these tests are
-    # slow, and will lock up a certain number of crucial Swarming
-    # machines essentially permanently.
-    if tester_config['build_config'] == 'Debug':
-      return False
-    if not tc.get('allow_on_mac_nvidia', False):
-      return False
   if is_android(tester_config):
     if not tc.get('allow_on_android', False):
       return False
   return True
 
 def should_run_on_tester(tester_name, tester_config, test_config, is_fyi):
   # Check if this config is disabled on this tester
   if 'disabled_tester_configs' in test_config:
     for dtc in test_config['disabled_tester_configs']:
       if tester_config_matches_tester(tester_name, tester_config, dtc, is_fyi,
                                       False):
         return False
   if 'tester_configs' in test_config:
     for tc in test_config['tester_configs']:
       if tester_config_matches_tester(tester_name, tester_config, tc, is_fyi,
                                       True):
         return True
     return False
   else:
     # If tester_configs is unspecified, run nearly all tests by default,
     # but let tester_config_matches_tester filter out any undesired
-    # tests, such as ones that should only run on the Optional bots, or
-    # not run on the NVIDIA Retina MacBook Pros.
+    # tests, such as ones that should only run on the Optional bots.
     return tester_config_matches_tester(tester_name, tester_config, {},
                                         is_fyi, True)
 
 def generate_gtest(tester_name, tester_config, test, test_config, is_fyi):
   if not should_run_on_tester(tester_name, tester_config, test_config, is_fyi):
     return None
   result = copy.deepcopy(test_config)
   if 'tester_configs' in result:
     # Don't print the tester_configs in the JSON.
     result.pop('tester_configs')
@@ skipping 129 matching lines @@
     json.dump(tests, fp, indent=2, separators=(',', ': '), sort_keys=True)
     fp.write('\n')
 
 def main():
   generate_all_tests(FYI_WATERFALL, True)
   generate_all_tests(WATERFALL, False)
   return 0
 
 if __name__ == "__main__":
   sys.exit(main())