From: mtklein Date: Wed, 14 Sep 2016 17:33:12 +0000 (-0700) Subject: 565 is not this important. X-Git-Tag: accepted/tizen/5.0/unified/20181102.025319~106^2~414 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=896ddb706d2eb9d8ebad61f767de058f7f0708a0;p=platform%2Fupstream%2FlibSkiaSharp.git 565 is not this important. Reduce its testing and perfing to just the fast Linux bots, and remove it from the default set of dm/nanobench configs. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2344553002 Review-Url: https://codereview.chromium.org/2344553002 --- diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Release.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Release.json index f40e0b4..80078ec 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Release.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Release.json @@ -285,7 +285,6 @@ "1.0", "1.1", "--config", - "565", "8888", "gpu", "nonrendering", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Debug.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Debug.json index 82a3ebf..40cc488 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Debug.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Debug.json @@ -327,7 +327,6 @@ "1.0", "1.1", "--config", - "565", "8888", "gpu", "nonrendering", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Release.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Release.json index b96ba53..b76b6c9 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Release.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Release.json @@ -379,7 +379,6 @@ "1.0", "1.1", "--config", - "565", "8888", "gpu", "nonrendering", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json index f074345..f121bce 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release.json @@ -379,7 +379,6 @@ "1.0", "1.1", "--config", - "565", "8888", "gpu", "nonrendering", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-NexusPlayer-GPU-PowerVR-x86-Release.json b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-NexusPlayer-GPU-PowerVR-x86-Release.json index bebe883..2eaef26 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-NexusPlayer-GPU-PowerVR-x86-Release.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Android-GCC-NexusPlayer-GPU-PowerVR-x86-Release.json @@ -379,7 +379,6 @@ "1.0", "1.1", "--config", - "565", "8888", "gpu", "nonrendering", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json b/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json index 498fe93..7d96aed 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json @@ -119,7 +119,6 @@ "1.0", "1.1", "--config", - "565", "8888", "gpu", "nonrendering", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json index 99ed57f..baa6a20 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json @@ -120,7 +120,6 @@ "1.0", "1.1", "--config", - "565", "8888", "gpu", "nonrendering", @@ -128,6 +127,7 @@ "hwui", "f16", "srgb", + "565", "msaa16", "nvpr16", "nvprdit16", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json index f89798a..1ef41c8 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json @@ -129,7 +129,6 @@ "1.0", "1.1", "--config", - "565", "8888", "gpu", "nonrendering", @@ -225,7 +224,6 @@ "1.0", "1.1", "--config", - "565", "8888", "gpu", "nonrendering", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench.json b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench.json index af30b88..bd3c687 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench.json @@ -123,7 +123,6 @@ "1.0", "1.1", "--config", - "565", "8888", "gpu", "nonrendering", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json index d224ad4..f37d233 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json @@ -75,7 +75,6 @@ "1.0", "1.1", "--config", - "565", "8888", "gpu", "nonrendering", @@ -83,6 +82,7 @@ "hwui", "f16", "srgb", + "565", "msaa16", "nvpr16", "nvprdit16", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json b/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json index 90e977a..fd1d940 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json @@ -119,7 +119,6 @@ "1.0", "1.1", "--config", - "565", "8888", "gpu", "nonrendering", @@ -127,6 +126,7 @@ "hwui", "f16", "srgb", + "565", "msaa16", "nvpr16", "nvprdit16", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json index 4f27376..207b491 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json @@ -122,7 +122,6 @@ "1.0", "1.1", "--config", - "565", "8888", "gpu", "nonrendering", diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json b/infra/bots/recipes/swarm_perf.expected/Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json index 66e4c8c..fae27d9 100644 --- a/infra/bots/recipes/swarm_perf.expected/Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json +++ b/infra/bots/recipes/swarm_perf.expected/Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json @@ -350,7 +350,6 @@ "--skps", "ignore_skps", "--config", - "565", "8888", "gpu", "nonrendering", diff --git a/infra/bots/recipes/swarm_perf.expected/big_issue_number.json b/infra/bots/recipes/swarm_perf.expected/big_issue_number.json index ce07181..06179eb 100644 --- a/infra/bots/recipes/swarm_perf.expected/big_issue_number.json +++ b/infra/bots/recipes/swarm_perf.expected/big_issue_number.json @@ -122,7 +122,6 @@ "1.0", "1.1", "--config", - "565", "8888", "gpu", "nonrendering", diff --git a/infra/bots/recipes/swarm_perf.expected/recipe_with_gerrit_patch.json b/infra/bots/recipes/swarm_perf.expected/recipe_with_gerrit_patch.json index 887fd4f..9b7ec6a 100644 --- a/infra/bots/recipes/swarm_perf.expected/recipe_with_gerrit_patch.json +++ b/infra/bots/recipes/swarm_perf.expected/recipe_with_gerrit_patch.json @@ -151,7 +151,6 @@ "1.0", "1.1", "--config", - "565", "8888", "gpu", "nonrendering", @@ -253,7 +252,6 @@ "1.0", "1.1", "--config", - "565", "8888", "gpu", "nonrendering", diff --git a/infra/bots/recipes/swarm_perf.py b/infra/bots/recipes/swarm_perf.py index 1149dfc..96e21e1 100644 --- a/infra/bots/recipes/swarm_perf.py +++ b/infra/bots/recipes/swarm_perf.py @@ -57,9 +57,11 @@ def nanobench_flags(bot): if 'iOS' in bot: args.extend(['--skps', 'ignore_skps']) - config = ['565', '8888', 'gpu', 'nonrendering', 'angle', 'hwui' ] + config = ['8888', 'gpu', 'nonrendering', 'angle', 'hwui' ] if 'AndroidOne' not in bot: config += [ 'f16', 'srgb' ] + if '-GCE-' in bot: + config += [ '565' ] # The S4 crashes and the NP produces a long error stream when we run with # MSAA. if ('GalaxyS4' not in bot and diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json index 6f56f93..3ff96d1 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android.json @@ -504,7 +504,7 @@ "python", "-u", "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Release cpu_or_gpu CPU cpu_or_gpu_value MT6582 extra_config GN_Android model AndroidOne os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nogpu --config 565 8888 gpu gpusrgb msaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist f16 _ _ dstreadshuffle f16 image _ _ srgb image _ _ gpusrgb image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image sp-8888 gm _ drawfilter pic-8888 gm _ drawfilter 2ndpic-8888 gm _ drawfilter lite-8888 gm _ drawfilter sp-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-picture 2ndpic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture sp-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-raster 2ndpic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster sp-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ image-cacherator-from-ctable 2ndpic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable sp-8888 gm _ gamut pic-8888 gm _ gamut lite-8888 gm _ gamut 2ndpic-8888 gm _ gamut serialize-8888 gm _ gamut --match ~WritePixels; echo $? >/data/local/tmp/rc", + "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 master client.skia builder Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Release-GN_Android build_number 5 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Release cpu_or_gpu CPU cpu_or_gpu_value MT6582 extra_config GN_Android model AndroidOne os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nogpu --config 8888 gpu gpusrgb msaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist f16 _ _ dstreadshuffle f16 image _ _ srgb image _ _ gpusrgb image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image sp-8888 gm _ drawfilter pic-8888 gm _ drawfilter 2ndpic-8888 gm _ drawfilter lite-8888 gm _ drawfilter sp-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-picture 2ndpic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture sp-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-raster 2ndpic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster sp-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ image-cacherator-from-ctable 2ndpic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable sp-8888 gm _ gamut pic-8888 gm _ gamut lite-8888 gm _ gamut 2ndpic-8888 gm _ gamut serialize-8888 gm _ gamut --match ~WritePixels; echo $? >/data/local/tmp/rc", "[SLAVE_BUILD]/tmp/dm.sh" ], "name": "write dm.sh" diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-AndroidOne-GPU-Mali400MP2-Arm7-Release.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-AndroidOne-GPU-Mali400MP2-Arm7-Release.json index 3c9001b..2ef7bb2 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-AndroidOne-GPU-Mali400MP2-Arm7-Release.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-AndroidOne-GPU-Mali400MP2-Arm7-Release.json @@ -531,7 +531,6 @@ "/storage/emulated/legacy/skiabot/skia_dm", "--nocpu", "--config", - "565", "8888", "gpu", "gpusrgb", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json index 408ba4b..af9c2c5 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug.json @@ -437,7 +437,6 @@ "/storage/emulated/legacy/skiabot/skia_dm", "--nocpu", "--config", - "565", "8888", "gpu", "gpusrgb", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug.json index ae6df5c..604386a 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug.json @@ -531,7 +531,6 @@ "/storage/emulated/legacy/skiabot/skia_dm", "--nocpu", "--config", - "565", "8888", "gl", "glsrgb", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus10-GPU-MaliT604-Arm7-Release.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus10-GPU-MaliT604-Arm7-Release.json index 86145d2..2f0e8f8 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus10-GPU-MaliT604-Arm7-Release.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus10-GPU-MaliT604-Arm7-Release.json @@ -531,7 +531,6 @@ "/storage/emulated/legacy/skiabot/skia_dm", "--nocpu", "--config", - "565", "8888", "gpu", "gpusrgb", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug.json index f682875..9325225 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug.json @@ -531,7 +531,6 @@ "/storage/emulated/legacy/skiabot/skia_dm", "--nocpu", "--config", - "565", "8888", "gpu", "gpusrgb", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json index 95ed115..ad6943b 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug.json @@ -531,7 +531,6 @@ "/storage/emulated/legacy/skiabot/skia_dm", "--nocpu", "--config", - "565", "8888", "gpu", "gpusrgb", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus9-CPU-Denver-Arm64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus9-CPU-Denver-Arm64-Debug.json index b65db9b..0be00d3 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus9-CPU-Denver-Arm64-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-Nexus9-CPU-Denver-Arm64-Debug.json @@ -531,7 +531,6 @@ "/storage/emulated/legacy/skiabot/skia_dm", "--nogpu", "--config", - "565", "8888", "gpu", "gpusrgb", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NexusPlayer-CPU-SSE4-x86-Release.json b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NexusPlayer-CPU-SSE4-x86-Release.json index eab9636..a1e6131 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NexusPlayer-CPU-SSE4-x86-Release.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Android-GCC-NexusPlayer-CPU-SSE4-x86-Release.json @@ -531,7 +531,6 @@ "/storage/emulated/legacy/skiabot/skia_dm", "--nogpu", "--config", - "565", "8888", "gpu", "gpusrgb", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json index d464e7f..b2685e0 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json @@ -219,7 +219,6 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--nocpu", "--config", - "565", "8888", "gpu", "gpusrgb", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json index 978d49d..ca91986 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json @@ -219,7 +219,6 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--nogpu", "--config", - "565", "8888", "gpu", "gpusrgb", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json index 1833def..1129a2c 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json @@ -168,12 +168,12 @@ "Ubuntu", "--nogpu", "--config", - "565", "8888", "gpu", "gpusrgb", "pdf", "msaa16", + "565", "f16", "srgb", "sp-8888", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json index c6af460..b9fa4ab 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json @@ -220,12 +220,12 @@ "--threads", "4", "--config", - "565", "8888", "gpu", "gpusrgb", "pdf", "msaa16", + "565", "f16", "srgb", "sp-8888", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json index 6bb52e3..3b6baec 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json @@ -102,12 +102,12 @@ "Ubuntu", "--nogpu", "--config", - "565", "8888", "gpu", "gpusrgb", "pdf", "msaa16", + "565", "f16", "srgb", "sp-8888", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json index 53bd035..e802aed 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json @@ -102,12 +102,12 @@ "Ubuntu", "--nogpu", "--config", - "565", "8888", "gpu", "gpusrgb", "pdf", "msaa16", + "565", "f16", "srgb", "sp-8888", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json index 38e014b..583736b 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json @@ -219,12 +219,12 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--nogpu", "--config", - "565", "8888", "gpu", "gpusrgb", "pdf", "msaa16", + "565", "f16", "srgb", "sp-8888", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json index b99a235..3f894bb 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json @@ -221,12 +221,12 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--nogpu", "--config", - "565", "8888", "gpu", "gpusrgb", "pdf", "msaa16", + "565", "f16", "srgb", "sp-8888", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json index 487cab7..c69bc2b 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json @@ -102,12 +102,12 @@ "Ubuntu", "--nogpu", "--config", - "565", "8888", "gpu", "gpusrgb", "pdf", "msaa16", + "565", "f16", "srgb", "sp-8888", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json index ac3db2e..889fa1f 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json @@ -109,7 +109,6 @@ "Ubuntu", "--nocpu", "--config", - "565", "8888", "gpu", "gpusrgb", @@ -506,7 +505,6 @@ "Ubuntu", "--nocpu", "--config", - "565", "8888", "gpu", "gpusrgb", @@ -904,7 +902,6 @@ "Ubuntu", "--nocpu", "--config", - "565", "8888", "gpu", "gpusrgb", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json index ea7220c..77bc33a 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json @@ -224,7 +224,6 @@ "[CUSTOM_[SWARM_OUT_DIR]]\\dm", "--nogpu", "--config", - "565", "8888", "gpu", "gpusrgb", diff --git a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json index 74f2e4d..824484b 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json +++ b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json @@ -220,7 +220,6 @@ "[CUSTOM_[SWARM_OUT_DIR]]\\dm", "--nocpu", "--config", - "565", "8888", "gpu", "gpusrgb", diff --git a/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json b/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json index 936de84..ce58625 100644 --- a/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json +++ b/infra/bots/recipes/swarm_test.expected/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug.json @@ -528,7 +528,6 @@ "skiabot/skia_dm", "--nocpu", "--config", - "565", "8888", "gpu", "gpusrgb", diff --git a/infra/bots/recipes/swarm_test.expected/adb_in_path.json b/infra/bots/recipes/swarm_test.expected/adb_in_path.json index 56f1498..f7cb68a 100644 --- a/infra/bots/recipes/swarm_test.expected/adb_in_path.json +++ b/infra/bots/recipes/swarm_test.expected/adb_in_path.json @@ -527,7 +527,6 @@ "/storage/emulated/legacy/skiabot/skia_dm", "--nocpu", "--config", - "565", "8888", "gpu", "gpusrgb", diff --git a/infra/bots/recipes/swarm_test.expected/big_issue_number.json b/infra/bots/recipes/swarm_test.expected/big_issue_number.json index 68632f0..bc25828 100644 --- a/infra/bots/recipes/swarm_test.expected/big_issue_number.json +++ b/infra/bots/recipes/swarm_test.expected/big_issue_number.json @@ -224,7 +224,6 @@ "[CUSTOM_[SWARM_OUT_DIR]]\\dm", "--nogpu", "--config", - "565", "8888", "gpu", "gpusrgb", diff --git a/infra/bots/recipes/swarm_test.expected/download_and_push_skimage.json b/infra/bots/recipes/swarm_test.expected/download_and_push_skimage.json index 9a6a95b..694f1ac 100644 --- a/infra/bots/recipes/swarm_test.expected/download_and_push_skimage.json +++ b/infra/bots/recipes/swarm_test.expected/download_and_push_skimage.json @@ -629,7 +629,6 @@ "/storage/emulated/legacy/skiabot/skia_dm", "--nocpu", "--config", - "565", "8888", "gpu", "gpusrgb", diff --git a/infra/bots/recipes/swarm_test.expected/download_and_push_skps.json b/infra/bots/recipes/swarm_test.expected/download_and_push_skps.json index 857133a..2db9f60 100644 --- a/infra/bots/recipes/swarm_test.expected/download_and_push_skps.json +++ b/infra/bots/recipes/swarm_test.expected/download_and_push_skps.json @@ -629,7 +629,6 @@ "/storage/emulated/legacy/skiabot/skia_dm", "--nocpu", "--config", - "565", "8888", "gpu", "gpusrgb", diff --git a/infra/bots/recipes/swarm_test.expected/download_and_push_svgs.json b/infra/bots/recipes/swarm_test.expected/download_and_push_svgs.json index 257cbcf..7b9bbd9 100644 --- a/infra/bots/recipes/swarm_test.expected/download_and_push_svgs.json +++ b/infra/bots/recipes/swarm_test.expected/download_and_push_svgs.json @@ -629,7 +629,6 @@ "/storage/emulated/legacy/skiabot/skia_dm", "--nocpu", "--config", - "565", "8888", "gpu", "gpusrgb", diff --git a/infra/bots/recipes/swarm_test.expected/failed_dm.json b/infra/bots/recipes/swarm_test.expected/failed_dm.json index e3c5401..0d4c66b 100644 --- a/infra/bots/recipes/swarm_test.expected/failed_dm.json +++ b/infra/bots/recipes/swarm_test.expected/failed_dm.json @@ -219,12 +219,12 @@ "[CUSTOM_[SWARM_OUT_DIR]]/dm", "--nogpu", "--config", - "565", "8888", "gpu", "gpusrgb", "pdf", "msaa16", + "565", "f16", "srgb", "sp-8888", diff --git a/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json b/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json index 68c0ad6..23ff475 100644 --- a/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json +++ b/infra/bots/recipes/swarm_test.expected/failed_get_hashes.json @@ -533,7 +533,6 @@ "/storage/emulated/legacy/skiabot/skia_dm", "--nocpu", "--config", - "565", "8888", "gpu", "gpusrgb", diff --git a/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json b/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json index f73b075..ff15761 100644 --- a/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json +++ b/infra/bots/recipes/swarm_test.expected/missing_SKP_VERSION_device.json @@ -633,7 +633,6 @@ "/storage/emulated/legacy/skiabot/skia_dm", "--nocpu", "--config", - "565", "8888", "gpu", "gpusrgb", diff --git a/infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json b/infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json index 3b977ef..2552a6d 100644 --- a/infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json +++ b/infra/bots/recipes/swarm_test.expected/missing_SK_IMAGE_VERSION_device.json @@ -633,7 +633,6 @@ "/storage/emulated/legacy/skiabot/skia_dm", "--nocpu", "--config", - "565", "8888", "gpu", "gpusrgb", diff --git a/infra/bots/recipes/swarm_test.expected/missing_SVG_VERSION_device.json b/infra/bots/recipes/swarm_test.expected/missing_SVG_VERSION_device.json index 721e16d..b4071eb 100644 --- a/infra/bots/recipes/swarm_test.expected/missing_SVG_VERSION_device.json +++ b/infra/bots/recipes/swarm_test.expected/missing_SVG_VERSION_device.json @@ -633,7 +633,6 @@ "/storage/emulated/legacy/skiabot/skia_dm", "--nocpu", "--config", - "565", "8888", "gpu", "gpusrgb", diff --git a/infra/bots/recipes/swarm_test.expected/recipe_with_gerrit_patch.json b/infra/bots/recipes/swarm_test.expected/recipe_with_gerrit_patch.json index f6de9cd..fb13055 100644 --- a/infra/bots/recipes/swarm_test.expected/recipe_with_gerrit_patch.json +++ b/infra/bots/recipes/swarm_test.expected/recipe_with_gerrit_patch.json @@ -224,12 +224,12 @@ "--threads", "4", "--config", - "565", "8888", "gpu", "gpusrgb", "pdf", "msaa16", + "565", "f16", "srgb", "sp-8888", diff --git a/infra/bots/recipes/swarm_test.py b/infra/bots/recipes/swarm_test.py index d141fc8..82e5d3c 100644 --- a/infra/bots/recipes/swarm_test.py +++ b/infra/bots/recipes/swarm_test.py @@ -63,7 +63,7 @@ def dm_flags(bot): # These are the canonical configs that we would ideally run on all bots. We # may opt out or substitute some below for specific bots - configs = ['565', '8888', 'gpu', 'gpusrgb', 'pdf'] + configs = ['8888', 'gpu', 'gpusrgb', 'pdf'] # Add in either msaa4 or msaa16 to the canonical set of configs to run if 'Android' in bot or 'iOS' in bot: configs.append('msaa4') @@ -85,6 +85,7 @@ def dm_flags(bot): configs.remove('pdf') if '-GCE-' in bot: + configs.extend(['565']) configs.extend(['f16', 'srgb']) # Gamma-correct formats. configs.extend(['sp-8888', '2ndpic-8888']) # Test niche uses of SkPicture. configs.extend(['lite-8888']) # Experimental display list. diff --git a/tools/flags/SkCommonFlagsConfig.cpp b/tools/flags/SkCommonFlagsConfig.cpp index 1d38b56..cbacd5b 100644 --- a/tools/flags/SkCommonFlagsConfig.cpp +++ b/tools/flags/SkCommonFlagsConfig.cpp @@ -15,7 +15,7 @@ using sk_gpu_test::GrContextFactory; #endif static const char defaultConfigs[] = - "565 8888 gpu nonrendering" + "8888 gpu nonrendering" #if SK_ANGLE #ifdef SK_BUILD_FOR_WIN " angle"