| 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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 # chromium recipe | 123 # chromium recipe |
| 124 # assert target_bits not in builders[platform] | 124 # assert target_bits not in builders[platform] |
| 125 | 125 |
| 126 if not builders[platform].get(target_bits, None): | 126 if not builders[platform].get(target_bits, None): |
| 127 builders[platform][target_bits] = name | 127 builders[platform][target_bits] = name |
| 128 if add_to_bisect: | 128 if add_to_bisect: |
| 129 SPEC['settings']['bisect_builders'].append(name) | 129 SPEC['settings']['bisect_builders'].append(name) |
| 130 | 130 |
| 131 | 131 |
| 132 def _AddTestSpec(name, perf_id, platform, target_bits=64, | 132 def _AddTestSpec(name, perf_id, platform, target_bits=64, |
| 133 num_host_shards=1, num_device_shards=1, | 133 num_host_shards=1, num_device_shards=1): |
| 134 parent_buildername=None): | |
| 135 for shard_index in xrange(num_host_shards): | 134 for shard_index in xrange(num_host_shards): |
| 136 builder_name = '%s (%d)' % (name, shard_index + 1) | 135 builder_name = '%s (%d)' % (name, shard_index + 1) |
| 137 tests = [steps.DynamicPerfTests( | 136 tests = [steps.DynamicPerfTests( |
| 138 perf_id, platform, target_bits, num_device_shards=num_device_shards, | 137 perf_id, platform, target_bits, num_device_shards=num_device_shards, |
| 139 num_host_shards=num_host_shards, shard_index=shard_index)] | 138 num_host_shards=num_host_shards, shard_index=shard_index)] |
| 140 SPEC['builders'][builder_name] = TestSpec( | 139 SPEC['builders'][builder_name] = TestSpec( |
| 141 'chromium_perf', perf_id, platform, target_bits, tests=tests, | 140 'chromium_perf', perf_id, platform, target_bits, tests=tests) |
| 142 parent_buildername=parent_buildername) | |
| 143 | 141 |
| 144 | 142 |
| 145 _AddBuildSpec('Android Builder', 'android', target_bits=32) | 143 _AddBuildSpec('Android Builder', 'android', target_bits=32) |
| 146 _AddBuildSpec('Android Compile', 'android', target_bits=32) | 144 _AddBuildSpec('Android Compile', 'android', target_bits=32) |
| 147 _AddBuildSpec('Android arm64 Builder', 'android') | 145 _AddBuildSpec('Android arm64 Builder', 'android') |
| 148 _AddBuildSpec('Win Builder', 'win', target_bits=32) | 146 _AddBuildSpec('Win Builder', 'win', target_bits=32) |
| 149 _AddBuildSpec( \ | 147 _AddBuildSpec( \ |
| 150 'Win x64 Builder', 'win', add_to_bisect=True, enable_swarming=True) | 148 'Win x64 Builder', 'win', add_to_bisect=True, enable_swarming=True) |
| 151 _AddBuildSpec('Mac Builder', 'mac', add_to_bisect=True) | 149 _AddBuildSpec('Mac Builder', 'mac', add_to_bisect=True) |
| 152 _AddBuildSpec('Linux Builder', 'linux', add_to_bisect=True) | 150 _AddBuildSpec('Linux Builder', 'linux', add_to_bisect=True) |
| 153 | 151 |
| 154 | 152 |
| 155 _AddTestSpec('Android Galaxy S5 Perf', 'android-galaxy-s5', 'android', | 153 _AddTestSpec('Android Galaxy S5 Perf', 'android-galaxy-s5', 'android', |
| 156 target_bits=32, num_device_shards=7, num_host_shards=3) | 154 target_bits=32, num_device_shards=7, num_host_shards=3) |
| 157 _AddTestSpec('Android Nexus5 Perf', 'android-nexus5', 'android', | 155 _AddTestSpec('Android Nexus5 Perf', 'android-nexus5', 'android', |
| 158 target_bits=32, num_device_shards=7, num_host_shards=3) | 156 target_bits=32, num_device_shards=7, num_host_shards=3) |
| 159 _AddTestSpec('Android Nexus5X Perf', 'android-nexus5X', 'android', | 157 _AddTestSpec('Android Nexus5X Perf', 'android-nexus5X', 'android', |
| 160 target_bits=32, num_device_shards=7, num_host_shards=3, | 158 target_bits=32, num_device_shards=7, num_host_shards=3) |
| 161 parent_buildername='Android Compile') | |
| 162 _AddTestSpec('Android Nexus6 Perf', 'android-nexus6', 'android', | 159 _AddTestSpec('Android Nexus6 Perf', 'android-nexus6', 'android', |
| 163 target_bits=32, num_device_shards=7, num_host_shards=3) | 160 target_bits=32, num_device_shards=7, num_host_shards=3) |
| 164 _AddTestSpec('Android Nexus7v2 Perf', 'android-nexus7v2', 'android', | 161 _AddTestSpec('Android Nexus7v2 Perf', 'android-nexus7v2', 'android', |
| 165 target_bits=32, num_device_shards=7, num_host_shards=3) | 162 target_bits=32, num_device_shards=7, num_host_shards=3) |
| 166 _AddTestSpec('Android Nexus9 Perf', 'android-nexus9', 'android', | 163 _AddTestSpec('Android Nexus9 Perf', 'android-nexus9', 'android', |
| 167 num_device_shards=7, num_host_shards=3) | 164 num_device_shards=7, num_host_shards=3) |
| 168 _AddTestSpec('Android One Perf', 'android-one', 'android', | 165 _AddTestSpec('Android One Perf', 'android-one', 'android', |
| 169 target_bits=32, num_device_shards=7, num_host_shards=3) | 166 target_bits=32, num_device_shards=7, num_host_shards=3) |
| 170 | 167 |
| 171 | 168 |
| (...skipping 24 matching lines...) Expand all Loading... |
| 196 _AddTestSpec('Mac Retina Perf', 'chromium-rel-mac-retina', 'mac', | 193 _AddTestSpec('Mac Retina Perf', 'chromium-rel-mac-retina', 'mac', |
| 197 num_host_shards=5) | 194 num_host_shards=5) |
| 198 _AddTestSpec('Mac HDD Perf', 'chromium-rel-mac-hdd', 'mac', | 195 _AddTestSpec('Mac HDD Perf', 'chromium-rel-mac-hdd', 'mac', |
| 199 num_host_shards=5) | 196 num_host_shards=5) |
| 200 _AddIsolatedTestSpec('Mac Pro 10.11 Perf', 'chromium-rel-mac11-pro', 'mac') | 197 _AddIsolatedTestSpec('Mac Pro 10.11 Perf', 'chromium-rel-mac11-pro', 'mac') |
| 201 _AddIsolatedTestSpec('Mac Air 10.11 Perf', 'chromium-rel-mac11-air', 'mac') | 198 _AddIsolatedTestSpec('Mac Air 10.11 Perf', 'chromium-rel-mac11-air', 'mac') |
| 202 | 199 |
| 203 | 200 |
| 204 _AddTestSpec('Linux Perf', 'linux-release', 'linux', | 201 _AddTestSpec('Linux Perf', 'linux-release', 'linux', |
| 205 num_host_shards=5) | 202 num_host_shards=5) |
| OLD | NEW |