Optionally run RAW images serially

RAW images use a lot of memory. Add a new FLAG to run one at a time so
we have less risk of running out of memory.

Isolate RAW images to their own thread on particular devices where our
images cause OOM errors.

Locally, this drops the max memory use from 3945 MB to 1664 MB (running only --image --images <RAW images we test>)

BUG=skia:4912
BUG=skia:4878
BUG=b/27035849
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1681553003

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

2 files changed, 10 insertions, 87 deletions

diff --git a/tools/dm_flags.json b/tools/dm_flags.json
index e6e8fc59ca..67e5845e4a 100644
--- a/tools/dm_flags.json
+++ b/tools/dm_flags.json
@@ -1631,7 +1631,8 @@
     "_", 
     "image", 
     "_", 
-    ".SRW"
+    ".SRW", 
+    "--noRAW_threading"
   ], 
   "Test-Android-GCC-NexusPlayer-CPU-SSSE3-x86-Release": [
     "--pre_log", 
@@ -1840,88 +1841,9 @@
     "gm", 
     "_", 
     "image-cacherator-from-ctable", 
-    "_", 
-    "image", 
-    "_", 
-    ".arw", 
-    "_", 
-    "image", 
-    "_", 
-    ".cr2", 
-    "_", 
-    "image", 
-    "_", 
-    ".dng", 
-    "_", 
-    "image", 
-    "_", 
-    ".nef", 
-    "_", 
-    "image", 
-    "_", 
-    ".nrw", 
-    "_", 
-    "image", 
-    "_", 
-    ".orf", 
-    "_", 
-    "image", 
-    "_", 
-    ".raf", 
-    "_", 
-    "image", 
-    "_", 
-    ".rw2", 
-    "_", 
-    "image", 
-    "_", 
-    ".pef", 
-    "_", 
-    "image", 
-    "_", 
-    ".srw", 
-    "_", 
-    "image", 
-    "_", 
-    ".ARW", 
-    "_", 
-    "image", 
-    "_", 
-    ".CR2", 
-    "_", 
-    "image", 
-    "_", 
-    ".DNG", 
-    "_", 
-    "image", 
-    "_", 
-    ".NEF", 
-    "_", 
-    "image", 
-    "_", 
-    ".NRW", 
-    "_", 
-    "image", 
-    "_", 
-    ".ORF", 
-    "_", 
-    "image", 
-    "_", 
-    ".RAF", 
-    "_", 
-    "image", 
-    "_", 
-    ".RW2", 
-    "_", 
-    "image", 
-    "_", 
-    ".PEF", 
-    "_", 
-    "image", 
-    "_", 
-    ".SRW", 
     "--match", 
-    "~ResourceCache"
+    "~ResourceCache", 
+    "--noRAW_threading"
   ], 
   "Test-Mac10.8-Clang-MacMini4.1-CPU-SSE4-x86_64-Release": [
     "--pre_log", 
diff --git a/tools/dm_flags.py b/tools/dm_flags.py
index e9d5d64bce..5542e4fb4b 100755
--- a/tools/dm_flags.py
+++ b/tools/dm_flags.py
@@ -155,14 +155,10 @@ def get_args(bot):
     blacklist.extend([   '2ndpic-8888', 'gm', '_', test])
     blacklist.extend(['serialize-8888', 'gm', '_', test])
 
+  # Extensions for RAW images
   r = ["arw", "cr2", "dng", "nef", "nrw", "orf", "raf", "rw2", "pef", "srw",
        "ARW", "CR2", "DNG", "NEF", "NRW", "ORF", "RAF", "RW2", "PEF", "SRW"]
 
-  # NexusPlayer runs out of memory running RAW codec tests
-  if 'NexusPlayer' in bot:
-    for raw_ext in r:
-      blacklist.extend(('_ image _ .%s' % raw_ext).split(' '))
-
   # skbug.com/4888
   # Blacklist RAW images on GPU tests until we can resolve failures
   if 'GPU' in bot:
@@ -206,6 +202,11 @@ def get_args(bot):
     args.append('--match')
     args.extend(match)
 
+  # These bots run out of memory running RAW codec tests. Do not run them in
+  # parallel
+  if 'NexusPlayer' in bot or 'Nexus5' in bot or 'Nexus9' in bot:
+    args.append('--noRAW_threading')
+
   return args
 cov_end = lineno()   # Don't care about code coverage past here.