Merge branch 'master' into secure-gpl-log-less-mysterious

Signed-off-by: Matt Liberty <[email protected]>

Author: maliberty

flow/designs/asap7/aes-block/rules-base.json

@@ -24,7 +24,7 @@
         "compare": "<="
     },
     "cts__design__instance__count__hold_buffer": {
-        "value": 1024,
+        "value": 1491,
         "compare": "<="
     },
     "globalroute__antenna_diodes_count": {
@@ -48,7 +48,7 @@
         "compare": "<="
     },
     "finish__timing__setup__ws": {
-        "value": -119.26,
+        "value": -118.73,
         "compare": ">="
     },
     "finish__design__instance__area": {
@@ -60,7 +60,7 @@
         "compare": "<="
     },
     "finish__timing__drv__hold_violation_count": {
-        "value": 100,
+        "value": 419,
         "compare": "<="
     },
     "finish__timing__wns_percent_delay": {

flow/designs/nangate45/bp_be_top/config.mk

@@ -3,12 +3,6 @@ export DESIGN_NAME = bp_be_top
 export PLATFORM    = nangate45
 
 export SYNTH_HIERARCHICAL = 1
-#
-# RTL_MP Settings
-export RTLMP_MAX_INST = 30000
-export RTLMP_MIN_INST = 5000
-export RTLMP_MAX_MACRO = 12
-export RTLMP_MIN_MACRO = 4 
 
 export VERILOG_FILES = $(DESIGN_HOME)/src/$(DESIGN_NAME)/pickled.v \
                        $(DESIGN_HOME)/$(PLATFORM)/$(DESIGN_NAME)/macros.v

flow/designs/sky130hd/microwatt/rules-base.json

@@ -40,15 +40,15 @@
         "compare": "<="
     },
     "detailedroute__antenna__violating__nets": {
-        "value": 1,
+        "value": 3,
         "compare": "<="
     },
     "detailedroute__antenna_diodes_count": {
-        "value": 1899,
+        "value": 3636,
         "compare": "<="
     },
     "finish__timing__setup__ws": {
-        "value": -3.1,
+        "value": -2.62,
         "compare": ">="
     },
     "finish__design__instance__area": {
@@ -64,7 +64,7 @@
         "compare": "<="
     },
     "finish__timing__wns_percent_delay": {
-        "value": -21.69,
+        "value": -21.23,
         "compare": ">="
     }
 }

flow/test/test_autotuner.sh

@@ -41,7 +41,7 @@ echo "Running Autotuner plotting smoke test"
 all_experiments=$(ls -d ./flow/logs/${PLATFORM}/${DESIGN_NAME}/smoke-test-tune*)
 all_experiments=$(basename -a $all_experiments)
 for expt in $all_experiments; do
-  python3 tools/AutoTuner/src/autotuner/utils/plot.py \
+  python3 tools/AutoTuner/scripts/plot.py \
     --platform ${PLATFORM} \
     --design ${DESIGN_NAME} \
     --experiment $expt

…ls/AutoTuner/src/autotuner/utils/plot.py tools/AutoTuner/scripts/plot.pytools/AutoTuner/src/autotuner/utils/plot.py renamed to tools/AutoTuner/scripts/plot.py tools/AutoTuner/src/autotuner/utils/plot.py renamed to tools/AutoTuner/scripts/plot.py

@@ -50,7 +50,7 @@
 METRIC = "metric"
 
 cur_dir = os.path.dirname(os.path.abspath(__file__))
-root_dir = os.path.join(cur_dir, "../../../../../")
+root_dir = os.path.join(cur_dir, "../../../")
 os.chdir(root_dir)
 
 
@@ -91,6 +91,8 @@ def load_dir(dir: str) -> pd.DataFrame:
             params.append(_dict)
         except Exception as e:
             failed.append(metrics_fname)
+            print("Failed to load", metrics_fname)
+            print(e)
             continue
 
     # Merge all dataframe

tools/AutoTuner/src/autotuner/utils.py

@@ -332,7 +332,7 @@ def openroad(
         stdout_file=os.path.join(log_path, "make-finish-stdout.log"),
     )
 
-    metrics_file = os.path.abspath(os.path.join(report_path, "metrics.json"))
+    metrics_file = os.path.abspath(os.path.join(log_path, "metrics.json"))
     metrics_command = export_command
     metrics_command += f"{base_dir}/flow/util/genMetrics.py -x"
     metrics_command += f" -v {flow_variant}"