Turns on S_COMMIT_OR_SKP for more perf bots.

master/master_builders_cfg.py

 # Copyright (c) 2012 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.
 
 # Sets up all the builders we want this buildbot master to run.
 
 #pylint: disable=C0301
 
 from skia_master_scripts.android_factory import AndroidFactory as f_android
 from skia_master_scripts.arm64model_factory \
@@ skipping 298 matching lines @@
       ('Perf', 'Ubuntu12',    'ShuttleA',   'GTX660',      'x86',    'Release', None,           None,      f_factory, LINUX,  S_COMMIT_OR_SKP, {}),
       ('Test', 'Ubuntu12',    'ShuttleA',   'GTX660',      'x86_64', 'Debug',   None,           None,      f_factory, LINUX,  S_PERCOMMIT,     {}),
       ('Test', 'Ubuntu12',    'ShuttleA',   'GTX660',      'x86_64', 'Release', None,           None,      f_factory, LINUX,  S_PERCOMMIT,     {}),
       ('Perf', 'Ubuntu12',    'ShuttleA',   'GTX660',      'x86_64', 'Release', None,           None,      f_factory, LINUX,  S_PERCOMMIT,     {}),
       ('Test', 'Ubuntu12',    'ShuttleA',   'GTX550Ti',    'x86_64', 'Debug',   'ZeroGPUCache', None,      f_factory, LINUX,  S_PERCOMMIT,     {}),
       ('Test', 'Ubuntu12',    'ShuttleA',   'GTX550Ti',    'x86_64', 'Release', 'Valgrind',     VALGRIND,  f_factory, LINUX,  S_PERCOMMIT,     {'flavor': 'valgrind'}),
       ('Test', 'Ubuntu13.10', 'ShuttleA',   'NoGPU',       'x86_64', 'Debug',   None,           NO_GPU,    f_factory, LINUX,  S_PERCOMMIT,     {}),
       ('Test', 'Ubuntu13.10', 'ShuttleA',   'HD2000',      'x86_64', 'Debug',   'ASAN',         None,      f_xsan,    LINUX,  S_PERCOMMIT,     {'sanitizer': 'address'}),
       ('Test', 'Mac10.6',     'MacMini4.1', 'GeForce320M', 'x86',    'Debug',   None,           GYP_10_6,  f_factory, MAC,    S_PERCOMMIT,     {}),
       ('Test', 'Mac10.6',     'MacMini4.1', 'GeForce320M', 'x86',    'Release', None,           GYP_10_6,  f_factory, MAC,    S_PERCOMMIT,     {}),
-      ('Perf', 'Mac10.6',     'MacMini4.1', 'GeForce320M', 'x86',    'Release', None,           GYP_10_6,  f_factory, MAC,    S_COMMIT_OR_SKP, {}),
+      ('Perf', 'Mac10.6',     'MacMini4.1', 'GeForce320M', 'x86',    'Release', None,           GYP_10_6,  f_factory, MAC,    S_PERCOMMIT, {}),
       ('Test', 'Mac10.6',     'MacMini4.1', 'GeForce320M', 'x86_64', 'Debug',   None,           GYP_10_6,  f_factory, MAC,    S_PERCOMMIT,     {}),
       ('Test', 'Mac10.6',     'MacMini4.1', 'GeForce320M', 'x86_64', 'Release', None,           GYP_10_6,  f_factory, MAC,    S_PERCOMMIT,     {}),
       ('Perf', 'Mac10.6',     'MacMini4.1', 'GeForce320M', 'x86_64', 'Release', None,           GYP_10_6,  f_factory, MAC,    S_PERCOMMIT,     {}),
       ('Test', 'Mac10.7',     'MacMini4.1', 'GeForce320M', 'x86',    'Debug',   None,           None,      f_factory, MAC,    S_PERCOMMIT,     {}),
       ('Test', 'Mac10.7',     'MacMini4.1', 'GeForce320M', 'x86',    'Release', None,           None,      f_factory, MAC,    S_PERCOMMIT,     {}),
       ('Perf', 'Mac10.7',     'MacMini4.1', 'GeForce320M', 'x86',    'Release', None,           None,      f_factory, MAC,    S_PERCOMMIT,     {}),
       ('Test', 'Mac10.7',     'MacMini4.1', 'GeForce320M', 'x86_64', 'Debug',   None,           None,      f_factory, MAC,    S_PERCOMMIT,     {}),
       ('Test', 'Mac10.7',     'MacMini4.1', 'GeForce320M', 'x86_64', 'Release', None,           None,      f_factory, MAC,    S_PERCOMMIT,     {}),
       ('Perf', 'Mac10.7',     'MacMini4.1', 'GeForce320M', 'x86_64', 'Release', None,           None,      f_factory, MAC,    S_PERCOMMIT,     {}),
       ('Test', 'Mac10.8',     'MacMini4.1', 'GeForce320M', 'x86',    'Debug',   None,           None,      f_factory, MAC,    S_PERCOMMIT,     {}),
       ('Test', 'Mac10.8',     'MacMini4.1', 'GeForce320M', 'x86',    'Release', None,           None,      f_factory, MAC,    S_PERCOMMIT,     {}),
