bench_util: allow optional whitespace in CSV format

bench/bench_util.py

 '''
 Created on May 19, 2011
 
 @author: bungeman
 '''
 
 import re
 import math
 
 # bench representation algorithm constant names
 ALGORITHM_AVERAGE = 'avg'
 ALGORITHM_MEDIAN = 'med'
 ALGORITHM_MINIMUM = 'min'
 ALGORITHM_25TH_PERCENTILE = '25th'
 
 # Regular expressions used throughout
 PER_SETTING_RE = '([^\s=]+)(?:=(\S+))?'
 SETTINGS_RE = 'skia bench:((?:\s+' + PER_SETTING_RE + ')*)'
 BENCH_RE = 'running bench (?:\[\d+ \d+\] )?\s*(\S+)'
-TIME_RE = '(?:(\w*)msecs = )?\s*((?:\d+\.\d+)(?:, \d+\.\d+)*)'
+TIME_RE = '(?:(\w*)msecs = )?\s*((?:\d+\.\d+)(?:,\s*\d+\.\d+)*)'

[epoger, 2013/08/13 15:08:32]

This seems to fix it.  To test, I ran this command on a Linux machine:

GYP_DEFINES="skia_gpu=0" make -j 30 && tools/tests/run.sh

It failed before making this change, and succeeded afterwards.

 # 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.
 TILE_RE = ('  tile_(\S+): tile \[\d+,\d+\] out of \[\d+,\d+\] <averaged>:'
            ' ((?:' + TIME_RE + '\s+)+)')
 # for extracting tile layout
 TILE_LAYOUT_RE = ' out of \[(\d+),(\d+)\] <averaged>: '
 
@@ skipping 258 matching lines @@
     """
     return '<a href="http://code.google.com/p/skia/source/detail?r=%s">%s</a>'%(
         revision_number, revision_number)
 
 def main():
     foo = [[0.0, 0.0], [0.0, 1.0], [0.0, 2.0], [0.0, 3.0]]
     LinearRegression(foo)
 
 if __name__ == "__main__":
     main()