Skip to content

Commit daaaa7e

Browse files
jeffng-orjeffng-or
committed
switched from using TAP_CELL_NAME to TAPCELL_TCL as the gate for whether tap cell inseration is executed
Signed-off-by: Jeff Ng <[email protected]>
1 parent 0647836 commit daaaa7e

File tree

17 files changed

+54
-90
lines changed

17 files changed

+54
-90
lines changed

‎docs/user/FlowVariables.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,8 @@ Note:
147147
| `GUI_NO_TIMING` | Skip loading timing for a faster GUI load. |
148148
| `GUI_SOURCE` | Source the script. |
149149
| `GUI_ARGS` | OpenROAD command line options for gui_ and open_ targets, typically set tup `-exit` in combination with GUI_SOURCE to run a script and exit. |
150-
| `FILL_CELLS` | Fill cells are used to fill empty sites. If not set or empty, fill cell insertion is skipped |
151-
| `TAP_CELL_NAME` | Name of the cell to use in tap cell insertion. If not set or empty, tap cell insertion may be skipped (based on platform) |
152-
| `ENDCAP_CELL_NAME` | Name of the cell to use in end cap insertion. If not set or empty, end cap insertion may be skipped (based on platform) |
150+
| `FILL_CELLS` | Fill cells are used to fill empty sites. If not set or empty, fill cell insertion is skipped. |
151+
| `TAP_CELL_NAME` | Name of the cell to use in tap cell insertion. |
153152

154153

155154
### Placement