-      ('Perf', 'Mac10.8',     'MacMini4.1', 'GeForce320M', 'x86',    'Release', None,           None,      f_factory, MAC,    S_PERCOMMIT,     {}),
+      ('Perf', 'Mac10.8',     'MacMini4.1', 'GeForce320M', 'x86',    'Release', None,           None,      f_factory, MAC,    S_COMMIT_OR_SKP,     {}),

[benchen, 2014/05/23 13:51:19]

Note: we switched perf trigger bot for Mac from 10.6 to 10.8.

       ('Test', 'Mac10.8',     'MacMini4.1', 'GeForce320M', 'x86_64', 'Debug',   None,           None,      f_factory, MAC,    S_PERCOMMIT,     {}),
       ('Test', 'Mac10.8',     'MacMini4.1', 'GeForce320M', 'x86_64', 'Release', None,           PDFVIEWER, f_factory, MAC,    S_PERCOMMIT,     {}),
       ('Perf', 'Mac10.8',     'MacMini4.1', 'GeForce320M', 'x86_64', 'Release', None,           PDFVIEWER, f_factory, MAC,    S_PERCOMMIT,     {}),
       ('Test', 'Win7',        'ShuttleA',   'HD2000',      'x86',    'Debug',   None,           GYP_WIN7,  f_factory, WIN32,  S_PERCOMMIT,     {}),
       ('Test', 'Win7',        'ShuttleA',   'HD2000',      'x86',    'Release', None,           GYP_WIN7,  f_factory, WIN32,  S_PERCOMMIT,     {}),
       ('Perf', 'Win7',        'ShuttleA',   'HD2000',      'x86',    'Release', None,           GYP_WIN7,  f_factory, WIN32,  S_COMMIT_OR_SKP, {}),
       ('Test', 'Win7',        'ShuttleA',   'HD2000',      'x86_64', 'Debug',   None,           GYP_WIN7,  f_factory, WIN32,  S_PERCOMMIT,     {}),
       ('Test', 'Win7',        'ShuttleA',   'HD2000',      'x86_64', 'Release', None,           GYP_WIN7,  f_factory, WIN32,  S_PERCOMMIT,     {}),
       ('Perf', 'Win7',        'ShuttleA',   'HD2000',      'x86_64', 'Release', None,           GYP_WIN7,  f_factory, WIN32,  S_PERCOMMIT,     {}),
       ('Test', 'Win7',        'ShuttleA',   'HD2000',      'x86',    'Debug',   'ANGLE',        GYP_ANGLE, f_factory, WIN32,  S_PERCOMMIT,     {'bench_args': ['--config', 'ANGLE'], 'bench_pictures_cfg': 'angle'}),
       ('Test', 'Win7',        'ShuttleA',   'HD2000',      'x86',    'Release', 'ANGLE',        GYP_ANGLE, f_factory, WIN32,  S_PERCOMMIT,     {'bench_args': ['--config', 'ANGLE'], 'bench_pictures_cfg': 'angle'}),
       ('Perf', 'Win7',        'ShuttleA',   'HD2000',      'x86',    'Release', 'ANGLE',        GYP_ANGLE, f_factory, WIN32,  S_PERCOMMIT,     {'bench_args': ['--config', 'ANGLE'], 'bench_pictures_cfg': 'angle'}),
       ('Test', 'Win7',        'ShuttleA',   'HD2000',      'x86',    'Debug',   'DirectWrite',  GYP_DW,    f_factory, WIN32,  S_PERCOMMIT,     {}),
       ('Test', 'Win7',        'ShuttleA',   'HD2000',      'x86',    'Release', 'DirectWrite',  GYP_DW,    f_factory, WIN32,  S_PERCOMMIT,     {}),
       ('Perf', 'Win7',        'ShuttleA',   'HD2000',      'x86',    'Release', 'DirectWrite',  GYP_DW,    f_factory, WIN32,  S_PERCOMMIT,     {}),
       ('Test', 'Win8',        'ShuttleA',   'GTX660',      'x86',    'Debug',   None,           GYP_WIN8,  f_factory, WIN32,  S_PERCOMMIT,     {'build_targets': ['most'], 'bench_pictures_cfg': 'default_msaa16'}),
       ('Test', 'Win8',        'ShuttleA',   'GTX660',      'x86',    'Release', None,           GYP_WIN8,  f_factory, WIN32,  S_PERCOMMIT,     {'build_targets': ['most'], 'bench_pictures_cfg': 'default_msaa16'}),
