Try throttling x86 desktop bots down with fewer threads.

tools/dm_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 = []
 
+  # 32-bit desktop bots tend to run out of memory, because they have relatively
+  # far more cores than RAM (e.g. 32 cores, 3G RAM).  Hold them back a bit.
+  if '-x86-' in bot and not 'NexusPlayer' in bot:
+    args.append('--threads 4')
+
   configs = ['565', '8888', 'gpu']
 
   if '-GCE-' in bot:
     configs.extend(['f16', 'srgb'])              # Gamma-correct formats.
     configs.extend(['sp-8888', '2ndpic-8888'])   # Test niche uses of SkPicture.
 
   if '-TSAN' not in bot:
     if ('TegraK1'  in bot or
         'GTX550Ti' in bot or
         'GTX660'   in bot or
@@ skipping 58 matching lines @@
     blacklist.extend('pdf gm _ fontmgr_iter'.split(' '))
     blacklist.extend('pdf _ _ PANO_20121023_214540.jpg'.split(' '))
     blacklist.extend('pdf skp _ worldjournal'.split(' '))
     blacklist.extend('pdf skp _ desk_baidu.skp'.split(' '))
     blacklist.extend('pdf skp _ desk_wikipedia.skp'.split(' '))
 
   if 'iOS' in bot:
     blacklist.extend('gpu skp _ _ msaa skp _ _'.split(' '))
     blacklist.extend('msaa16 gm _ tilemodesProcess'.split(' '))
 
-  # the 32-bit GCE bots run out of memory in DM when running these large images
-  if 'x86' in bot and not 'x86-64' in bot:
-    blacklist.extend('_ image _ interlaced1.png'.split(' '))
-    blacklist.extend('_ image _ interlaced2.png'.split(' '))
-    blacklist.extend('_ image _ interlaced3.png'.split(' '))
-
   if 'Mac' in bot or 'iOS' in bot:
     # CG fails on questionable bmps
     blacklist.extend('_ image gen_platf rgba32abf.bmp'.split(' '))
     blacklist.extend('_ image gen_platf rgb24prof.bmp'.split(' '))
     blacklist.extend('_ image gen_platf rgb24lprof.bmp'.split(' '))
     blacklist.extend('_ image gen_platf 8bpp-pixeldata-cropped.bmp'.split(' '))
     blacklist.extend('_ image gen_platf 4bpp-pixeldata-cropped.bmp'.split(' '))
     blacklist.extend('_ image gen_platf 32bpp-pixeldata-cropped.bmp'.split(' '))
     blacklist.extend('_ image gen_platf 24bpp-pixeldata-cropped.bmp'.split(' '))
-    
+
     # CG has unpredictable behavior on this questionable gif
     # It's probably using uninitialized memory
     blacklist.extend('_ image gen_platf frame_larger_than_image.gif'.split(' '))
 
   # WIC fails on questionable bmps
   if 'Win' in bot:
     blacklist.extend('_ image gen_platf rle8-height-negative.bmp'.split(' '))
     blacklist.extend('_ image gen_platf rle4-height-negative.bmp'.split(' '))
     blacklist.extend('_ image gen_platf pal8os2v2.bmp'.split(' '))
     blacklist.extend('_ image gen_platf pal8os2v2-16.bmp'.split(' '))
@@ skipping 50 matching lines @@
   # 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"]
 
   # skbug.com/4888
   # Blacklist RAW images on GPU tests until we can resolve failures
   if 'GPU' in bot:
     for raw_ext in r:
       blacklist.extend(('_ image _ .%s' % raw_ext).split(' '))
 
-  # Blacklist RAW images on some 32-bit machines due to out-of-memory issues
-  if (('Win' in bot or 'Ubuntu' in bot) and not '64' in bot):
-    for raw_ext in r:
-      blacklist.extend(('_ image _ .%s' % raw_ext).split(' '))
-
   match = []
   if 'Valgrind' in bot: # skia:3021
     match.append('~Threaded')
 
   if 'GalaxyS3' in bot:  # skia:1699
     match.append('~WritePixels')
 
   if 'AndroidOne' in bot:  # skia:4711
     match.append('~WritePixels')
 
@@ skipping 71 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)