Skip to content

Upgrade Cheshire (64-bit CVA6) #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Xeratec wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

Upgrade Cheshire (64-bit CVA6) #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b73aa13
Fix Hyperbus test
Xeratec Mar 6, 2026
7de6e42
Switch to 64-bit CVA6 (local Cheshire Version)
Xeratec Mar 4, 2026
3518ba7
Fix CVA6 Stall error
Xeratec Mar 18, 2026
9533591
Update Cheshire and regenerate Snitch Bootrom
Xeratec Mar 18, 2026
1680f99
Move Hyperbus to AXI LLC
Xeratec Mar 18, 2026
0ff4dc1
Enable LLC
Xeratec Mar 18, 2026
b9c65a7
Rebase to latest chimera template version
Xeratec Jul 8, 2026
61462df
hw: address PR #84 review feedback
Xeratec Aug 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ snitch_cluster
deps/
*.OLD
*.egg-info/
*compile.log

# EMACS

Expand Down
3 changes: 3 additions & 0 deletions Bender.local
View file
Open in desktop

@Lore0599 Lore0599 Aug 10, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a specific reason why we need the bender local?
I think it would be better to update teh Bender.lock (and YML)

@Xeratec Xeratec Aug 25, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I argue it makes sense to resolve conflicts that we already know. This is currently the case for common_cells and axi. Thus, when running bender update you don't have to manually resolve these.

@Lore0599 Lore0599 Aug 27, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, but when running bender update, I think we want to see any conflicts and resolve them manually; that is part of the expected Bender behavior.

I would therefore prefer to remove this file and update both Bender.lock and Bender.yml accordingly.

Also, I think we should try to use a released version of common_cells, if possible. Can we use v1.40.0?