-      ('Perf', 'Win8',        'ShuttleA',   'GTX660',      'x86',    'Release', None,           GYP_WIN8,  f_factory, WIN32,  S_PERCOMMIT,     {'build_targets': ['most'], 'bench_pictures_cfg': 'default_msaa16'}),
+      ('Perf', 'Win8',        'ShuttleA',   'GTX660',      'x86',    'Release', None,           GYP_WIN8,  f_factory, WIN32,  S_COMMIT_OR_SKP,     {'build_targets': ['most'], 'bench_pictures_cfg': 'default_msaa16'}),
       ('Test', 'Win8',        'ShuttleA',   'GTX660',      'x86_64', 'Debug',   None,           GYP_WIN8,  f_factory, WIN32,  S_PERCOMMIT,     {'build_targets': ['most'], 'bench_pictures_cfg': 'default_msaa16'}),
       ('Test', 'Win8',        'ShuttleA',   'GTX660',      'x86_64', 'Release', None,           GYP_WIN8,  f_factory, WIN32,  S_PERCOMMIT,     {'build_targets': ['most'], 'bench_pictures_cfg': 'default_msaa16'}),
       ('Perf', 'Win8',        'ShuttleA',   'GTX660',      'x86_64', 'Release', None,           GYP_WIN8,  f_factory, WIN32,  S_PERCOMMIT,     {'build_targets': ['most'], 'bench_pictures_cfg': 'default_msaa16'}),
       ('Test', 'Win8',        'ShuttleA',   'HD7770',      'x86',    'Debug',   None,           GYP_WIN8,  f_factory, WIN32,  S_PERCOMMIT,     {'build_targets': ['most'], 'bench_pictures_cfg': 'default_msaa16'}),
       ('Test', 'Win8',        'ShuttleA',   'HD7770',      'x86',    'Release', None,           GYP_WIN8,  f_factory, WIN32,  S_PERCOMMIT,     {'build_targets': ['most'], 'bench_pictures_cfg': 'default_msaa16'}),
