From 769faa2456957d880c0ef121f58a682408c947ff Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Fri, 11 Aug 2017 15:32:50 -0400 Subject: Run perf tests on glsrgb and glessrgb configs. No-Try: true Change-Id: I41dfddf21f8ed80582d5dc88150e1fbaf98326e6 Reviewed-on: https://skia-review.googlesource.com/33803 Reviewed-by: Brian Osman Commit-Queue: Ben Wagner --- ...oid-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android.json | 2 +- ...d-Clang-PixelC-GPU-TegraX1-arm64-Release-Android.json | 2 +- ...CC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json | 1 + ...X550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json | 1 + ...-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release.json | 1 + .../Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json | 1 + infra/bots/recipes/perf.expected/trybot.json | 1 + infra/bots/recipes/perf.py | 16 ++++++++++++++-- 8 files changed, 21 insertions(+), 4 deletions(-) (limited to 'infra/bots') diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android.json index 073774f772..9c4f322bc3 100644 --- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android.json +++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android.json @@ -561,7 +561,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "set -x; /data/local/tmp/nanobench -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --nocpu --config gles glesmsaa4 --match ~blurroundrect ~patch_grid ~desk_carsvg ~keymobi_shop_mobileweb_ebay_com.skp ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp; echo $? >/data/local/tmp/rc", + "set -x; /data/local/tmp/nanobench -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --nocpu --config gles glessrgb glesmsaa4 --match ~blurroundrect ~patch_grid ~desk_carsvg ~keymobi_shop_mobileweb_ebay_com.skp ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/nanobench.sh" ], "env": { diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android.json index 724a19b150..f362a870aa 100644 --- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android.json +++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android.json @@ -597,7 +597,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "set -x; /data/local/tmp/nanobench -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --nocpu --config gles glesmsaa4 glesnvpr4 glesnvprdit4 glesinst glesinst4 --match ~blurroundrect ~patch_grid ~desk_carsvg ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123_1337000001.json --properties gitHash abc123 swarming_bot_id skia-bot-123 swarming_task_id 123456 --key arch arm64 compiler Clang cpu_or_gpu GPU cpu_or_gpu_value TegraX1 extra_config Android model PixelC os Android; echo $? >/data/local/tmp/rc", + "set -x; /data/local/tmp/nanobench -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --nocpu --config gles glessrgb glesmsaa4 glesnvpr4 glesnvprdit4 glesinst glesinst4 --match ~blurroundrect ~patch_grid ~desk_carsvg ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123_1337000001.json --properties gitHash abc123 swarming_bot_id skia-bot-123 swarming_task_id 123456 --key arch arm64 compiler Clang cpu_or_gpu GPU cpu_or_gpu_value TegraX1 extra_config Android model PixelC os Android; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/nanobench.sh" ], "env": { diff --git a/infra/bots/recipes/perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipes/perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json index 7ca97052a5..7a4db1f528 100644 --- a/infra/bots/recipes/perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json +++ b/infra/bots/recipes/perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json @@ -137,6 +137,7 @@ "--nocpu", "--config", "gl", + "glsrgb", "glmsaa8", "glnvpr8", "glnvprdit8", diff --git a/infra/bots/recipes/perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json b/infra/bots/recipes/perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json index 95ca6b044d..60033f1d84 100644 --- a/infra/bots/recipes/perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json +++ b/infra/bots/recipes/perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json @@ -137,6 +137,7 @@ "--nocpu", "--config", "gl", + "glsrgb", "glmsaa8", "glnvpr8", "glnvprdit8", diff --git a/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release.json b/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release.json index 2d48bc3eb2..4ee9994882 100644 --- a/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release.json +++ b/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release.json @@ -165,6 +165,7 @@ "--nocpu", "--config", "gl", + "glsrgb", "gles", "--match", "~inc0.gif", diff --git a/infra/bots/recipes/perf.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json b/infra/bots/recipes/perf.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json index 40a6ced9e0..f4822810b2 100644 --- a/infra/bots/recipes/perf.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json +++ b/infra/bots/recipes/perf.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json @@ -564,6 +564,7 @@ "--nocpu", "--config", "gles", + "glessrgb", "--match", "~blurroundrect", "~patch_grid", diff --git a/infra/bots/recipes/perf.expected/trybot.json b/infra/bots/recipes/perf.expected/trybot.json index f8b70a7493..2eb3efdc4b 100644 --- a/infra/bots/recipes/perf.expected/trybot.json +++ b/infra/bots/recipes/perf.expected/trybot.json @@ -160,6 +160,7 @@ "--nocpu", "--config", "gl", + "glsrgb", "--match", "~inc0.gif", "~inc1.gif", diff --git a/infra/bots/recipes/perf.py b/infra/bots/recipes/perf.py index 42cde25d51..3b2bfcc679 100644 --- a/infra/bots/recipes/perf.py +++ b/infra/bots/recipes/perf.py @@ -76,7 +76,7 @@ def nanobench_flags(api, bot): elif 'ChromeOS' in bot: gl_prefix = 'gles' - configs.append(gl_prefix) + configs.extend([gl_prefix, gl_prefix + 'srgb']) if sample_count is not '': configs.append(gl_prefix + 'msaa' + sample_count) if ('TegraX1' in bot or @@ -89,7 +89,19 @@ def nanobench_flags(api, bot): # We want to test both the OpenGL config and the GLES config on Linux Intel: # GL is used by Chrome, GLES is used by ChromeOS. if 'Intel' in bot and api.vars.is_linux: - configs.append('gles') + configs.extend(['gles', 'glessrgb']) + + # The following devices do not support glessrgb. + if 'glessrgb' in configs: + if ('IntelHD405' in bot or + 'IntelIris540' in bot or + 'IntelIris640' in bot or + 'IntelBayTrail' in bot or + 'IntelHD2000' in bot or + 'AndroidOne' in bot or + 'Nexus7' in bot or + 'NexusPlayer' in bot): + configs.remove('glessrgb') # Bench instanced rendering on a limited number of platforms inst_config = gl_prefix + 'inst' -- cgit v1.2.3