Renable image benchmarking

tools/nanobench_flags.py

Index: tools/nanobench_flags.py
diff --git a/tools/nanobench_flags.py b/tools/nanobench_flags.py
index f5902426865bbea24081b0128bf0e088aa2e5095..471c1d92f8486c55a1c2f01f269856a3f7c104ae 100755
--- a/tools/nanobench_flags.py
+++ b/tools/nanobench_flags.py
@@ -29,8 +29,8 @@ cov_start = lineno()+1   # We care about coverage starting just past this def.
 def get_args(bot):
   args = []
 
-  # Temporarily disable image benchmarking.
-  args.append('--images')
+  if 'GPU' in bot:
+    args.append('--images')
 
   if 'Appurify' not in bot:
     args.extend(['--scales', '1.0', '1.1'])
@@ -80,6 +80,17 @@ def get_args(bot):
     match.append('~keymobi')
     match.append('~path_hairline')
 
+  # the 32-bit GCE bots run out of memory in DM when running these large images
+  # so defensively disable them in nanobench, too.
+  # FIXME (scroggo): This may have just been due to SkImageDecoder's
+  # buildTileIndex leaking memory (skbug.com/4360). That is disabled by
+  # default for nanobench, so we may not need this.
+  # FIXME (scroggo): Share image blacklists between dm and nanobench?
+  if 'x86' in bot and not 'x86-64' in bot:
+    match.append('~interlaced1.png')
+    match.append('~interlaced2.png')
+    match.append('~interlaced3.png')
+
   if match:
     args.append('--match')
     args.extend(match)