DM: add a pixel check to serialize

If we're running through serialize and then drawing into some raster target (e.g. serialize-8888 like we run on the bots), make sure the serialized version is identical to what we'd get if we just drew into the rest of the pipeline (i.e. 8888).

Start by blacklisting all current failures.  This at least prevents further regression.

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

Committed: https://skia.googlesource.com/skia/+/6eb4e36a93ea695e7adb771ea9ac3326680a8e98

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

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

1 files changed, 1013 insertions, 5 deletions

diff --git a/tools/dm_flags.json b/tools/dm_flags.json
index 5731b054fe..9c189caf32 100644
--- a/tools/dm_flags.json
+++ b/tools/dm_flags.json
@@ -188,7 +188,91 @@
     "msaa16", 
     "gm", 
     "_", 
-    "tilemodesProcess"
+    "tilemodesProcess", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "not_native32_bitmap_config", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_image", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_alpha_image", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_alpha_image_shader", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "c_gms", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colortype", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colortype_xfermodes", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colorwheelnative", 
+    "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", 
+    "_", 
+    "lightingshader", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "localmatriximagefilter", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "verylargebitmap", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "verylarge_picture_image"
   ], 
   "Test-Android-GCC-AndroidOne-GPU-Mali400MP2-Arm7-Release": [
     "--config", 
@@ -351,6 +435,90 @@
     "image", 
     "decode", 
     "inc14.png", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "not_native32_bitmap_config", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_image", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_alpha_image", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_alpha_image_shader", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "c_gms", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colortype", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colortype_xfermodes", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colorwheelnative", 
+    "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", 
+    "_", 
+    "lightingshader", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "localmatriximagefilter", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "verylargebitmap", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "verylarge_picture_image", 
     "--match", 
     "~WritePixels"
   ], 
@@ -518,6 +686,90 @@
     "image", 
     "decode", 
     "inc14.png", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "not_native32_bitmap_config", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_image", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_alpha_image", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_alpha_image_shader", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "c_gms", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colortype", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colortype_xfermodes", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colorwheelnative", 
+    "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", 
+    "_", 
+    "lightingshader", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "localmatriximagefilter", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "verylargebitmap", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "verylarge_picture_image", 
     "--match", 
     "~WritePixels"
   ], 
@@ -683,6 +935,90 @@
     "image", 
     "decode", 
     "inc14.png", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "not_native32_bitmap_config", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_image", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_alpha_image", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_alpha_image_shader", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "c_gms", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colortype", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colortype_xfermodes", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colorwheelnative", 
+    "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", 
+    "_", 
+    "lightingshader", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "localmatriximagefilter", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "verylargebitmap", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "verylarge_picture_image", 
     "--match", 
     "~imagefiltersclipped", 
     "~imagefilterscropexpand", 
@@ -849,7 +1185,91 @@
     "_", 
     "image", 
     "decode", 
-    "inc14.png"
+    "inc14.png", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "not_native32_bitmap_config", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_image", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_alpha_image", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_alpha_image_shader", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "c_gms", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colortype", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colortype_xfermodes", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colorwheelnative", 
+    "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", 
+    "_", 
+    "lightingshader", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "localmatriximagefilter", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "verylargebitmap", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "verylarge_picture_image"
   ], 
   "Test-Android-GCC-Nexus9-GPU-TegraK1-Arm64-Debug": [
     "--config", 
@@ -1012,7 +1432,91 @@
     "_", 
     "image", 
     "decode", 
-    "inc14.png"
+    "inc14.png", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "not_native32_bitmap_config", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_image", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_alpha_image", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_alpha_image_shader", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "c_gms", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colortype", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colortype_xfermodes", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colorwheelnative", 
+    "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", 
+    "_", 
+    "lightingshader", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "localmatriximagefilter", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "verylargebitmap", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "verylarge_picture_image"
   ], 
   "Test-Android-GCC-NexusPlayer-CPU-SSSE3-x86-Release": [
     "--config", 
@@ -1184,6 +1688,90 @@
     "image", 
     "_", 
     "interlaced3.png", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "not_native32_bitmap_config", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_image", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_alpha_image", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_alpha_image_shader", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "c_gms", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colortype", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colortype_xfermodes", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colorwheelnative", 
+    "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", 
+    "_", 
+    "lightingshader", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "localmatriximagefilter", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "verylargebitmap", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "verylarge_picture_image", 
     "--match", 
     "~ResourceCache"
   ], 
@@ -1373,7 +1961,91 @@
     "_", 
     "image", 
     "_", 
-    "interlaced3.png"
+    "interlaced3.png", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "not_native32_bitmap_config", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_image", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_alpha_image", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_alpha_image_shader", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "c_gms", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colortype", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colortype_xfermodes", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colorwheelnative", 
+    "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", 
+    "_", 
+    "lightingshader", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "localmatriximagefilter", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "verylargebitmap", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "verylarge_picture_image"
   ], 
   "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN": [
     "--matrix", 
@@ -1560,7 +2232,91 @@
     "_", 
     "image", 
     "_", 
-    "interlaced3.png"
+    "interlaced3.png", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "not_native32_bitmap_config", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_image", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_alpha_image", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_alpha_image_shader", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "c_gms", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colortype", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colortype_xfermodes", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colorwheelnative", 
+    "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", 
+    "_", 
+    "lightingshader", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "localmatriximagefilter", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "verylargebitmap", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "verylarge_picture_image"
   ], 
   "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Valgrind": [
     "--matrix", 
@@ -1768,6 +2524,90 @@
     "image", 
     "_", 
     "interlaced3.png", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "not_native32_bitmap_config", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_image", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_alpha_image", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_alpha_image_shader", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "c_gms", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colortype", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colortype_xfermodes", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colorwheelnative", 
+    "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", 
+    "_", 
+    "lightingshader", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "localmatriximagefilter", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "verylargebitmap", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "verylarge_picture_image", 
     "--match", 
     "~Threaded"
   ], 
@@ -1974,6 +2814,90 @@
     "image", 
     "_", 
     "interlaced3.png", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "not_native32_bitmap_config", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_image", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_alpha_image", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_alpha_image_shader", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "c_gms", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colortype", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colortype_xfermodes", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colorwheelnative", 
+    "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", 
+    "_", 
+    "lightingshader", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "localmatriximagefilter", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "verylargebitmap", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "verylarge_picture_image", 
     "--match", 
     "~Threaded"
   ], 
@@ -2172,6 +3096,90 @@
     "image", 
     "_", 
     "interlaced3.png", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "not_native32_bitmap_config", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_image", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_alpha_image", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "bleed_alpha_image_shader", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "blend", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "c_gms", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colortype", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colortype_xfermodes", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "colorwheelnative", 
+    "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", 
+    "_", 
+    "lightingshader", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "localmatriximagefilter", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "path_stroke_with_zero_length", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "textblobgeometrychange", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "verylargebitmap", 
+    "serialize-8888", 
+    "gm", 
+    "_", 
+    "verylarge_picture_image", 
     "--match", 
     "~GLPrograms"
   ]