Merge remote-tracking branch 'origin/master' into HEAD

Author: oharboe

flow/Makefile

@@ -78,7 +78,6 @@
 # DESIGN_CONFIG=./designs/asap7/megaboom/config.mk
 # DESIGN_CONFIG=./designs/asap7/mock-array/config.mk
 # DESIGN_CONFIG=./designs/asap7/riscv32i/config.mk
-# DESIGN_CONFIG=./designs/asap7/sha3/config.mk
 # DESIGN_CONFIG=./designs/asap7/swerv_wrapper/config.mk
 # DESIGN_CONFIG=./designs/asap7/uart/config.mk
 
@@ -94,7 +93,6 @@
 # DESIGN_CONFIG=./designs/gf180/ibex/config.mk
 # DESIGN_CONFIG=./designs/gf180/jpeg/config.mk
 # DESIGN_CONFIG=./designs/gf180/riscv32i/config.mk
-# DESIGN_CONFIG=./designs/gf180/sha3/config.mk
 # DESIGN_CONFIG=./designs/gf180/uart-blocks/config.mk
 #
 # Default design
@@ -163,7 +161,9 @@ else
   $(error [ERROR][FLOW] Platform '$(PLATFORM)' not found.)
 endif
 
+ifeq ($(MAKELEVEL),0)
 $(info [INFO][FLOW] Using platform directory $(PLATFORM_DIR))
+endif
 include $(PLATFORM_DIR)/config.mk
 
 export GALLERY_REPORT ?= 0
@@ -203,12 +203,15 @@ export REPORTS_DIR = $(WORK_HOME)/reports/$(PLATFORM)/$(DESIGN_NICKNAME)/$(FLOW_
 export RESULTS_DIR = $(WORK_HOME)/results/$(PLATFORM)/$(DESIGN_NICKNAME)/$(FLOW_VARIANT)
 
 ifdef BLOCKS
+ifeq ($(MAKELEVEL),0)
   $(info [INFO][FLOW] Invoked hierarchical flow.)
   $(foreach block,$(BLOCKS),$(info Block ${block} needs to be hardened.))
+endif
   $(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))
+  $(foreach block,$(BLOCKS),$(eval BLOCK_LOG_FOLDERS += ./logs/$(PLATFORM)/$(DESIGN_NICKNAME)_$(block)/$(FLOW_VARIANT)/))
   export ADDITIONAL_LEFS += $(BLOCK_LEFS)
   export ADDITIONAL_LIBS += $(BLOCK_LIBS)
   export ADDITIONAL_GDS += $(BLOCK_GDS)
@@ -455,7 +458,7 @@ else ifneq ($(FOOTPRINT_TCL),)
 IS_CHIP = 1
 endif
 
-UNSET_AND_MAKE = @bash -c 'for var in $(UNSET_VARIABLES_NAMES); do unset $$var; done; echo $(MAKE) DESIGN_CONFIG=$(DESIGN_CONFIG) $$@; $(MAKE) DESIGN_CONFIG=$(DESIGN_CONFIG) $$@' --
+UNSET_AND_MAKE = @bash -c 'for var in $(UNSET_VARIABLES_NAMES); do unset $$var; done; $(MAKE) --no-print-directory DESIGN_CONFIG=$(DESIGN_CONFIG) $$@' --
 
 # Separate dependency checking and doing a step. This can
 # be useful to retest a stage without having to delete the
@@ -732,7 +735,7 @@ finish: $(LOG_DIR)/6_report.log \
 
 .PHONY: elapsed
 elapsed:
-	-@$(UTILS_DIR)/genElapsedTime.py -d "$(LOG_DIR)"
+	-@$(UTILS_DIR)/genElapsedTime.py -d $(BLOCK_LOG_FOLDERS) $(LOG_DIR)
 
 # ==============================================================================
 

flow/designs/asap7/aes/rules-base.json

@@ -1,14 +1,14 @@
 {
     "synth__design__instance__area__stdcell": {
-        "value": 2576,
+        "value": 2576.15,
         "compare": "<="
     },
     "constraints__clocks__count": {
         "value": 1,
         "compare": "=="
     },
     "placeopt__design__instance__area": {
-        "value": 2871,
+        "value": 2869,
         "compare": "<="
     },
     "placeopt__design__instance__count__stdcell": {
@@ -19,36 +19,16 @@
         "value": 0,
         "compare": "=="
     },
-    "cts__timing__setup__ws": {
-        "value": -100.0,
-        "compare": ">="
-    },
-    "cts__timing__setup__ws__pre_repair": {
-        "value": -250.75,
-        "compare": ">="
-    },
-    "cts__timing__setup__ws__post_repair": {
-        "value": -250.75,
-        "compare": ">="
-    },
     "cts__design__instance__count__setup_buffer": {
-        "value": 2717,
+        "value": 2566,
         "compare": "<="
     },
     "cts__design__instance__count__hold_buffer": {
-        "value": 1105,
+        "value": 2211,
         "compare": "<="
     },
-    "globalroute__timing__clock__slack": {
-        "value": -79.41,
-        "compare": ">="
-    },
-    "globalroute__timing__setup__ws": {
-        "value": -79.41,
-        "compare": ">="
-    },
     "detailedroute__route__wirelength": {
-        "value": 116087,
+        "value": 126061,
         "compare": "<="
     },
     "detailedroute__route__drc_errors": {
@@ -60,31 +40,19 @@
         "compare": ">="
     },
     "finish__design__instance__area": {
-        "value": 3035,
+        "value": 3287,
         "compare": "<="
     },
-    "finish__timing__drv__max_slew_limit": {
-        "value": -0.2,
-        "compare": ">="
-    },
-    "finish__timing__drv__max_fanout_limit": {
-        "value": -0.2,
-        "compare": ">="
-    },
-    "finish__timing__drv__max_cap_limit": {
-        "value": -0.2,
-        "compare": ">="
-    },
     "finish__timing__drv__setup_violation_count": {
-        "value": 44,
+        "value": 1105,
         "compare": "<="
     },
     "finish__timing__drv__hold_violation_count": {
-        "value": 102,
+        "value": 106,
         "compare": "<="
     },
     "finish__timing__wns_percent_delay": {
-        "value": -10.0,
+        "value": -16.45,
         "compare": ">="
     }
 }

