Merge pull request #4137 from The-OpenROAD-Project-staging/mbff-updates

Mbff updates

Author: maliberty

flow/designs/asap7/aes-mbff/config.mk

@@ -15,5 +15,9 @@ export PLACE_DENSITY            = 0.65
 export TNS_END_PERCENT          = 100
 
 export CLUSTER_FLOPS            = 1
+export CLUSTER_FLOPS_ARGS       = -num_paths 200 -tray_weight 4.0
 export ENABLE_DPO               = 0
 
+# Disabled until KF can handle mbff
+export LEC_CHECK                = 0
+

flow/platforms/asap7/config.mk

@@ -161,9 +161,11 @@ export TC_NLDM_DFF_LIB_FILE    ?= $(subst PLACEHOLDER,$(PRIMARY_VT_TAG),$(TC_NLD
 export TC_NLDM_LIB_FILES       ?= $(subst PLACEHOLDER,$(PRIMARY_VT_TAG),$(TC_NLDM_LIB_FILES_T))
 
 ifeq ($(CLUSTER_FLOPS),1)
-   # Add the multi-bit FF for clustering.  These are single corner libraries.
-   export ADDITIONAL_LIBS      += $(LIB_DIR)/asap7sc7p5t_DFFHQNH2V2X_$(PRIMARY_VT_TAG)VT_TT_nldm_FAKE.lib \
-                                  $(LIB_DIR)/asap7sc7p5t_DFFHQNV2X_$(PRIMARY_VT_TAG)VT_TT_nldm_FAKE.lib
+   # Add the multi-bit FF for clustering, matching the CORNER selection.
+   # BC -> FF, WC -> SS, TC -> TT
+   _MBFF_LIB_CORNER = $(if $(filter BC,$(CORNER)),FF,$(if $(filter WC,$(CORNER)),SS,TT))
+   export ADDITIONAL_LIBS      += $(LIB_DIR)/asap7sc7p5t_DFFHQNH2V2X_$(PRIMARY_VT_TAG)VT_$(_MBFF_LIB_CORNER)_nldm_FAKE.lib \
+                                  $(LIB_DIR)/asap7sc7p5t_DFFHQNV2X_$(PRIMARY_VT_TAG)VT_$(_MBFF_LIB_CORNER)_nldm_FAKE.lib
 
    export ADDITIONAL_LEFS      += $(PLATFORM_DIR)/lef/asap7sc7p5t_DFFHQNH2V2X.lef \
                                   $(PLATFORM_DIR)/lef/asap7sc7p5t_DFFHQNV2X.lef

flow/scripts/global_place.tcl

@@ -68,8 +68,8 @@ if { $result != 0 } {
 
 log_cmd estimate_parasitics -placement
 
-if { $::env(CLUSTER_FLOPS) } {
-  cluster_flops
+if { [env_var_exists_and_non_empty CLUSTER_FLOPS] } {
+  cluster_flops {*}[env_var_or_empty CLUSTER_FLOPS_ARGS]
   log_cmd estimate_parasitics -placement
 }