Merge pull request #2420 from Pinata-Consulting/pdn-simplified

Pdn simplified

Author: maliberty

flow/Makefile

@@ -218,11 +218,6 @@ export OBJECTS_DIR = $(WORK_HOME)/objects/$(PLATFORM)/$(DESIGN_NICKNAME)/$(FLOW_
 export REPORTS_DIR = $(WORK_HOME)/reports/$(PLATFORM)/$(DESIGN_NICKNAME)/$(FLOW_VARIANT)
 export RESULTS_DIR = $(WORK_HOME)/results/$(PLATFORM)/$(DESIGN_NICKNAME)/$(FLOW_VARIANT)
 
-# BLOCKS is ORFS specific and is used to trigger hierarchical flow,
-# MACROS is a space separated list of macros used in the design,
-# but not necessarily built by ORFS using the BLOCKS mechanism.
-export MACROS ?= $(BLOCKS)
-
 ifneq ($(BLOCKS),)
   $(foreach block,$(BLOCKS),$(eval BLOCK_LEFS += ./results/$(PLATFORM)/$(DESIGN_NICKNAME)_$(block)/$(FLOW_VARIANT)/${block}.lef))
   $(foreach block,$(BLOCKS),$(eval BLOCK_LIBS += ./results/$(PLATFORM)/$(DESIGN_NICKNAME)_$(block)/$(FLOW_VARIANT)/${block}.lib))

flow/platforms/asap7/openRoad/pdn/BLOCKS_grid_strategy.tcl

@@ -1,4 +1,5 @@
 # Top level PDN for macros using BLOCK_grid_strategy.tcl
+source $::env(SCRIPTS_DIR)/util.tcl
 
 ####################################
 # global connections
@@ -30,7 +31,16 @@ add_pdn_connect -grid {top} -layers {M5 M6}
 # Element grid
 ####################################
 # The halo around the macro prevents pdn from blocking pin access
-define_pdn_grid -macro -cells $::env(MACROS) \
+
+set macro_names {}
+
+foreach macro [find_macros] {
+  set macro_name [[$macro getMaster] getName]
+  dict set macro_names $macro_name 1
+}
+set macro_names [dict keys $macro_names]
+
+define_pdn_grid -macro -cells $macro_names \
     -halo "$::env(MACRO_HALO_X) $::env(MACRO_HALO_Y) $::env(MACRO_HALO_X) $::env(MACRO_HALO_Y)" \
     -voltage_domains {CORE} -name ElementGrid
 

flow/scripts/macro_place_util.tcl

@@ -1,19 +1,3 @@
-proc find_macros {} {
-  set macros ""
-
-  set db [ord::get_db]
-  set block [[$db getChip] getBlock]
-  foreach inst [$block getInsts] {
-    set inst_master [$inst getMaster]
-
-    # BLOCK means MACRO cells
-    if { [string match [$inst_master getType] "BLOCK"] } {
-      append macros " " $inst
-    }
-  }
-  return $macros
-}
-
 if {[find_macros] != ""} {
 # If wrappers defined replace macros with their wrapped version
 # # ----------------------------------------------------------------------------

flow/scripts/util.tcl

@@ -83,3 +83,19 @@ proc append_env_var {list_name var_name prefix has_arg} {
     }
   }
 }
+
+proc find_macros {} {
+  set macros ""
+
+  set db [ord::get_db]
+  set block [[$db getChip] getBlock]
+  foreach inst [$block getInsts] {
+    set inst_master [$inst getMaster]
+
+    # BLOCK means MACRO cells
+    if { [string match [$inst_master getType] "BLOCK"] } {
+      append macros " " $inst
+    }
+  }
+  return $macros
+}