Fixes bench_util's CONFIG_RE to cope with space flexibility.

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
+# 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+)(?:,\s*\d+\.\d+)*)'
 # 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
 # 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>: '
 
 PER_SETTING_RE_COMPILED = re.compile(PER_SETTING_RE)
 SETTINGS_RE_COMPILED = re.compile(SETTINGS_RE)
@@ skipping 101 matching lines @@
         for new_time in TIME_RE_COMPILED.finditer(times):
             current_time_type = new_time.group(1)
             iters = [float(i) for i in
                      new_time.group(2).strip().split(',')]
             value_dic.setdefault(bench, {}).setdefault(
                 current_config, {}).setdefault(current_time_type, []).append(
                     _ListAlgorithm(iters, representation).compute())
             layout_dic.setdefault(bench, {}).setdefault(
                 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):
     """Parses bench output into a useful data structure.
 
     ({str:str}, __iter__ -> str) -> [BenchDataPoint]
     representation is one of the ALGORITHM_XXX types."""
 
     benches = []
     current_bench = None
     bench_dic = {}  # [bench][config][time_type] -> [list of bench values]
     # [bench][config][time_type] -> tile_layout
@@ skipping 135 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()