Skip to content

sw: Fix runtime exit routine #51

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

Open
Smephite wants to merge 2 commits into
base: main
Choose a base branch
from
Open

sw: Fix runtime exit routine #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9626d5
sw: Fix runtime routine
Smephite Dec 8, 2025
ba86791
sw: Fix multi-cluster setting EOC correctly
Smephite Dec 19, 2025
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
5 changes: 4 additions & 1 deletion hw/system/spatz_cluster/src/generated/spatz_cluster_wrapper.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ package spatz_cluster_pkg;

localparam int unsigned TCDMStartAddr = 32'h100000;
localparam int unsigned TCDMSize = 32'h20000;

localparam logic AddrMisalign = 1'b0; // 0-aligned, 1-misalign
localparam int unsigned PeriStartAddr = TCDMStartAddr + TCDMSize;

localparam int unsigned BootAddr = 32'h1000;
Expand Down Expand Up @@ -243,6 +243,7 @@ module spatz_cluster_wrapper
localparam int unsigned NumSpatzOutstandingLoads [NumCores] = '{4, 4};
localparam int unsigned NumSpatzFPUs [NumCores] = '{default: 4};
localparam int unsigned NumSpatzIPUs [NumCores] = '{default: 1};
localparam int unsigned NumSpatzTCDMPorts [NumCores] = '{default: 4};

typedef logic [IwcAxiIdOutWidth-1:0] axi_id_out_iwc_t;

Expand Down Expand Up @@ -302,6 +303,8 @@ module spatz_cluster_wrapper
.NumSpatzOutstandingLoads (NumSpatzOutstandingLoads),
.NumSpatzFPUs (NumSpatzFPUs),
.NumSpatzIPUs (NumSpatzIPUs),
.NumSpatzTCDMPorts (NumSpatzTCDMPorts),
.AddrMisalign (AddrMisalign),
.axi_in_req_t (axi_in_req_t),
.axi_in_resp_t (axi_in_resp_t),
.axi_out_req_t (spatz_axi_iwc_out_req_t),
Expand Down
Binary file modified hw/system/spatz_cluster/test/bootrom.elf
View file
Open in desktop
Binary file not shown.
11 changes: 10 additions & 1 deletion sw/snRuntime/src/platforms/cheshire/start_snitch.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ _snrt_exit:
addi sp, sp, -8
sw a0, 0(sp)
sw ra, 4(sp)
call snrt_global_core_idx
call snrt_cluster_core_idx
# reload exit code into t0
lw t0, 0(sp)
lw ra, 4(sp)
Expand All @@ -25,8 +25,17 @@ _snrt_exit:
# - a0: global core index
# - t0: exit code
bnez a0, 1f
addi sp, sp, -8
sw a0, 0(sp)
sw ra, 4(sp)

slli t0, t0, 1
ori t0, t0, 1
mv a0, t0
call snrt_set_eoc_and_return_code

lw t0, 0(sp)
lw ra, 4(sp)
addi sp, sp, 8

1: ret
2 changes: 1 addition & 1 deletion sw/snRuntime/src/platforms/standalone/start_snitch.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ _snrt_exit:
addi sp, sp, -8
sw a0, 0(sp)
sw ra, 4(sp)
call snrt_global_core_idx
call snrt_cluster_core_idx
# reload exit code into t0
lw t0, 0(sp)
lw ra, 4(sp)
Expand Down