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 from common.skia import global_constants | 5 from common.skia import global_constants |
6 | 6 |
7 | 7 |
8 DEPS = [ | 8 DEPS = [ |
9 'ct', | 9 'ct', |
10 'file', | 10 'file', |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
129 api.path['slave_build'].join('skps')) | 129 api.path['slave_build'].join('skps')) |
130 | 130 |
131 # Create this slave's isolated.gen.json file to use for batcharchiving. | 131 # Create this slave's isolated.gen.json file to use for batcharchiving. |
132 isolate_dir = chromium_checkout.join('chrome') | 132 isolate_dir = chromium_checkout.join('chrome') |
133 isolate_path = isolate_dir.join(CT_SKPS_ISOLATE) | 133 isolate_path = isolate_dir.join(CT_SKPS_ISOLATE) |
134 extra_variables = { | 134 extra_variables = { |
135 'SLAVE_NUM': str(slave_num), | 135 'SLAVE_NUM': str(slave_num), |
136 'TOOL_NAME': skia_tool, | 136 'TOOL_NAME': skia_tool, |
137 'GIT_HASH': skia_hash, | 137 'GIT_HASH': skia_hash, |
138 'CONFIGURATION': configuration, | 138 'CONFIGURATION': configuration, |
| 139 'BUILDER': buildername, |
139 } | 140 } |
140 api.skia_swarming.create_isolated_gen_json( | 141 api.skia_swarming.create_isolated_gen_json( |
141 isolate_path, isolate_dir, 'linux', 'ct-%s-%s' % (skia_tool, slave_num), | 142 isolate_path, isolate_dir, 'linux', 'ct-%s-%s' % (skia_tool, slave_num), |
142 extra_variables) | 143 extra_variables) |
143 | 144 |
144 # Batcharchive everything on the isolate server for efficiency. | 145 # Batcharchive everything on the isolate server for efficiency. |
145 max_slaves_to_batcharchive = MAX_SLAVES_TO_BATCHARCHIVE | 146 max_slaves_to_batcharchive = MAX_SLAVES_TO_BATCHARCHIVE |
146 if '1m' in buildername: | 147 if '1m' in buildername: |
147 # Break up the "isolate tests" step into batches with <100k files due to | 148 # Break up the "isolate tests" step into batches with <100k files due to |
148 # https://github.com/luci/luci-go/issues/9 | 149 # https://github.com/luci/luci-go/issues/9 |
149 max_slaves_to_batcharchive = 5 | 150 max_slaves_to_batcharchive = 5 |
150 tasks_to_swarm_hashes = [] | 151 tasks_to_swarm_hashes = [] |
151 for slave_start_num in xrange(1, ct_num_slaves+1, max_slaves_to_batcharchive): | 152 for slave_start_num in xrange(1, ct_num_slaves+1, max_slaves_to_batcharchive): |
152 m = min(max_slaves_to_batcharchive, ct_num_slaves) | 153 m = min(max_slaves_to_batcharchive, ct_num_slaves) |
153 batcharchive_output = api.skia_swarming.batcharchive( | 154 batcharchive_output = api.skia_swarming.batcharchive( |
154 targets=['ct-' + skia_tool + '-%s' % num for num in range( | 155 targets=['ct-' + skia_tool + '-%s' % num for num in range( |
155 slave_start_num, slave_start_num + m)]) | 156 slave_start_num, slave_start_num + m)]) |
156 tasks_to_swarm_hashes.extend(batcharchive_output) | 157 tasks_to_swarm_hashes.extend(batcharchive_output) |
157 # Sort the list to go through tasks in order. | 158 # Sort the list to go through tasks in order. |
158 tasks_to_swarm_hashes.sort() | 159 tasks_to_swarm_hashes.sort() |
159 | 160 |
160 # Trigger all swarming tasks. | 161 # Trigger all swarming tasks. |
161 dimensions={'os': 'Ubuntu-14.04', 'cpu': 'x86-64', 'pool': 'Chrome'} | 162 dimensions={'os': 'Ubuntu-14.04', 'cpu': 'x86-64', 'pool': 'Chrome'} |
162 if skia_tool == 'nanobench': | 163 if 'GPU' in buildername: |
163 # Run on GPU bots for nanobench. | |
164 dimensions['gpu'] = '10de:104a' | 164 dimensions['gpu'] = '10de:104a' |
165 tasks = api.skia_swarming.trigger_swarming_tasks( | 165 tasks = api.skia_swarming.trigger_swarming_tasks( |
166 tasks_to_swarm_hashes, dimensions=dimensions) | 166 tasks_to_swarm_hashes, dimensions=dimensions) |
167 | 167 |
168 # Now collect all tasks. | 168 # Now collect all tasks. |
169 failed_tasks = [] | 169 failed_tasks = [] |
170 for task in tasks: | 170 for task in tasks: |
171 try: | 171 try: |
172 api.skia_swarming.collect_swarming_task(task) | 172 api.skia_swarming.collect_swarming_task(task) |
173 | 173 |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
212 api.test('CT_IMG_DECODE_10k_SKPs') + | 212 api.test('CT_IMG_DECODE_10k_SKPs') + |
213 api.properties( | 213 api.properties( |
214 buildername='Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_' | 214 buildername='Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_' |
215 '10k_SKPs', | 215 '10k_SKPs', |
216 ct_num_slaves=ct_num_slaves, | 216 ct_num_slaves=ct_num_slaves, |
217 revision=skia_revision, | 217 revision=skia_revision, |
218 ) | 218 ) |
219 ) | 219 ) |
220 | 220 |
221 yield( | 221 yield( |
222 api.test('CT_BENCH_10k_SKPs') + | 222 api.test('CT_CPU_BENCH_10k_SKPs') + |
223 api.properties( | 223 api.properties( |
224 buildername= | 224 buildername= |
225 'Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs', | 225 'Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs', |
226 ct_num_slaves=ct_num_slaves, | 226 ct_num_slaves=ct_num_slaves, |
227 revision=skia_revision, | 227 revision=skia_revision, |
228 ) + | 228 ) + |
229 api.path.exists( | 229 api.path.exists( |
230 api.path['slave_build'].join('skia'), | 230 api.path['slave_build'].join('skia'), |
231 api.path['slave_build'].join('src') | 231 api.path['slave_build'].join('src') |
232 ) | 232 ) |
233 ) | 233 ) |
234 | 234 |
235 yield( | 235 yield( |
| 236 api.test('CT_GPU_BENCH_10k_SKPs') + |
| 237 api.properties( |
| 238 buildername= |
| 239 'Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs', |
| 240 ct_num_slaves=ct_num_slaves, |
| 241 revision=skia_revision, |
| 242 ) + |
| 243 api.path.exists( |
| 244 api.path['slave_build'].join('skia'), |
| 245 api.path['slave_build'].join('src') |
| 246 ) |
| 247 ) |
| 248 |
| 249 yield( |
236 api.test('CT_DM_1m_SKPs') + | 250 api.test('CT_DM_1m_SKPs') + |
237 api.properties( | 251 api.properties( |
238 buildername='Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs', | 252 buildername='Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs', |
239 ct_num_slaves=ct_num_slaves, | 253 ct_num_slaves=ct_num_slaves, |
240 revision=skia_revision, | 254 revision=skia_revision, |
241 ) | 255 ) |
242 ) | 256 ) |
243 | 257 |
244 yield ( | 258 yield ( |
245 api.test('CT_DM_SKPs_UnknownBuilder') + | 259 api.test('CT_DM_SKPs_UnknownBuilder') + |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
298 | 312 |
299 yield( | 313 yield( |
300 api.test('CT_IMG_DECODE_10k_SKPs_Trybot') + | 314 api.test('CT_IMG_DECODE_10k_SKPs_Trybot') + |
301 api.properties( | 315 api.properties( |
302 buildername='Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_' | 316 buildername='Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_' |
303 '10k_SKPs_Trybot', | 317 '10k_SKPs_Trybot', |
304 ct_num_slaves=ct_num_slaves, | 318 ct_num_slaves=ct_num_slaves, |
305 revision=skia_revision, | 319 revision=skia_revision, |
306 ) | 320 ) |
307 ) | 321 ) |
OLD | NEW |