| OLD | NEW |
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import collections | 5 import collections |
| 6 | 6 |
| 7 from . import steps | 7 from . import steps |
| 8 | 8 |
| 9 import DEPS | 9 import DEPS |
| 10 CHROMIUM_CONFIG_CTX = DEPS['chromium'].CONFIG_CTX | 10 CHROMIUM_CONFIG_CTX = DEPS['chromium'].CONFIG_CTX |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 platform=platform, | 70 platform=platform, |
| 71 target_bits=target_bits, | 71 target_bits=target_bits, |
| 72 tests=tests, | 72 tests=tests, |
| 73 ) | 73 ) |
| 74 | 74 |
| 75 spec['compile_targets'] = ['chromium_builder_perf'] | 75 spec['compile_targets'] = ['chromium_builder_perf'] |
| 76 | 76 |
| 77 return spec | 77 return spec |
| 78 | 78 |
| 79 | 79 |
| 80 def TestSpec(config_name, platform, target_bits, | 80 def TestSpec(config_name, perf_id, platform, target_bits, |
| 81 parent_buildername=None, tests=None): | 81 parent_buildername=None, tests=None): |
| 82 spec = _BaseSpec( | 82 spec = _BaseSpec( |
| 83 bot_type='tester', | 83 bot_type='tester', |
| 84 config_name=config_name, | 84 config_name=config_name, |
| 85 platform=platform, | 85 platform=platform, |
| 86 target_bits=target_bits, | 86 target_bits=target_bits, |
| 87 tests=tests or [], | 87 tests=tests or [], |
| 88 ) | 88 ) |
| 89 | 89 |
| 90 if not parent_buildername: | 90 if not parent_buildername: |
| 91 parent_buildername = builders[platform][target_bits] | 91 parent_buildername = builders[platform][target_bits] |
| 92 spec['parent_buildername'] = parent_buildername | 92 spec['parent_buildername'] = parent_buildername |
| 93 spec['perf-id'] = perf_id |
| 94 spec['results-url'] = 'https://chromeperf.appspot.com' |
| 93 spec['test_generators'] = [steps.generate_script] | 95 spec['test_generators'] = [steps.generate_script] |
| 94 | 96 |
| 95 return spec | 97 return spec |
| 96 | 98 |
| 97 | 99 |
| 98 def _AddBuildSpec(name, platform, target_bits=64, add_to_bisect=False): | 100 def _AddBuildSpec(name, platform, target_bits=64, add_to_bisect=False): |
| 99 if target_bits == 64: | 101 if target_bits == 64: |
| 100 perf_id = platform | 102 perf_id = platform |
| 101 else: | 103 else: |
| 102 perf_id = '%s-%d' % (platform, target_bits) | 104 perf_id = '%s-%d' % (platform, target_bits) |
| 103 | 105 |
| 104 SPEC['builders'][name] = BuildSpec( | 106 SPEC['builders'][name] = BuildSpec( |
| 105 'chromium_perf', perf_id, platform, target_bits) | 107 'chromium_perf', perf_id, platform, target_bits) |
| 106 assert target_bits not in builders[platform] | 108 assert target_bits not in builders[platform] |
| 107 builders[platform][target_bits] = name | 109 builders[platform][target_bits] = name |
| 108 if add_to_bisect: | 110 if add_to_bisect: |
| 109 SPEC['settings']['bisect_builders'].append(name) | 111 SPEC['settings']['bisect_builders'].append(name) |
| 110 | 112 |
| 111 | 113 |
| 112 def _AddTestSpec(name, perf_id, platform, target_bits=64, | 114 def _AddTestSpec(name, perf_id, platform, target_bits=64, |
| 113 num_host_shards=1, num_device_shards=1): | 115 num_host_shards=1, num_device_shards=1): |
| 114 for shard_index in xrange(num_host_shards): | 116 for shard_index in xrange(num_host_shards): |
| 115 builder_name = '%s (%d)' % (name, shard_index + 1) | 117 builder_name = '%s (%d)' % (name, shard_index + 1) |
| 116 tests = [steps.DynamicPerfTests( | 118 tests = [steps.DynamicPerfTests( |
| 117 perf_id, platform, target_bits, num_device_shards=num_device_shards, | 119 perf_id, platform, target_bits, num_device_shards=num_device_shards, |
| 118 num_host_shards=num_host_shards, shard_index=shard_index)] | 120 num_host_shards=num_host_shards, shard_index=shard_index)] |
| 119 SPEC['builders'][builder_name] = TestSpec( | 121 SPEC['builders'][builder_name] = TestSpec( |
| 120 'chromium_perf', platform, target_bits, tests=tests) | 122 'chromium_perf', perf_id, platform, target_bits, tests=tests) |
| 121 | 123 |
| 122 | 124 |
| 123 _AddBuildSpec('Android Builder', 'android', target_bits=32) | 125 _AddBuildSpec('Android Builder', 'android', target_bits=32) |
| 124 _AddBuildSpec('Android arm64 Builder', 'android') | 126 _AddBuildSpec('Android arm64 Builder', 'android') |
| 125 _AddBuildSpec('Win Builder', 'win', target_bits=32) | 127 _AddBuildSpec('Win Builder', 'win', target_bits=32) |
| 126 _AddBuildSpec('Win x64 Builder', 'win', add_to_bisect=True) | 128 _AddBuildSpec('Win x64 Builder', 'win', add_to_bisect=True) |
| 127 _AddBuildSpec('Mac Builder', 'mac', add_to_bisect=True) | 129 _AddBuildSpec('Mac Builder', 'mac', add_to_bisect=True) |
| 128 _AddBuildSpec('Linux Builder', 'linux', add_to_bisect=True) | 130 _AddBuildSpec('Linux Builder', 'linux', add_to_bisect=True) |
| 129 | 131 |
| 130 | 132 |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 _AddTestSpec('Mac 10.10 Perf', 'chromium-rel-mac10', 'mac', | 171 _AddTestSpec('Mac 10.10 Perf', 'chromium-rel-mac10', 'mac', |
| 170 num_host_shards=5) | 172 num_host_shards=5) |
| 171 _AddTestSpec('Mac Retina Perf', 'chromium-rel-mac-retina', 'mac', | 173 _AddTestSpec('Mac Retina Perf', 'chromium-rel-mac-retina', 'mac', |
| 172 num_host_shards=5) | 174 num_host_shards=5) |
| 173 _AddTestSpec('Mac HDD Perf', 'chromium-rel-mac-hdd', 'mac', | 175 _AddTestSpec('Mac HDD Perf', 'chromium-rel-mac-hdd', 'mac', |
| 174 num_host_shards=5) | 176 num_host_shards=5) |
| 175 | 177 |
| 176 | 178 |
| 177 _AddTestSpec('Linux Perf', 'linux-release', 'linux', | 179 _AddTestSpec('Linux Perf', 'linux-release', 'linux', |
| 178 num_host_shards=5) | 180 num_host_shards=5) |
| OLD | NEW |