Fix errors with memory stalls

Author: Andrea Belano

Bender.lock

@@ -1,4 +1,20 @@
 packages:
+  apb:
+    revision: 77ddf073f194d44b9119949d2421be59789e69ae
+    version: 0.2.4
+    source:
+      Git: https://github.com/pulp-platform/apb.git
+    dependencies:
+    - common_cells
+  axi:
+    revision: 2f395b176bee1c769c80f060a4345fda965bb04b
+    version: 0.38.0
+    source:
+      Git: https://github.com/pulp-platform/axi.git
+    dependencies:
+    - common_cells
+    - common_verification
+    - tech_cells_generic
   cluster_interconnect:
     revision: 1284def6c0b7f7e9355eb093d00883ad9dead1b7
     version: null
@@ -51,14 +67,17 @@ packages:
     dependencies:
     - common_cells
   hci:
-    revision: 17f960efb11df1851fb80d51ba90b25e46c4b4ae
+    revision: fa625bdb824209bc2c0faaa6d99ec15ff981473f
     version: null
     source:
       Git: https://github.com/pulp-platform/hci.git
     dependencies:
     - cluster_interconnect
+    - common_cells
     - hwpe-stream
     - l2_tcdm_hybrid_interco
+    - redundancy_cells
+    - register_interface
   hwpe-ctrl:
     revision: 0e95510c0f4d43452d21b7723d766ae92e45c101
     version: null
@@ -67,7 +86,7 @@ packages:
     dependencies:
     - tech_cells_generic
   hwpe-stream:
-    revision: 6d715406d5518446d4d7449f68068b963a827c81
+    revision: db62a6411a7f3dc2b2a74e202377da118a4a6673
     version: null
     source:
       Git: https://github.com/pulp-platform/hwpe-stream.git
@@ -86,6 +105,25 @@ packages:
     source:
       Git: https://github.com/pulp-platform/L2_tcdm_hybrid_interco.git
     dependencies: []
+  redundancy_cells:
+    revision: c37bdb47339bf70e8323de8df14ea8bbeafb6583
+    version: null
+    source:
+      Git: https://github.com/pulp-platform/redundancy_cells.git
+    dependencies:
+    - common_cells
+    - common_verification
+    - register_interface
+    - tech_cells_generic
+  register_interface:
+    revision: 146501d80052b61475cdc333d3aab4cd769fd5dc
+    version: 0.3.9
+    source:
+      Git: https://github.com/pulp-platform/register_interface.git
+    dependencies:
+    - apb
+    - axi
+    - common_cells
   tech_cells_generic:
     revision: 7968dd6e6180df2c644636bc6d2908a49f2190cf
     version: 0.2.13

Bender.yml

@@ -15,9 +15,9 @@ dependencies:
   cv32e40p          : { git: "https://github.com/pulp-platform/cv32e40p.git"          , rev: "astral-v1.0"                            }
   cv32e40x          : { git: "https://github.com/pulp-platform/cv32e40x.git"          , rev: "redmule-v1.0"                           }
   ibex              : { git: "https://github.com/pulp-platform/ibex.git"              , rev: pulpissimo-v6.1.2                        }
-  hwpe-stream       : { git: "https://github.com/pulp-platform/hwpe-stream.git"       , rev: 6d715406d5518446d4d7449f68068b963a827c81 } #branch: ab/strb_fix
+  hwpe-stream       : { git: "https://github.com/pulp-platform/hwpe-stream.git"       , rev: db62a6411a7f3dc2b2a74e202377da118a4a6673 } #branch: ab/strb_fix
   hwpe-ctrl         : { git: "https://github.com/pulp-platform/hwpe-ctrl.git"         , rev: 0e95510c0f4d43452d21b7723d766ae92e45c101 } # branch: yt/task-interfaces
-  hci               : { git: "https://github.com/pulp-platform/hci.git"               , rev: 17f960efb11df1851fb80d51ba90b25e46c4b4ae } # branch: ab/fifo_options
+  hci               : { git: "https://github.com/pulp-platform/hci.git"               , rev: fa625bdb824209bc2c0faaa6d99ec15ff981473f } # branch: ab/fifo_options
   fpnew             : { git: "https://github.com/pulp-platform/cvfpu.git"             , rev: "pulp-v0.1.3"                            }
   common_cells      : { git: "https://github.com/pulp-platform/common_cells.git"      , version: 1.21.0                               }
   tech_cells_generic: { git: "https://github.com/pulp-platform/tech_cells_generic.git", version: 0.2.11                               }

rtl/redmule_scheduler.sv

@@ -317,7 +317,7 @@ module redmule_scheduler
     end
   end
 
-  assign w_zero_cnt_d = w_done && current_state == LOAD_W && w_zero_cnt_q != H ? w_zero_cnt_q + 1 : w_zero_cnt_q;
+  assign w_zero_cnt_d = w_done && current_state == LOAD_W && ~stall_engine && w_zero_cnt_q != H ? w_zero_cnt_q + 1 : w_zero_cnt_q;
 
   assign w_done_en = w_mat_iters_en && w_mat_iters_q == reg_file_i.hwpe_params[X_ITERS][31:16]-1;
 
@@ -638,14 +638,14 @@ module redmule_scheduler
                           ~check_x_full      && check_x_full_en      ||
                           ~check_y_loaded    && check_y_loaded_en    ||
                           ~check_quant_valid && check_quant_valid_en
-                        );
+                        ) || z_wait_counter_q == PIPE_REGS && flgs_z_buffer_i.z_priority;
 `else
   assign stall_engine = current_state == LOAD_W && (
                           ~check_w_valid     && check_w_valid_en     ||
                           ~check_x_full      && check_x_full_en      ||
                           ~check_y_loaded    && check_y_loaded_en    ||
                           ~check_quant_valid && check_quant_valid_en
-                        );
+                        ) || z_wait_counter_q == PIPE_REGS && flgs_z_buffer_i.z_priority;
 `endif
 
   always_ff @(posedge clk_i or negedge rst_ni) begin : first_load_register

rtl/x_buffer/redmule_x_buffer.sv

@@ -161,7 +161,7 @@ always_comb begin : fsm
       // As buf_write_cnt increments one cycle late, we have to check if its value is set to increase in the next cycle
       if ((pad_r_addr_q == buf_write_cnt-1 || flags_o.empty) && (~ctrl_i.h_shift || first_block || (pad_read_cnt == ctrl_i.slots))) begin
         if (pad_read_cnt == ctrl_i.slots) begin
-          if (~flags_o.full) begin
+          if (~flags_o.full || ctrl_i.rst_w_index) begin
             next_state = PAD_EMPTY;
           end else begin
             next_state = WAIT_FIRST_READ;
@@ -197,7 +197,7 @@ always_comb begin : fsm
     FILL: begin
       if (flags_o.empty) begin
         // If the width of the buffer is 1, the full flag is asserted at the same time as the empty flag so we skip the PAD_EMPTY state
-        if (flags_o.full) begin
+        if (ctrl_i.width == 1 && flags_o.full) begin
           next_state = FILL;
         end else begin
           next_state = PAD_EMPTY;