Merge pull request #1658 from byuccl/fix_parse_runtime

Faster log parsing: fix parse_vtr_flow.py to only read each log file once

Author: jgoeders

vtr_flow/scripts/python_libs/vtr/parse_vtr_flow.py

@@ -5,7 +5,7 @@
 import sys
 from pathlib import Path
 import glob
-from collections import OrderedDict
+from collections import OrderedDict, defaultdict
 
 # pylint: disable=wrong-import-position
 sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
@@ -15,21 +15,52 @@
 # pylint: enable=wrong-import-position
 
 
+def parse_file_and_update_results(filename, patterns, results):
+
+    """
+    Find filename, and then look through for the matching patterns, updating results
+    """
+
+    # We interpret the parse pattern's filename as a glob pattern
+    filepaths = glob.glob(filename)
+
+    if len(filepaths) > 1:
+        raise vtr.InspectError(
+            "File pattern '{}' is ambiguous ({} files matched)".format(filename, len(filepaths)),
+            len(filepaths),
+            filepaths,
+        )
+
+    if len(filepaths) == 1:
+        assert Path(filepaths[0]).exists
+
+        with open(filepaths[0], "r") as file:
+            for line in file:
+                while line[0] == "#":
+                    line = line[1:]
+
+                for parse_pattern in patterns:
+                    match = parse_pattern.regex().match(line)
+                    if match and match.groups():
+                        # Extract the first group value
+                        results[parse_pattern] = match.groups()[0]
+
+
 def parse_vtr_flow(arg_list):
     """
     parse vtr flow output
     """
     parse_path = arg_list[0]
     parse_config_file = arg_list[1]
-    parse_config_file = vtr.util.verify_file(parse_config_file, "parse config")
-
     extra_params = arg_list[2:]
+
+    parse_config_file = vtr.util.verify_file(parse_config_file, "parse config")
     if parse_config_file is None:
         parse_config_file = str(paths.vtr_benchmarks_parse_path)
 
     parse_patterns = vtr.load_parse_patterns(str(parse_config_file))
 
-    metrics = OrderedDict()
+    results = OrderedDict()
 
     extra_params_parsed = OrderedDict()
 
@@ -38,49 +69,31 @@ def parse_vtr_flow(arg_list):
         extra_params_parsed[key] = value
         print(key, end="\t")
 
-    # Set defaults
     for parse_pattern in parse_patterns.values():
-        metrics[parse_pattern.name()] = (
-            parse_pattern.default_value() if parse_pattern.default_value() is not None else ""
+        # Set defaults
+        results[parse_pattern] = (
+            parse_pattern.default_value() if parse_pattern.default_value() is not None else "-1"
         )
+
+        # Print header row
         print(parse_pattern.name(), end="\t")
     print("")
 
     for key, value in extra_params_parsed.items():
         print(value, end="\t")
 
-    # Process each pattern
+    # Group parse patterns by filename so that we only need to read each log file from disk once
+    parse_patterns_by_filename = defaultdict(list)
     for parse_pattern in parse_patterns.values():
+        parse_patterns_by_filename[parse_pattern.filename()].append(parse_pattern)
 
-        # We interpret the parse pattern's filename as a glob pattern
-        filepaths = glob.glob(str(Path(parse_path) / parse_pattern.filename()))
-
-        if len(filepaths) > 1:
-            raise vtr.InspectError(
-                "File pattern '{}' is ambiguous ({} files matched)".format(
-                    parse_pattern.filename(), len(filepaths)
-                ),
-                len(filepaths),
-                filepaths,
-            )
-
-        if len(filepaths) == 1:
-
-            assert Path(filepaths[0]).exists
-            metrics[parse_pattern.name()] = "-1"
-            with open(filepaths[0], "r") as file:
-                for line in file:
-                    while line[0] == "#":
-                        line = line[1:]
-                    match = parse_pattern.regex().match(line)
-                    if match and match.groups():
-                        # Extract the first group value
-                        metrics[parse_pattern.name()] = match.groups()[0]
-            print(metrics[parse_pattern.name()], end="\t")
-        else:
-            # No matching file, skip
-            print("-1", end="\t")
-            assert len(filepaths) == 0
+    # Process each pattern
+    for filename, patterns in parse_patterns_by_filename.items():
+        parse_file_and_update_results(str(Path(parse_path) / filename), patterns, results)
+
+    # Print results
+    for parse_pattern in parse_patterns.values():
+        print(results[parse_pattern], end="\t")
     print("")
 
     return 0

vtr_flow/scripts/run_vtr_task.py

@@ -291,10 +291,12 @@ def run_tasks(
             print("Elapsed time: {}".format(format_elapsed_time(datetime.now() - start)))
 
         if args.parse:
+            start = datetime.now()
             print("\nParsing test results...")
             if len(args.list_file) > 0:
                 print("scripts/parse_vtr_task.py -l {}".format(args.list_file[0]))
             parse_tasks(configs, jobs)
+            print("Elapsed time: {}".format(format_elapsed_time(datetime.now() - start)))
 
         if args.create_golden:
             create_golden_results_for_tasks(configs)