For AXI, instead, I think it is fine for now to keep the specific commit hash. Let’s just keep it in Bender.yml; if bender update is run, it will be our responsibility to resolve any resulting version conflicts.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
overrides:
common_cells: { git: "https://github.com/pulp-platform/common_cells.git", rev: ca9d577f2fbc45ec557ab4e0905bbfc154441540 } # snitch branch from 15.12.25 commit "Add iomsb function used in most other PULP repos"
axi: { git: "https://github.com/colluca/axi", rev: bd1abffc0812f8170902e5fb93142c7785c0b8c1 } # idma: { git: "https://github.com/pulp-platform/iDMA.git", rev: 28a36e5e07705549e59fc33db96ab681bc1ca88e}
44 changes: 26 additions & 18 deletions Bender.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ packages:
- obi_peripherals
- register_interface
axi:
revision: 8e04779f341eb2c89412aae92223a292beef487e
revision: bd1abffc0812f8170902e5fb93142c7785c0b8c1
version: null
source:
Git: https://github.com/colluca/axi
Expand All @@ -37,8 +37,8 @@ packages:
- register_interface
- tech_cells_generic
axi_riscv_atomics:
revision: 0ac3a78fe342c5a5b9b10bff49d58897f773059e
version: 0.8.2
revision: 97a1dd2ac643c276880420a0cf8eea697f228aa9
version: 0.8.3
source:
Git: https://github.com/pulp-platform/axi_riscv_atomics.git
dependencies:
Expand Down Expand Up @@ -71,7 +71,7 @@ packages:
- common_cells
- register_interface
cheshire:
revision: 1b6ba6294a5925a5dc199b4f98704adb76648ed1
revision: b34d22838ed54b8f4f941f4eabb6a15ca29192a0
version: null
source:
Git: https://github.com/pulp-platform/cheshire.git
Expand All @@ -87,6 +87,7 @@ packages:
- common_cells
- common_verification
- cva6
- dram_rtl_sim
- idma
- irq_router
- opentitan_peripherals
Expand All @@ -95,8 +96,8 @@ packages:
- serial_link
- unbent
clic:
revision: 8ed76ffc779a435d0ed034f3068e4c3334fe2ecf
version: 2.0.0
revision: 6515a71eb4ae3b143ab912d265e79832b3179a76
version: 3.0.0
source:
Git: https://github.com/pulp-platform/clic.git
dependencies:
Expand Down Expand Up @@ -128,8 +129,8 @@ packages:
dependencies:
- common_cells
common_cells:
revision: 9afda9abb565971649c2aa0985639c096f351171
version: 1.38.0
revision: ca9d577f2fbc45ec557ab4e0905bbfc154441540
version: null
source:
Git: https://github.com/pulp-platform/common_cells.git
dependencies:
Expand All @@ -142,17 +143,24 @@ packages:
Git: https://github.com/pulp-platform/common_verification.git
dependencies: []
cva6:
revision: 630bd959c9cc69a35d461a2abc205310d2edacf8
revision: 4c02b24fe7c04690f626776a92274da24f80d1da
version: null
source:
Git: https://github.com/Scheremo/cva6.git
Git: https://github.com/pulp-platform/cva6.git
dependencies:
- axi
- common_cells
- fpnew
- tech_cells_generic
dram_rtl_sim:
revision: 2cac4a9e12a60537567276b539ab6c919c87b5dc
version: 0.1.1
source:
Git: https://github.com/pulp-platform/dram_rtl_sim.git
dependencies:
- axi
fpnew:
revision: a8e0cba6dd50f357ece73c2c955d96efc3c6c315
revision: e5aa6a01b5bbe1675c3aa8872e1203413ded83d1
version: null
source:
Git: https://github.com/pulp-platform/cvfpu.git
Expand All @@ -167,8 +175,8 @@ packages:
dependencies:
- common_cells
hyperbus:
revision: 841deb9d821b63bf05a1c85d3a4746352a8bcae2
version: null
revision: 2a14bd8f9a985b488ee23d240764f52f129f7729
version: 0.0.9
source:
Git: https://github.com/pulp-platform/hyperbus.git
dependencies:
Expand Down Expand Up @@ -198,7 +206,7 @@ packages:
- common_cells
- register_interface
memory_island:
revision: 64828cb7a9ccc1f1656ec92d06129072f445c319
revision: d072ba0945adad5ccd0af2d4604abe57c1058252
version: null
source:
Git: https://github.com/pulp-platform/memory_island.git
Expand Down Expand Up @@ -234,8 +242,8 @@ packages:
- register_interface
- tech_cells_generic
register_interface:
revision: 8e8c209ea559d3b54f45cf30fcce95ce70ff5e49
version: 0.4.6
revision: d6e1d4cdaab7870f4faf3f88a1c788eaf5ac129d
version: 0.4.7
source:
Git: https://github.com/pulp-platform/register_interface.git
dependencies:
Expand All @@ -252,8 +260,8 @@ packages:
- common_cells
- tech_cells_generic
scm:
revision: 472f99affe44ff7b282b519c047a3cfeb35b16c6
version: 1.2.0
revision: 1976c7efb4979271eee2abe262fde0f9a20e2557
version: 1.2.1
source:
Git: https://github.com/pulp-platform/scm.git
dependencies:
Expand Down
21 changes: 8 additions & 13 deletions Bender.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,20 @@ package:
- "Lorenzo Leone <lleone@iis.ee.ethz.ch>"

