Merge remote-tracking branch 'private/master' into secure-gpl-binSize-float

gudeh · gudeh · commit 92e96d8658e4 · 2025-01-22T18:02:52.000Z
diff --git a/flow/designs/gf12/swerv_wrapper/metadata-base-ok.json b/flow/designs/gf12/swerv_wrapper/metadata-base-ok.json
diff --git a/flow/designs/gf12/swerv_wrapper/rules-base.json b/flow/designs/gf12/swerv_wrapper/rules-base.json
@@ -32,7 +32,7 @@
         "compare": "<="
     },
     "detailedroute__route__wirelength": {
-        "value": 2491797,
+        "value": 2269978,
         "compare": "<="
     },
     "detailedroute__route__drc_errors": {
@@ -60,7 +60,7 @@
         "compare": "<="
     },
     "finish__timing__drv__hold_violation_count": {
-        "value": 538,
+        "value": 778,
         "compare": "<="
     },
     "finish__timing__wns_percent_delay": {
diff --git a/flow/designs/nangate45/gcd/autotuner.json b/flow/designs/nangate45/gcd/autotuner.json
@@ -1,22 +1,14 @@
 {
-    "_SDC_FILE_PATH": "constraints.sdc",
+    "_SDC_FILE_PATH": "constraint.sdc",
     "_SDC_CLK_PERIOD": {
         "type": "float",
         "minmax": [
-            200,
-            400
+            0.3,
+            1.0
         ],
         "step": 0
     },
-    "CORE_ASPECT_RATIO": {
-        "type": "float",
-        "minmax": [
-            0.5,
-            2.0
-        ],
-        "step": 0
-    },
-    "CORE_MARGIN": {
+   "CORE_MARGIN": {
         "type": "int",
         "minmax": [
             2,
@@ -27,16 +19,16 @@
     "CELL_PAD_IN_SITES_GLOBAL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            1,
-            5
+            0,
+            3
         ],
         "step": 1
     },
     "CELL_PAD_IN_SITES_DETAIL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            1,
-            5
+            0,
+            3
         ],
         "step": 1
     },
@@ -47,12 +39,12 @@
             0.3
         ],
         "step": 0
-    },
+    },	
     "PLACE_DENSITY_LB_ADDON": {
         "type": "float",
         "minmax": [
             0.0,
-            0.99
+            0.2
         ],
         "step": 0
     },
@@ -72,5 +64,5 @@
         ],
         "step": 1
     },
-    "_FR_FILE_PATH": "fastroute.tcl"
+    "_FR_FILE_PATH": "../../../platforms/nangate45/fastroute.tcl"
 }
diff --git a/flow/designs/sky130hd/microwatt/config.mk b/flow/designs/sky130hd/microwatt/config.mk
@@ -33,6 +33,9 @@ export SKIP_GATE_CLONING = 1
 
 export SETUP_SLACK_MARGIN = 0.2
 
+# GRT non-default config
+export FASTROUTE_TCL = $(DESIGN_HOME)/$(PLATFORM)/$(DESIGN_NICKNAME)/fastroute.tcl
+
 # This is high, some SRAMs should probably be converted
 # to real SRAMs and not instantiated as flops
 export SYNTH_MEMORY_MAX_BITS ?= 42000
diff --git a/flow/designs/sky130hd/microwatt/fastroute.tcl b/flow/designs/sky130hd/microwatt/fastroute.tcl
@@ -0,0 +1,5 @@
+set_global_routing_layer_adjustment $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER) 0.15
+
+set_routing_layers -clock $::env(MIN_CLK_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER)
+set_routing_layers -signal $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER)
+
diff --git a/flow/scripts/detail_route.tcl b/flow/scripts/detail_route.tcl
@@ -58,6 +58,8 @@ if {![env_var_equals SKIP_ANTENNA_REPAIR_POST_DRT 1]} {
     detailed_route {*}$all_args
     incr repair_antennas_iters
   }
+} else {
+  utl::metric_int "antenna_diodes_count" -1
 }
 
 if { [env_var_exists_and_non_empty POST_DETAIL_ROUTE_TCL] } {
diff --git a/flow/scripts/global_place.tcl b/flow/scripts/global_place.tcl
@@ -10,9 +10,7 @@ fast_route
 set global_placement_args {}
 
 # Parameters for routability mode in global placement
-if {$::env(GPL_ROUTABILITY_DRIVEN)} {
-  lappend global_placement_args {-routability_driven}
-}
+append_env_var global_placement_args GPL_ROUTABILITY_DRIVEN -routability_driven 0
 
 # Parameters for timing driven mode in global placement
 if {$::env(GPL_TIMING_DRIVEN)} {
diff --git a/jenkins/public_nightly.Jenkinsfile b/jenkins/public_nightly.Jenkinsfile
@@ -1,4 +1,4 @@
-@Library('utils@orfs-v2.2.3') _
+@Library('utils@orfs-v2.2.4') _
 
 node {
 
diff --git a/jenkins/public_tests_all.Jenkinsfile b/jenkins/public_tests_all.Jenkinsfile
@@ -1,4 +1,4 @@
-@Library('utils@orfs-v2.2.3') _
+@Library('utils@orfs-v2.2.4') _
 
 node {
 

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,8 @@ if {![env_var_equals SKIP_ANTENNA_REPAIR_POST_DRT 1]} {`
`58`	`58`	`detailed_route {*}$all_args`
`59`	`59`	`incr repair_antennas_iters`
`60`	`60`	`}`
	`61`	`+} else {`
	`62`	`+ utl::metric_int "antenna_diodes_count" -1`
`61`	`63`	`}`
`62`	`64`
`63`	`65`	`if { [env_var_exists_and_non_empty POST_DETAIL_ROUTE_TCL] } {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@Library('[email protected].3') _`
	`1`	`+@Library('[email protected].4') _`
`2`	`2`
`3`	`3`	`node {`
`4`	`4`