Merge pull request The-OpenROAD-Project#3604 from Pinata-Consulting/repair-timing-global-var-eyesore-fix

floorplan: fix global variable eyesore

Author: maliberty

flow/scripts/floorplan.tcl

@@ -139,9 +139,7 @@ if { [env_var_equals REMOVE_ABC_BUFFERS 1] } {
   remove_buffers
 } else {
   # Skip clone & split
-  set ::env(SETUP_MOVE_SEQUENCE) "unbuffer,sizeup,swap,buffer,vt_swap"
-  set ::env(SKIP_LAST_GASP) 1
-  repair_timing_helper -setup
+  repair_timing_helper -setup -skip_last_gasp -sequence "unbuffer,sizeup,swap,buffer,vt_swap"
 }
 
 puts "Default units for flow"

flow/scripts/util.tcl

@@ -14,7 +14,7 @@ proc log_cmd { cmd args } {
 }
 
 proc repair_timing_helper { args } {
-  set additional_args "$args -verbose"
+  set additional_args {}
   append_env_var additional_args SETUP_SLACK_MARGIN -setup_margin 1
   append_env_var additional_args HOLD_SLACK_MARGIN -hold_margin 1
   append_env_var additional_args SETUP_MOVE_SEQUENCE -sequence 1
@@ -26,6 +26,8 @@ proc repair_timing_helper { args } {
   append_env_var additional_args SKIP_VT_SWAP -skip_vt_swap 0
   append_env_var additional_args SKIP_CRIT_VT_SWAP -skip_crit_vt_swap 0
   append_env_var additional_args MATCH_CELL_FOOTPRINT -match_cell_footprint 0
+  lappend additional_args {*}$args -verbose
+
   log_cmd repair_timing {*}$additional_args
 }