Merge pull request #694 from Pinata-Consulting/write-liberty-files-for-macros

write liberty file alongside .lef files for macros

Author: maliberty

flow/Makefile

@@ -185,9 +185,11 @@ ifdef BLOCKS
   $(foreach block,$(BLOCKS),$(info Block ${block} needs to be hardened.))
   $(foreach block,$(BLOCKS),$(eval BLOCK_CONFIGS += ./designs/$(PLATFORM)/$(DESIGN_NICKNAME)/$(block)/config.mk))
   $(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))
   $(foreach block,$(BLOCKS),$(eval BLOCK_GDS += ./results/$(PLATFORM)/$(DESIGN_NICKNAME)_$(block)/$(FLOW_VARIANT)/6_final.gds))
   $(foreach block,$(BLOCKS),$(eval BLOCK_CDL += ./results/$(PLATFORM)/$(DESIGN_NICKNAME)_$(block)/$(FLOW_VARIANT)/6_final.cdl))
   export ADDITIONAL_LEFS += $(BLOCK_LEFS)
+  export ADDITIONAL_LIBS += $(BLOCK_LIBS)
   export ADDITIONAL_GDS += $(BLOCK_GDS)
   export GDS_FILES += $(BLOCK_GDS)
   ifdef CDL_FILES
@@ -290,16 +292,18 @@ else
 endif
 export WRAPPED_GDSOAS = $(foreach lef,$(notdir $(WRAP_LEFS)),$(OBJECTS_DIR)/$(lef:.lef=_mod.$(STREAM_SYSTEM_EXT)))
 
+define GENERATE_ABSTRACT_RULE
+# Single rule, two targets, hence the "&:", syntax
+$(1) $(2) &: $(3)
+	$(MAKE) "DESIGN_CONFIG=$(3)" generate_abstract
+endef
 
 # Targets to harden Blocks in case of hierarchical flow is triggered
-build_macros: $(BLOCK_LEFS)
+build_macros: $(BLOCK_LEFS) $(BLOCK_LIBS)
 
-$(foreach block,$(BLOCKS),$(eval ./results/$(PLATFORM)/$(DESIGN_NICKNAME)_$(block)/$(FLOW_VARIANT)/${block}.lef: ./designs/$(PLATFORM)/$(DESIGN_NICKNAME)/${block}/config.mk))
+$(foreach block,$(BLOCKS),$(eval $(call GENERATE_ABSTRACT_RULE,./results/$(PLATFORM)/$(DESIGN_NICKNAME)_$(block)/$(FLOW_VARIANT)/${block}.lef,./results/$(PLATFORM)/$(DESIGN_NICKNAME)_$(block)/$(FLOW_VARIANT)/${block}.lib,./designs/$(PLATFORM)/$(DESIGN_NICKNAME)/${block}/config.mk)))
 $(foreach block,$(BLOCKS),$(eval ./results/$(PLATFORM)/$(DESIGN_NICKNAME)_$(block)/$(FLOW_VARIANT)/6_final.gds: ./results/$(PLATFORM)/$(DESIGN_NICKNAME)_$(block)/$(FLOW_VARIANT)/${block}.lef))
 
-$(BLOCK_LEFS):
-	$(MAKE) DESIGN_CONFIG=$< generate_abstract
-
 # Utility to print tool version information
 #-------------------------------------------------------------------------------
 .PHONY: versions.txt

flow/scripts/generate_abstract.tcl

@@ -2,6 +2,7 @@ source $::env(SCRIPTS_DIR)/load.tcl
 load_design 6_1_fill.odb 6_1_fill.sdc "Starting generation of abstract views"
 
 puts "Starting generation of abstract views"
+write_timing_model $::env(RESULTS_DIR)/$::env(DESIGN_NAME).lib
 write_abstract_lef $::env(RESULTS_DIR)/$::env(DESIGN_NAME).lef
 
 if {[info exist ::env(CDL_FILES)]} {