Changes per-tile bench values to use the average of repetitions from new bench log output.
Corresponding logs change was done at https://codereview.appspot.com/7101060/ and this CL needs to be submitted together with that one for data consistency. Then we can turn on timePerTile.
Review URL: https://codereview.appspot.com/7193051
git-svn-id: http://skia.googlecode.com/svn/trunk@7351 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/bench/bench_util.py b/bench/bench_util.py
index 39efda4..6d6839d 100644
--- a/bench/bench_util.py
+++ b/bench/bench_util.py
@@ -118,9 +118,11 @@
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+)+)'
- # per-tile bench lines are in the following format
- tile_re = (' tile_(\S+): tile \[\d+,\d+\] out of \[\d+,\d+\]: ((?:' +
- 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.
+ tile_re = (' tile_(\S+): tile \[\d+,\d+\] out of \[\d+,\d+\] <averaged>:'
+ ' ((?:' + time_re + '\s+)+)')
for line in lines: