Skip to content

Commit ba86791

Browse files
committed
sw: Fix multi-cluster setting EOC correctly
Use cluster local core ID for determining which core is to set EOC instead of global one. This fixes multi-cluster configurations not setting the EOC correctly on cluster != 0
1 parent e9626d5 commit ba86791

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

hw/system/spatz_cluster/src/generated/spatz_cluster_wrapper.sv

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ package spatz_cluster_pkg;
5858

5959
localparam int unsigned TCDMStartAddr = 32'h100000;
6060
localparam int unsigned TCDMSize = 32'h20000;
61-
61+
localparam logic AddrMisalign = 1'b0; // 0-aligned, 1-misalign
6262
localparam int unsigned PeriStartAddr = TCDMStartAddr + TCDMSize;
6363

6464
localparam int unsigned BootAddr = 32'h1000;
@@ -243,6 +243,7 @@ module spatz_cluster_wrapper
243243
localparam int unsigned NumSpatzOutstandingLoads [NumCores] = '{4, 4};
244244
localparam int unsigned NumSpatzFPUs [NumCores] = '{default: 4};
245245
localparam int unsigned NumSpatzIPUs [NumCores] = '{default: 1};
246+
localparam int unsigned NumSpatzTCDMPorts [NumCores] = '{default: 4};
246247

247248
typedef logic [IwcAxiIdOutWidth-1:0] axi_id_out_iwc_t;
248249

@@ -302,6 +303,8 @@ module spatz_cluster_wrapper
302303
.NumSpatzOutstandingLoads (NumSpatzOutstandingLoads),
303304
.NumSpatzFPUs (NumSpatzFPUs),
304305
.NumSpatzIPUs (NumSpatzIPUs),
306+
.NumSpatzTCDMPorts (NumSpatzTCDMPorts),
307+
.AddrMisalign (AddrMisalign),
305308
.axi_in_req_t (axi_in_req_t),
306309
.axi_in_resp_t (axi_in_resp_t),
307310
.axi_out_req_t (spatz_axi_iwc_out_req_t),
0 Bytes
Binary file not shown.

sw/snRuntime/src/platforms/cheshire/start_snitch.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ _snrt_exit:
1515
addi sp, sp, -8
1616
sw a0, 0(sp)
1717
sw ra, 4(sp)
18-
call snrt_global_core_idx
18+
call snrt_cluster_core_idx
1919
# reload exit code into t0
2020
lw t0, 0(sp)
2121
lw ra, 4(sp)

sw/snRuntime/src/platforms/standalone/start_snitch.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ _snrt_exit:
1515
addi sp, sp, -8
1616
sw a0, 0(sp)
1717
sw ra, 4(sp)
18-
call snrt_global_core_idx
18+
call snrt_cluster_core_idx
1919
# reload exit code into t0
2020
lw t0, 0(sp)
2121
lw ra, 4(sp)

0 commit comments

Comments
 (0)