aboutsummaryrefslogtreecommitdiffhomepage
path: root/bench
diff options
context:
space:
mode:
authorGravatar bensong@google.com <bensong@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-02-06 20:59:14 +0000
committerGravatar bensong@google.com <bensong@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-02-06 20:59:14 +0000
commitff388f8ec404f8730937b43a476faee8d94428b7 (patch)
treedfbe71eb52622e8c964cd8eaab3d2509360df349 /bench
parent92b0f51b9bd33e661f9c249a55bf285a151813ef (diff)
Fixes a bug introduced by the new per-tile bench log format.
Review URL: https://codereview.appspot.com/7301056 git-svn-id: http://skia.googlecode.com/svn/trunk@7630 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'bench')
-rw-r--r--bench/bench_util.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/bench/bench_util.py b/bench/bench_util.py
index 6d6839dae7..b2e21069cf 100644
--- a/bench/bench_util.py
+++ b/bench/bench_util.py
@@ -116,8 +116,8 @@ def parse(settings, lines, representation=None):
settings_re = 'skia bench:((?:\s+' + setting_re + ')*)'
bench_re = 'running bench (?:\[\d+ \d+\] )?\s*(\S+)'
time_re = '(?:(\w*)msecs = )?\s*((?:\d+\.\d+)(?:,\d+\.\d+)*)'
- # non-per-tile benches have configs that don't end with ']'
- config_re = '(\S+[^\]]): ((?:' + time_re + '\s+)+)'
+ # non-per-tile benches have configs that don't end with ']' or '>'
+ config_re = '(\S+[^\]>]): ((?:' + time_re + '\s+)+)'
# 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
# their inaccuracy.