Update [dm|nanobench]_flags for CPU/GPU split

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 = '''
 Write extra flags to outfile for DM based on the bot name:
-  $ python dm_flags.py outfile Test-Mac10.9-MacMini6.2-HD4000-x86_64-Release
+  $ python dm_flags.py outfile Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug
 Or run self-tests:
   $ python dm_flags.py test
 '''
 
 import inspect
 import json
 import os
 import sys
 
 
@@ skipping 73 matching lines @@
     blacklist.extend('gpu skp _ gpu image _ gpu subset _'.split(' '))
     blacklist.extend('msaa skp _ msaa image _ gpu subset _'.split(' '))
 
   if 'Valgrind' in bot:
     # PDF + .webp -> jumps depending on uninitialized memory.  skia:3505
     blacklist.extend('pdf _ .webp'.split(' '))
     # These take 18+ hours to run.
     blacklist.extend('pdf gm fontmgr_iter'.split(' '))
     blacklist.extend('pdf _ PANO_20121023_214540.jpg'.split(' '))
     blacklist.extend('pdf skp tabl_worldjournal.skp'.split(' '))
-    if 'Valgrind_GPU' in bot:
-      args.append('--nocpu')
-    elif 'Valgrind_CPU' in bot:
-      args.append('--nogpu')
 
   if blacklist:
     args.append('--blacklist')
     args.extend(blacklist)
 
   match = []
-  if 'Alex' in bot:  # skia:2793
-    # This machine looks to be running out of heap.
-    # Running with fewer threads may help.
-    args.extend(['--threads', '1'])
   if 'Valgrind' in bot: # skia:3021
     match.append('~Threaded')
   if 'TSAN' in bot: # skia:3562
     match.append('~Math')
 
   if 'Xoom' in bot or 'GalaxyS3' in bot:  # skia:1699
     match.append('~WritePixels')
 
   # skia:3249: these images flakily don't decode on Android.
   if 'Android' in bot:
     match.append('~tabl_mozilla_0')
     match.append('~desk_yahoonews_0')
 
   if 'NexusPlayer' in bot:
     match.append('~ResourceCache')
 
   if match:
     args.append('--match')
     args.extend(match)
 
-  # Though their GPUs are interesting, these don't test anything on
-  # the CPU that other ARMv7+NEON bots don't test faster (N5).
-  if ('Nexus10'  in bot or
-      'Nexus7'   in bot or
-      'GalaxyS3' in bot or
-      'GalaxyS4' in bot):
-    args.append('--nocpu')
   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.
   args = {}
   cases = [
-    'Test-Android-GalaxyS3-Mali400-Arm7-Debug',
-    'Test-Android-Nexus7-Tegra3-Arm7-Release',
-    'Test-Android-NexusPlayer-PowerVR-x86-Release',
-    'Test-Android-Xoom-Tegra2-Arm7-Release',
-    'Test-ChromeOS-Alex-GMA3150-x86-Debug',
-    'Test-Ubuntu12-ShuttleA-GTX550Ti-x86_64-Release-Valgrind_GPU',
-    'Test-Ubuntu13.10-GCE-NoGPU-x86_64-Release-TSAN',
-    'Test-Ubuntu14-GCE-NoGPU-x86_64-Release-Valgrind_CPU',
-    'Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE',
+    'Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug',
+    'Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release',
+    'Test-Android-GCC-NexusPlayer-CPU-SSSE3-x86-Release',
+    'Test-Android-GCC-Xoom-GPU-Tegra2-Arm7-Release',
+    'Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind',
+    'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN',
+    'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Valgrind',
+    'Test-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Debug-ANGLE',
   ]
 
   cov = coverage.coverage()
   cov.start()
   for case in cases:
     args[case] = get_args(case)
   cov.stop()
 
   this_file = os.path.basename(__file__)
   _, _, not_run, _ = cov.analysis(this_file)
@@ skipping 11 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)