Merge pull request #2733 from AcKoucher/secure-remove-macro-place-cha…

…nnel remove MACRO_PLACE_CHANNEL
The-OpenROAD-Project · Jan 29, 2025 · d846560 · d846560
2 parents 97497e0 + 912d736
commit d846560
Showing 34 changed files with 11 additions and 55 deletions.
diff --git a/docs/user/FlowVariables.md b/docs/user/FlowVariables.md
@@ -116,7 +116,6 @@ configuration file.
 | <a name="MACRO_HALO_Y"></a>MACRO_HALO_Y| Set macro halo for y-direction. Only available for ASAP7 PDK.| | |
 | <a name="MACRO_PLACEMENT"></a>MACRO_PLACEMENT| Specifies the path of a file on how to place certain macros manually using read_macro_placement.| | |
 | <a name="MACRO_PLACEMENT_TCL"></a>MACRO_PLACEMENT_TCL| Specifies the path of a TCL file on how to place certain macros manually.| | |
-| <a name="MACRO_PLACE_CHANNEL"></a>MACRO_PLACE_CHANNEL| Horizontal/vertical channel width between macros (microns). Used by automatic macro placement. Imagine channel=10 and halo=5. Then macros must be 10 apart but standard cells must be 5 away from a macro.| | |
 | <a name="MACRO_PLACE_HALO"></a>MACRO_PLACE_HALO| Horizontal/vertical halo around macros (microns). Used by automatic macro placement.| | |
 | <a name="MACRO_WRAPPERS"></a>MACRO_WRAPPERS| The wrapper file that replaces existing macros with their wrapped version.| | |
 | <a name="MAKE_TRACKS"></a>MAKE_TRACKS| Tcl file that defines add routing tracks to a floorplan.| | |
