Add msaa runs to nanobench

TBR=mtklein@google.com

Review URL: https://codereview.chromium.org/964053002

diff --git a/tools/nanobench_flags.json b/tools/nanobench_flags.json
index 2a8f9c8..2317123 100644 (file)
--- a/tools/nanobench_flags.json
+++ b/tools/nanobench_flags.json
@@ -3,6 +3,15 @@
     "--scales", 
     "1.0", 
     "1.1", 
+    "--config", 
+    "565", 
+    "8888", 
+    "gpu", 
+    "nonrendering", 
+    "angle", 
+    "hwui", 
+    "msaa4", 
+    "nvprmsaa4", 
     "--match", 
     "~blurroundrect", 
     "~patch_grid", 
@@ -13,6 +22,15 @@
     "--scales", 
     "1.0", 
     "1.1", 
+    "--config", 
+    "565", 
+    "8888", 
+    "gpu", 
+    "nonrendering", 
+    "angle", 
+    "hwui", 
+    "msaa4", 
+    "nvprmsaa4", 
     "--match", 
     "skp"
   ], 
@@ -20,6 +38,15 @@
     "--scales", 
     "1.0", 
     "1.1", 
+    "--config", 
+    "565", 
+    "8888", 
+    "gpu", 
+    "nonrendering", 
+    "angle", 
+    "hwui", 
+    "msaa16", 
+    "nvprmsaa16", 
     "--loops", 
     "1", 
     "--samples", 
@@ -29,6 +56,15 @@
     "--scales", 
     "1.0", 
     "1.1", 
+    "--config", 
+    "565", 
+    "8888", 
+    "gpu", 
+    "nonrendering", 
+    "angle", 
+    "hwui", 
+    "msaa16", 
+    "nvprmsaa16", 
     "--match", 
     "~gradient", 
     "~etc1bitmap"

diff --git a/tools/nanobench_flags.py b/tools/nanobench_flags.py
index 18668c9..cb862a6 100755 (executable)
--- a/tools/nanobench_flags.py
+++ b/tools/nanobench_flags.py
@@ -24,6 +24,18 @@ def get_args(bot):
 
   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'])
@@ -42,6 +54,7 @@ def get_args(bot):
   if match:
     args.append('--match')
     args.extend(match)
+  
 
   if ('GalaxyS3' in bot or
       'GalaxyS4' in bot):