Skip to content

Commit e3ab2bd

Browse files
author
Andrea Belano
committed
[treewide] Propagate redmule configuration struct instead of fake register file
1 parent 02e7782 commit e3ab2bd

File tree

5 files changed

+111
-160
lines changed

5 files changed

+111
-160
lines changed

rtl/redmule_ctrl.sv

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ module redmule_ctrl
2727
output logic busy_o ,
2828
output logic clear_o ,
2929
output logic [N_CORES-1:0][1:0] evt_o ,
30-
output ctrl_regfile_t reg_file_o ,
30+
output redmule_config_t config_o ,
3131
input logic reg_enable_i ,
3232
input logic start_cfg_i ,
3333
input flgs_streamer_t flgs_streamer_i ,
@@ -56,7 +56,9 @@ module redmule_ctrl
5656

5757
redmule_ctrl_state_e current, next;
5858

59-
hwpe_ctrl_package::ctrl_regfile_t reg_file_d, reg_file_q;
59+
redmule_config_t redmule_config;
60+
61+
hwpe_ctrl_package::ctrl_regfile_t reg_file;
6062
hwpe_ctrl_package::ctrl_slave_t cntrl_slave;
6163
hwpe_ctrl_package::flags_slave_t flgs_slave;
6264

@@ -75,18 +77,18 @@ module redmule_ctrl
7577
.cfg ( periph ),
7678
.ctrl_i ( cntrl_slave ),
7779
.flags_o ( flgs_slave ),
78-
.reg_file ( reg_file_d )
80+
.reg_file ( reg_file )
7981
);
8082

8183
redmule_tiler i_cfg_tiler (
82-
.clk_i ( clk_i ),
83-
.rst_ni ( rst_ni ),
84-
.clear_i ( clear ),
85-
.setback_i ( tiler_setback ),
86-
.start_cfg_i ( start_cfg_i ),
87-
.reg_file_i ( reg_file_d ),
88-
.valid_o ( tiler_valid ),
89-
.reg_file_o ( reg_file_q )
84+
.clk_i ( clk_i ),
85+
.rst_ni ( rst_ni ),
86+
.clear_i ( clear ),
87+
.setback_i ( tiler_setback ),
88+
.start_cfg_i ( start_cfg_i ),
89+
.reg_file_i ( reg_file ),
90+
.valid_o ( tiler_valid ),
91+
.config_o ( redmule_config )
9092
);
9193

9294
assign cfg_complete_o = tiler_valid;
@@ -121,7 +123,7 @@ module redmule_ctrl
121123
/*---------------------------------------------------------------------------------------------*/
122124
/* Register file assignment */
123125
/*---------------------------------------------------------------------------------------------*/
124-
assign reg_file_o = reg_file_q;
126+
assign config_o = redmule_config;
125127

126128
/*---------------------------------------------------------------------------------------------*/
127129
/* Controller FSM */
@@ -160,7 +162,7 @@ module redmule_ctrl
160162
end
161163
end
162164
REDMULE_COMPUTING: begin
163-
if (flgs_streamer_i.z_stream_sink_flags.ready_start && ((reg_file_q.hwpe_params[R_CONF][2:1] == RED_NONE) | flgs_streamer_i.r_stream_sink_flags.ready_start)) begin
165+
if (flgs_streamer_i.z_stream_sink_flags.ready_start && ((redmule_config.red_op == RED_NONE) | flgs_streamer_i.r_stream_sink_flags.ready_start)) begin
164166
next = REDMULE_FINISHED;
165167
end
166168
end

0 commit comments

Comments
 (0)