gen_bench_expectations to generate bench expectations files.

bench/check_bench_regressions.py

 '''
 Created on May 16, 2011
 
 @author: bungeman
 '''
 import bench_util
 import getopt
 import httplib
 import itertools
 import json
@@ skipping 62 matching lines @@
                 self.config == other.config and
                 self.time_type == other.time_type and
                 self.settings == other.settings)
 
     def __hash__(self):
         return (hash(self.bench) ^
                 hash(self.config) ^
                 hash(self.time_type) ^
                 hash(frozenset(self.settings.iteritems())))
 
-def parse_dir(directory, default_settings, revision, rep):
-    """Parses bench data from bench logs files.
-       revision can be either svn revision or git commit hash.
-    """
-    revision_data_points = []  # list of BenchDataPoint
-    file_list = os.listdir(directory)
-    file_list.sort()
-    for bench_file in file_list:
-        scalar_type = None
-        # Scalar type, if any, is in the bench filename after revision
-        if (len(revision) > MAX_SVN_REV_LENGTH and
-            bench_file.startswith('bench_' + revision + '_')):
-            # The revision is GIT commit hash.
-            scalar_type = bench_file[len(revision) + len('bench_') + 1:]
-        elif (bench_file.startswith('bench_r' + revision + '_') and
-              revision.isdigit()):
-            # The revision is SVN number
-            scalar_type = bench_file[len(revision) + len('bench_r') + 1:]
-        else:
-            continue
-
-        file_handle = open(directory + '/' + bench_file, 'r')
-
-        default_settings['scalar'] = scalar_type
-        revision_data_points.extend(
-                        bench_util.parse(default_settings, file_handle, rep))
-        file_handle.close()
-    return revision_data_points
-
 def create_bench_dict(revision_data_points):
     """Convert current revision data into a dictionary of line data.
 
     Args:
       revision_data_points: a list of bench data points
 
     Returns:
       a dictionary of this form:
           keys = Label objects
           values = the corresponding bench value
@@ skipping 77 matching lines @@
           for ratio in ratios:
               li.extend(exceptions[i][ratio])
           header = '%s benches got slower (sorted by %% difference):' % len(li)
           if i == FASTER:
               header = header.replace('slower', 'faster')
           outputs.extend(['', header] + li)
 
     if outputs:
         raise Exception('\n'.join(outputs))
 
+
 def main():
     """Parses command line and checks bench expectations."""
     try:
         opts, _ = getopt.getopt(sys.argv[1:],
                                 "a:b:d:e:r:",
                                 "default-setting=")
     except getopt.GetoptError, err:
         print str(err)
         usage()
         sys.exit(2)
@@ skipping 22 matching lines @@
     except ValueError:
         usage()
         sys.exit(2)
 
     if directory is None or bot is None or rev is None:
         usage()
         sys.exit(2)
 
     platform_and_alg = bot + '-' + rep
 
-    data_points = parse_dir(directory,
-                            {},  # Sets default settings to empty.
-                            rev,
-                            rep)
+    data_points = bench_util.parse_skp_bench_data(directory, rev, rep)
 
     bench_dict = create_bench_dict(data_points)
 
     if bench_expectations:
         check_expectations(bench_dict, bench_expectations, platform_and_alg)
 
 
 if __name__ == "__main__":
     main()