From dd54e5d557ad45cdd819bdfe43556d9eae3616c5 Mon Sep 17 00:00:00 2001 From: mtklein Date: Mon, 29 Feb 2016 09:51:09 -0800 Subject: [PATCH] Revert of DM: disable ignored and very niche configs on bots. (patchset #1 id:1 of https://codereview.chromium.org/1745073002/ ) Reason for revert: remote-8888 just caught a bug. I am disproved. Original issue's description: > DM: disable ignored and very niche configs on bots. > > These are all probably just wasting time: > - upright-matrix-{8888,gpu} and remote[_cache] are ignored in Gold > - sp and 2ndpic test very niche areas of SkPicture > that are not under active change > - twice-8888 was never useful... the twice- via was meant for local > testing of GPU batching / caching. Drawing into 8888 was moot. > > These configs are all useful to keep around for local testing, but probably are > not worth the extra runtime or especially burden to have to think about them. > > If we should happen to stumble into bugs these configs would have caught, > let's add them back with a note about those bugs to justify their need to run. > I'm not convinced any exist today. > > This cuts ~30s off the CQ. > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1745073002 > > Committed: https://skia.googlesource.com/skia/+/7b6d3a30cf18377935c800603fc00fe0966d15de TBR=halcanary@google.com,mtklein@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1749583003 --- tools/dm_flags.json | 862 +++++++++++++++++++++++++++++++++++++++++++++++++++- tools/dm_flags.py | 17 +- 2 files changed, 869 insertions(+), 10 deletions(-) diff --git a/tools/dm_flags.json b/tools/dm_flags.json index d824705..dd0154e 100644 --- a/tools/dm_flags.json +++ b/tools/dm_flags.json @@ -1,9 +1,16 @@ { "Pretend-iOS-Bot": [ + "--matrix", + "0", + "1", + "1", + "0", "--config", "565", "8888", "gpu", + "upright-matrix-8888", + "upright-matrix-gpu", "pdf", "pdf_poppler", "serialize-8888", @@ -110,42 +117,102 @@ "gm", "_", "verylarge_picture_image", + "sp-8888", + "gm", + "_", + "blend", "pic-8888", "gm", "_", "blend", + "2ndpic-8888", + "gm", + "_", + "blend", + "sp-8888", + "gm", + "_", + "drawfilter", "pic-8888", "gm", "_", "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "path_stroke_with_zero_length", "pic-8888", "gm", "_", "path_stroke_with_zero_length", + "2ndpic-8888", + "gm", + "_", + "path_stroke_with_zero_length", + "sp-8888", + "gm", + "_", + "textblobgeometrychange", "pic-8888", "gm", "_", "textblobgeometrychange", + "2ndpic-8888", + "gm", + "_", + "textblobgeometrychange", + "sp-8888", + "gm", + "_", + "patch_primitive", + "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", "_", @@ -249,42 +316,102 @@ "gm", "_", "verylarge_picture_image", + "sp-8888", + "gm", + "_", + "blend", "pic-8888", "gm", "_", "blend", + "2ndpic-8888", + "gm", + "_", + "blend", + "sp-8888", + "gm", + "_", + "drawfilter", "pic-8888", "gm", "_", "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "path_stroke_with_zero_length", "pic-8888", "gm", "_", "path_stroke_with_zero_length", + "2ndpic-8888", + "gm", + "_", + "path_stroke_with_zero_length", + "sp-8888", + "gm", + "_", + "textblobgeometrychange", "pic-8888", "gm", "_", "textblobgeometrychange", + "2ndpic-8888", + "gm", + "_", + "textblobgeometrychange", + "sp-8888", + "gm", + "_", + "patch_primitive", + "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", "_", @@ -473,42 +600,102 @@ "gm", "_", "verylarge_picture_image", + "sp-8888", + "gm", + "_", + "blend", "pic-8888", "gm", "_", "blend", + "2ndpic-8888", + "gm", + "_", + "blend", + "sp-8888", + "gm", + "_", + "drawfilter", "pic-8888", "gm", "_", "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "path_stroke_with_zero_length", "pic-8888", "gm", "_", "path_stroke_with_zero_length", + "2ndpic-8888", + "gm", + "_", + "path_stroke_with_zero_length", + "sp-8888", + "gm", + "_", + "textblobgeometrychange", "pic-8888", "gm", "_", "textblobgeometrychange", + "2ndpic-8888", + "gm", + "_", + "textblobgeometrychange", + "sp-8888", + "gm", + "_", + "patch_primitive", + "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", "_", @@ -695,42 +882,102 @@ "gm", "_", "verylarge_picture_image", + "sp-8888", + "gm", + "_", + "blend", "pic-8888", "gm", "_", "blend", + "2ndpic-8888", + "gm", + "_", + "blend", + "sp-8888", + "gm", + "_", + "drawfilter", "pic-8888", "gm", "_", "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "path_stroke_with_zero_length", "pic-8888", "gm", "_", "path_stroke_with_zero_length", + "2ndpic-8888", + "gm", + "_", + "path_stroke_with_zero_length", + "sp-8888", + "gm", + "_", + "textblobgeometrychange", "pic-8888", "gm", "_", "textblobgeometrychange", + "2ndpic-8888", + "gm", + "_", + "textblobgeometrychange", + "sp-8888", + "gm", + "_", + "patch_primitive", + "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", "_", @@ -919,42 +1166,102 @@ "gm", "_", "verylarge_picture_image", + "sp-8888", + "gm", + "_", + "blend", "pic-8888", "gm", "_", "blend", + "2ndpic-8888", + "gm", + "_", + "blend", + "sp-8888", + "gm", + "_", + "drawfilter", "pic-8888", "gm", "_", "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "path_stroke_with_zero_length", "pic-8888", "gm", "_", "path_stroke_with_zero_length", + "2ndpic-8888", + "gm", + "_", + "path_stroke_with_zero_length", + "sp-8888", + "gm", + "_", + "textblobgeometrychange", "pic-8888", "gm", "_", "textblobgeometrychange", + "2ndpic-8888", + "gm", + "_", + "textblobgeometrychange", + "sp-8888", + "gm", + "_", + "patch_primitive", + "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", "_", @@ -1139,42 +1446,102 @@ "gm", "_", "verylarge_picture_image", - "pic-8888", + "sp-8888", "gm", "_", "blend", "pic-8888", "gm", "_", + "blend", + "2ndpic-8888", + "gm", + "_", + "blend", + "sp-8888", + "gm", + "_", "drawfilter", "pic-8888", "gm", "_", + "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", "path_stroke_with_zero_length", "pic-8888", "gm", "_", + "path_stroke_with_zero_length", + "2ndpic-8888", + "gm", + "_", + "path_stroke_with_zero_length", + "sp-8888", + "gm", + "_", "textblobgeometrychange", "pic-8888", "gm", "_", - "image-cacherator-from-picture", - "serialize-8888", + "textblobgeometrychange", + "2ndpic-8888", "gm", "_", - "image-cacherator-from-picture", - "pic-8888", + "textblobgeometrychange", + "sp-8888", "gm", "_", - "image-cacherator-from-raster", - "serialize-8888", + "patch_primitive", + "sp-8888", "gm", "_", - "image-cacherator-from-raster", + "image-cacherator-from-picture", "pic-8888", "gm", "_", - "image-cacherator-from-ctable", + "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", "_", @@ -1367,42 +1734,102 @@ "gm", "_", "verylarge_picture_image", + "sp-8888", + "gm", + "_", + "blend", "pic-8888", "gm", "_", "blend", + "2ndpic-8888", + "gm", + "_", + "blend", + "sp-8888", + "gm", + "_", + "drawfilter", "pic-8888", "gm", "_", "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "path_stroke_with_zero_length", "pic-8888", "gm", "_", "path_stroke_with_zero_length", + "2ndpic-8888", + "gm", + "_", + "path_stroke_with_zero_length", + "sp-8888", + "gm", + "_", + "textblobgeometrychange", "pic-8888", "gm", "_", "textblobgeometrychange", + "2ndpic-8888", + "gm", + "_", + "textblobgeometrychange", + "sp-8888", + "gm", + "_", + "patch_primitive", + "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", "_", @@ -1412,10 +1839,17 @@ "--noRAW_threading" ], "Test-Mac10.8-Clang-MacMini4.1-CPU-SSE4-x86_64-Release": [ + "--matrix", + "0", + "1", + "1", + "0", "--config", "565", "8888", "gpu", + "upright-matrix-8888", + "upright-matrix-gpu", "msaa16", "pdf", "pdf_poppler", @@ -1523,52 +1957,124 @@ "gm", "_", "verylarge_picture_image", + "sp-8888", + "gm", + "_", + "blend", "pic-8888", "gm", "_", "blend", + "2ndpic-8888", + "gm", + "_", + "blend", + "sp-8888", + "gm", + "_", + "drawfilter", "pic-8888", "gm", "_", "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "path_stroke_with_zero_length", "pic-8888", "gm", "_", "path_stroke_with_zero_length", + "2ndpic-8888", + "gm", + "_", + "path_stroke_with_zero_length", + "sp-8888", + "gm", + "_", + "textblobgeometrychange", "pic-8888", "gm", "_", "textblobgeometrychange", + "2ndpic-8888", + "gm", + "_", + "textblobgeometrychange", + "sp-8888", + "gm", + "_", + "patch_primitive", + "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" ], "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN": [ + "--matrix", + "0", + "1", + "1", + "0", "--config", "565", "8888", "gpu", + "upright-matrix-8888", + "upright-matrix-gpu", + "sp-8888", + "twice-8888", + "2ndpic-8888", + "remote-8888", + "remote_cache-8888", "msaa16", "pdf", "pdf_poppler", @@ -1676,42 +2182,102 @@ "gm", "_", "verylarge_picture_image", + "sp-8888", + "gm", + "_", + "blend", "pic-8888", "gm", "_", "blend", + "2ndpic-8888", + "gm", + "_", + "blend", + "sp-8888", + "gm", + "_", + "drawfilter", "pic-8888", "gm", "_", "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "path_stroke_with_zero_length", "pic-8888", "gm", "_", "path_stroke_with_zero_length", + "2ndpic-8888", + "gm", + "_", + "path_stroke_with_zero_length", + "sp-8888", + "gm", + "_", + "textblobgeometrychange", "pic-8888", "gm", "_", "textblobgeometrychange", + "2ndpic-8888", + "gm", + "_", + "textblobgeometrychange", + "sp-8888", + "gm", + "_", + "patch_primitive", + "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", "_", @@ -1721,10 +2287,22 @@ "~Shared" ], "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN": [ + "--matrix", + "0", + "1", + "1", + "0", "--config", "565", "8888", "gpu", + "upright-matrix-8888", + "upright-matrix-gpu", + "sp-8888", + "twice-8888", + "2ndpic-8888", + "remote-8888", + "remote_cache-8888", "msaa16", "pdf", "pdf_poppler", @@ -1832,52 +2410,124 @@ "gm", "_", "verylarge_picture_image", + "sp-8888", + "gm", + "_", + "blend", "pic-8888", "gm", "_", "blend", + "2ndpic-8888", + "gm", + "_", + "blend", + "sp-8888", + "gm", + "_", + "drawfilter", "pic-8888", "gm", "_", "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "path_stroke_with_zero_length", "pic-8888", "gm", "_", "path_stroke_with_zero_length", + "2ndpic-8888", + "gm", + "_", + "path_stroke_with_zero_length", + "sp-8888", + "gm", + "_", + "textblobgeometrychange", "pic-8888", "gm", "_", "textblobgeometrychange", + "2ndpic-8888", + "gm", + "_", + "textblobgeometrychange", + "sp-8888", + "gm", + "_", + "patch_primitive", + "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" ], "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Valgrind": [ + "--matrix", + "0", + "1", + "1", + "0", "--config", "565", "8888", "gpu", + "upright-matrix-8888", + "upright-matrix-gpu", + "sp-8888", + "twice-8888", + "2ndpic-8888", + "remote-8888", + "remote_cache-8888", "msaa16", "pdf", "pdf_poppler", @@ -2005,42 +2655,102 @@ "gm", "_", "verylarge_picture_image", + "sp-8888", + "gm", + "_", + "blend", "pic-8888", "gm", "_", "blend", + "2ndpic-8888", + "gm", + "_", + "blend", + "sp-8888", + "gm", + "_", + "drawfilter", "pic-8888", "gm", "_", "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "path_stroke_with_zero_length", "pic-8888", "gm", "_", "path_stroke_with_zero_length", + "2ndpic-8888", + "gm", + "_", + "path_stroke_with_zero_length", + "sp-8888", + "gm", + "_", + "textblobgeometrychange", "pic-8888", "gm", "_", "textblobgeometrychange", + "2ndpic-8888", + "gm", + "_", + "textblobgeometrychange", + "sp-8888", + "gm", + "_", + "patch_primitive", + "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", "_", @@ -2049,10 +2759,17 @@ "~Threaded" ], "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind": [ + "--matrix", + "0", + "1", + "1", + "0", "--config", "565", "8888", "gpu", + "upright-matrix-8888", + "upright-matrix-gpu", "nvprmsaa16", "msaa16", "pdf", @@ -2181,42 +2898,102 @@ "gm", "_", "verylarge_picture_image", + "sp-8888", + "gm", + "_", + "blend", "pic-8888", "gm", "_", "blend", + "2ndpic-8888", + "gm", + "_", + "blend", + "sp-8888", + "gm", + "_", + "drawfilter", "pic-8888", "gm", "_", "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "path_stroke_with_zero_length", "pic-8888", "gm", "_", "path_stroke_with_zero_length", + "2ndpic-8888", + "gm", + "_", + "path_stroke_with_zero_length", + "sp-8888", + "gm", + "_", + "textblobgeometrychange", "pic-8888", "gm", "_", "textblobgeometrychange", + "2ndpic-8888", + "gm", + "_", + "textblobgeometrychange", + "sp-8888", + "gm", + "_", + "patch_primitive", + "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", "_", @@ -2305,10 +3082,17 @@ "~Threaded" ], "Test-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Debug-ANGLE": [ + "--matrix", + "0", + "1", + "1", + "0", "--config", "565", "8888", "gpu", + "upright-matrix-8888", + "upright-matrix-gpu", "msaa16", "pdf", "pdf_poppler", @@ -2425,42 +3209,102 @@ "gm", "_", "verylarge_picture_image", + "sp-8888", + "gm", + "_", + "blend", "pic-8888", "gm", "_", "blend", + "2ndpic-8888", + "gm", + "_", + "blend", + "sp-8888", + "gm", + "_", + "drawfilter", "pic-8888", "gm", "_", "drawfilter", + "2ndpic-8888", + "gm", + "_", + "drawfilter", + "sp-8888", + "gm", + "_", + "path_stroke_with_zero_length", "pic-8888", "gm", "_", "path_stroke_with_zero_length", + "2ndpic-8888", + "gm", + "_", + "path_stroke_with_zero_length", + "sp-8888", + "gm", + "_", + "textblobgeometrychange", "pic-8888", "gm", "_", "textblobgeometrychange", + "2ndpic-8888", + "gm", + "_", + "textblobgeometrychange", + "sp-8888", + "gm", + "_", + "patch_primitive", + "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", "_", diff --git a/tools/dm_flags.py b/tools/dm_flags.py index 257dbd8..ec36268 100755 --- a/tools/dm_flags.py +++ b/tools/dm_flags.py @@ -31,6 +31,15 @@ def get_args(bot): configs = ['565', '8888', 'gpu'] + if 'Android' not in bot: + configs.extend(('upright-matrix-8888', 'upright-matrix-gpu')) + args.extend('--matrix 0 1 1 0'.split(' ')) + + if '-GCE-' in bot: + configs.append('sp-8888') + configs.extend(['twice-8888', '2ndpic-8888']) + configs.extend(['remote-8888', 'remote_cache-8888']) + if '-TSAN' not in bot: if ('TegraK1' in bot or 'GTX550Ti' in bot or @@ -132,12 +141,18 @@ def get_args(bot): 'drawfilter', 'path_stroke_with_zero_length', 'textblobgeometrychange']: - blacklist.extend(['pic-8888', 'gm', '_', test]) + blacklist.extend([ 'sp-8888', 'gm', '_', test]) + blacklist.extend([ 'pic-8888', 'gm', '_', test]) + blacklist.extend(['2ndpic-8888', 'gm', '_', test]) + for test in ['patch_primitive']: + blacklist.extend(['sp-8888', 'gm', '_', test]) # skia:4703 for test in ['image-cacherator-from-picture', 'image-cacherator-from-raster', 'image-cacherator-from-ctable']: + blacklist.extend([ 'sp-8888', 'gm', '_', test]) blacklist.extend([ 'pic-8888', 'gm', '_', test]) + blacklist.extend([ '2ndpic-8888', 'gm', '_', test]) blacklist.extend(['serialize-8888', 'gm', '_', test]) # Extensions for RAW images -- 2.7.4