Renable image benchmarking

tools/nanobench_flags.py

 #
 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 
 #!/usr/bin/env python
 
 usage = '''
@@ skipping 11 matching lines @@
 
 def lineno():
   caller = inspect.stack()[1]  # Up one level to our caller.
   return inspect.getframeinfo(caller[0]).lineno
 
 
 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'])
 
   if 'iOS' in bot:
     args.extend(['--skps', 'ignore_skps'])
 
   if 'Appurify' not in bot:
     config = ['565', '8888', 'gpu', 'nonrendering', 'angle', 'hwui']
     # The S4 crashes and the NP produces a long error stream when we run with
@@ skipping 29 matching lines @@
   if 'GalaxyS4' in bot:
     match.append('~GLInstancedArraysBench')  # skia:4371
 
   if 'iOS' in bot:
     match.append('~blurroundrect')
     match.append('~patch_grid')  # skia:2847
     match.append('~desk_carsvg')
     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)
 
   return args
 cov_end = lineno()   # Don't care about code coverage past here.
 
 
 def self_test():
   import coverage  # This way the bots don't need coverage.py to be installed.
@@ skipping 29 matching lines @@
   if len(sys.argv) == 2 and sys.argv[1] == 'test':
     self_test()
     sys.exit(0)
 
   if len(sys.argv) != 3:
     print usage
     sys.exit(1)
 
   with open(sys.argv[1], 'w') as out:
     json.dump(get_args(sys.argv[2]), out)