Add msaa runs to nanobench

tools/nanobench_flags.py

 #!/usr/bin/env python
 
 usage = '''
 Write extra flags to outfile for nanobench based on the bot name:
   $ python nanobench_flags.py outfile Perf-Android-GalaxyS3-Mali400-Arm7-Release
 Or run self-tests:
   $ python nanobench_flags.py test
 '''
 
 import inspect
 import json
 import os
 import sys
 
 
 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 = []
 
   args.extend(['--scales', '1.0', '1.1'])
 
+  config = ['565', '8888', 'gpu', 'nonrendering', 'angle', 'hwui']
+  # The S4 crashes and the NP produces a long error stream when we run with
+  # MSAA.
+  if ('GalaxyS4'    not in bot and
+      'NexusPlayer' not in bot):
+    if 'Android' in bot:
+      config.extend(['msaa4', 'nvprmsaa4'])
+    else:
+      config.extend(['msaa16', 'nvprmsaa16'])
+  args.append('--config')
+  args.extend(config)
+
   if 'Valgrind' in bot:
     # Don't care about Valgrind performance.
     args.extend(['--loops',   '1'])
     args.extend(['--samples', '1'])
 
   match = []
   if 'Android' in bot:
     # Segfaults when run as GPU bench. Very large texture?
     match.append('~blurroundrect')
     match.append('~patch_grid')  # skia:2847
     match.append('~desk_carsvg')
   if 'HD2000' in bot:
     match.extend(['~gradient', '~etc1bitmap'])  # skia:2895
   if 'Nexus7' in bot:
     match = ['skp']  # skia:2774
   if match:
     args.append('--match')
     args.extend(match)
+  
 
   if ('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.
@@ skipping 27 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)