Merge pull request #1 from d-m-bailey/2409

Changes for 2409

Author: d-m-bailey

.gitignore

@@ -1,9 +1,17 @@
 /.idea/
 /precheck_results/
 */tmp
-*/*/tmp
-venv/
-caravel/
-mgmt_core_wrapper/
-dependencies/
+*.hex*
+*.lst
+*.vcd
+*.gtkw
+/env
+/venv/
+/venv-cocotb/
+/caravel/
+runs/
+/dependencies/
+/mgmt_core_wrapper/
+/logs
+lvs_results/
 __pycache__/

Makefile

@@ -16,6 +16,7 @@
 MAKEFLAGS+=--warn-undefined-variables
 
 export CARAVEL_ROOT?=$(PWD)/caravel
+export UPRJ_ROOT?=$(PWD)
 PRECHECK_ROOT?=${HOME}/mpw_precheck
 export MCW_ROOT?=$(PWD)/mgmt_core_wrapper
 SIM?=RTL
@@ -43,9 +44,9 @@ export ROOTLESS
 
 ifeq ($(PDK),sky130A)
 	SKYWATER_COMMIT=f70d8ca46961ff92719d8870a18a076370b85f6c
-	export OPEN_PDKS_COMMIT?=dd7771c384ed36b91a25e9f8b314355fc26561be
-	export OPENLANE_TAG?=2023.10.16
-	MPW_TAG ?= mpw-9i
+	export OPEN_PDKS_COMMIT?=0fe599b2afb6708d281543108caf8310912f54af
+	export OPENLANE_TAG?=2024.08.15
+	MPW_TAG ?= mpw-9k
 
 ifeq ($(CARAVEL_LITE),1)
 	CARAVEL_NAME := caravel-lite
@@ -61,9 +62,9 @@ endif
 
 ifeq ($(PDK),sky130B)
 	SKYWATER_COMMIT=f70d8ca46961ff92719d8870a18a076370b85f6c
-	export OPEN_PDKS_COMMIT?=dd7771c384ed36b91a25e9f8b314355fc26561be
-	export OPENLANE_TAG?=2023.10.16
-	MPW_TAG ?= mpw-9i
+	export OPEN_PDKS_COMMIT?=0fe599b2afb6708d281543108caf8310912f54af
+	export OPENLANE_TAG?=2024.08.15
+	MPW_TAG ?= mpw-9k
 
 ifeq ($(CARAVEL_LITE),1)
 	CARAVEL_NAME := caravel-lite
@@ -77,9 +78,9 @@ endif
 
 endif
 
-ifeq ($(PDK),gf180mcuC)
+ifeq ($(PDK),gf180mcuD)
 
-	MPW_TAG ?= gfmpw-0b
+	MPW_TAG ?= gfmpw-1c
 	CARAVEL_NAME := caravel
 	CARAVEL_REPO := https://github.com/efabless/caravel-gf180mcu
 	CARAVEL_TAG := $(MPW_TAG)
@@ -251,6 +252,7 @@ run-precheck: check-pdk check-precheck
 		docker run -it -v $(PRECHECK_ROOT):$(PRECHECK_ROOT) \
 		-v $(INPUT_DIRECTORY):$(INPUT_DIRECTORY) \
 		-v $(PDK_ROOT):$(PDK_ROOT) \
+		-v $(HOME)/.ipm:$(HOME)/.ipm \
 		-e INPUT_DIRECTORY=$(INPUT_DIRECTORY) \
 		-e PDK_PATH=$(PDK_ROOT)/$(PDK) \
 		-e PDK_ROOT=$(PDK_ROOT) \
@@ -263,6 +265,7 @@ run-precheck: check-pdk check-precheck
 		docker run -it -v $(PRECHECK_ROOT):$(PRECHECK_ROOT) \
 		-v $(INPUT_DIRECTORY):$(INPUT_DIRECTORY) \
 		-v $(PDK_ROOT):$(PDK_ROOT) \
+		-v $(HOME)/.ipm:$(HOME)/.ipm \
 		-e INPUT_DIRECTORY=$(INPUT_DIRECTORY) \
 		-e PDK_PATH=$(PDK_ROOT)/$(PDK) \
 		-e PDK_ROOT=$(PDK_ROOT) \
@@ -271,7 +274,6 @@ run-precheck: check-pdk check-precheck
 		efabless/mpw_precheck:latest bash -c "cd $(PRECHECK_ROOT) ; python3 mpw_precheck.py --input_directory $(INPUT_DIRECTORY) --pdk_path $(PDK_ROOT)/$(PDK)"; \
 	fi
 
-
 BLOCKS = $(shell cd lvs && find * -maxdepth 0 -type d)
 LVS_BLOCKS = $(foreach block, $(BLOCKS), lvs-$(block))
 $(LVS_BLOCKS): lvs-% : ./lvs/%/lvs_config.json check-pdk check-precheck

lvs/openframe_project_wrapper/lvs_config.json

@@ -12,6 +12,9 @@
 	"EXTRACT_ABSTRACT": [
 		""
 	],
+	"EXTRACT_CREATE_SUBCUT": [
+		""
+	],
 	"LVS_FLATTEN": [
 		"*vccd1_connection*",
 		"*vssd1_connection*"
@@ -32,4 +35,4 @@
 		"$UPRJ_ROOT/verilog/gl/$TOP_SOURCE.v"
 	],
 	"LAYOUT_FILE": "$UPRJ_ROOT/gds/$TOP_LAYOUT.gds"
-}
+}

openlane/Makefile

@@ -13,13 +13,13 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+SHELL := /bin/bash
 MAKEFLAGS+=--warn-undefined-variables
 
 export OPENLANE_RUN_TAG = $(shell date '+%y_%m_%d_%H_%M')
-OPENLANE_TAG ?= 2023.07.19
+OPENLANE_TAG ?= 2024.08.15
 OPENLANE_IMAGE_NAME ?= efabless/openlane:$(OPENLANE_TAG)
-designs = $(shell find * -maxdepth 0 -type d)
-current_design = null
+designs=$(shell find * -maxdepth 0 -type d)
 
 ROOTLESS ?= 0
 USER_ARGS = -u $$(id -u $$USER):$$(id -g $$USER)
@@ -41,6 +41,7 @@ docker_mounts = \
 	-v $$(realpath $(PWD)/..):$$(realpath $(PWD)/..) \
 	-v $(PDK_ROOT):$(PDK_ROOT) \
 	-v $(CARAVEL_ROOT):$(CARAVEL_ROOT) \
+	-v $(HOME)/.ipm:$(HOME)/.ipm \
 	-v $(OPENLANE_ROOT):/openlane
 
 docker_env = \
@@ -66,24 +67,21 @@ list:
 	@echo $(designs)
 
 .PHONY: $(designs)
-$(designs) : % : ./%/config.json
-ifneq (,$(wildcard ./$(MAKECMDGOALS)/interactive.tcl))
-	mkdir -p ./$*/runs/$(OPENLANE_RUN_TAG) 
+$(designs) : % :
+	mkdir -p ./$*/runs/$(OPENLANE_RUN_TAG)
 	rm -rf ./$*/runs/$*
 	ln -s $$(realpath ./$*/runs/$(OPENLANE_RUN_TAG)) ./$*/runs/$*
