Merge branch 'master' into update-or

Signed-off-by: Matt Liberty <[email protected]>

Author: maliberty

flow/Makefile

@@ -146,7 +146,7 @@ SHELL          := /usr/bin/env bash
 #   location
 # - default is current install / clone directory
 ifeq ($(origin FLOW_HOME), undefined)
-FLOW_HOME := $(abspath $(dir $(firstword $(MAKEFILE_LIST))))
+  FLOW_HOME := $(abspath $(dir $(firstword $(MAKEFILE_LIST))))
 endif
 export FLOW_HOME
 

flow/designs/asap7/cva6/config.mk

@@ -79,10 +79,10 @@ export ADDITIONAL_LIBS = $(PLATFORM_DIR)/lib/NLDM/fakeram7_256x256.lib
 
 export SDC_FILE               = $(DESIGN_HOME)/$(PLATFORM)/$(DESIGN_NAME)/constraint.sdc
 
-export DIE_AREA               = 0 0 350 350
-export CORE_AREA              = 1.08 1.08 340 340
+export CORE_UTILIZATION       = 40
+export CORE_MARGIN            = 2
+export MACRO_HALO             = 5
 export PLACE_DENSITY          = 0.50
-export MACRO_HALO             = 5 5
 
 # a smoketest for this option, there are a
 # few last gasp iterations

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

@@ -1,6 +1,6 @@
 {
     "synth__design__instance__area__stdcell": {
-        "value": 40692.1,
+        "value": 40631.65,
         "compare": "<="
     },
     "constraints__clocks__count": {
@@ -12,27 +12,27 @@
         "compare": "<="
     },
     "placeopt__design__instance__count__stdcell": {
-        "value": 164118,
+        "value": 163049,
         "compare": "<="
     },
     "detailedplace__design__violations": {
         "value": 0,
         "compare": "=="
     },
     "cts__design__instance__count__setup_buffer": {
-        "value": 14271,
+        "value": 14178,
         "compare": "<="
     },
     "cts__design__instance__count__hold_buffer": {
-        "value": 14271,
+        "value": 14178,
         "compare": "<="
     },
     "globalroute__antenna_diodes_count": {
         "value": 0,
         "compare": "<="
     },
     "detailedroute__route__wirelength": {
-        "value": 1618999,
+        "value": 1884562,
         "compare": "<="
     },
     "detailedroute__route__drc_errors": {
@@ -56,15 +56,15 @@
         "compare": "<="
     },
     "finish__timing__drv__setup_violation_count": {
-        "value": 7136,
+        "value": 7089,
         "compare": "<="
     },
     "finish__timing__drv__hold_violation_count": {
-        "value": 105,
+        "value": 101,
         "compare": "<="
     },
     "finish__timing__wns_percent_delay": {
-        "value": -20.43,
+        "value": -20.3,
         "compare": ">="
     }
 }

flow/designs/ihp-sg13g2/ibex/rules-base.json

@@ -28,7 +28,7 @@
         "compare": "<="
     },
     "globalroute__antenna_diodes_count": {
-        "value": 0,
+        "value": 2,
         "compare": "<="
     },
     "detailedroute__route__wirelength": {
@@ -44,7 +44,7 @@
         "compare": "<="
     },
     "detailedroute__antenna_diodes_count": {
-        "value": 51,
+        "value": 32,
         "compare": "<="
     },
     "finish__timing__setup__ws": {

flow/designs/sky130hd/microwatt/rules-base.json

@@ -28,7 +28,7 @@
         "compare": "<="
     },
     "globalroute__antenna_diodes_count": {
-        "value": 3606,
+        "value": 5426,
         "compare": "<="
     },
     "detailedroute__route__wirelength": {
@@ -40,7 +40,7 @@
         "compare": "<="
     },
     "detailedroute__antenna__violating__nets": {
-        "value": 9,
+        "value": 0,
         "compare": "<="
     },
     "detailedroute__antenna_diodes_count": {

flow/designs/sky130hs/ibex/rules-base.json

@@ -28,11 +28,11 @@
         "compare": "<="
     },
     "globalroute__antenna_diodes_count": {
-        "value": 12,
+        "value": 30,
         "compare": "<="
     },
     "detailedroute__route__wirelength": {
-        "value": 911447,
+        "value": 908310,
         "compare": "<="
     },
     "detailedroute__route__drc_errors": {

flow/scripts/variables.mk

@@ -3,15 +3,6 @@
 # lazy evaluation, conditional code, include statements,
 # etc.
 
-# Setup variables to point to root / head of the OpenROAD directory
-# - the following settings allowed user to point OpenROAD binaries to different
-#   location
-# - default is current install / clone directory
-ifeq ($(origin FLOW_HOME), undefined)
-FLOW_HOME := $(abspath $(dir $(firstword $(MAKEFILE_LIST)))/..)
-endif
-export FLOW_HOME
-
 export DESIGN_NICKNAME?=$(DESIGN_NAME)
 
 #-------------------------------------------------------------------------------
@@ -21,7 +12,6 @@ export DESIGN_NICKNAME?=$(DESIGN_NAME)
 # - utils, scripts, test - default is under current directory
 export DESIGN_HOME   ?= $(FLOW_HOME)/designs
 export PLATFORM_HOME ?= $(FLOW_HOME)/platforms
-# WORK_HOME is set up in flow/Makefile
 
 export UTILS_DIR     ?= $(FLOW_HOME)/util
 export SCRIPTS_DIR   ?= $(FLOW_HOME)/scripts