DM: more invariants

  - add ViaPicture
  - run ViaPicture on most bots
  - run ViaSecondPicture (tests SkPictureRecorder reuse) and ViaTwice (tests caching) on some bots
  - extend ViaSerialization reference checking to ViaPicture, ViaSecondPicture,
    ViaSingletonPictures, and ViaTwice
  - suppress current reference check failures with --blacklist

I'm open to following up on changing how those suppressions work.

Passing --nocheck turns off these invariant checks, letting us debug failures with normal image diff tools.

CQ_EXTRA_TRYBOTS=client.skia:Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot

BUG=skia:4769
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1569823006

Review URL: https://codereview.chromium.org/1569823006

2 files changed, 656 insertions, 17 deletions

diff --git a/tools/dm_flags.json b/tools/dm_flags.json
index 9c189caf32..aaca2d0bbc 100644
--- a/tools/dm_flags.json
+++ b/tools/dm_flags.json
@@ -15,7 +15,7 @@
     "pdf_poppler", 
     "serialize-8888", 
     "tiles_rt-8888", 
-    "pipe-8888", 
+    "pic-8888", 
     "--src", 
     "tests", 
     "gm", 
@@ -272,7 +272,59 @@
     "serialize-8888", 
     "gm", 
     "_", 
-    "verylarge_picture_image"
+    "verylarge_picture_image", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "patch_primitive"
   ], 
   "Test-Android-GCC-AndroidOne-GPU-Mali400MP2-Arm7-Release": [
     "--config", 
@@ -282,7 +334,7 @@
     "msaa4", 
     "serialize-8888", 
     "tiles_rt-8888", 
-    "pipe-8888", 
+    "pic-8888", 
     "--src", 
     "tests", 
     "gm", 
@@ -519,6 +571,58 @@
     "gm", 
     "_", 
     "verylarge_picture_image", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "patch_primitive", 
     "--match", 
     "~WritePixels"
   ], 
@@ -530,7 +634,7 @@
     "msaa4", 
     "serialize-8888", 
     "tiles_rt-8888", 
-    "pipe-8888", 
+    "pic-8888", 
     "gpudft", 
     "--src", 
     "tests", 
@@ -770,6 +874,58 @@
     "gm", 
     "_", 
     "verylarge_picture_image", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "patch_primitive", 
     "--match", 
     "~WritePixels"
   ], 
@@ -780,7 +936,7 @@
     "gpu", 
     "serialize-8888", 
     "tiles_rt-8888", 
-    "pipe-8888", 
+    "pic-8888", 
     "--src", 
     "tests", 
     "gm", 
@@ -1019,6 +1175,58 @@
     "gm", 
     "_", 
     "verylarge_picture_image", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "patch_primitive", 
     "--match", 
     "~imagefiltersclipped", 
     "~imagefilterscropexpand", 
@@ -1033,7 +1241,7 @@
     "gpu", 
     "serialize-8888", 
     "tiles_rt-8888", 
-    "pipe-8888", 
+    "pic-8888", 
     "--src", 
     "tests", 
     "gm", 
@@ -1269,7 +1477,59 @@
     "serialize-8888", 
     "gm", 
     "_", 
-    "verylarge_picture_image"
+    "verylarge_picture_image", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "patch_primitive"
   ], 
   "Test-Android-GCC-Nexus9-GPU-TegraK1-Arm64-Debug": [
     "--config", 
@@ -1280,7 +1540,7 @@
     "msaa4", 
     "serialize-8888", 
     "tiles_rt-8888", 
-    "pipe-8888", 
+    "pic-8888", 
     "--src", 
     "tests", 
     "gm", 
@@ -1516,7 +1776,59 @@
     "serialize-8888", 
     "gm", 
     "_", 
-    "verylarge_picture_image"
+    "verylarge_picture_image", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "patch_primitive"
   ], 
   "Test-Android-GCC-NexusPlayer-CPU-SSSE3-x86-Release": [
     "--config", 
@@ -1772,6 +2084,58 @@
     "gm", 
     "_", 
     "verylarge_picture_image", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "patch_primitive", 
     "--match", 
     "~ResourceCache"
   ], 
@@ -1792,7 +2156,7 @@
     "pdf_poppler", 
     "serialize-8888", 
     "tiles_rt-8888", 
