Skip to content
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.

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

treewide: Bump AXI-RT and fix AXI-RT functional tests #118

Merged
merged 22 commits into from
Nov 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c84c957
Bender: Bump AXI-REALM
alex96295 Oct 8, 2024
7fdc4a0
treewide: Fix default num of AXI-REALM managers and regenerate regs
alex96295 Nov 19, 2024
a7e3e65
sw/include: Add manager ID discovery from hardware features
alex96295 Nov 19, 2024
e0283fc
sw/tests: Fix AXI-REALM budget test
alex96295 Nov 19, 2024
c3358c8
sw/tests: Add test for AXI-REALM isolation capability
alex96295 Nov 19, 2024
014049b
cheshire.mk: Bump non-free
alex96295 Nov 19, 2024
2b5296e
sw: Some cleanup
paulsc96 Nov 20, 2024
f6067a6
Makefile: Ensure use of real path as root
paulsc96 Nov 20, 2024
9188376
requirements.txt: Fix `tclint` version to 0.4.2
paulsc96 Nov 20, 2024
02bb5f3
sw: Fix lint
paulsc96 Nov 20, 2024
d288055
sw/tests: Fix incorrect type casts
paulsc96 Nov 20, 2024
8673cc0
Makefile: Fix `CHSROOT` to speed up build
paulsc96 Nov 20, 2024
d7e1176
make: Force full rebuild of AXI RT regs on generation
paulsc96 Nov 20, 2024
bbff9be
sw: Avoid undefined non-void* to integer casts
paulsc96 Nov 20, 2024
7fd8d5c
sw: Fix incorrect check of HW feature present in AXI-RT tests
alex96295 Nov 27, 2024
7f1fd46
sw: Fix lint of void cast
alex96295 Nov 27, 2024
89c850e
fixup! sw: Fix lint of void cast
alex96295 Nov 27, 2024
db1aede
sw: Avoid troublesome word-size volatile stack tip
paulsc96 Nov 28, 2024
dee9900
sw/tests: Some cleanup
paulsc96 Nov 28, 2024
c372247
sw/tests: Backport idea of feature checks
paulsc96 Nov 28, 2024
34e2bea
sw/tests: Clean lint
paulsc96 Nov 28, 2024
d4adb6d
sw/tests: Some more `axirt_hello` cleanup
paulsc96 Nov 28, 2024
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
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 <creinwar@student.ethz.ch>
# Paul Scheffler <paulsc@iis.ee.ethz.ch>

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 ?= git@iis-git.ee.ethz.ch: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
Loading