Fix bench_pictures.cfg
- Add configs for Razr I
- Don't run multithreaded with --timeIndividualTiles
Review URL: https://codereview.chromium.org/12636002
git-svn-id: http://skia.googlecode.com/svn/trunk@8027 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tools/bench_pictures_cfg_helper.py b/tools/bench_pictures_cfg_helper.py
index 07b1e1e..2670d77 100644
--- a/tools/bench_pictures_cfg_helper.py
+++ b/tools/bench_pictures_cfg_helper.py
@@ -13,10 +13,11 @@
return config
-def TileArgs(tile_x, tile_y):
- return {'mode': ['tile', str(tile_x), str(tile_y)],
- 'timeIndividualTiles': True,
- }
+def TileArgs(tile_x, tile_y, timeIndividualTiles=True):
+ config = {'mode': ['tile', str(tile_x), str(tile_y)]}
+ if timeIndividualTiles:
+ config['timeIndividualTiles'] = True
+ return config
def BitmapConfig(**kwargs):
@@ -27,16 +28,18 @@
return Config(config='gpu', **kwargs)
-def TiledBitmapConfig(tile_x, tile_y, **kwargs):
- return BitmapConfig(**dict(TileArgs(tile_x, tile_y).items() + kwargs.items()))
+def TiledBitmapConfig(tile_x, tile_y, timeIndividualTiles=True, **kwargs):
+ return BitmapConfig(**dict(TileArgs(tile_x, tile_y,
+ timeIndividualTiles=timeIndividualTiles).items() + kwargs.items()))
def TiledGPUConfig(tile_x, tile_y, **kwargs):
return GPUConfig(**dict(TileArgs(tile_x, tile_y).items() + kwargs.items()))
-def TiledConfig(tile_x, tile_y, **kwargs):
- return Config(**dict(TileArgs(tile_x, tile_y).items() + kwargs.items()))
+def TiledConfig(tile_x, tile_y, timeIndividualTiles=True, **kwargs):
+ return Config(**dict(TileArgs(tile_x, tile_y,
+ timeIndividualTiles=timeIndividualTiles).items() + kwargs.items()))
def ViewportBitmapConfig(viewport_x, viewport_y, **kwargs):
@@ -70,7 +73,8 @@
def MultiThreadTileConfig(threads, tile_x, tile_y, **kwargs):
- return TiledBitmapConfig(multi=str(threads), tile_x=tile_x, tile_y=tile_y,
+ return TiledBitmapConfig(tile_x=tile_x, tile_y=tile_y,
+ timeIndividualTiles=False, multi=str(threads),
**kwargs)