Merge pull request #3299 from Pinata-Consulting/log-hashes-per-step

Log hashes per step

Author: maliberty

flow/scripts/flow.sh

@@ -6,3 +6,6 @@ echo Running $2.tcl, stage $1
  $OPENROAD_EXE $OPENROAD_ARGS -exit $SCRIPTS_DIR/noop.tcl 2>&1 >$LOG_DIR/$1.tmp.log; \
  eval "$TIME_CMD $OPENROAD_CMD -no_splash $SCRIPTS_DIR/$2.tcl -metrics $LOG_DIR/$1.json" 2>&1 | \
  tee -a $(realpath $LOG_DIR/$1.tmp.log))
+# Log the hash for this step. The summary "make elapsed" in "make finish",
+# will not have all the .odb files for the bazel-orfs use-case.
+$PYTHON_EXE $UTILS_DIR/genElapsedTime.py --match $1 -d $LOG_DIR | tee -a $(realpath $LOG_DIR/$1.log)

flow/util/genElapsedTime.py

@@ -18,13 +18,17 @@ def print_log_dir_times(logdir, args):
     first = True
     totalElapsed = 0
     total_max_memory = 0
-    print(logdir)
+    if not args.match:
+        print(logdir)
 
     # Loop on all log files in the directory
     for f in sorted(pathlib.Path(logdir).glob("**/*.log")):
         if "eqy_output" in str(f):
             continue
         # Extract Elapsed Time line from log file
+        stem = os.path.splitext(os.path.basename(str(f)))[0]
+        if args.match and args.match != stem:
+            continue
         with open(str(f)) as logfile:
             found = False
             for line in logfile:
@@ -95,7 +99,7 @@ def print_log_dir_times(logdir, args):
             print(
                 format_str
                 % (
-                    os.path.splitext(os.path.basename(str(f)))[0],
+                    stem,
                     elapsedTime,
                     peak_memory,
                     odb_hash[0:20],
@@ -104,14 +108,18 @@ def print_log_dir_times(logdir, args):
         totalElapsed += elapsedTime
         total_max_memory = max(total_max_memory, int(peak_memory))
 
-    if totalElapsed != 0:
+    if totalElapsed != 0 and not args.match:
         print(format_str % ("Total", totalElapsed, total_max_memory, ""))
 
 
 def scan_logs(args):
     parser = argparse.ArgumentParser(
         description="Print elapsed time for every step in the flow"
     )
+    parser.add_argument(
+        "--match",
+        help="Match this string in the log file names",
+    )
     parser.add_argument(
         "--logDir", "-d", required=True, nargs="+", help="Log files directories"
     )