Merge pull request #3274 from The-OpenROAD-Project-staging/secure-floorplan-setup-only

maliberty · web-flow · commit e72804722145 · 2025-06-27T18:59:22.000-07:00
Only do setup repair in floorplan.tcl
diff --git a/flow/designs/gf12/coyote/rules-base.json b/flow/designs/gf12/coyote/rules-base.json
@@ -32,11 +32,11 @@
         "compare": "<="
     },
     "detailedroute__route__wirelength": {
-        "value": 5770855,
+        "value": 5678019,
         "compare": "<="
     },
     "detailedroute__route__drc_errors": {
-        "value": 0,
+        "value": 1,
         "compare": "<="
     },
     "detailedroute__antenna__violating__nets": {
@@ -60,7 +60,7 @@
         "compare": "<="
     },
     "finish__timing__drv__hold_violation_count": {
-        "value": 100,
+        "value": 266,
         "compare": "<="
     },
     "finish__timing__wns_percent_delay": {
diff --git a/flow/scripts/floorplan.tcl b/flow/scripts/floorplan.tcl
@@ -102,7 +102,7 @@ if { [env_var_equals REMOVE_ABC_BUFFERS 1] } {
   # Skip clone & split
   set ::env(SETUP_MOVE_SEQUENCE) "unbuffer,sizeup,swap,buffer"
   set ::env(SKIP_LAST_GASP) 1
-  repair_timing_helper 0
+  repair_timing_helper -setup
 }
 
 puts "Default units for flow"
diff --git a/flow/scripts/util.tcl b/flow/scripts/util.tcl
@@ -22,10 +22,10 @@ proc fast_route {} {
   }
 }
 
-proc repair_timing_helper { {hold_margin 1} } {
-  set additional_args "-verbose"
+proc repair_timing_helper { args } {
+  set additional_args "$args -verbose"
   append_env_var additional_args SETUP_SLACK_MARGIN -setup_margin 1
-  if {$hold_margin || $::env(HOLD_SLACK_MARGIN) < 0} {
+  if {$::env(HOLD_SLACK_MARGIN) < 0} {
     append_env_var additional_args HOLD_SLACK_MARGIN -hold_margin 1
   }
   append_env_var additional_args SETUP_MOVE_SEQUENCE -sequence 1
diff --git a/tools/OpenROAD b/tools/OpenROAD
@@ -1 +1 @@
-Subproject commit e743761ef889c67a4cc3475b23be78358c9f5ace
+Subproject commit c79c8317e05ecbf45eba5096a74cb421ab97b7ae

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ if { [env_var_equals REMOVE_ABC_BUFFERS 1] } {`
`102`	`102`	`# Skip clone & split`
`103`	`103`	`set ::env(SETUP_MOVE_SEQUENCE) "unbuffer,sizeup,swap,buffer"`
`104`	`104`	`set ::env(SKIP_LAST_GASP) 1`
`105`		`- repair_timing_helper 0`
	`105`	`+ repair_timing_helper -setup`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`puts "Default units for flow"`
Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,10 @@ proc fast_route {} {`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`
`25`		`-proc repair_timing_helper { {hold_margin 1} } {`
`26`		`- set additional_args "-verbose"`
	`25`	`+proc repair_timing_helper { args } {`
	`26`	`+ set additional_args "$args -verbose"`
`27`	`27`	`append_env_var additional_args SETUP_SLACK_MARGIN -setup_margin 1`
`28`		`- if {$hold_margin \|\| $::env(HOLD_SLACK_MARGIN) < 0} {`
	`28`	`+ if {$::env(HOLD_SLACK_MARGIN) < 0} {`
`29`	`29`	`append_env_var additional_args HOLD_SLACK_MARGIN -hold_margin 1`
`30`	`30`	`}`
`31`	`31`	`append_env_var additional_args SETUP_MOVE_SEQUENCE -sequence 1`