Merge pull request #3197 from The-OpenROAD-Project-staging/secure-remove_fast_route_calls

maliberty · web-flow · commit 5443cc6caa98 · 2025-05-29T12:22:57.000-07:00
remove redundant fast_route calls
diff --git a/flow/designs/gf12/bp_single/fastroute.tcl b/flow/designs/gf12/bp_single/fastroute.tcl
@@ -5,5 +5,3 @@ set_global_routing_layer_adjustment K1-K4 0.45
 
 set_routing_layers -signal $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER) -clock  K1-$::env(MAX_ROUTING_LAYER)
 
-set_macro_extension 1
-
diff --git a/flow/designs/gf12/ca53/fastroute.tcl b/flow/designs/gf12/ca53/fastroute.tcl
@@ -4,4 +4,4 @@ set_global_routing_layer_adjustment C4-K4 0.5
 #set_global_routing_layer_adjustment H1-H2 0.5
 
 set_routing_layers -signal M2-$::env(MAX_ROUTING_LAYER) -clock  K1-$::env(MAX_ROUTING_LAYER)
-set_macro_extension 2
+
diff --git a/flow/scripts/detail_route.tcl b/flow/scripts/detail_route.tcl
@@ -46,8 +46,6 @@ set all_args [concat [list \
 
 log_cmd detailed_route {*}$all_args
 
-fast_route
-
 if {![env_var_equals SKIP_ANTENNA_REPAIR_POST_DRT 1]} {
   set repair_antennas_iters 1
   if {[repair_antennas]} {
diff --git a/flow/scripts/global_route.tcl b/flow/scripts/global_route.tcl
@@ -10,8 +10,6 @@ proc global_route_helper {} {
     source $::env(PRE_GLOBAL_ROUTE)
   }
 
-  fast_route
-
   proc do_global_route {} {
     set all_args [concat [list \
       -congestion_report_file $::global_route_congestion_report] \
diff --git a/flow/scripts/open.tcl b/flow/scripts/open.tcl
@@ -69,4 +69,3 @@ if {[env_var_equals GUI_TIMING 1]} {
   }
 }
 
-fast_route
diff --git a/flow/scripts/util.tcl b/flow/scripts/util.tcl
@@ -19,9 +19,6 @@ proc fast_route {} {
   } else {
     log_cmd set_global_routing_layer_adjustment $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER) $::env(ROUTING_LAYER_ADJUSTMENT)
     log_cmd set_routing_layers -signal $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER)
-    if {[env_var_exists_and_non_empty MACRO_EXTENSION]} {
-      log_cmd set_macro_extension $::env(MACRO_EXTENSION)
-    }
   }
 }
 
diff --git a/flow/tutorials/scripts/drt/drc_fix.tcl b/flow/tutorials/scripts/drt/drc_fix.tcl
@@ -8,7 +8,6 @@ read_sdc ./gcd/gcd.sdc
 # global_route
 set_global_routing_layer_adjustment met1-met5 0.5
 set_routing_layers -signal met1-met5
-set_macro_extension 2
 global_route -guide_file [make_result_file route.guide] \
              -congestion_iterations 100 \
              -verbose
diff --git a/flow/tutorials/scripts/drt/drc_issue.tcl b/flow/tutorials/scripts/drt/drc_issue.tcl
@@ -8,7 +8,6 @@ read_sdc ./gcd/gcd.sdc
 # global_route
 set_global_routing_layer_adjustment met1-met5 0.5
 set_routing_layers -signal met1-met5
-set_macro_extension 2
 global_route -guide_file [make_result_file route.guide] \
              -congestion_iterations 100 \
              -verbose
diff --git a/flow/util/write_net_rc_script.tcl b/flow/util/write_net_rc_script.tcl
@@ -12,7 +12,6 @@ if {[env_var_exists_and_non_empty FASTROUTE_TCL]} {
 } else {
   set_global_routing_layer_adjustment $env(MIN_ROUTING_LAYER)-$env(MAX_ROUTING_LAYER) 0.5
   set_routing_layers -signal $env(MIN_ROUTING_LAYER)-$env(MAX_ROUTING_LAYER)
-  set_macro_extension 2
 }
 
 global_route -congestion_iterations 100
diff --git a/tools/OpenROAD b/tools/OpenROAD
@@ -1 +1 @@
-Subproject commit 5e7c8c4f45b21ff3e550cd9dc27070dd48ff4498
+Subproject commit 6c13d24b282c9f8f46975ea18f1762c056486f89

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,3 @@ set_global_routing_layer_adjustment K1-K4 0.45`
`5`	`5`
`6`	`6`	`set_routing_layers -signal $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER) -clock K1-$::env(MAX_ROUTING_LAYER)`
`7`	`7`
`8`		`-set_macro_extension 1`
`9`		`-`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,6 @@ proc global_route_helper {} {`
`10`	`10`	`source $::env(PRE_GLOBAL_ROUTE)`
`11`	`11`	`}`
`12`	`12`
`13`		`- fast_route`
`14`		`-`
`15`	`13`	`proc do_global_route {} {`
`16`	`14`	`set all_args [concat [list \`
`17`	`15`	`-congestion_report_file $::global_route_congestion_report] \`
Original file line number	Diff line number	Diff line change
`@@ -69,4 +69,3 @@ if {[env_var_equals GUI_TIMING 1]} {`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`-fast_route`
Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,6 @@ proc fast_route {} {`
`19`	`19`	`} else {`
`20`	`20`	`log_cmd set_global_routing_layer_adjustment $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER) $::env(ROUTING_LAYER_ADJUSTMENT)`
`21`	`21`	`log_cmd set_routing_layers -signal $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER)`
`22`		`- if {[env_var_exists_and_non_empty MACRO_EXTENSION]} {`
`23`		`- log_cmd set_macro_extension $::env(MACRO_EXTENSION)`
`24`		`- }`
`25`	`22`	`}`
`26`	`23`	`}`
`27`	`24`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ if {[env_var_exists_and_non_empty FASTROUTE_TCL]} {`
`12`	`12`	`} else {`
`13`	`13`	`set_global_routing_layer_adjustment $env(MIN_ROUTING_LAYER)-$env(MAX_ROUTING_LAYER) 0.5`
`14`	`14`	`set_routing_layers -signal $env(MIN_ROUTING_LAYER)-$env(MAX_ROUTING_LAYER)`
`15`		`- set_macro_extension 2`
`16`	`15`	`}`
`17`	`16`
`18`	`17`	`global_route -congestion_iterations 100`