‎flow/Makefile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,11 @@ $(eval $(call do-step,2_4_floorplan_macro,$(RESULTS_DIR)/2_3_floorplan_tdms.odb
711711

712712
# STEP 5: Tapcell and Welltie insertion
713713
#-------------------------------------------------------------------------------
714+
ifeq ($(TAPCELL_TCL),)
715+
$(eval $(call do-copy,2_5_floorplan_tapcell,2_4_floorplan_macro.odb))
716+
else
714717
$(eval $(call do-step,2_5_floorplan_tapcell,$(RESULTS_DIR)/2_4_floorplan_macro.odb $(TAPCELL_TCL),tapcell))
718+
endif
715719

716720
# STEP 6: PDN generation
717721
#-------------------------------------------------------------------------------

‎flow/designs/gf180/uart-blocks/config.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ export MACRO_PLACE_CHANNEL = 20 20
2121
export PDN_TCL = ./designs/$(PLATFORM)/$(DESIGN_NICKNAME)/BLOCKS_grid_strategy.tcl
2222
export PLACE_DENSITY = 0.60
2323

24-
export TAPCELL_TCL = ./designs/$(PLATFORM)/$(DESIGN_NICKNAME)/tapcell.tcl
24+
export TAPCELL_TCL ?= ./designs/$(PLATFORM)/$(DESIGN_NICKNAME)/tapcell.tcl
2525
export MACRO_HALO_X = 14
2626
export MACRO_HALO_Y = 14

‎flow/designs/gf180/uart-blocks/tapcell.tcl‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
1-
if {[info exists ::env(TAP_CELL_NAME)] && $::env(TAP_CELL_NAME) != "" &&
2-
[info exists ::env(ENDCAP_CELL_NAME)] && $::env(ENDCAP_CELL_NAME) != ""} {
3-
tapcell \
4-
-endcap_cpp "12" \
5-
-distance 100 \
6-
-tapcell_master $::env(TAP_CELL_NAME) \
7-
-endcap_master $::env(ENDCAP_CELL_NAME) \
8-
-halo_width_x $::env(MACRO_HALO_X) \
9-
-halo_width_y $::env(MACRO_HALO_Y)
10-
} else {
11-
puts "Skipping tapcell insertion since TAP_CELL_NAME and/or ENDCAP_CELL_NAME are not defined"
12-
}
1+
tapcell \
2+
-endcap_cpp "12" \
3+
-distance 100 \
4+
-tapcell_master $::env(TIE_CELL) \
5+
-endcap_master $::env(ENDCAP_CELL) \
6+
-halo_width_x $::env(MACRO_HALO_X) \
7+
-halo_width_y $::env(MACRO_HALO_Y)
138

‎flow/platforms/asap7/config.mk‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ export MACRO_HALO_Y ?= 2
125125
export PLACE_DENSITY ?= 0.60
126126

127127
# Endcap and Welltie cells
128-
export TAPCELL_TCL = $(PLATFORM_DIR)/openRoad/tapcell.tcl
128+
export TAPCELL_TCL ?= $(PLATFORM_DIR)/openRoad/tapcell.tcl
129129

130130
# Fill cells used in fill cell insertion
131131
export FILL_CELLS ?= FILLERxp5_ASAP7_75t_R \
@@ -137,7 +137,6 @@ export FILL_CELLS ?= FILLERxp5_ASAP7_75t_R \
137137
DECAPx10_ASAP7_75t_R
138138

139139
export TAP_CELL_NAME ?= TAPCELL_ASAP7_75t_R
140-
export ENDCAP_CELL_NAME ?= $(TAP_CELL_NAME)
141140

142141
export SET_RC_TCL = $(PLATFORM_DIR)/setRC.tcl
143142

@@ -169,7 +168,6 @@ ifeq ($(ASAP7_USELVT), 1)
169168
export FILL_CELLS ?= "FILLERxp5_ASAP7_75t_L"
170169

171170
export TAP_CELL_NAME ?= TAPCELL_ASAP7_75t_L
172-
export ENDCAP_CELL_NAME ?= $(TAP_CELL_NAME)
173171

174172
export GDS_FILES = $(PLATFORM_DIR)/gds/asap7sc7p5t_28_L_220121a.gds \
175173
$(ADDITIONAL_GDS)
@@ -219,7 +217,6 @@ ifeq ($(ASAP7_USESLVT), 1)
219217
export FILL_CELLS ?= "FILLERxp5_ASAP7_75t_SL"
220218

221219
export TAP_CELL_NAME ?= TAPCELL_ASAP7_75t_SL
222-
export ENDCAP_CELL_NAME ?= $(TAP_CELL_NAME)
223220

224221
export GDS_FILES = $(PLATFORM_DIR)/gds/asap7sc7p5t_28_SL_220121a.gds \
225222
$(ADDITIONAL_GDS)

‎flow/platforms/asap7/openRoad/tapcell.tcl‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
1-
if {[info exists ::env(TAP_CELL_NAME)] && $::env(TAP_CELL_NAME) != "" &&
2-
[info exists ::env(ENDCAP_CELL_NAME)] && $::env(ENDCAP_CELL_NAME) != ""} {
3-
puts "Tap and End Cap cell insertion"
4-
puts " TAP Cell : $::env(TAP_CELL_NAME)"
5-
puts " ENDCAP Cell : $::env(TAP_CELL_NAME)"
6-
puts " Halo Around Macro : $::env(MACRO_HALO_X) $::env(MACRO_HALO_Y)"
7-
puts " TAP Cell Distance : 25"
1+
puts "Tap and End Cap cell insertion"
2+
puts " TAP Cell : $::env(TAP_CELL_NAME)"
3+
puts " ENDCAP Cell : $::env(TAP_CELL_NAME)"
4+
puts " Halo Around Macro : $::env(MACRO_HALO_X) $::env(MACRO_HALO_Y)"
5+
puts " TAP Cell Distance : 25"
86

9-
# allow user to set the halo around macro with MACRO_HALO_?
10-
tapcell \
11-
-distance 25 \
12-
-tapcell_master "$::env(TAP_CELL_NAME)" \
13-
-endcap_master "$::env(TAP_CELL_NAME)" \
14-
-halo_width_x $::env(MACRO_HALO_X) \
15-
-halo_width_y $::env(MACRO_HALO_Y)
16-
} else {
17-
puts "Skipping tapcell insertion since TAP_CELL_NAME and/or ENDCAP_CELL_NAME are not defined"
18-
}
7+
# allow user to set the halo around macro with MACRO_HALO_?
8+
tapcell \
9+
-distance 25 \
10+
-tapcell_master "$::env(TAP_CELL_NAME)" \
11+
-endcap_master "$::env(TAP_CELL_NAME)" \
12+
-halo_width_x $::env(MACRO_HALO_X) \
13+
-halo_width_y $::env(MACRO_HALO_Y)

‎flow/platforms/gf180/config.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ export FILL_CELLS ?= gf180mcu_fd_sc_mcu$(TRACK_OPTIO
3232
gf180mcu_fd_sc_mcu$(TRACK_OPTION)$(POWER_OPTION)__fill_2 \
3333
gf180mcu_fd_sc_mcu$(TRACK_OPTION)$(POWER_OPTION)__fill_1
3434

35-
export TAP_CELL_NAME = gf180mcu_fd_sc_mcu$(TRACK_OPTION)$(POWER_OPTION)__filltie
36-
export ENDCAP_CELL_NAME = gf180mcu_fd_sc_mcu$(TRACK_OPTION)$(POWER_OPTION)__endcap
35+
export TIE_CELL = gf180mcu_fd_sc_mcu$(TRACK_OPTION)$(POWER_OPTION)__filltie
36+
export ENDCAP_CELL = gf180mcu_fd_sc_mcu$(TRACK_OPTION)$(POWER_OPTION)__endcap
3737
export RC_FILE = $(PLATFORM_DIR)/setRC.tcl
3838

3939
#-----------------------------------------------------

‎flow/platforms/gf180/openROAD/tapcell.tcl‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
if {[info exists ::env(TAP_CELL_NAME)] && $::env(TAP_CELL_NAME) != "" &&
2-
[info exists ::env(ENDCAP_CELL_NAME)] && $::env(ENDCAP_CELL_NAME) != ""} {
3-
tapcell \
4-
-endcap_cpp "12" \
5-
-distance 100 \
6-
-tapcell_master $::env(TAP_CELL_NAME) \
7-
-endcap_master $::env(ENDCAP_CELL_NAME)
8-
} else {
9-
puts "Skipping tapcell insertion since TAP_CELL_NAME and/or ENDCAP_CELL_NAME are not defined"
10-
}
1+
tapcell \
2+
-endcap_cpp "12" \
3+
-distance 100 \
4+
-tapcell_master $::env(TIE_CELL) \
5+
-endcap_master $::env(ENDCAP_CELL)

‎flow/platforms/ihp-sg13g2/config.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export CORE_MARGIN ?= 16.5
7676

7777
# There are no Endcap and Welltie cells in this PDK, so
7878
# `cut_rows` has to be called from the tapcell script.
79-
export TAPCELL_TCL = $(PLATFORM_DIR)/tapcell.tcl
79+
export TAPCELL_TCL ?= $(PLATFORM_DIR)/tapcell.tcl
8080

8181
export MACRO_PLACE_HALO ?= 40 40
8282
export MACRO_PLACE_CHANNEL ?= 80 80

‎flow/platforms/nangate45/config.mk‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ export PDN_TCL ?= $(PLATFORM_DIR)/grid_strategy-M1-M4-M7.tcl
5858

5959
# Endcap and Welltie cells
6060
export TAP_CELL_NAME = TAPCELL_X1
61-
export ENDCAP_CELL_NAME = $(TAP_CELL_NAME)
62-
export TAPCELL_TCL = $(PLATFORM_DIR)/tapcell.tcl
61+
export TAPCELL_TCL ?= $(PLATFORM_DIR)/tapcell.tcl
6362

6463
export MACRO_PLACE_HALO ?= 22.4 15.12
6564
export MACRO_PLACE_CHANNEL ?= 18.8 19.95

0 commit comments

Comments
 (0)