diff options
| author |  Ben Wagner <benjaminwagner@google.com> | 2017-03-31 15:54:47 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-31 21:04:36 +0000 |
| commit | 6b1f0249e6ec86748055443ca41e272fdc340602 (patch) | |
| tree | 1e294c013eeb0ac1537dfeb30faeea9d148c792f /infra | |
| parent | ea9bc0c07b5dae78a9a449d7d7a07fc79262d41a (diff) | |
Fix perf configs for ANGLE bots.
Don't run non-ANGLE configs on ANGLE bots.
Also, stop perfing angle_gl_es2, since it's not used by Chrome. Add perfing for
ANGLE MSAA, and omit test that fails with MSAA config.
NOTRY=true
BUG=skia:6457
Change-Id: Iafe605a369e6bfddddeee3d30a538ec889eb0952
Reviewed-on: https://skia-review.googlesource.com/10968
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'infra')
4 files changed, 10 insertions, 29 deletions
diff --git a/infra/bots/recipe_modules/perf/api.py b/infra/bots/recipe_modules/perf/api.py index d85a1b77b9..ccd856b55c 100644 --- a/infra/bots/recipe_modules/perf/api.py +++ b/infra/bots/recipe_modules/perf/api.py @@ -73,10 +73,10 @@ def nanobench_flags(bot): config = ['vk'] if 'ANGLE' in bot: - config.extend(['angle_d3d11_es2']) - # The GL backend of ANGLE crashes on the perf bot currently. - if 'Win' not in bot: - config.extend(['angle_gl_es2']) + # Test only ANGLE configs. + config = ['angle_d3d11_es2'] + if sample_count is not '': + config.append('angle_d3d11_es2_msaa' + sample_count) args.append('--config') args.extend(config) @@ -129,6 +129,8 @@ def nanobench_flags(bot): match.append('~text_16_LCD_WT') if 'Vulkan' in bot and 'NexusPlayer' in bot: match.append('~hardstop') # skia:6037 + if 'ANGLE' in bot and any('msaa' in x for x in config): + match.append('~native_image_to_raster_surface') # skia:6457 # We do not need or want to benchmark the decodes of incomplete images. # In fact, in nanobench we assert that the full image decode succeeds. diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json index 832ac4372b..04dade4adf 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json @@ -128,18 +128,10 @@ "1.0", "1.1", "--config", - "8888", - "nonrendering", - "hwui", - "f16", - "srgb", - "gl", - "glmsaa8", - "glnvpr8", - "glnvprdit8", "angle_d3d11_es2", - "angle_gl_es2", + "angle_d3d11_es2_msaa8", "--match", + "~native_image_to_raster_surface", "~inc0.gif", "~inc1.gif", "~incInterlaced.gif", diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE.json index 38558c9a71..cfc972dc9b 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE.json @@ -123,12 +123,6 @@ "1.0", "1.1", "--config", - "8888", - "nonrendering", - "hwui", - "f16", - "srgb", - "gl", "angle_d3d11_es2", "--match", "~tile_image_filter_tiled_64", diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json index 1c5a937fa9..37db38dfae 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json @@ -86,17 +86,10 @@ "1.0", "1.1", "--config", - "8888", - "nonrendering", - "hwui", - "f16", - "srgb", - "gl", - "glmsaa8", - "glnvpr8", - "glnvprdit8", "angle_d3d11_es2", + "angle_d3d11_es2_msaa8", "--match", + "~native_image_to_raster_surface", "~inc0.gif", "~inc1.gif", "~incInterlaced.gif", |