Merge pull request f4pga#871 from litghost/add_qor_tool

Add QoR tool

.github/kokoro/continuous-docs.cfg

@@ -13,6 +13,10 @@ action {
     # File types
     regex: "**/*result*.xml"
     regex: "**/*sponge_log.xml"
+    regex: "**/pack.log"
+    regex: "**/place.log"
+    regex: "**/route.log"
+    regex: "**/*_qor.csv"
     strip_prefix: "github/symbiflow-arch-defs-continuous-docs/"
   }
 }

.github/kokoro/continuous-ice40.cfg

@@ -13,6 +13,10 @@ action {
     # File types
     regex: "**/*result*.xml"
     regex: "**/*sponge_log.xml"
+    regex: "**/pack.log"
+    regex: "**/place.log"
+    regex: "**/route.log"
+    regex: "**/*_qor.csv"
     strip_prefix: "github/symbiflow-arch-defs-continuous-ice40/"
   }
 }

.github/kokoro/continuous-testarch.cfg

@@ -13,6 +13,10 @@ action {
     # File types
     regex: "**/*result*.xml"
     regex: "**/*sponge_log.xml"
+    regex: "**/pack.log"
+    regex: "**/place.log"
+    regex: "**/route.log"
+    regex: "**/*_qor.csv"
     strip_prefix: "github/symbiflow-arch-defs-continuous-testarch/"
   }
 }

.github/kokoro/continuous-tests.cfg

@@ -13,6 +13,10 @@ action {
     # File types
     regex: "**/*result*.xml"
     regex: "**/*sponge_log.xml"
+    regex: "**/pack.log"
+    regex: "**/place.log"
+    regex: "**/route.log"
+    regex: "**/*_qor.csv"
     strip_prefix: "github/symbiflow-arch-defs-continuous-tests/"
   }
 }

.github/kokoro/continuous-xc7.cfg

@@ -13,6 +13,10 @@ action {
     # File types
     regex: "**/*result*.xml"
     regex: "**/*sponge_log.xml"
+    regex: "**/pack.log"
+    regex: "**/place.log"
+    regex: "**/route.log"
+    regex: "**/*_qor.csv"
     strip_prefix: "github/symbiflow-arch-defs-continuous-xc7/"
   }
 }

.github/kokoro/ice40.sh

@@ -15,5 +15,6 @@ echo "----------------------------------------"
 	export MAKE_ARGS="-j${MAX_CORES} --output-sync=target"
 	# Run as many tests as we can.    Rerun individually on failure.
 	make -k ${MAKE_ARGS} all_ice40 || make all_ice40
+	make print_qor > ice40_qor.csv
 )
 echo "----------------------------------------"

.github/kokoro/presubmit-docs.cfg

@@ -13,6 +13,10 @@ action {
     # File types
     regex: "**/*result*.xml"
     regex: "**/*sponge_log.xml"
+    regex: "**/pack.log"
+    regex: "**/place.log"
+    regex: "**/route.log"
+    regex: "**/*_qor.csv"
     strip_prefix: "github/symbiflow-arch-defs-presubmit-docs/"
   }
 }

.github/kokoro/presubmit-ice40.cfg

@@ -13,6 +13,10 @@ action {
     # File types
     regex: "**/*result*.xml"
     regex: "**/*sponge_log.xml"
+    regex: "**/pack.log"
+    regex: "**/place.log"
+    regex: "**/route.log"
+    regex: "**/*_qor.csv"
     strip_prefix: "github/symbiflow-arch-defs-presubmit-ice40/"
   }
 }

.github/kokoro/presubmit-testarch.cfg

@@ -13,6 +13,10 @@ action {
     # File types
     regex: "**/*result*.xml"
     regex: "**/*sponge_log.xml"
+    regex: "**/pack.log"
+    regex: "**/place.log"
+    regex: "**/route.log"
+    regex: "**/*_qor.csv"
     strip_prefix: "github/symbiflow-arch-defs-presubmit-testarch/"
   }
 }

.github/kokoro/presubmit-tests.cfg

@@ -13,6 +13,10 @@ action {
     # File types
     regex: "**/*result*.xml"
     regex: "**/*sponge_log.xml"
+    regex: "**/pack.log"
+    regex: "**/place.log"
+    regex: "**/route.log"
+    regex: "**/*_qor.csv"
     strip_prefix: "github/symbiflow-arch-defs-presubmit-tests/"
   }
 }

