restore files with conflicts, rerun secure-CI

Signed-off-by: Augusto Berndt <[email protected]>

Author: gudeh

flow/designs/asap7/mock-array/Element/config.mk

@@ -27,7 +27,7 @@ export IO_CONSTRAINTS         = designs/asap7/mock-array/Element/io.tcl
 export PDN_TCL                = $(FLOW_HOME)/platforms/asap7/openRoad/pdn/BLOCK_grid_strategy.tcl
 
 # Detailed routing should be easy, limit iterations
-export DETAILED_ROUTE_END_ITERATION = 6
+export DETAILED_ROUTE_END_ITERATION ?= 6
 
 export MIN_ROUTING_LAYER = M2
 # M5 is the top PDN layer, so don't exceed that.

flow/designs/asap7/mock-array/config.mk

@@ -57,7 +57,7 @@ power:
 	$(OPENSTA_EXE) -no_init -exit designs/asap7/mock-array/power.tcl
 
 # Routing by abutment should be easy, limit iterations
-export DETAILED_ROUTE_END_ITERATION = 6
+export DETAILED_ROUTE_END_ITERATION ?= 6
 
 export MAX_ROUTING_LAYER = M9
 export ROUTING_LAYER_ADJUSTMENT = 0.45

flow/designs/gf180/ibex/metadata-base-ok.json

@@ -28,7 +28,7 @@
         "compare": "<="
     },
     "globalroute__antenna_diodes_count": {
-        "value": 15,
+        "value": 18,
         "compare": "<="
     },
     "detailedroute__route__wirelength": {
@@ -48,11 +48,11 @@
         "compare": "<="
     },
     "finish__timing__setup__ws": {
-        "value": -2.03,
+        "value": -1.91,
         "compare": ">="
     },
     "finish__design__instance__area": {
-        "value": 924710,
+        "value": 936597,
         "compare": "<="
     },
     "finish__timing__drv__setup_violation_count": {
@@ -64,7 +64,7 @@
         "compare": "<="
     },
     "finish__timing__wns_percent_delay": {
-        "value": -29.27,
+        "value": -28.08,
         "compare": ">="
     }
 }

flow/designs/gf180/ibex/rules-base.json

@@ -48,7 +48,7 @@
         "compare": "<="
     },
     "finish__timing__setup__ws": {
-        "value": -2.72,
+        "value": -3.55,
         "compare": ">="
     },
     "finish__design__instance__area": {

flow/designs/sky130hd/microwatt/metadata-base-ok.json

@@ -28,11 +28,11 @@
         "compare": "<="
     },
     "globalroute__antenna_diodes_count": {
-        "value": 25,
+        "value": 36,
         "compare": "<="
     },
     "detailedroute__route__wirelength": {
-        "value": 800273,
+        "value": 787855,
         "compare": "<="
     },
     "detailedroute__route__drc_errors": {
@@ -44,15 +44,15 @@
         "compare": "<="
     },
     "detailedroute__antenna_diodes_count": {
-        "value": 20,
+        "value": 14,
         "compare": "<="
     },
     "finish__timing__setup__ws": {
         "value": 0.0,
         "compare": ">="
     },
     "finish__design__instance__area": {
-        "value": 285126,
+        "value": 280694,
         "compare": "<="
     },
     "finish__timing__drv__setup_violation_count": {