From bc635c8448edfddd210a29473e7bba6a1d0f9014 Mon Sep 17 00:00:00 2001 From: Rob Taylor Date: Mon, 1 Sep 2025 19:05:20 +0100 Subject: [PATCH 1/3] Remove unnecessary dependencies --- pyproject.toml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 65eb367..61123d6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,11 +14,10 @@ license = {file = "LICENSE.md"} requires-python = ">=3.11" dependencies = [ "amaranth[builtin-yosys]>=0.5.4,<0.6", - "chipflow-digital-ip @ git+https://github.com/ChipFlow/chipflow-digital-ip", - "minerva @ git+https://github.com/minerva-cpu/minerva", + "amaranth-soc @ git+https://github.com/amaranth-lang/amaranth-soc", "chipflow-lib @ git+https://github.com/ChipFlow/chipflow-lib.git", + "chipflow-digital-ip @ git+https://github.com/ChipFlow/chipflow-digital-ip", "ziglang==0.11.0", - "amaranth-soc @ git+https://github.com/amaranth-lang/amaranth-soc", ] # Build system configuration From 20d3d9138931dc3c5e06c932387ba5c148452ea2 Mon Sep 17 00:00:00 2001 From: Rob Taylor Date: Wed, 24 Sep 2025 22:20:21 +0100 Subject: [PATCH 2/3] Add [chipflow.test] sections --- mcu_soc/chipflow.toml | 3 +++ minimal/chipflow.toml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mcu_soc/chipflow.toml b/mcu_soc/chipflow.toml index e76f526..4fa670f 100644 --- a/mcu_soc/chipflow.toml +++ b/mcu_soc/chipflow.toml @@ -10,3 +10,6 @@ board = "design.steps.board:MyBoardStep" [chipflow.silicon] process = "ihp_sg13g2" package = "pga144" + +[chipflow.test] +event_reference = "design/tests/events_reference.json" diff --git a/minimal/chipflow.toml b/minimal/chipflow.toml index 82c1cd2..7355aaa 100644 --- a/minimal/chipflow.toml +++ b/minimal/chipflow.toml @@ -6,10 +6,10 @@ soc = "design.design:MySoC" [chipflow.steps] board = "design.steps.board:MyBoardStep" -software = "design.steps.software:MySoftwareStep" [chipflow.silicon] process = "sky130" package = "openframe" - +[chipflow.test] +event_reference = "design/tests/events_reference.json" From 8575cc68603237105a6bc6bd4276f92f9a9f3ee4 Mon Sep 17 00:00:00 2001 From: Rob Taylor Date: Wed, 24 Sep 2025 22:23:07 +0100 Subject: [PATCH 3/3] Use new sim commands --- pyproject.toml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 61123d6..c2a6623 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -51,21 +51,16 @@ source = "scm" [tool.pdm.scripts] _.env_file = ".env.toolchain" -_json-compare.call = "tools.json_compare:main" _check-project.call = "tools.check_project:main" -_run-sim.shell = "cd $PDM_RUN_CWD/build/sim && ./sim_soc" submit.composite = ["_check-project", "chipflow silicon submit {args}"] chipflow.shell = "cd $PDM_RUN_CWD && chipflow" sim-run.composite = [ "_check-project", - "chipflow sim", - "chipflow software", - "_run-sim {args}" + "chipflow sim run", ] sim-check.composite = [ "_check-project", - "sim-run {args}", - "_json-compare design/tests/events_reference.json build/sim/events.json" + "chipflow sim check", ] board-load-software-ulx3s.composite = ["_check_project", "openFPGALoader -fb ulx3s -o 0x00100000 $PDM_RUN_CWD/build/software/software.bin"] board-load-ulx3s.composite = ["_check_project", "openFPGALoader -b ulx3s $PDM_RUN_CWD/build/top.bit"]