.github/kokoro/presubmit-xc7.cfg

@@ -13,6 +13,10 @@ action {
     # File types
     regex: "**/*result*.xml"
     regex: "**/*sponge_log.xml"
+    regex: "**/pack.log"
+    regex: "**/place.log"
+    regex: "**/route.log"
+    regex: "**/*_qor.csv"
     strip_prefix: "github/symbiflow-arch-defs-presubmit-xc7/"
   }
 }

.github/kokoro/xc7.sh

@@ -15,5 +15,6 @@ echo "----------------------------------------"
 	export MAKE_ARGS="-j${MAX_CORES} --output-sync=target"
 	# Run as many tests as we can.  Rerun individually on failure.
 	make -k ${MAKE_ARGS} all_xc7 || make all_xc7
+	make print_qor > xc7_qor.csv
 )
 echo "----------------------------------------"

CMakeLists.txt

@@ -251,3 +251,8 @@ add_dependencies(all_demos
     )
 
 add_custom_target(docs)
+
+add_custom_target(print_qor
+    COMMAND ${PYTHON3} ${symbiflow-arch-defs_SOURCE_DIR}/utils/print_qor.py ${symbiflow-arch-defs_BINARY_DIR}
+    DEPENDS ${PYTHON3_TARGET}
+    )

common/cmake/env.cmake

@@ -209,7 +209,7 @@ function(ADD_CONDA_PACKAGE)
     add_custom_command(
       OUTPUT ${OUTPUTS}
       COMMAND ${CMAKE_COMMAND} -E echo "Taking ${CONDA_BIN}.lock"
-      COMMAND flock ${CONDA_BIN}.lock ${CONDA_BIN} install --force-reinstall ${PACKAGE_SPEC}
+      COMMAND flock ${CONDA_BIN}.lock ${CONDA_BIN} install --force ${PACKAGE_SPEC}
       ${TOUCH_COMMANDS}
       DEPENDS conda ${CONDA_BIN}
       )

utils/print_qor.py

@@ -0,0 +1,82 @@
+""" Gathers statistics from VPR runs, like pack/place/route runtimes and Fmax.
+"""
+import argparse
+import csv
+import os
+import sys
+
+
+def scan_runtime(fname):
+    """ Find runtime of VPR log (if any), else returns empty str. """
+    try:
+        with open(fname, 'r') as f:
+            for l in f:
+                pass
+
+            if not l.startswith('The entire flow of VPR took'):
+                return ""
+
+            return str(float(l.split()[6]))
+    except FileNotFoundError:
+        return ""
+
+
+def scan_critical(fname):
+    """ Find critical path and Fmax from VPR log (if any).
+
+    Returns
+    -------
+    critical_path : str
+        Critical path delay in nsec
+    fmax : str
+        Fmax in MHz.
+
+    """
+    try:
+        with open(fname, 'r') as f:
+            for l in f:
+                if l.startswith('Final critical path:'):
+                    parts = l.split()
+                    if len(parts) >= 7:
+                        critical_path = float(parts[3])
+                        fmax = float(parts[6])
+                        return str(critical_path), str(fmax)
+    except FileNotFoundError:
+        pass
+
+    return "", ""
+
+
+def main():
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument("build_dir")
+
+    args = parser.parse_args()
+
+    fields = [
+        "path", "pack time (sec)", "place time (sec)", "route time (sec)",
+        "Fmax (MHz)", "t_crit (ns)"
+    ]
+    w = csv.DictWriter(sys.stdout, fields)
+    w.writeheader()
+    for root, dirs, files in os.walk(args.build_dir):
+        if 'pack.log' in files:
+            d = {}
+
+            d['path'] = root
+            d['pack time (sec)'] = scan_runtime(os.path.join(root, 'pack.log'))
+            d['place time (sec)'] = scan_runtime(
+                os.path.join(root, 'place.log')
+            )
+            d['route time (sec)'] = scan_runtime(
+                os.path.join(root, 'route.log')
+            )
+            d['Fmax (MHz)'], d['t_crit (ns)'] = scan_critical(
+                os.path.join(root, 'route.log')
+            )
+
+            w.writerow(d)
+
+
+if __name__ == "__main__":
+    main()