Merge pull request #16 from pulp-platform/retiming

Solve critical paths to improve timing.
pulp-platform · Jan 11, 2024 · 473371b · 473371b
2 parents b366403 + 96f7373
commit 473371b
Show file tree

Hide file tree

Showing 7 changed files with 393 additions and 272 deletions.
diff --git a/Bender.lock b/Bender.lock
@@ -51,7 +51,7 @@ packages:
     dependencies:
     - common_cells
   hci:
-    revision: 9d9fc44f6181e7d5357a1b31a0600630440b9586
+    revision: 0c67be238169209e3c89f6dd577496db1cf9cc88
     version: null
     source:
       Git: https://github.com/pulp-platform/hci.git
@@ -60,7 +60,7 @@ packages:
     - hwpe-stream
     - l2_tcdm_hybrid_interco
   hwpe-ctrl:
-    revision: b8b393575f40aea4dbd22cc7fc6077aaff2e3ed1
+    revision: c35d5b0886ab549fb9144c3c14a4682112330e21
     version: null
     source:
       Git: https://github.com/pulp-platform/hwpe-ctrl.git

diff --git a/Bender.yml b/Bender.yml
@@ -26,8 +26,8 @@ dependencies:
   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"       , version: 1.6                                  }
-  hci               : { git: "https://github.com/pulp-platform/hci.git"               , rev: 9d9fc44f6181e7d5357a1b31a0600630440b9586 }
-  hwpe-ctrl         : { git: "https://github.com/pulp-platform/hwpe-ctrl.git"         , rev: b8b393575f40aea4dbd22cc7fc6077aaff2e3ed1 } # branch: yt/reqrsp
+  hwpe-ctrl         : { git: "https://github.com/pulp-platform/hwpe-ctrl.git"         , rev: c35d5b0886ab549fb9144c3c14a4682112330e21 } # branch: yt/reqrsp
+  hci               : { git: "https://github.com/pulp-platform/hci.git"               , rev: 0c67be238169209e3c89f6dd577496db1cf9cc88 } # branch: yt/reqrsp
   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                               }

diff --git a/rtl/redmule_castout.sv b/rtl/redmule_castout.sv
@@ -94,7 +94,7 @@ generate
 
     assign  res [i*MIN_FMT+:MIN_FMT] = result[i][WIDTH-MIN_FMT-1:0];
 
-  end // block: generate_cast_units
+  end
 
 endgenerate
 

diff --git a/rtl/redmule_ctrl.sv b/rtl/redmule_ctrl.sv
@@ -91,7 +91,7 @@ localparam int unsigned LEFT_PARAMS   = LEFT_PARAMS
     .N_IO_REGS      ( REDMULE_REGS ),
     .N_GENERIC_REGS ( 6            ),
     .ID_WIDTH       ( ID_WIDTH     ),
-    .DataWidth      ( SysDataWidth )
+    .DATA_WIDTH     ( SysDataWidth )
   ) i_slave         (
     .clk_i          ( clk_i        ),
     .rst_ni         ( rst_ni       ),

diff --git a/rtl/redmule_pkg.sv b/rtl/redmule_pkg.sv
@@ -118,6 +118,11 @@ package redmule_pkg;
     CSR_REDMULE_MACFG  = 12'h805
   } redmule_csr_num_e;
 
+  parameter int unsigned NumStreamSources = 3; // X, W, Y
+  parameter int unsigned XsourceStreamId  = 0;
+  parameter int unsigned WsourceStreamId  = 1;
+  parameter int unsigned YsourceStreamId  = 2;
+
   typedef enum logic { LD_IN_FMP, LD_WEIGHT } source_sel_e;
   typedef enum logic { LOAD, STORE }          ld_st_sel_e;