flow/designs/asap7/aes_lvt/rules-base.json

@@ -1,86 +1,54 @@
 {
     "synth__design__instance__area__stdcell": {
-        "value": 2576,
+        "value": 2614.16,
         "compare": "<="
     },
     "constraints__clocks__count": {
         "value": 1,
         "compare": "=="
     },
     "placeopt__design__instance__area": {
-        "value": 2871,
+        "value": 2870,
         "compare": "<="
     },
     "placeopt__design__instance__count__stdcell": {
-        "value": 25423,
+        "value": 25671,
         "compare": "<="
     },
     "detailedplace__design__violations": {
         "value": 0,
         "compare": "=="
     },
-    "cts__timing__setup__ws": {
-        "value": -100.0,
-        "compare": ">="
-    },
-    "cts__timing__setup__ws__pre_repair": {
-        "value": -250.75,
-        "compare": ">="
-    },
-    "cts__timing__setup__ws__post_repair": {
-        "value": -250.75,
-        "compare": ">="
-    },
     "cts__design__instance__count__setup_buffer": {
-        "value": 2858,
+        "value": 2232,
         "compare": "<="
     },
     "cts__design__instance__count__hold_buffer": {
-        "value": 1105,
+        "value": 2232,
         "compare": "<="
     },
-    "globalroute__timing__clock__slack": {
-        "value": -58.79,
-        "compare": ">="
-    },
-    "globalroute__timing__setup__ws": {
-        "value": -58.79,
-        "compare": ">="
-    },
     "detailedroute__route__wirelength": {
-        "value": 116087,
+        "value": 117485,
         "compare": "<="
     },
     "detailedroute__route__drc_errors": {
         "value": 0,
         "compare": "<="
     },
     "finish__timing__setup__ws": {
-        "value": -46.45,
+        "value": -8.46,
         "compare": ">="
     },
     "finish__design__instance__area": {
-        "value": 3035,
+        "value": 2969,
         "compare": "<="
     },
-    "finish__timing__drv__max_slew_limit": {
-        "value": -0.2,
-        "compare": ">="
-    },
-    "finish__timing__drv__max_fanout_limit": {
-        "value": -0.2,
-        "compare": ">="
-    },
-    "finish__timing__drv__max_cap_limit": {
-        "value": -0.2,
-        "compare": ">="
-    },
     "finish__timing__drv__setup_violation_count": {
-        "value": 10,
+        "value": 1116,
         "compare": "<="
     },
     "finish__timing__drv__hold_violation_count": {
-        "value": 36,
+        "value": 128,
         "compare": "<="
     },
     "finish__timing__wns_percent_delay": {

flow/designs/asap7/ethmac/rules-base.json

@@ -1,50 +1,34 @@
 {
     "synth__design__instance__area__stdcell": {
-        "value": 8662,
+        "value": 8702.92,
         "compare": "<="
     },
     "constraints__clocks__count": {
         "value": 3,
         "compare": "=="
     },
     "placeopt__design__instance__area": {
-        "value": 8744,
+        "value": 8754,
         "compare": "<="
     },
     "placeopt__design__instance__count__stdcell": {
-        "value": 66415,
+        "value": 66457,
         "compare": "<="
     },
     "detailedplace__design__violations": {
         "value": 0,
         "compare": "=="
     },
-    "cts__timing__setup__ws": {
-        "value": -127.74,
-        "compare": ">="
-    },
-    "cts__timing__setup__ws__pre_repair": {
-        "value": -214.42,
-        "compare": ">="
-    },
-    "cts__timing__setup__ws__post_repair": {
-        "value": -214.42,
-        "compare": ">="
-    },
     "cts__design__instance__count__setup_buffer": {
-        "value": 2888,
+        "value": 5779,
         "compare": "<="
     },
     "cts__design__instance__count__hold_buffer": {
-        "value": 2888,
+        "value": 5779,
         "compare": "<="
     },
-    "globalroute__timing__setup__ws": {
-        "value": -47.32,
-        "compare": ">="
-    },
     "detailedroute__route__wirelength": {
-        "value": 250821,
+        "value": 253182,
         "compare": "<="
     },
     "detailedroute__route__drc_errors": {
@@ -59,24 +43,12 @@
         "value": 8802,
         "compare": "<="
     },
-    "finish__timing__drv__max_slew_limit": {
-        "value": -2.9,
-        "compare": ">="
-    },
-    "finish__timing__drv__max_fanout_limit": {
-        "value": -0.2,
-        "compare": ">="
-    },
-    "finish__timing__drv__max_cap_limit": {
-        "value": -0.2,
-        "compare": ">="
-    },
     "finish__timing__drv__setup_violation_count": {
-        "value": 10,
+        "value": 2889,
         "compare": "<="
     },
     "finish__timing__drv__hold_violation_count": {
-        "value": 10,
+        "value": 100,
         "compare": "<="
     },
     "finish__timing__wns_percent_delay": {