From: mtklein <mtklein@chromium.org>
Date: Mon, 29 Feb 2016 16:52:27 +0000 (-0800)
Subject: DM: disable ignored and very niche configs on bots.
X-Git-Tag: accepted/tizen/5.0/unified/20181102.025319~129^2~1759
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7b6d3a30cf18377935c800603fc00fe0966d15de;p=platform%2Fupstream%2FlibSkiaSharp.git

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

Review URL: https://codereview.chromium.org/1745073002
---

diff --git a/tools/dm_flags.json b/tools/dm_flags.json
index dd0154e..d824705 100644
--- a/tools/dm_flags.json
+++ b/tools/dm_flags.json
@@ -1,16 +1,9 @@
 {
   "Pretend-iOS-Bot": [
-    "--matrix", 
-    "0", 
-    "1", 
-    "1", 
-    "0", 
     "--config", 
     "565", 
     "8888", 
     "gpu", 
-    "upright-matrix-8888", 
-    "upright-matrix-gpu", 
     "pdf", 
     "pdf_poppler", 
     "serialize-8888", 
@@ -117,102 +110,42 @@
     "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", 
     "_", 
@@ -316,102 +249,42 @@
     "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", 
     "_", 
@@ -600,102 +473,42 @@
     "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", 
     "_", 
@@ -882,102 +695,42 @@
     "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", 
     "_", 
@@ -1166,102 +919,42 @@
     "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", 
     "_", 
@@ -1446,102 +1139,42 @@
     "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", 
+    "pic-8888", 
     "gm", 
     "_", 
     "textblobgeometrychange", 
     "pic-8888", 
     "gm", 
     "_", 
-    "textblobgeometrychange", 
-    "2ndpic-8888", 
+    "image-cacherator-from-picture", 
+    "serialize-8888", 
     "gm", 
     "_", 
-    "textblobgeometrychange", 
-    "sp-8888", 
+    "image-cacherator-from-picture", 
+    "pic-8888", 
     "gm", 
     "_", 
-    "patch_primitive", 
-    "sp-8888", 
+    "image-cacherator-from-raster", 
+    "serialize-8888", 
     "gm", 
     "_", 
-    "image-cacherator-from-picture", 
+    "image-cacherator-from-raster", 
     "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", 
+    "image-cacherator-from-ctable", 
     "serialize-8888", 
     "gm", 
     "_", 
@@ -1734,102 +1367,42 @@
     "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", 
     "_", 
@@ -1839,17 +1412,10 @@
     "--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", 
@@ -1957,124 +1523,52 @@
     "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", 
@@ -2182,102 +1676,42 @@
     "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", 
     "_", 
@@ -2287,22 +1721,10 @@
     "~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", 
@@ -2410,124 +1832,52 @@
     "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", 
@@ -2655,102 +2005,42 @@
     "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", 
     "_", 
@@ -2759,17 +2049,10 @@
     "~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", 
@@ -2898,102 +2181,42 @@
     "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", 
     "_", 
@@ -3082,17 +2305,10 @@
     "~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", 
@@ -3209,102 +2425,42 @@
     "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 ec36268..257dbd8 100755
--- a/tools/dm_flags.py
+++ b/tools/dm_flags.py
@@ -31,15 +31,6 @@ 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
@@ -141,18 +132,12 @@ def get_args(bot):
                'drawfilter',
                'path_stroke_with_zero_length',
                'textblobgeometrychange']:
-    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])
+    blacklist.extend(['pic-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