dependencies:
register_interface: { git: "https://github.com/pulp-platform/register_interface.git", version: 0.4.3 }
axi: { git: https://github.com/colluca/axi, rev: multicast }
cheshire: { git: "https://github.com/pulp-platform/cheshire.git", rev: 1b6ba6294a5925a5dc199b4f98704adb76648ed1}
snitch_cluster: { git: "https://github.com/pulp-platform/snitch_cluster.git", rev: 5b2fccd96c42812774c20ab2f9b811e164809789}
common_cells: { git: "https://github.com/pulp-platform/common_cells.git", version: 1.31.1}
register_interface: { git: "https://github.com/pulp-platform/register_interface.git", version: 0.4.7 }
axi: { git: "https://github.com/colluca/axi", rev: bd1abffc0812f8170902e5fb93142c7785c0b8c1 } #
Comment thread
Lore0599 marked this conversation as resolved.
Resolved
cheshire: { git: "https://github.com/pulp-platform/cheshire.git", rev: wiesep/chimera-main }
snitch_cluster: { git: "https://github.com/pulp-platform/snitch_cluster.git", rev: 5b2fccd96c42812774c20ab2f9b811e164809789 } # main branch from 22.09.25 commit "treewide: Bump AXI after rebase"
common_cells: { git: "https://github.com/pulp-platform/common_cells.git", version: 1.39.0 }
idma: { git: "https://github.com/pulp-platform/iDMA.git", version: 0.6.5 }
memory_island: { git: "https://github.com/pulp-platform/memory_island.git", rev: 64828cb7a9ccc1f1656ec92d06129072f445c319 } # main branch
apb: { git: "https://github.com/pulp-platform/apb.git", version: 0.2.4 }
hyperbus: { git: "https://github.com/pulp-platform/hyperbus.git", rev: aottaviano/nonfree } # TMP: to fix hyperbus model issue
memory_island: { git: "https://github.com/pulp-platform/memory_island.git", rev: main }
apb: { git: "https://github.com/pulp-platform/apb.git", version: 0.2.4 }
hyperbus: { git: "https://github.com/pulp-platform/hyperbus.git", version : 0.0.9 }
tech_cells_generic: { git: "https://github.com/pulp-platform/tech_cells_generic.git", version: 0.2.12 }

export_include_dirs:
- hw/include

workspace:
package_links:
cheshire: cheshire
idma: idma

sources:
# Level 0
- hw/chimera_pkg.sv
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ SN_CFG = $(SN_ROOT)/cfg/default.json
BENDER_YML = $(CHIM_ROOT)/Bender.yml
BENDER_LOCK = $(CHIM_ROOT)/Bender.lock

CHS_XLEN ?= 32
CHS_XLEN ?= 64

CHIM_HW_DIR ?= $(CHIM_ROOT)/hw
CHIM_SW_DIR ?= $(CHIM_ROOT)/sw
Expand Down
2 changes: 1 addition & 1 deletion bender.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
# Lorenzo Leone <lleone@iis.ee.ethz.ch>

COMMON_TARGS ?=
COMMON_TARGS += -t snitch_cluster -t cv32a6_convolve -t cva6 -t rtl
COMMON_TARGS += -t snitch_cluster -t cv64a6_imafdchsclic_sv39_wb -t cva6 -t rtl

SIM_TARGS = $(COMMON_TARGS) -t test -t sim
2 changes: 1 addition & 1 deletion chimera.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ $(CHIM_HW_DIR)/regs/pcr.md: $(CHIM_ROOT)/hw/regs/chimera_regs.hjson

.PHONY: snitch_bootrom
CHIM_BROM_SRCS = $(wildcard $(CHIM_ROOT)/hw/bootrom/snitch/*.S $(CHIM_ROOT)/hw/bootrom/snitch/*.c) $(CHIM_SW_LIBS)
CHIM_BROM_FLAGS = $(CHS_SW_LDFLAGS) -Os -fno-zero-initialized-in-bss -flto -fwhole-program -march=rv32im
CHIM_BROM_FLAGS = $(CHS_SW_LDFLAGS) -Os -fno-zero-initialized-in-bss -flto -fwhole-program -march=rv32im_zicsr -mabi=ilp32

CHIM_BOOTROM_ALL += $(CHIM_ROOT)/hw/bootrom/snitch/snitch_bootrom.sv $(CHIM_ROOT)/hw/bootrom/snitch/snitch_bootrom.dump

Expand Down
Binary file modified hw/bootrom/snitch/snitch_bootrom.bin
View file
Open in desktop
Binary file not shown.
Loading