-    "pipe-8888", 
+    "pic-8888", 
     "--src", 
     "tests", 
     "gm", 
@@ -2045,7 +2409,59 @@
     "serialize-8888", 
     "gm", 
     "_", 
-    "verylarge_picture_image"
+    "verylarge_picture_image", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "patch_primitive"
   ], 
   "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN": [
     "--matrix", 
@@ -2060,6 +2476,8 @@
     "upright-matrix-8888", 
     "upright-matrix-gpu", 
     "sp-8888", 
+    "twice-8888", 
+    "2ndpic-8888", 
     "remote-8888", 
     "remote_cache-8888", 
     "msaa16", 
@@ -2067,7 +2485,7 @@
     "pdf_poppler", 
     "serialize-8888", 
     "tiles_rt-8888", 
-    "pipe-8888", 
+    "pic-8888", 
     "--src", 
     "tests", 
     "gm", 
@@ -2316,7 +2734,59 @@
     "serialize-8888", 
     "gm", 
     "_", 
-    "verylarge_picture_image"
+    "verylarge_picture_image", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "patch_primitive"
   ], 
   "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Valgrind": [
     "--matrix", 
@@ -2331,6 +2801,8 @@
     "upright-matrix-8888", 
     "upright-matrix-gpu", 
     "sp-8888", 
+    "twice-8888", 
+    "2ndpic-8888", 
     "remote-8888", 
     "remote_cache-8888", 
     "msaa16", 
@@ -2338,7 +2810,7 @@
     "pdf_poppler", 
     "serialize-8888", 
     "tiles_rt-8888", 
-    "pipe-8888", 
+    "pic-8888", 
     "--src", 
     "tests", 
     "gm", 
@@ -2608,6 +3080,58 @@
     "gm", 
     "_", 
     "verylarge_picture_image", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "patch_primitive", 
     "--match", 
     "~Threaded"
   ], 
@@ -2629,7 +3153,7 @@
     "pdf_poppler", 
     "serialize-8888", 
     "tiles_rt-8888", 
-    "pipe-8888", 
+    "pic-8888", 
     "--src", 
     "tests", 
     "gm", 
@@ -2898,6 +3422,58 @@
     "gm", 
     "_", 
     "verylarge_picture_image", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "patch_primitive", 
     "--match", 
     "~Threaded"
   ], 
@@ -2918,7 +3494,7 @@
     "pdf_poppler", 
     "serialize-8888", 
     "tiles_rt-8888", 
-    "pipe-8888", 
+    "pic-8888", 
     "angle", 
     "--src", 
     "tests", 
@@ -3180,6 +3756,58 @@
     "gm", 
     "_", 
     "verylarge_picture_image", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "drawfilter", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "pic-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "2ndpic-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "sp-8888", 
+    "gm", 
+    "_", 
+    "patch_primitive", 
     "--match", 
     "~GLPrograms"
   ]
diff --git a/tools/dm_flags.py b/tools/dm_flags.py
index 32431f236d..3e69661cdc 100755
--- a/tools/dm_flags.py
+++ b/tools/dm_flags.py
@@ -37,6 +37,7 @@ def get_args(bot):
 
   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:
@@ -67,7 +68,7 @@ def get_args(bot):
   # NP is running out of RAM when we run all these modes.  skia:3255
   if 'NexusPlayer' not in bot:
     configs.extend(mode + '-8888' for mode in
-                   ['serialize', 'tiles_rt', 'pipe'])
+                   ['serialize', 'tiles_rt', 'pic'])
 
   if 'ANGLE' in bot:
     configs.append('angle')
@@ -191,6 +192,16 @@ def get_args(bot):
                'verylargebitmap',              # Windows only.
                'verylarge_picture_image']:     # Windows only.
     blacklist.extend(['serialize-8888', 'gm', '_', test])
+  # skia:4769
+  for test in ['blend',
+               'drawfilter',
+               'path_stroke_with_zero_length',
+               'textblobgeometrychange']:
+    blacklist.extend(['pic-8888', 'gm', '_', test])
+    blacklist.extend(['2ndpic-8888', 'gm', '_', test])
+    blacklist.extend(['sp-8888', 'gm', '_', test])
+  for test in ['patch_primitive']:
+    blacklist.extend(['sp-8888', 'gm', '_', test])
 
   if blacklist:
     args.append('--blacklist')