@@ -230,7 +229,6 @@ configuration file.
 - [MACRO_HALO_Y](#MACRO_HALO_Y)
 - [MACRO_PLACEMENT](#MACRO_PLACEMENT)
 - [MACRO_PLACEMENT_TCL](#MACRO_PLACEMENT_TCL)
-- [MACRO_PLACE_CHANNEL](#MACRO_PLACE_CHANNEL)
 - [MACRO_PLACE_HALO](#MACRO_PLACE_HALO)
 - [MACRO_WRAPPERS](#MACRO_WRAPPERS)
 - [MAKE_TRACKS](#MAKE_TRACKS)

diff --git a/flow/designs/asap7/riscv32i/config.mk b/flow/designs/asap7/riscv32i/config.mk
@@ -25,7 +25,6 @@ export CORE_AREA = 5 5 75 85
 export PLACE_DENSITY_LB_ADDON = 0.10
 
 export PLACE_PINS_ARGS    = -exclude left:* -exclude right:* -exclude top:*
-export MACRO_PLACE_HALO    = 1 1
-export MACRO_PLACE_CHANNEL = 6 6
-#
+export MACRO_PLACE_HALO    = 2 2
+
 export TNS_END_PERCENT   = 100
diff --git a/flow/designs/gf12/ariane/config.mk b/flow/designs/gf12/ariane/config.mk
@@ -25,8 +25,6 @@ export PLACE_DENSITY ?= 0.50
 export PLACE_PINS_ARGS = -exclude left:0-150 -exclude left:450-600 -exclude right:* -exclude top:* -exclude bottom:*
 
 export MACRO_PLACE_HALO = 7 7 
-export MACRO_PLACE_CHANNEL = 14 14
-
 export MACRO_WRAPPERS = $(DESIGN_HOME)/$(PLATFORM)/$(DESIGN_NICKNAME)/wrappers.tcl
 
 ifeq ($(USE_FILL),1)

diff --git a/flow/designs/gf12/ariane133/config.mk b/flow/designs/gf12/ariane133/config.mk
@@ -4,8 +4,6 @@ export PLATFORM    = gf12
 
 export SYNTH_HIERARCHICAL = 1
 export MAX_UNGROUP_SIZE ?= 10000
-#
-# RTL_MP Settings
 
 export VERILOG_FILES = $(PLATFORM_DIR)/ariane133/ariane.v
 
@@ -22,7 +20,6 @@ export CORE_AREA   = 5 5 895 745
 export PLACE_PINS_ARGS = -exclude left:0-200 -exclude left:500-700 -exclude right:* -exclude top:* -exclude bottom:*
 
 export MACRO_PLACE_HALO = 7 7
-export MACRO_PLACE_CHANNEL = 14 14
 
 export PLACE_DENSITY_LB_ADDON = 0.05
 

diff --git a/flow/designs/gf12/bp_dual/config.mk b/flow/designs/gf12/bp_dual/config.mk
@@ -65,6 +65,4 @@ export MACRO_WRAPPERS = $(PLATFORM_DIR)/bp/wrappers/wrappers.tcl
 
 export PDN_TCL = $(PLATFORM_DIR)/cfg/pdn_grid_strategy_13m_9T.top.tcl
 
-# Define macro halo and channel spacings
-export MACRO_PLACE_HALO = 7 7
-export MACRO_PLACE_CHANNEL = 14 14
+export MACRO_PLACE_HALO = 7 7
diff --git a/flow/designs/gf12/bp_quad/config.mk b/flow/designs/gf12/bp_quad/config.mk
@@ -47,6 +47,4 @@ export MACRO_WRAPPERS = $(PLATFORM_DIR)/bp/wrappers/wrappers.tcl
 
 export PDN_TCL = $(PLATFORM_DIR)/cfg/pdn_grid_strategy_13m_9T.top.tcl
 
-# Define macro halo and channel spacings
 export MACRO_PLACE_HALO = 5 5 
-export MACRO_PLACE_CHANNEL = 10 10
diff --git a/flow/designs/gf12/ca53/config.mk b/flow/designs/gf12/ca53/config.mk
@@ -51,7 +51,6 @@ export PLACE_DENSITY_LB_ADDON = 0.05
 export PLACE_PINS_ARGS = -exclude left:0-600 -exclude left:1350-1400 -exclude right:* -exclude top:* -exclude bottom:*
 
 export MACRO_PLACE_HALO = 7 7
-export MACRO_PLACE_CHANNEL = 14 14
 
 export MACRO_WRAPPERS = $(dir $(DESIGN_CONFIG))/wrappers.tcl
 

diff --git a/flow/designs/gf12/swerv_wrapper/config.mk b/flow/designs/gf12/swerv_wrapper/config.mk
@@ -35,7 +35,6 @@ export PLACE_DENSITY_LB_ADDON = 0.05
 export MACRO_WRAPPERS = $(DESIGN_HOME)/$(PLATFORM)/$(DESIGN_NICKNAME)/wrappers.tcl
 #
 export MACRO_PLACE_HALO = 7 7
-export MACRO_PLACE_CHANNEL = 14 14
 
 ifeq ($(USE_FILL),1)
 export DESIGN_TYPE = CELL

diff --git a/flow/designs/gf180/uart-blocks/config.mk b/flow/designs/gf180/uart-blocks/config.mk
@@ -15,7 +15,6 @@ export CORE_AREA = 10 10 420 420
 export PLACE_PINS_ARGS    = -exclude bottom:* -exclude top:* -exclude right:*
 
 export MACRO_PLACE_HALO = 20 20
-export MACRO_PLACE_CHANNEL = 20 20
 
 export PDN_TCL = $(DESIGN_HOME)/$(PLATFORM)/$(DESIGN_NICKNAME)/BLOCKS_grid_strategy.tcl
 export PLACE_DENSITY          = 0.60

diff --git a/flow/designs/nangate45/ariane133/config.mk b/flow/designs/nangate45/ariane133/config.mk
@@ -24,6 +24,6 @@ export CORE_AREA   = 10 12 1448 1448
 export PLACE_PINS_ARGS = -exclude left:0-500 -exclude left:1000-1500: -exclude right:* -exclude top:* -exclude bottom:*
 
 export MACRO_PLACE_HALO    = 10 10
-export MACRO_PLACE_CHANNEL = 20 20
+
 export TNS_END_PERCENT     = 100
 export SKIP_GATE_CLONING   = 1
diff --git a/flow/designs/nangate45/ariane136/config.mk b/flow/designs/nangate45/ariane136/config.mk
@@ -26,6 +26,6 @@ export CORE_AREA   = 10 12 1448 1448
 export PLACE_PINS_ARGS = -exclude left:0-500 -exclude left:1000-1500: -exclude right:* -exclude top:* -exclude bottom:*
 
 export MACRO_PLACE_HALO = 10 10
-export MACRO_PLACE_CHANNEL = 20 20
+
 export TNS_END_PERCENT = 100
 export PLACE_DENSITY = 0.35
diff --git a/flow/designs/nangate45/black_parrot/config.mk b/flow/designs/nangate45/black_parrot/config.mk
@@ -37,5 +37,5 @@ export PLACE_PINS_ARGS = -exclude left:* -exclude right:* -exclude top:* -exclud
 export PLACE_DENSITY_LB_ADDON = 0.05
 
 export MACRO_PLACE_HALO    = 10 10
-export MACRO_PLACE_CHANNEL = 20 20
+
 export TNS_END_PERCENT     = 100
diff --git a/flow/designs/nangate45/bp_be_top/config.mk b/flow/designs/nangate45/bp_be_top/config.mk
@@ -27,7 +27,6 @@ export CORE_AREA   = 10.07 11.2 790 690
 export PLACE_PINS_ARGS = -exclude left:500-800 -exclude right:500-800 -exclude top:*
 
 export MACRO_PLACE_HALO = 10 10
-export MACRO_PLACE_CHANNEL = 20 20
 
 export PLACE_DENSITY_LB_ADDON = 0.10
 export TNS_END_PERCENT        = 100
diff --git a/flow/designs/nangate45/bp_fe_top/config.mk b/flow/designs/nangate45/bp_fe_top/config.mk
@@ -28,7 +28,6 @@ export PLACE_PINS_ARGS = -exclude left:400-700 -exclude right:400-700 -exclude t
 
 
 export MACRO_PLACE_HALO = 10 10
-export MACRO_PLACE_CHANNEL = 20 20
 
 export PLACE_DENSITY_LB_ADDON = 0.10
 export PLACE_DENSITY_MAX_POST_HOLD = 0.12

diff --git a/flow/designs/nangate45/bp_multi_top/config.mk b/flow/designs/nangate45/bp_multi_top/config.mk
@@ -34,7 +34,6 @@ export CORE_AREA   = 10.07 9.8 1090 1090
 export PLACE_PINS_ARGS = -exclude left:100-1100 -exclude right:100-1100 -exclude top:*
 
 export MACRO_PLACE_HALO = 10 10
-export MACRO_PLACE_CHANNEL = 20 20
 
 export PLACE_DENSITY_LB_ADDON = 0.05
 export SKIP_GATE_CLONING      = 1
diff --git a/flow/designs/nangate45/bp_quad/config.mk b/flow/designs/nangate45/bp_quad/config.mk
@@ -34,5 +34,4 @@ export CORE_AREA   = 10 12 3590 3590
 
 export PLACE_PINS_ARGS = -exclude left:* -exclude right:* -exclude top:* -exclude bottom:0-1000 -exclude bottom:2400-3600
 
-export MACRO_PLACE_HALO = 10 10
-export MACRO_PLACE_CHANNEL = 20 20
+export MACRO_PLACE_HALO = 10 10
diff --git a/flow/designs/nangate45/mempool_group/config.mk b/flow/designs/nangate45/mempool_group/config.mk
@@ -24,5 +24,4 @@ export CORE_AREA   = 10 12 4390 4390
 
 export PLACE_PINS_ARGS = -exclude left:* -exclude right:* -exclude top:* -exclude bottom:0-1000 -exclude bottom:3400-4400
 
-export MACRO_PLACE_HALO = 10 10
-export MACRO_PLACE_CHANNEL = 20 20
+export MACRO_PLACE_HALO = 10 10
diff --git a/flow/designs/nangate45/swerv_wrapper/config.mk b/flow/designs/nangate45/swerv_wrapper/config.mk
@@ -24,7 +24,6 @@ export CORE_AREA   = 10.07 11.2 1090 990
 export PLACE_PINS_ARGS = -exclude left:* -exclude right:* -exclude top:* -exclude bottom:0-200 -exclude bottom:1000-1100
 
 export MACRO_PLACE_HALO = 10 10
-export MACRO_PLACE_CHANNEL = 20 20
 
 export PLACE_DENSITY_LB_ADDON = 0.10
 export TNS_END_PERCENT        = 100

diff --git a/flow/designs/sky130hd/chameleon_hier/config.mk b/flow/designs/sky130hd/chameleon_hier/config.mk
@@ -41,7 +41,7 @@ export VERILOG_FILES = \
   $(VERILOG_FILES_BLACKBOX)
 
 export ENABLE_DPO = 0
-export MACRO_PLACE_CHANNEL  = 160 160
+
 export MACRO_PLACE_HALO = 160 160
 export DIE_AREA    = 0.0 0.0 6800 6800
 export CORE_AREA   = 200 200 6600 6600

diff --git a/flow/designs/sky130hd/microwatt/config.mk b/flow/designs/sky130hd/microwatt/config.mk
@@ -24,7 +24,6 @@ export ADDITIONAL_LIBS = $(wildcard $(microwatt_DIR)/lib/*.lib)
 export SYNTH_HIERARCHICAL = 1
 
 export MACRO_PLACE_HALO = 100 100
-export MACRO_PLACE_CHANNEL = 200 200
 
 # CTS tuning
 export CTS_BUF_DISTANCE = 600

diff --git a/flow/designs/tsmc65lp/black_parrot/config.mk b/flow/designs/tsmc65lp/black_parrot/config.mk
@@ -38,6 +38,5 @@ export CORE_AREA   = 10 12 1790 1591.2
 export PLACE_PINS_ARGS = -exclude left:* -exclude right:* -exclude top:*
 
 export MACRO_PLACE_HALO = 10 10
-export MACRO_PLACE_CHANNEL = 20 20
 
 export PLACE_DENSITY_LB_ADDON = 0.10 
diff --git a/flow/designs/tsmc65lp/bp_be_top/config.mk b/flow/designs/tsmc65lp/bp_be_top/config.mk
@@ -23,6 +23,5 @@ export CORE_AREA   = 10 12 990 890
 export PLACE_PINS_ARGS = -exclude left:0-500 -exclude right:0-500 -exclude bottom:*
 
 export MACRO_PLACE_HALO = 10 10
-export MACRO_PLACE_CHANNEL = 20 20
 
 export PLACE_DENSITY_LB_ADDON = 0.05
diff --git a/flow/designs/tsmc65lp/bp_fe_top/config.mk b/flow/designs/tsmc65lp/bp_fe_top/config.mk
@@ -26,6 +26,5 @@ export CORE_AREA   = 10 12 870 770
 export PLACE_PINS_ARGS = -exclude left:* -exclude right:0-400 -exclude bottom:*
 
 export MACRO_PLACE_HALO = 10 10
-export MACRO_PLACE_CHANNEL = 20 20
 
 export PLACE_DENSITY_LB_ADDON = 0.05
diff --git a/flow/designs/tsmc65lp/bp_multi_top/config.mk b/flow/designs/tsmc65lp/bp_multi_top/config.mk
@@ -42,6 +42,5 @@ export CORE_AREA   = 10 12 1790 1590
 export PLACE_PINS_ARGS = -exclude left:0-1400 -exclude right:0-1400 -exclude bottom:* -exclude top:0-100 -exclude top:1500-1600
 
 export MACRO_PLACE_HALO = 10 10
-export MACRO_PLACE_CHANNEL = 20 20
 
 export PLACE_DENSITY_LB_ADDON = 0.10 
diff --git a/flow/designs/tsmc65lp/coyote/config.mk b/flow/designs/tsmc65lp/coyote/config.mk
@@ -35,7 +35,6 @@ export CORE_AREA = 5 5 2245 2245
 export PLACE_PINS_ARGS = -exclude left:* -exclude right:0-700 -exclude right:1500-2250 -exclude top:* -exclude bottom:*
 
 export MACRO_PLACE_HALO = 10 10
-export MACRO_PLACE_CHANNEL = 20 20
 
 export PLACE_DENSITY_LB_ADDON = 0.10 
 export REMOVE_BUFFER_TREE     = 1
diff --git a/flow/designs/tsmc65lp/swerv_wrapper/config.mk b/flow/designs/tsmc65lp/swerv_wrapper/config.mk
@@ -29,7 +29,6 @@ export DIE_AREA    = 0 0 1610 1360
 export CORE_AREA   = 5 5 1605 1355
 export PLACE_PINS_ARGS = -exclude left:* -exclude right:* -exclude top:* -exclude bottom:0-300 -exclude bottom:1300-1600
 
-export MACRO_PLACE_HALO = 10 10 
-export MACRO_PLACE_CHANNEL = 20 20
+export MACRO_PLACE_HALO = 10 10
 
 export PLACE_DENSITY_LB_ADDON = 0.10 
diff --git a/flow/platforms/asap7/config.mk b/flow/platforms/asap7/config.mk
@@ -115,7 +115,6 @@ export IO_PLACER_H             ?= M4
 export IO_PLACER_V             ?= M5
 
 export MACRO_PLACE_HALO        ?= 10 10
-export MACRO_PLACE_CHANNEL     ?= 12 12
 
 # the followings create a keep out / halo between
 # macro and core rows

diff --git a/flow/platforms/gf180/config.mk b/flow/platforms/gf180/config.mk
@@ -79,7 +79,6 @@ export TAPCELL_TCL                           ?= $(PLATFORM_DIR)/openROAD/tapcell
 
 # macro planning
 export MACRO_PLACE_HALO                      ?= 10 10
-export MACRO_PLACE_CHANNEL                   ?= 20.16 20.16
 
 #---------------------------------------------------------
 # Place

diff --git a/flow/platforms/ihp-sg13g2/config.mk b/flow/platforms/ihp-sg13g2/config.mk
@@ -79,7 +79,6 @@ export CORE_MARGIN ?= 16.5
 export TAPCELL_TCL ?= $(PLATFORM_DIR)/tapcell.tcl
 
 export MACRO_PLACE_HALO ?= 40 40
-export MACRO_PLACE_CHANNEL ?= 80 80
 
 #---------------------------------------------------------
 # Place

diff --git a/flow/platforms/nangate45/config.mk b/flow/platforms/nangate45/config.mk
@@ -61,7 +61,6 @@ export TAPCELL_TCL ?= $(PLATFORM_DIR)/tapcell.tcl
 export TAP_CELL_NAME = TAPCELL_X1
 
 export MACRO_PLACE_HALO ?= 22.4 15.12
-export MACRO_PLACE_CHANNEL ?= 18.8 19.95
 
 #---------------------------------------------------------
 # Place

diff --git a/flow/platforms/sky130hd/config.mk b/flow/platforms/sky130hd/config.mk
@@ -97,7 +97,6 @@ export TAP_CELL_NAME = sky130_fd_sc_hd__tapvpwrvgnd_1
 export TAPCELL_TCL ?= $(PLATFORM_DIR)/tapcell.tcl
 
 export MACRO_PLACE_HALO ?= 40 40
-export MACRO_PLACE_CHANNEL ?= 80 80
 
 #---------------------------------------------------------
 # Place

diff --git a/flow/platforms/sky130hs/config.mk b/flow/platforms/sky130hs/config.mk
@@ -59,7 +59,6 @@ export TAP_CELL_NAME = sky130_fd_sc_hs__tapvpwrvgnd_1
 export TAPCELL_TCL ?= $(PLATFORM_DIR)/tapcell.tcl
 
 export MACRO_PLACE_HALO ?= 40 40
-export MACRO_PLACE_CHANNEL ?= 80 80
 
 #---------------------------------------------------------
 # Place

diff --git a/flow/scripts/macro_place_util.tcl b/flow/scripts/macro_place_util.tcl
@@ -18,12 +18,9 @@ if {[find_macros] != ""} {
   }
 
   lassign $::env(MACRO_PLACE_HALO) halo_x halo_y
-  lassign $::env(MACRO_PLACE_CHANNEL) channel_x channel_y
   set halo_max [expr max($halo_x, $halo_y)]
-  set channel_max [expr max($channel_x, $channel_y)]
-  set blockage_width [expr max($halo_max, $channel_max/2)]
+  set blockage_width $halo_max
 
-
   if {[env_var_exists_and_non_empty MACRO_BLOCKAGE_HALO]} {
     set blockage_width $::env(MACRO_BLOCKAGE_HALO)
   }

diff --git a/flow/scripts/variables.yaml b/flow/scripts/variables.yaml
@@ -269,13 +269,6 @@ MACRO_PLACE_HALO:
     placement.
   stages:
     - floorplan
-MACRO_PLACE_CHANNEL:
-  description: >
-    Horizontal/vertical channel width between macros (microns). Used by
-    automatic macro placement. Imagine channel=10 and halo=5. Then macros must
-    be 10 apart but standard cells must be 5 away from a macro.
-  stages:
-    - floorplan
 MACRO_BLOCKAGE_HALO:
   description: >
     Blockage width overridden from default calculation.