Merge pull request #676 from eder-matheus/secure-remove_macro_extension

eder-matheus · web-flow · commit 525677485c40 · 2022-12-07T18:20:04.000-03:00
remove macro extensions from platforms that do not need it
diff --git a/flow/designs/sky130hd/chameleon/config.mk b/flow/designs/sky130hd/chameleon/config.mk
@@ -45,7 +45,6 @@ export ADDITIONAL_LEFS  = $(chameleon_DIR)/lef/apb_sys_0.lef \
                           $(chameleon_DIR)/lef/ibex_wrapper.lef
 
 export MACRO_PLACEMENT = $(chameleon_DIR)/chameleon.macro_placment.cfg
-export MACRO_EXTENSION = 1
 
 export FP_PDN_RAIL_WIDTH = 0.48
 export FP_PDN_RAIL_OFFSET = 0
diff --git a/flow/platforms/nangate45/fastroute.tcl b/flow/platforms/nangate45/fastroute.tcl
@@ -2,4 +2,3 @@ set_global_routing_layer_adjustment metal2-metal3 0.5
 set_global_routing_layer_adjustment metal4-$::env(MAX_ROUTING_LAYER) 0.25
 
 set_routing_layers -signal $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER)
-set_macro_extension 2
diff --git a/flow/platforms/sky130hd/fastroute.tcl b/flow/platforms/sky130hd/fastroute.tcl
@@ -2,6 +2,3 @@ set_global_routing_layer_adjustment $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING
 
 set_routing_layers -signal $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER)
 
-if {[info exist env(MACRO_EXTENSION)]} {
-  set_macro_extension $::env(MACRO_EXTENSION)
-}
diff --git a/flow/platforms/sky130hd_fakestack/fastroute.tcl b/flow/platforms/sky130hd_fakestack/fastroute.tcl
@@ -2,6 +2,3 @@ set_global_routing_layer_adjustment $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING
 
 set_routing_layers -signal $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER)
 
-if {[info exist env(MACRO_EXTENSION)]} {
-  set_macro_extension $::env(MACRO_EXTENSION)
-}
diff --git a/flow/scripts/global_route.tcl b/flow/scripts/global_route.tcl
@@ -11,7 +11,6 @@ if {[info exist env(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 -guide_file $env(RESULTS_DIR)/route.guide \
diff --git a/tools/OpenROAD b/tools/OpenROAD
@@ -1 +1 @@
-Subproject commit 2a9ef5fa175f38558e01681e98a7572316b3b17b
+Subproject commit 1aa79fc4da6f45d59745809f26f800aa8e52cc62

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,3 @@ set_global_routing_layer_adjustment metal2-metal3 0.5`
`2`	`2`	`set_global_routing_layer_adjustment metal4-$::env(MAX_ROUTING_LAYER) 0.25`
`3`	`3`
`4`	`4`	`set_routing_layers -signal $::env(MIN_ROUTING_LAYER)-$::env(MAX_ROUTING_LAYER)`
`5`		`-set_macro_extension 2`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ if {[info exist env(FASTROUTE_TCL)]} {`
`11`	`11`	`} else {`
`12`	`12`	`set_global_routing_layer_adjustment $env(MIN_ROUTING_LAYER)-$env(MAX_ROUTING_LAYER) 0.5`
`13`	`13`	`set_routing_layers -signal $env(MIN_ROUTING_LAYER)-$env(MAX_ROUTING_LAYER)`
`14`		`- set_macro_extension 2`
`15`	`14`	`}`
`16`	`15`
`17`	`16`	`global_route -guide_file $env(RESULTS_DIR)/route.guide \`