From b471ad222f8d7b539349069372d8e98e4b3a1bf5 Mon Sep 17 00:00:00 2001 From: Marwan Abbas <67271180+marwaneltoukhy@users.noreply.github.com> Date: Sun, 30 Jul 2023 16:47:34 +0300 Subject: [PATCH 1/4] Update Makefile to fix lvs target --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 23c19b465..6684bb1f8 100644 --- a/Makefile +++ b/Makefile @@ -266,7 +266,7 @@ $(LVS_BLOCKS): lvs-% : ./lvs/%/lvs_config.json check-pdk check-precheck -v $(INPUT_DIRECTORY):$(INPUT_DIRECTORY) \ -v $(PDK_ROOT):$(PDK_ROOT) \ -u $(shell id -u $(USER)):$(shell id -g $(USER)) \ - efabless/mpw_precheck:latest bash -c "cd $(PRECHECK_ROOT) ; python3 checks/lvs_check/lvs.py --pdk_path $(PDK_ROOT)/$(PDK) --design_directory $(INPUT_DIRECTORY) --output_directory $(INPUT_DIRECTORY)/lvs --design_name $* --config_file $(INPUT_DIRECTORY)/lvs/$*/lvs_config.json" + efabless/mpw_precheck:latest bash -c "export PYTHONPATH=$(PRECHECK_ROOT) ; cd $(PRECHECK_ROOT) ; python3 checks/lvs_check/lvs.py --pdk_path $(PDK_ROOT)/$(PDK) --design_directory $(INPUT_DIRECTORY) --output_directory $(INPUT_DIRECTORY)/lvs --design_name $* --config_file $(INPUT_DIRECTORY)/lvs/$*/lvs_config.json" .PHONY: clean clean: From a8668d31f81e0311a0266236b2ff4d787ae8ac61 Mon Sep 17 00:00:00 2001 From: kareefardi Date: Wed, 2 Aug 2023 18:32:54 +0300 Subject: [PATCH 2/4] Export MPW_TAG before calling other Makefiles --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 23c19b465..3b82c39d7 100644 --- a/Makefile +++ b/Makefile @@ -90,7 +90,7 @@ endif # Include Caravel Makefile Targets .PHONY: % : check-caravel %: - export CARAVEL_ROOT=$(CARAVEL_ROOT) && $(MAKE) -f $(CARAVEL_ROOT)/Makefile $@ + export CARAVEL_ROOT=$(CARAVEL_ROOT) && export MPW_TAG=$(MPW_TAG) && $(MAKE) -f $(CARAVEL_ROOT)/Makefile $@ .PHONY: install install: From 49785cc6f1d4f96c4a5b1d38ecc682213964f5aa Mon Sep 17 00:00:00 2001 From: Spencer Bowles Date: Wed, 9 Aug 2023 16:44:22 -0400 Subject: [PATCH 3/4] Fix counter_la.py test log name --- verilog/dv/cocotb/counter_tests/counter_la/counter_la.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/verilog/dv/cocotb/counter_tests/counter_la/counter_la.py b/verilog/dv/cocotb/counter_tests/counter_la/counter_la.py index 485eb8dd9..f9e94db45 100644 --- a/verilog/dv/cocotb/counter_tests/counter_la/counter_la.py +++ b/verilog/dv/cocotb/counter_tests/counter_la/counter_la.py @@ -7,7 +7,7 @@ async def counter_la(dut): caravelEnv = await test_configure(dut,timeout_cycles=1346140) - cocotb.log.info(f"[TEST] Start counter_wb test") + cocotb.log.info(f"[TEST] Start counter_la test") # wait for start of sending await caravelEnv.release_csb() await caravelEnv.wait_mgmt_gpio(1) @@ -33,4 +33,4 @@ async def counter_la(dut): cocotb.log.error(f"counter have wrong value expected = {counter} recieved = {int ((caravelEnv.monitor_gpio(37,30).binstr + caravelEnv.monitor_gpio(7,0).binstr ),2) }") await cocotb.triggers.ClockCycles(caravelEnv.clk,1) counter +=1 - \ No newline at end of file + From 9ee2462d8ac93ed725feda83f685b91f28e039a5 Mon Sep 17 00:00:00 2001 From: marwaneltoukhy Date: Thu, 10 Aug 2023 10:36:10 +0300 Subject: [PATCH 4/4] fixed precheck docker run command --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 23c19b465..021ae3231 100644 --- a/Makefile +++ b/Makefile @@ -233,7 +233,7 @@ run-precheck: check-pdk check-precheck @if [ "$$DISABLE_LVS" = "1" ]; then\ $(eval INPUT_DIRECTORY := $(shell pwd)) \ cd $(PRECHECK_ROOT) && \ - docker run -v $(PRECHECK_ROOT):$(PRECHECK_ROOT) \ + docker run -it -v $(PRECHECK_ROOT):$(PRECHECK_ROOT) \ -v $(INPUT_DIRECTORY):$(INPUT_DIRECTORY) \ -v $(PDK_ROOT):$(PDK_ROOT) \ -e INPUT_DIRECTORY=$(INPUT_DIRECTORY) \ @@ -245,7 +245,7 @@ run-precheck: check-pdk check-precheck else \ $(eval INPUT_DIRECTORY := $(shell pwd)) \ cd $(PRECHECK_ROOT) && \ - docker run -v $(PRECHECK_ROOT):$(PRECHECK_ROOT) \ + docker run -it -v $(PRECHECK_ROOT):$(PRECHECK_ROOT) \ -v $(INPUT_DIRECTORY):$(INPUT_DIRECTORY) \ -v $(PDK_ROOT):$(PDK_ROOT) \ -e INPUT_DIRECTORY=$(INPUT_DIRECTORY) \