Modify bench_pictures configs for Android

Review URL: https://codereview.appspot.com/6942064

git-svn-id: http://skia.googlecode.com/svn/trunk@6888 2bbb7eff-a529-9590-31e7-b0007b416f81

2 files changed, 59 insertions, 10 deletions

diff --git a/tools/bench_pictures.cfg b/tools/bench_pictures.cfg
index ca06a7ab6d..c64a686640 100644
--- a/tools/bench_pictures.cfg
+++ b/tools/bench_pictures.cfg
@@ -64,10 +64,40 @@ default_configs = [
 ]
 
 
-# Configs to run on Android devices. This just excludes configs with
-# '--mode playbackCreation'.
-android_configs = [cfg for cfg in default_configs \
-                   if cfg['mode'] != 'playbackCreation']
+def AndroidConfigList(tile_size, scale, cores, viewport, do_gpu=True):
+  tile_x = tile_size[0]
+  tile_y = tile_size[1]
+
+  viewport_x = viewport[0]
+  viewport_y = viewport[1]
+
+  configs = [
+    # Record
+    RecordConfig(scale=str(scale)),
+    RecordRTreeConfig(tile_x, tile_y, scale=str(scale)),
+    RecordGridConfig( tile_x, tile_y, scale=str(scale)),
+
+    # Tiled playback
+    TiledBitmapConfig(tile_x, tile_y, scale=str(scale)),
+    TileRTreeConfig(  tile_x, tile_y, scale=str(scale)),
+    TileGridConfig(   tile_x, tile_y, scale=str(scale)),
+
+    # Viewport playback
+    ViewportBitmapConfig(viewport_x, viewport_y, scale=str(scale)),
+    ViewportRTreeConfig( viewport_x, viewport_y, scale=str(scale)),
+    ViewportGridConfig(  viewport_x, viewport_y, scale=str(scale)),
+  ]
+
+  if do_gpu:
+    configs.append(TiledGPUConfig(tile_x, tile_y, scale=str(scale)))
+    configs.append(ViewportGPUConfig(viewport_x, viewport_y, scale=str(scale)))
+
+  # Multicore
+  for num_cores in cores:
+    configs.append(MultiThreadTileConfig(num_cores, tile_x, tile_y,
+                                         scale=str(scale)))
+
+  return configs
 
 
 # This dictionary defines the sets of configs for all platforms. Each config is
@@ -77,10 +107,11 @@ bench_pictures_cfg = {
   'debug': [TiledBitmapConfig(DEFAULT_TILE_X, DEFAULT_TILE_Y)],
   'default': default_configs,
   'no_gpu': [cfg for cfg in default_configs if cfg['device'] != 'gpu'],
-  'nexus_s': [cfg for cfg in android_configs if cfg['device'] != 'gpu'],
-  'nexus_4': android_configs,
-  'nexus_7': android_configs,
-  'nexus_10': android_configs,
-  'galaxy_nexus': android_configs,
-  'xoom': android_configs,
+  'nexus_s':      AndroidConfigList((256, 256), 0.4897, [],  (800,  480),
+                                    do_gpu=False),
+  'nexus_4':      AndroidConfigList((256, 256), 0.8163, [],  (1280, 768)),
+  'nexus_7':      AndroidConfigList((256, 256), 0.8163, [2], (1280, 800)),
+  'nexus_10':     AndroidConfigList((512, 512), 1.6326, [],  (2560, 1600)),
+  'galaxy_nexus': AndroidConfigList((256, 256), 0.8163, [],  (1280, 800)),
+  'xoom':         AndroidConfigList((256, 256), 0.8163, [],  (1200, 800)),
 }
\ No newline at end of file
diff --git a/tools/bench_pictures_cfg_helper.py b/tools/bench_pictures_cfg_helper.py
index 12559522ca..654bad6e66 100644
--- a/tools/bench_pictures_cfg_helper.py
+++ b/tools/bench_pictures_cfg_helper.py
@@ -29,6 +29,24 @@ def TiledGPUConfig(tile_x, tile_y, **kwargs):
   return GPUConfig(mode=['tile', str(tile_x), str(tile_y)], **kwargs)
 
 
+def ViewportBitmapConfig(viewport_x, viewport_y, **kwargs):
+  return BitmapConfig(viewport=[str(viewport_x), str(viewport_y)], **kwargs)
+
+
+def ViewportGPUConfig(viewport_x, viewport_y, **kwargs):
+  return GPUConfig(viewport=[str(viewport_x), str(viewport_y)], **kwargs)
+
+
+def ViewportRTreeConfig(viewport_x, viewport_y, **kwargs):
+  return RTreeConfig(viewport_x, viewport_y, mode='simple',
+                     viewport=[str(viewport_x), str(viewport_y)], **kwargs)
+
+
+def ViewportGridConfig(viewport_x, viewport_y, **kwargs):
+  return GridConfig(viewport_x, viewport_y, mode='simple',
+                    viewport=[str(viewport_x), str(viewport_y)], **kwargs)
+
+
 def CopyTilesConfig(tile_x, tile_y, **kwargs):
   return BitmapConfig(mode=['copyTile', str(tile_x), str(tile_y)], **kwargs)