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..9c353460233d6fcd1edc85f649c57b8b3865bbde 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,13 @@ 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

[msarett, 2015/10/15 14:20:57]

GCE?

[scroggo, 2015/10/15 14:40:47]

FWIW, this comment is copied from dm_flags.py.

Google Cloud Engine (I think?). These are our bots running in the cloud.

[mtklein, 2015/10/15 15:02:55]

Yep.

+  # so defensively disable them in nanobench, too.
+  if 'x86' in bot and not 'x86-64' in bot:

[msarett, 2015/10/15 14:20:57]

It occurs to me that the memory leaks in SkImageDecoder were probably just as
responsible for our out of memory errors as these images.

In the future, we may want to investigate trying to test these images again.

[scroggo, 2015/10/15 14:40:47]

Seems reasonable. I'm already disabling SkImageDecoder's buildTileIndex  in
nanobench, so we could try not disabling it. I'd rather leave it in to see if we
can pass, and then try removing it. Added a FIXME.

[msarett, 2015/10/15 14:53:17]

On second thought, if it's not an Android bot, it's not running the leaky code.

+    match.append('~interlaced1.png')

[mtklein, 2015/10/15 14:19:52]

Just in case it's not clear, there's nothing stopping us from putting these
shared bad image lists in a third .py file that both dm_flags and
nanobench_flags import.  Not saying we have to, but if you find it handy, they
can share code / data.

[scroggo, 2015/10/15 14:40:47]

I considered doing that, although I'm not sure how much overlap there will be in
total. DM is very specific about disabling certain modes, certain files, certain
platforms. Maybe we'll need to do the same with nanobench, but until it
obviously makes things more convenient, I think this will be simpler. Added a
FIXME, anyway.

[mtklein, 2015/10/15 15:02:55]

sgtm

+    match.append('~interlaced2.png')
+    match.append('~interlaced3.png')
+
   if match:
     args.append('--match')
     args.extend(match)