Skip to content

Commit d5998ee

Browse files
committed
treewide: Apply minor review changes
1 parent e71e6b3 commit d5998ee

File tree

7 files changed

+9
-22
lines changed

7 files changed

+9
-22
lines changed

Bender.local

Lines changed: 0 additions & 7 deletions
This file was deleted.

Bender.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ packages:
7474
revision: c396bbf477457b184a74b7f2386302f5895bb522
7575
version: null
7676
source:
77-
Git: git@github.com:pulp-platform/iDMA.git
77+
Git: https://github.com/pulp-platform/iDMA.git
7878
dependencies:
7979
- axi
8080
- axi_stream
@@ -83,8 +83,8 @@ packages:
8383
- obi
8484
- register_interface
8585
obi:
86-
revision: 0155fc34e900c7c884e081c0a1114a247937ff69
87-
version: 0.1.7
86+
revision: 8097928cf1b43712f93d5356f336397879b4ad2c
87+
version: 0.1.6
8888
source:
8989
Git: https://github.com/pulp-platform/obi.git
9090
dependencies:

Bender.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dependencies:
2727
tech_cells_generic: { git: https://github.com/pulp-platform/tech_cells_generic, version: 0.2.13 }
2828
riscv-dbg: { git: https://github.com/pulp-platform/riscv-dbg, version: 0.8.0 }
2929
cluster_icache: { git: https://github.com/pulp-platform/cluster_icache.git, rev: 64e21ae455bbdde850c4df13bef86ea55ac42537 }
30-
idma: { git: git@github.com:pulp-platform/iDMA.git, rev: __deploy__3c6bbb7__multicast-integration }
30+
idma: { git: https://github.com/pulp-platform/iDMA.git, rev: __deploy__3c6bbb7__multicast-integration }
3131

3232
export_include_dirs:
3333
- hw/reqrsp_interface/include

hw/snitch/src/snitch.sv

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,8 @@ module snitch import snitch_pkg::*; import riscv_instr::*; #(
248248
logic csr_en;
249249
logic csr_dump;
250250
logic csr_stall_d, csr_stall_q;
251+
// Multicast mask
252+
logic [31:0] csr_mcast_d, csr_mcast_q;
251253

252254
localparam logic M = 0;
253255
localparam logic S = 1;
@@ -281,10 +283,7 @@ module snitch import snitch_pkg::*; import riscv_instr::*; #(
281283
dm::dcsr_t dcsr_d, dcsr_q;
282284
logic [31:0] dpc_d, dpc_q;
283285
logic [31:0] dscratch_d, dscratch_q;
284-
285286
logic debug_d, debug_q;
286-
// Multicast mask
287-
logic [31:0] csr_mcast_d, csr_mcast_q;
288287

289288
`FFAR(scratch_q, scratch_d, '0, clk_i, rst_i)
290289
`FFAR(tvec_q, tvec_d, '0, clk_i, rst_i)
@@ -2357,9 +2356,9 @@ module snitch import snitch_pkg::*; import riscv_instr::*; #(
23572356
dcsr_d = dcsr_q;
23582357
dpc_d = dpc_q;
23592358
dscratch_d = dscratch_q;
2360-
csr_mcast_d = csr_mcast_q;
23612359

23622360
csr_stall_d = csr_stall_q;
2361+
csr_mcast_d = csr_mcast_q;
23632362

23642363
if (barrier_i) csr_stall_d = 1'b0;
23652364
barrier_o = 1'b0;

sw/snRuntime/src/dma.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,6 @@ inline uint32_t snrt_dma_start_1d_mcast_wideptr(uint64_t dst, uint64_t src,
9999
10, OP_CUSTOM1)),
100100
"r"(reg_size));
101101

102-
// Reset dmmcast or next transfers will inherit this setting
103-
asm volatile(".word %0\n" ::"i"(R_TYPE_ENCODE(DMMCAST_FUNCT7, 0b00000, 0,
104-
XDMA_FUNCT3, 0, OP_CUSTOM1)),
105-
"r"(reg_mcast));
106-
107102
return reg_txid;
108103
}
109104

sw/snRuntime/src/sync.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ inline void snrt_wake_all(uint32_t core_mask) {
8181
// Note: we need to address another cluster's address space
8282
// because the cluster XBAR has not been extended to support
8383
// multicast yet. We address the second cluster, if we are the
84-
// first cluster, and the second otherwise.
84+
// first cluster, and the first cluster otherwise.
8585
uintptr_t addr = (uintptr_t)snrt_cluster_clint_set_ptr() -
8686
SNRT_CLUSTER_OFFSET * snrt_cluster_idx();
8787
if (snrt_cluster_idx() == 0) addr += SNRT_CLUSTER_OFFSET;

util/clustergen/schema/snitch_cluster.schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
},
161161
"enable_multicast": {
162162
"type": "boolean",
163-
"description": "Whether to enable the mutlicast feature into the cluster",
163+
"description": "Whether to enable multicast in the cluster.",
164164
"default": false
165165
},
166166
"hart_base_id": {

0 commit comments

Comments
 (0)