From 445fc4ab39c5cd692ff9d415039aefe88e24208b Mon Sep 17 00:00:00 2001
From: agorararmard <aagouhar@efabless.com>
Date: Fri, 2 Oct 2020 15:41:28 +0200
Subject: [PATCH] CI and logging updates

- remove sha512 from allow_failures (to appear on sta)
- test runtime of genericfir
- test showing live log for ./flow.tcl in solo designs (impact on runtime/and log limits)
- improve the handling of "not found" designs in run_designs
- improve the handling of show_output and print_rem when present together
- remove "not found" designs from rem_designs
---
 .travis.yml            |  8 ++++----
 run_designs.py         | 28 ++++++++++++++++++++--------
 travisCI/travisTest.sh |  2 +-
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 42d9df73..7945b9cf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,11 +41,11 @@ jobs:
       env: TEST_SET=aes_cipher
     - name: "des"
       env: TEST_SET=des
-    - name: "sha512"
-      env: TEST_SET=sha512
+    - name: "genericfir"
+      env: TEST_SET=genericfir
   allow_failures:
-    - name: "sha512"
-      env: TEST_SET=sha512
+    - name: "genericfir"
+      env: TEST_SET=genericfir
 
 install:
   - sh travisCI/travisBuild.sh
diff --git a/run_designs.py b/run_designs.py
index c83b1858..045063c1 100644
--- a/run_designs.py
+++ b/run_designs.py
@@ -73,14 +73,6 @@ args = parser.parse_args()
 
 regression = args.regression
 tag = args.tag
-if args.print_rem is not None:
-        if float(args.print_rem) > 0:
-                print_rem_time = float(args.print_rem)
-        else:
-                print_rem_time = None
-else:
-        print_rem_time = None
-
 if args.defaultTestSet:
         designs= [x  for x in os.listdir('./designs/')]
         for i in designs:
@@ -99,6 +91,16 @@ for excluded_design in excluded_designs:
 
 show_log_output = args.show_output & (len(designs) == 1) & (args.regression is None)
 
+
+if args.print_rem is not None and show_log_output == False:
+        if float(args.print_rem) > 0:
+                print_rem_time = float(args.print_rem)
+        else:
+                print_rem_time = None
+else:
+        print_rem_time = None
+
+
 if print_rem_time is not None:
         rem_designs = dict.fromkeys(designs, 1)
 
@@ -336,6 +338,9 @@ if regression is not None:
         base_path = utils.get_design_path(design=design)
         if base_path is None:
             print("{design} not found, skipping...".format(design=design))
+            if print_rem_time is not None:
+                if design in rem_designs.keys():
+                        rem_designs.pop(design)
             continue
         design_name= get_design_name(design, config)
         base_config_path=base_path+"base_config.tcl"
@@ -365,6 +370,13 @@ if regression is not None:
             que.put((design, config_tag, config_tag,design_name))
 else:
     for design in designs:
+        base_path = utils.get_design_path(design=design)
+        if base_path is None:
+            print("{design} not found, skipping...".format(design=design))
+            if print_rem_time is not None:
+                if design in rem_designs.keys():
+                        rem_designs.pop(design)
+            continue
         default_config_tag = "config_{tag}".format(tag=tag)
         design_name= get_design_name(design, config)
         que.put((design, config, default_config_tag,design_name))
diff --git a/travisCI/travisTest.sh b/travisCI/travisTest.sh
index 89ba8f89..cc83f141 100644
--- a/travisCI/travisTest.sh
+++ b/travisCI/travisTest.sh
@@ -18,7 +18,7 @@ export PDK_ROOT=$(pwd)/pdks
 export RUN_ROOT=$(pwd)
 echo $PDK_ROOT
 echo $RUN_ROOT
-docker run -it -v $RUN_ROOT:/openLANE_flow -v $PDK_ROOT:$PDK_ROOT -e PDK_ROOT=$PDK_ROOT -u $(id -u $USER):$(id -g $USER) openlane:rc4  bash -c "python3 run_designs.py -d $(cat $RUN_ROOT/travisCI/$test_set) -t TEST_$test_set -dl -dt -th 20 -b regression_results/benchmark_results/SW_HD.csv -p 30"
+docker run -it -v $RUN_ROOT:/openLANE_flow -v $PDK_ROOT:$PDK_ROOT -e PDK_ROOT=$PDK_ROOT -u $(id -u $USER):$(id -g $USER) openlane:rc4  bash -c "python3 run_designs.py -d $(cat $RUN_ROOT/travisCI/$test_set) -t TEST_$test_set -dl -dt -th 20 -b regression_results/benchmark_results/SW_HD.csv -p 30 -so"
 
 FILE=$RUN_ROOT/regression_results/TEST_$test_set/TEST_${test_set}_design_test_report.csv
 echo "Verbose Differences with the Benchmark"