Skip to content

Reinstate out-of-order multiplexer in streamer #56

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
FrancescoConti wants to merge 2 commits into
base: ab/xif-1.0
Choose a base branch
from
Open

Reinstate out-of-order multiplexer in streamer #56

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
fcca23d
Move RedMulE streamer back to ooo mux
FrancescoConti Mar 3, 2026
8dfe6b7
[scheduler] Fix spurious pop in y_config_fast FIFOs
FrancescoConti Mar 4, 2026
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
52 changes: 28 additions & 24 deletions rtl/redmule_scheduler.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ module redmule_scheduler
) i_x_config_fifo (
.clk_i ( clk_i ),
.rst_ni ( rst_ni ),
.flush_i ( clear ),
.flush_i ( clear_i ),
.testmode_i ( '0 ),
.full_o ( x_config_full ),
.empty_o ( x_config_empty ),
Expand Down Expand Up @@ -274,7 +274,7 @@ module redmule_scheduler
) i_w_config_fifo (
.clk_i ( clk_i ),
.rst_ni ( rst_ni ),
.flush_i ( clear ),
.flush_i ( clear_i ),
.testmode_i ( '0 ),
.full_o ( w_config_full ),
.empty_o ( w_config_empty ),
Expand Down Expand Up @@ -403,40 +403,44 @@ module redmule_scheduler
logic [$clog2(W):0] y_width, z_width;
logic [$clog2(D):0] y_height, z_height;

logic y_config_pop;
assign y_config_pop = y_rows_iter_q == y_config.x_rows_iter-1 && y_rows_iter_en && ~y_config_empty;
fifo_v3 #(
.FALL_THROUGH (0),
.DEPTH (2),
.dtype (redmule_config_t)
) i_y_config_fifo (
.clk_i ( clk_i ),
.rst_ni ( rst_ni ),
.flush_i ( clear ),
.testmode_i ( '0 ),
.full_o ( y_config_full ),
.empty_o ( y_config_empty ),
.usage_o ( ),
.data_i ( config_i ),
.push_i ( config_valid_i ),
.data_o ( y_config ),
.pop_i ( y_rows_iter_q == y_config.x_rows_iter-1 && y_rows_iter_en )
.clk_i ( clk_i ),
.rst_ni ( rst_ni ),
.flush_i ( clear_i ),
.testmode_i ( '0 ),
.full_o ( y_config_full ),
.empty_o ( y_config_empty ),
.usage_o ( ),
.data_i ( config_i ),
.push_i ( config_valid_i ),
.data_o ( y_config ),
.pop_i ( y_config_pop )
);

logic y_config_fast_pop;
assign y_config_fast_pop = y_loads_cnt_q == y_config_fast.tot_stores-1 && y_pushed_q && ~y_config_fast_empty && ~stall_engine;
fifo_v3 #(
.FALL_THROUGH (0),
.DEPTH (2),
.dtype (redmule_config_t)
) i_y_config_fast_fifo (
.clk_i ( clk_i ),
.rst_ni ( rst_ni ),
.flush_i ( clear ),
.testmode_i ( '0 ),
.full_o ( y_config_fast_full ),
.empty_o ( y_config_fast_empty ),
.usage_o ( ),
.data_i ( config_i ),
.push_i ( config_valid_i ),
.data_o ( y_config_fast ),
.pop_i ( y_loads_cnt_q == y_config_fast.tot_stores-1 && y_pushed_q && ~stall_engine )
.clk_i ( clk_i ),
.rst_ni ( rst_ni ),
.flush_i ( clear_i ),
.testmode_i ( '0 ),
.full_o ( y_config_fast_full ),
.empty_o ( y_config_fast_empty ),
.usage_o ( ),
.data_i ( config_i ),
.push_i ( config_valid_i ),
.data_o ( y_config_fast ),
.pop_i ( y_config_fast_pop )
);

always_ff @(posedge clk_i or negedge rst_ni) begin : y_pushed_register
Expand Down
31 changes: 22 additions & 9 deletions rtl/redmule_streamer.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,17 +137,19 @@ hci_core_intf #(
.IW ( `HCI_SIZE_GET_IW(ldst_tcdm) ),
.EW ( `HCI_SIZE_GET_EW(ldst_tcdm) ),
.EHW ( `HCI_SIZE_GET_EHW(ldst_tcdm) )
) virt_tcdm [0:NumStreamSources+1] ( .clk ( clk_i ) );
) virt_tcdm [0:NumStreamSources] ( .clk ( clk_i ) );

redmule_mux #(
.NB_CHAN (NumStreamSources+2),
hci_core_mux_ooo #(
.NB_CHAN ( NumStreamSources+1 ),
.`HCI_SIZE_PARAM(out) ( `HCI_SIZE_PARAM(ldst_tcdm) )
) i_mux (
.clk_i ( clk_i ),
.rst_ni ( rst_ni ),
.clear_i ( clear_i ),
.in ( virt_tcdm ),
.out ( ldst_tcdm_pre_r_valid )
.clk_i ( clk_i ),
.rst_ni ( rst_ni ),
.clear_i ( clear_i ),
.priority_force_i ( '0 ),
.priority_i ( '0 ),
.in ( virt_tcdm ),
.out ( ldst_tcdm_pre_r_valid )
);

hci_core_r_valid_filter #(
Expand All @@ -158,7 +160,18 @@ hci_core_r_valid_filter #(
.clear_i ( clear_i ),
.enable_i ( 1'b1 ),
.tcdm_target ( ldst_tcdm_pre_r_valid ),
.tcdm_initiator ( ldst_tcdm )
.tcdm_initiator ( ldst_tcdm_pre_r_id )
);

hci_core_r_id_filter #(
.`HCI_SIZE_PARAM(tcdm_target) ( `HCI_SIZE_PARAM(ldst_tcdm) )
) i_load_r_id_filter (
.clk_i ( clk_i ),
.rst_ni ( rst_ni ),
.clear_i ( clear_i ),
.enable_i ( 1'b1 ),
.tcdm_target ( ldst_tcdm_pre_r_id ),
.tcdm_initiator ( ldst_tcdm )
);

/************************************ Store Channel *************************************/
Expand Down
Loading