variables: DESIGN_DIR is overrideable

Plus some driveby cleanup and making things a bit more consistent.

Signed-off-by: Øyvind Harboe <[email protected]>

Author: oharboe

flow/Makefile

@@ -87,7 +87,7 @@ DESIGN_CONFIG ?= ./designs/nangate45/gcd/config.mk
 export DESIGN_CONFIG
 include $(DESIGN_CONFIG)
 
-export DESIGN_DIR  = $(dir $(DESIGN_CONFIG))
+export DESIGN_DIR ?= $(dir $(DESIGN_CONFIG))
 
 # default value "base" is duplicated from variables.yaml because we need it
 # earlier in the flow for BLOCKS. BLOCKS is a feature specific to the

flow/designs/asap7/mock-array/Element/config.mk

@@ -13,13 +13,13 @@ export PLACE_DENSITY          = 0.82
 export CORE_AREA = $(shell \
   export MOCK_ARRAY_TABLE="$(MOCK_ARRAY_TABLE)" && \
   export MOCK_ARRAY_SCALE="$(MOCK_ARRAY_SCALE)" && \
-  cd $(dir $(DESIGN_CONFIG))/../ && \
+  cd $(DESIGN_DIR)/../ && \
   python3 -c "import config; print(f'{config.ce_margin_x} {config.ce_margin_y} {config.ce_width - config.ce_margin_x} {config.ce_height - config.ce_margin_y}')")
 
 export DIE_AREA = $(shell \
   export MOCK_ARRAY_TABLE="$(MOCK_ARRAY_TABLE)" && \
   export MOCK_ARRAY_SCALE="$(MOCK_ARRAY_SCALE)" && \
-  cd $(dir $(DESIGN_CONFIG))/../ && \
+  cd $(DESIGN_DIR)/../ && \
   python3 -c "import config; print(f'0 0 {config.ce_width} {config.ce_height}')")
 
 export IO_CONSTRAINTS         = designs/asap7/mock-array/Element/io.tcl

flow/designs/asap7/mock-array/config.mk

@@ -14,13 +14,13 @@ export PLACE_DENSITY          = 0.30
 export CORE_AREA = $(shell \
   export MOCK_ARRAY_TABLE="$(MOCK_ARRAY_TABLE)"  && \
   export MOCK_ARRAY_SCALE="$(MOCK_ARRAY_SCALE)" && \
-  cd $(dir $(DESIGN_CONFIG)) && \
+  cd $(DESIGN_DIR) && \
   python3 -c "import config ; print(f'{config.margin_x} {config.margin_y} {config.core_width + config.margin_x} {config.core_height + config.margin_y}')")
 
 export DIE_AREA  = $(shell \
   export MOCK_ARRAY_TABLE="$(MOCK_ARRAY_TABLE)" && \
   export MOCK_ARRAY_SCALE="$(MOCK_ARRAY_SCALE)" && \
-  cd $(dir $(DESIGN_CONFIG)) && \
+  cd $(DESIGN_DIR) && \
   python3 -c "import config; print(f'{0} {0} {config.die_width} {config.die_height}')")
 
 export MACRO_PLACE_HALO = 0 2.16

flow/designs/gf12/ca53/config.mk

@@ -52,10 +52,10 @@ export IO_CONSTRAINTS     = $(DESIGN_HOME)/$(PLATFORM)/ca53/io.tcl
 
 export MACRO_PLACE_HALO = 7 7
 
-export MACRO_WRAPPERS = $(dir $(DESIGN_CONFIG))/wrappers.tcl
+export MACRO_WRAPPERS = $(DESIGN_DIR)/wrappers.tcl
 
 #export MAX_ROUTING_LAYER = H2 
-export FASTROUTE_TCL = $(dir $(DESIGN_CONFIG))/fastroute.tcl
+export FASTROUTE_TCL = $(DESIGN_DIR)/fastroute.tcl
 #
 ifeq ($(USE_FILL),1)
 export DESIGN_TYPE = CELL

flow/designs/gf55/aes/config.mk

@@ -1,6 +1,4 @@
 
-DESIGN_DIR              := $(realpath $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))))
-
 export DESIGN_NICKNAME   = aes
 export DESIGN_NAME       = aes_cipher_top
 export PLATFORM          = gf55

flow/designs/intel16/aes/config.mk

@@ -1,4 +1,3 @@
-DESIGN_DIR                   := $(realpath $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))))
 DESIGN_PDK_HOME              := $(realpath $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))))
 
 export DESIGN_NICKNAME = aes

flow/designs/intel16/ibex/config.mk

@@ -1,4 +1,3 @@
-DESIGN_DIR                   := $(realpath $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))))
 DESIGN_PDK_HOME              := $(realpath $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))))
 
 export DESIGN_NICKNAME = ibex

flow/designs/intel16/jpeg/config.mk

@@ -1,4 +1,3 @@
-DESIGN_DIR                   := $(realpath $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))))
 DESIGN_PDK_HOME              := $(realpath $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))))
 
 export DESIGN_NICKNAME = jpeg

flow/util/genMassive.py

@@ -332,7 +332,7 @@ def writeConfigs(CurAttrs, CurChunkNum):
 
     fo = open("%s/%s" % (CurChunkDir, fileName), "w")
 
-    fo.write("include $(realpath $(dir $(DESIGN_CONFIG))../../)/config.mk\n")
+    fo.write("include $(realpath $(DESIGN_DIR)../../)/config.mk\n")
     fo.write("\n")
     fo.write("FLOW_VARIANT = %s\n" % (variantName))
     fo.write("\n")
@@ -363,8 +363,7 @@ def writeConfigs(CurAttrs, CurChunkNum):
         fOutSdc.write(filedata)
         fOutSdc.close()
         fo.write(
-            "export SDC_FILE = $(dir $(DESIGN_CONFIG))/constraint-DoE-%s.sdc\n"
-            % variantName
+            "export SDC_FILE = $(DESIGN_DIR)/constraint-DoE-%s.sdc\n" % variantName
         )
 
     if CurAbcClkPeriod != "empty":
@@ -411,8 +410,7 @@ def writeConfigs(CurAttrs, CurChunkNum):
         or CurGrSeed != "empty"
     ):
         fo.write(
-            "export FASTROUTE_TCL = $(dir $(DESIGN_CONFIG))/fastroute-DoE-%s.tcl"
-            % variantName
+            "export FASTROUTE_TCL = $(DESIGN_DIR)/fastroute-DoE-%s.tcl" % variantName
         )
 
         if CurPlatform in PUBLIC:

flow/util/utils.mk

@@ -10,7 +10,7 @@ metadata: finish
 		| tee $(REPORTS_DIR)/gen-metrics-$(FLOW_VARIANT)-check.log
 	@$(UTILS_DIR)/checkMetadata.py \
 		-m $(REPORTS_DIR)/metadata-$(FLOW_VARIANT).json \
-		-r $(dir $(DESIGN_CONFIG))rules-$(FLOW_VARIANT).json 2>&1 \
+		-r $(DESIGN_DIR)/rules-$(FLOW_VARIANT).json 2>&1 \
 		| tee $(REPORTS_DIR)/metadata-$(FLOW_VARIANT)-check.log
 
 .PHONY: clean_metadata