Chromium Code Reviews| Index: tools/perf/core/perf_data_generator.py |
| diff --git a/tools/perf/core/perf_data_generator.py b/tools/perf/core/perf_data_generator.py |
| index 927965e257f249131a913e3d7c68c97188f99c2b..709a0c5c07353d933a01322161939e5df3c8f331 100755 |
| --- a/tools/perf/core/perf_data_generator.py |
| +++ b/tools/perf/core/perf_data_generator.py |
| @@ -581,7 +581,8 @@ def generate_cplusplus_isolate_script_test(dimension): |
| def generate_telemetry_tests( |
| - tester_config, benchmarks, benchmark_sharding_map, use_whitelist): |
| + tester_config, benchmarks, benchmark_sharding_map, use_whitelist, |
| + benchmark_ref_build_blacklist=None): |
|
nednguyen
2017/04/14 20:45:59
remove the default param here
rnephew (Reviews Here)
2017/04/14 21:40:17
Done.
|
| isolated_scripts = [] |
| # First determine the browser that you need based on the tester |
| browser_name = '' |
| @@ -624,13 +625,15 @@ def generate_telemetry_tests( |
| 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) |
| - if current_shard == (num_shards - 1): |
| - current_shard = 0 |
| - else: |
| - current_shard += 1 |
| + # if it is not blacklisted from running on the reference browser. |
| + if benchmark.Name() not in benchmark_ref_build_blacklist: |
| + reference_test = generate_telemetry_test( |
| + swarming_dimensions, benchmark.Name(),'reference') |
| + isolated_scripts.append(reference_test) |
| + if current_shard == (num_shards - 1): |
| + current_shard = 0 |
| + else: |
| + current_shard += 1 |
| return isolated_scripts |
| @@ -668,6 +671,12 @@ LEGACY_DEVICE_AFFIINITY_ALGORITHM = [ |
| 'Win 10 High-DPI Perf', |
| ] |
| +# List of benchmarks that are to never be run with reference builds. |
| +BENCHMARK_REF_BUILD_BLACKLIST = [ |
| + 'power.idle_platform', |
| +] |
| + |
| + |
| def current_benchmarks(use_whitelist): |
| benchmarks_dir = os.path.join(src_dir(), 'tools', 'perf', 'benchmarks') |
| top_level_dir = os.path.dirname(benchmarks_dir) |
| @@ -768,7 +777,8 @@ def generate_all_tests(waterfall): |
| if name in LEGACY_DEVICE_AFFIINITY_ALGORITHM: |
| sharding_map = None |
| isolated_scripts = generate_telemetry_tests( |
| - config, benchmark_list, sharding_map, use_whitelist) |
| + config, benchmark_list, sharding_map, use_whitelist, |
| + benchmark_ref_build_blacklist=BENCHMARK_REF_BUILD_BLACKLIST) |
| # Generate swarmed non-telemetry tests if present |
| if config['swarming_dimensions'][0].get('perf_tests', False): |
| isolated_scripts += generate_cplusplus_isolate_script_test( |