Skip to content

Commit

Permalink
treewide: Bump AXI-RT and fix AXI-RT functional tests (#118)
Browse files Browse the repository at this point in the history
* Bender: Bump AXI-REALM

* Fix functional bug

* treewide: Fix default num of AXI-REALM managers and regenerate regs

This parameter in the makefrag affects the number of registers generated
inside the AXI-REALM IP. The default value, associated with the default
configuration of Cheshire, is 6, accounting for: `core0`, `debug
module`, `dma`, `serial link`, `vga` and `usb`. Change accordingly if
the configuration changes, e.g., the number of cores or if new managers
are added.

* sw/include: Add manager ID discovery from hardware features

Add utility function to get the manager id of cheshire according to the
implemented HW features, thus removing any hardcoded
parametrization (the number of application-class cores, as well as the
specific hardware features, are configurable, hence not known a priori)

* sw/tests: Fix AXI-REALM budget test

* Fix check on budget left for W and R transactions

* sw/tests: Add test for AXI-REALM isolation capability

Test that the manager is isolated when the transfer size exceeds the
available budget

* cheshire.mk: Bump non-free

* Makefile: Ensure use of real path as root

* requirements.txt: Fix `tclint` version to 0.4.2

* Makefile: Fix `CHSROOT` to speed up build

* make: Force full rebuild of AXI RT regs on generation

* sw/tests: Backport idea of feature checks

---------

Co-authored-by: Paul Scheffler <[email protected]>
  • Loading branch information
alex96295 and paulsc96 authored Nov 28, 2024
1 parent f64e4bf commit 139773e
Show file tree
Hide file tree
Showing 12 changed files with 395 additions and 391 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ jobs:
python-version: 3.9
cache: pip
-
name: Install tclint
run: pip install tclint
name: Install Python requirements
run: pip install -r requirements.txt
-
name: Run Tcllint
run: tclint . --style-spaces-in-braces --style-line-length 100
4 changes: 2 additions & 2 deletions Bender.lock
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ packages:
- common_cells
- common_verification
axi_rt:
revision: 56074a195b1c8b05f4bdd73674e437bbcb35f2cd
version: 0.0.0-alpha.7
revision: 641ea950e24722af747033f2ab85f0e48ea8d7f8
version: 0.0.0-alpha.9
source:
Git: https://github.com/pulp-platform/axi_rt.git
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion Bender.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies:
axi: { git: "https://github.com/pulp-platform/axi.git", version: 0.39.2 }
axi_llc: { git: "https://github.com/pulp-platform/axi_llc.git", version: 0.2.1 }
axi_riscv_atomics: { git: "https://github.com/pulp-platform/axi_riscv_atomics.git", version: 0.8.2 }
axi_rt: { git: "https://github.com/pulp-platform/axi_rt.git", version: 0.0.0-alpha.7 }
axi_rt: { git: "https://github.com/pulp-platform/axi_rt.git", version: 0.0.0-alpha.9 }
axi_vga: { git: "https://github.com/pulp-platform/axi_vga.git", version: 0.1.3 }
clic: { git: "https://github.com/pulp-platform/clic.git", version: 2.0.0 }
clint: { git: "https://github.com/pulp-platform/clint.git", version: 0.2.0 }
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Christopher Reinwardt <[email protected]>
# Paul Scheffler <[email protected]>

CHS_ROOT ?= $(shell pwd)
CHS_ROOT := $(shell realpath .)
BENDER ?= bender -d $(CHS_ROOT)

all:
Expand Down
6 changes: 3 additions & 3 deletions cheshire.mk
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ chs-clean-deps:
######################

CHS_NONFREE_REMOTE ?= [email protected]:pulp-restricted/cheshire-nonfree.git
CHS_NONFREE_COMMIT ?= f731b17
CHS_NONFREE_COMMIT ?= 1f4092e

CHS_PHONY += chs-nonfree-init
chs-nonfree-init:
Expand Down Expand Up @@ -96,11 +96,11 @@ $(OTPROOT)/.generated: $(CHS_ROOT)/hw/rv_plic.cfg.hjson
flock -x $@ sh -c "cp $< $(dir $@)/src/rv_plic/; $(MAKE) -j1 otp" && touch $@

# AXI RT
AXIRT_NUM_MGRS ?= 8
AXIRT_NUM_MGRS ?= 6
AXIRT_NUM_SUBS ?= 2
include $(AXIRTROOT)/axirt.mk
$(AXIRTROOT)/.generated:
flock -x $@ $(MAKE) axirt_regs && touch $@
flock -x $@ $(MAKE) -B axirt_regs && touch $@

# AXI VGA
include $(AXI_VGA_ROOT)/axi_vga.mk
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ yapf
mkdocs
mkdocs-material
markdown-grid-tables
tclint
tclint==0.4.2
flatdict
Loading

0 comments on commit 139773e

Please sign in to comment.