AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes bench_util's CONFIG_RE to cope with space flexibility.

Browse Source 
The real "fix" down the road is Joe's ongoing work of switching to JSON.
Review URL: https://codereview.chromium.org/103943004

git-svn-id: http://skia.googlecode.com/svn/trunk@12498 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
bensong@google.com 2013-12-05 01:31:56 +00:00
parent 498aafadd5
commit 967b258065
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bench/bench_util.py
View File

@ -13,13 +13,13 @@ ALGORITHM_MEDIAN = 'med'
ALGORITHM_MINIMUM = 'min' ALGORITHM_MINIMUM = 'min'
ALGORITHM_25TH_PERCENTILE = '25th' ALGORITHM_25TH_PERCENTILE = '25th'
# Regular expressions used throughout # Regular expressions used throughout.
PER_SETTING_RE = '([^\s=]+)(?:=(\S+))?' PER_SETTING_RE = '([^\s=]+)(?:=(\S+))?'
SETTINGS_RE = 'skia bench:((?:\s+' + PER_SETTING_RE + ')*)' SETTINGS_RE = 'skia bench:((?:\s+' + PER_SETTING_RE + ')*)'
BENCH_RE = 'running bench (?:\[\d+ \d+\] )?\s*(\S+)' BENCH_RE = 'running bench (?:\[\d+ \d+\] )?\s*(\S+)'
TIME_RE = '(?:(\w*)msecs = )?\s*((?:\d+\.\d+)(?:,\s*\d+\.\d+)*)' TIME_RE = '(?:(\w*)msecs = )?\s*((?:\d+\.\d+)(?:,\s*\d+\.\d+)*)'
# non-per-tile benches have configs that don't end with ']' or '>' # non-per-tile benches have configs that don't end with ']' or '>'
CONFIG_RE = '(\S+[^\]>]): ((?:' + TIME_RE + '\s+)+)' CONFIG_RE = '(\S+[^\]>]):\s+((?:' + TIME_RE + '\s+)+)'
# per-tile bench lines are in the following format. Note that there are # per-tile bench lines are in the following format. Note that there are
# non-averaged bench numbers in separate lines, which we ignore now due to # non-averaged bench numbers in separate lines, which we ignore now due to
# their inaccuracy. # their inaccuracy.
@ -141,6 +141,8 @@ def _ParseAndStoreTimes(config_re_compiled, is_per_tile, line, bench,
layout_dic.setdefault(bench, {}).setdefault( layout_dic.setdefault(bench, {}).setdefault(
current_config, {}).setdefault(current_time_type, tile_layout) current_config, {}).setdefault(current_time_type, tile_layout)
# TODO(bensong): switch to reading JSON output when available. This way we don't
# need the RE complexities.
def parse(settings, lines, representation=None): def parse(settings, lines, representation=None):
"""Parses bench output into a useful data structure. """Parses bench output into a useful data structure.