-	$(docker_run) \
-		$(OPENLANE_IMAGE_NAME) sh -c $(openlane_cmd_interactive)
-else
-	# $(current_design)
-	mkdir -p ./$*/runs/$(OPENLANE_RUN_TAG) 
-	rm -rf ./$*/runs/$*
-	ln -s $$(realpath ./$*/runs/$(OPENLANE_RUN_TAG)) ./$*/runs/$*
-	$(docker_run) \
-		$(OPENLANE_IMAGE_NAME) sh -c $(openlane_cmd)
-endif
+	if [[ -f ./$@/interactive.tcl ]]; then \
+		$(docker_run) \
+			$(OPENLANE_IMAGE_NAME) sh -c $(openlane_cmd_interactive); \
+	else \
+		$(docker_run) \
+			$(OPENLANE_IMAGE_NAME) sh -c $(openlane_cmd); \
+	fi
 	@mkdir -p ../signoff/$*/
 	@cp ./$*/runs/$*/OPENLANE_VERSION ../signoff/$*/
 	@cp ./$*/runs/$*/PDK_SOURCES ../signoff/$*/
+	@cp ./$*/runs/$*/reports/*.csv ../signoff/$*/
 
 .PHONY: openlane
 openlane: check-openlane-env

openlane/openframe_project_wrapper/CustomApplyDEFTemplate/reader.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import odb
+from openroad import Tech, Design
+from typing import ClassVar, Optional
 
 import os
 import sys
@@ -22,8 +24,17 @@
 
 
 class OdbReader(object):
+    primary_reader: ClassVar[Optional["OdbReader"]] = None
+
     def __init__(self, *args):
-        self.db = odb.dbDatabase.create()
+        if primary := OdbReader.primary_reader:
+            self.db = odb.dbDatabase.create()
+            self.db.setLogger(primary.design.getLogger())
+        else:
+            self.ord_tech = Tech()
+            self.design = Design(self.ord_tech)
+            self.db = self.ord_tech.getDB()
+
         if len(args) == 1:
             db_in = args[0]
             self.db = odb.read_db(self.db, db_in)
@@ -45,6 +56,9 @@ def __init__(self, *args):
             self.dbunits = self.block.getDefUnits()
             self.instances = self.block.getInsts()
 
+        if OdbReader.primary_reader is None:
+            OdbReader.primary_reader = self
+
     def add_lef(self, new_lef):
         odb.read_lef(self.db, new_lef)
 
@@ -77,6 +91,7 @@ def wrapper(input_db, output, output_def, input_lef, **kwargs):
 
         if output_def is not None:
             odb.write_def(reader.block, output_def)
+        sys.stdout.flush()
         odb.write_db(reader.db, output)
 
     wrapper = click.option(

openlane/openframe_project_wrapper/interactive.tcl

@@ -1,7 +1,7 @@
 package require openlane
 set script_dir [file dirname [file normalize [info script]]]
 set save_path "$script_dir/../.."
-prep -design $script_dir -tag $::env(OPENLANE_RUN_TAG)
+prep -design $script_dir -tag $::env(OPENLANE_RUN_TAG) -ignore_mismatches
 
 if { $::env(RUN_LINTER) } {
     run_verilator
@@ -98,4 +98,4 @@ save_final_views
 save_final_views -save_path $save_path -tag $::env(OPENLANE_RUN_TAG)
 calc_total_runtime
 save_state
-generate_final_summary_report
+generate_final_summary_report