-      ('Perf', 'Win8',        'ShuttleA',   'HD7770',      'x86',    'Release', None,           GYP_WIN8,  f_factory, WIN32,  S_PERCOMMIT,     {'build_targets': ['most'], 'bench_pictures_cfg': 'default_msaa16'}),
+      ('Perf', 'Win8',        'ShuttleA',   'HD7770',      'x86',    'Release', None,           GYP_WIN8,  f_factory, WIN32,  S_COMMIT_OR_SKP,     {'build_targets': ['most'], 'bench_pictures_cfg': 'default_msaa16'}),
       ('Test', 'Win8',        'ShuttleA',   'HD7770',      'x86_64', 'Debug',   None,           GYP_WIN8,  f_factory, WIN32,  S_PERCOMMIT,     {'build_targets': ['most'], 'bench_pictures_cfg': 'default_msaa16'}),

[borenet, 2014/05/23 14:13:44]

Do we only care about 32-bit right now?  Should we go ahead and enable some
64-bit as well?

[bsalomon, 2014/05/23 14:24:51]

chrome is shipping 32bit on windows still, I believe. For GPU testing I think we
should just test the arch used by Chrome.

       ('Test', 'Win8',        'ShuttleA',   'HD7770',      'x86_64', 'Release', None,           GYP_WIN8,  f_factory, WIN32,  S_PERCOMMIT,     {'build_targets': ['most'], 'bench_pictures_cfg': 'default_msaa16'}),
       ('Perf', 'Win8',        'ShuttleA',   'HD7770',      'x86_64', 'Release', None,           GYP_WIN8,  f_factory, WIN32,  S_PERCOMMIT,     {'build_targets': ['most'], 'bench_pictures_cfg': 'default_msaa16'}),
       ('Test', 'ChromeOS',    'Alex',       'GMA3150',     'x86',    'Debug',   None,           None,      f_cros,    LINUX,  S_PERCOMMIT,     {'board': 'x86-alex', 'bench_pictures_cfg': 'no_gpu'}),
       ('Test', 'ChromeOS',    'Alex',       'GMA3150',     'x86',    'Release', None,           None,      f_cros,    LINUX,  S_PERCOMMIT,     {'board': 'x86-alex', 'bench_pictures_cfg': 'no_gpu'}),
       ('Perf', 'ChromeOS',    'Alex',       'GMA3150',     'x86',    'Release', None,           None,      f_cros,    LINUX,  S_PERCOMMIT,     {'board': 'x86-alex', 'bench_pictures_cfg': 'no_gpu'}),
       ('Test', 'ChromeOS',    'Link',       'HD4000',      'x86_64', 'Debug',   None,           None,      f_cros,    LINUX,  S_PERCOMMIT,     {'board': 'link', 'bench_pictures_cfg': 'no_gpu'}),
       ('Test', 'ChromeOS',    'Link',       'HD4000',      'x86_64', 'Release', None,           None,      f_cros,    LINUX,  S_PERCOMMIT,     {'board': 'link', 'bench_pictures_cfg': 'no_gpu'}),
       ('Perf', 'ChromeOS',    'Link',       'HD4000',      'x86_64', 'Release', None,           None,      f_cros,    LINUX,  S_PERCOMMIT,     {'board': 'link', 'bench_pictures_cfg': 'no_gpu'}),
       ('Test', 'ChromeOS',    'Daisy',      'MaliT604',    'Arm7',   'Debug',   None,           None,      f_cros,    LINUX,  S_PERCOMMIT,     {'board': 'daisy', 'bench_pictures_cfg': 'no_gpu'}),
       ('Test', 'ChromeOS',    'Daisy',      'MaliT604',    'Arm7',   'Release', None,           None,      f_cros,    LINUX,  S_PERCOMMIT,     {'board': 'daisy', 'bench_pictures_cfg': 'no_gpu'}),
@@ skipping 141 matching lines @@
       # To resolve https://code.google.com/p/skia/issues/detail?id=2432
       # ('buildbots: don't run UpdateScripts if running on non-production
       # master'), I wanted to add a third boolean flag (do_update_scripts),
       # but I saw that I would need to add it in so many places I was
       # discouraged.  If the merged all the flags into a single object it
       # would be easier to add more flags.
       do_upload_render_results=active_master.do_upload_render_results,
       do_upload_bench_results=active_master.do_upload_bench_results)
 
   return helper.Update(cfg)