From 801b3dc28d7dddb3dd6f4b2938b3fdc5ea6ddc63 Mon Sep 17 00:00:00 2001 From: kareem Date: Wed, 23 Feb 2022 14:15:25 -0800 Subject: [PATCH] also update openlane, magic, openpdks commit id --- Makefile | 11 +++++++++-- openlane/Makefile | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 8445fe07..a1e72947 100644 --- a/Makefile +++ b/Makefile @@ -82,7 +82,7 @@ SPECIAL_VOLTAGE_LIBRARY ?= sky130_fd_sc_hvl IO_LIBRARY ?= sky130_fd_io PRIMITIVES_LIBRARY ?= sky130_fd_pr SKYWATER_COMMIT ?= c094b6e83a4f9298e47f696ec5a7fd53535ec5eb -OPEN_PDKS_COMMIT ?= e52981fc0b5876a44a7f680b84aed5298a26028d +OPEN_PDKS_COMMIT ?= 7519dfb04400f224f140749cda44ee7de6f5e095 PDK_MAGIC_COMMIT ?= 7d601628e4e05fd17fcb80c3552dacb64e9f6e7b .DEFAULT_GOAL := ship @@ -1240,6 +1240,7 @@ $(PDK_ROOT)/sky130A: $(PDK_ROOT)/open_pdks $(PDK_ROOT)/skywater-pdk docker run --rm\ -v $(PDK_ROOT):$(PDK_ROOT)\ -u $(shell id -u $(USER)):$(shell id -g $(USER)) \ + -e PDK_ROOT=$(PDK_ROOT)\ -e GIT_COMMITTER_NAME="caravel"\ -e GIT_COMMITTER_EMAIL="caravel@caravel.caravel"\ efabless/openlane-tools:magic-$(PDK_MAGIC_COMMIT)-centos-7\ @@ -1247,9 +1248,10 @@ $(PDK_ROOT)/sky130A: $(PDK_ROOT)/open_pdks $(PDK_ROOT)/skywater-pdk export PATH=$$PATH:/build/bin &&\ cd $(PDK_ROOT)/open_pdks && \ ls . -al && \ - ./configure --enable-sky130-pdk=$(PDK_ROOT)/skywater-pdk/libraries --with-sky130-local-path=$(PDK_ROOT) --enable-sram-sky130=yes && \ + ./configure --enable-sky130-pdk=$(PDK_ROOT)/skywater-pdk/libraries --enable-sram-sky130 && \ cd sky130 && \ make veryclean && \ + make prerequisites && \ make && \ make SHARED_PDKS_PATH=$(PDK_ROOT) install && \ make clean \ @@ -1331,3 +1333,8 @@ README.rst: README.src.rst docs/source/getting-started.rst docs/source/tool-vers -e's@.. note::@**NOTE:**@g' \ -e's@.. warning::@**WARNING:**@g' \ > openlane/README.rst + +.PHONY: clean-openlane +clean-openlane: + rm -rf $(OPENLANE_ROOT) + diff --git a/openlane/Makefile b/openlane/Makefile index df8e268f..7d5674c6 100644 --- a/openlane/Makefile +++ b/openlane/Makefile @@ -18,7 +18,7 @@ BLOCKS = $(shell find * -maxdepth 0 -type d) CONFIG = $(foreach block,$(BLOCKS), ./$(block)/config.tcl) CLEAN = $(foreach block,$(BLOCKS), clean-$(block)) -OPENLANE_TAG ?= 2021.11.23_01.42.34 +OPENLANE_TAG ?= 2022.02.23_02.50.41 OPENLANE_IMAGE_NAME ?= efabless/openlane:$(OPENLANE_TAG) OPENLANE_BASIC_COMMAND = "cd $(PWD)/../openlane && flow.tcl -design ./$* -save_path .. -save -tag $* -overwrite" OPENLANE_INTERACTIVE_COMMAND = "cd $(PWD)/../openlane && flow.tcl -it -file ./$*/interactive.tcl" @@ -74,7 +74,7 @@ openlane: check-openlane-env $(OPENLANE_ROOT) $(OPENLANE_ROOT): git clone https://github.com/The-OpenROAD-Project/OpenLane --branch=$(OPENLANE_TAG) --depth=1 $(OPENLANE_ROOT) && \ cd $(OPENLANE_ROOT) && \ - export IMAGE_NAME=efabless/openlane:$(OPENLANE_TAG) && \ + export OPENLANE_IMAGE_NAME=efabless/openlane:$(OPENLANE_TAG) && \ $(MAKE) pull-openlane .PHONY: check-openlane-env