merge/rebase

Signed-off-by: Jeff Ng <[email protected]>

Author: jeffng-or

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

@@ -1,8 +1,13 @@
-  tapcell \
-    -endcap_cpp             "12" \
-    -distance               100 \
-    -tapcell_master         $::env(TIE_CELL) \
-    -endcap_master          $::env(ENDCAP_CELL) \
-    -halo_width_x $::env(MACRO_HALO_X) \
-    -halo_width_y $::env(MACRO_HALO_Y)
+if {[info exists ::env(TAP_CELL_NAME)] && $::env(TAP_CELL_NAME) != "" &&
+    [info exists ::env(ENDCAP_CELL_NAME)] && $::env(ENDCAP_CELL_NAME) != ""} {
+    tapcell \
+	-endcap_cpp             "12" \
+	-distance               100 \
+	-tapcell_master         $::env(TAP_CELL_NAME) \
+	-endcap_master          $::env(ENDCAP_CELL_NAME) \
+	-halo_width_x $::env(MACRO_HALO_X) \
+	-halo_width_y $::env(MACRO_HALO_Y)
+} else {
+    puts "Skipping tapcell insertion since TAP_CELL_NAME and/or ENDCAP_CELL_NAME are not defined"
+}
 

flow/platforms/asap7/openRoad/tapcell.tcl

@@ -1,13 +1,18 @@
-puts "Tap and End Cap cell insertion"
-puts "  TAP Cell          : $::env(TAP_CELL_NAME)"
-puts "  ENDCAP Cell       : $::env(TAP_CELL_NAME)"
-puts "  Halo Around Macro : $::env(MACRO_HALO_X) $::env(MACRO_HALO_Y)"
-puts "  TAP Cell Distance : 25"
+if {[info exists ::env(TAP_CELL_NAME)] && $::env(TAP_CELL_NAME) != "" &&
+    [info exists ::env(ENDCAP_CELL_NAME)] && $::env(ENDCAP_CELL_NAME) != ""} {
+    puts "Tap and End Cap cell insertion"
+    puts "  TAP Cell          : $::env(TAP_CELL_NAME)"
+    puts "  ENDCAP Cell       : $::env(TAP_CELL_NAME)"
+    puts "  Halo Around Macro : $::env(MACRO_HALO_X) $::env(MACRO_HALO_Y)"
+    puts "  TAP Cell Distance : 25"
 
-# allow user to set the halo around macro with MACRO_HALO_?
-tapcell \
-  -distance 25 \
-  -tapcell_master "$::env(TAP_CELL_NAME)" \
-  -endcap_master "$::env(TAP_CELL_NAME)"  \
-  -halo_width_x $::env(MACRO_HALO_X) \
-  -halo_width_y $::env(MACRO_HALO_Y)
+    # allow user to set the halo around macro with MACRO_HALO_?
+    tapcell \
+	-distance 25 \
+	-tapcell_master "$::env(TAP_CELL_NAME)" \
+	-endcap_master "$::env(TAP_CELL_NAME)"  \
+	-halo_width_x $::env(MACRO_HALO_X) \
+	-halo_width_y $::env(MACRO_HALO_Y)
+} else {
+    puts "Skipping tapcell insertion since TAP_CELL_NAME and/or ENDCAP_CELL_NAME are not defined"
+}

flow/platforms/gf180/config.mk

@@ -32,8 +32,8 @@ export FILL_CELLS                             ?= gf180mcu_fd_sc_mcu$(TRACK_OPTIO
                                                  gf180mcu_fd_sc_mcu$(TRACK_OPTION)$(POWER_OPTION)__fill_2 \
                                                  gf180mcu_fd_sc_mcu$(TRACK_OPTION)$(POWER_OPTION)__fill_1
 
-export TIE_CELL                               = gf180mcu_fd_sc_mcu$(TRACK_OPTION)$(POWER_OPTION)__filltie
-export ENDCAP_CELL                            = gf180mcu_fd_sc_mcu$(TRACK_OPTION)$(POWER_OPTION)__endcap
+export TAP_CELL_NAME                          = gf180mcu_fd_sc_mcu$(TRACK_OPTION)$(POWER_OPTION)__filltie
+export ENDCAP_CELL_NAME                       = gf180mcu_fd_sc_mcu$(TRACK_OPTION)$(POWER_OPTION)__endcap
 export RC_FILE                                = $(PLATFORM_DIR)/setRC.tcl
 
 #-----------------------------------------------------

flow/platforms/gf180/openROAD/tapcell.tcl

@@ -1,5 +1,10 @@
-  tapcell \
-    -endcap_cpp             "12" \
-    -distance               100 \
-    -tapcell_master         $::env(TIE_CELL) \
-    -endcap_master          $::env(ENDCAP_CELL)
+if {[info exists ::env(TAP_CELL_NAME)] && $::env(TAP_CELL_NAME) != "" &&
+    [info exists ::env(ENDCAP_CELL_NAME)] && $::env(ENDCAP_CELL_NAME) != ""} {
+    tapcell \
+	-endcap_cpp             "12" \
+	-distance               100 \
+	-tapcell_master         $::env(TAP_CELL_NAME) \
+	-endcap_master          $::env(ENDCAP_CELL_NAME)
+} else {
+    puts "Skipping tapcell insertion since TAP_CELL_NAME and/or ENDCAP_CELL_NAME are not defined"
+}

flow/platforms/nangate45/config.mk

@@ -58,7 +58,6 @@ export PDN_TCL ?= $(PLATFORM_DIR)/grid_strategy-M1-M4-M7.tcl
 
 # Endcap and Welltie cells
 export TAP_CELL_NAME = TAPCELL_X1
-export TAPCELL_TCL ?= $(PLATFORM_DIR)/tapcell.tcl
 
 export MACRO_PLACE_HALO ?= 22.4 15.12
 export MACRO_PLACE_CHANNEL ?= 18.8 19.95