Fix timing issues and bump core and fpu_ss

rfiorani · FrancescoConti · commit 62de5bf3271e · 2025-11-19T15:32:31.000+01:00
diff --git a/Bender.local b/Bender.local
@@ -2,7 +2,7 @@ overrides:
   fpnew              : { git: "https://github.com/pulp-platform/cvfpu.git"             , rev: a8e0cba6dd50f357ece73c2c955d96efc3c6c315 }
   hci                : { git: "https://github.com/pulp-platform/hci.git"               , rev: 5a48a854573fca5bbabc1cfd4110fa4530a50ed7 }
   cv32e40p           : { git: "https://github.com/pulp-platform/cv32e40p.git"          , rev: 1a93f340e9dadb9f7c8c471f27a40932c8b1c62e }
-  cv32e40x           : { git: "https://github.com/pulp-platform/cv32e40x.git"          , rev: e51af131252027374d083a745ab6727fb9959daa }
+  cv32e40x           : { git: "https://github.com/pulp-platform/cv32e40x.git"          , rev: a90101211048ba1a16cedbe4db963ab6e12569d7 }
   axi                : { git: "https://github.com/pulp-platform/axi.git"               , version: 0.39.5                               }
   register_interface : { git: "https://github.com/pulp-platform/register_interface.git", rev: e25b36670ff7aab3402f40efcc2b11ee0f31cf19 }
   idma               : { git: "https://github.com/pulp-platform/iDMA.git"              , rev: c12caf59bb482fe44b27361f6924ad346b2d22fe }
diff --git a/Bender.yml b/Bender.yml
@@ -23,14 +23,14 @@ package:
 
 dependencies:
   redmule           : { git: "https://github.com/pulp-platform/redmule.git"           , rev: 9a1aa14be0b23f0ade84bab57e7e434397ac9876 } # branch: vi/scale_up
-  cv32e40x          : { git: "https://github.com/pulp-platform/cv32e40x.git"          , rev: e51af131252027374d083a745ab6727fb9959daa } # branch: vi/redmule_scaleup
+  cv32e40x          : { git: "https://github.com/pulp-platform/cv32e40x.git"          , rev: a90101211048ba1a16cedbe4db963ab6e12569d7 } # branch: vi/redmule_scaleup
   idma              : { git: "https://github.com/pulp-platform/iDMA.git"              , rev: a6b190c7991331432afa9a2899d032bc1b176830 } # branch: vi/redmule_scaleup
   hwpe-stream       : { git: "https://github.com/pulp-platform/hwpe-stream.git"       , version: 1.6                                  }
   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: 5a48a854573fca5bbabc1cfd4110fa4530a50ed7 } # branch: vi/redmule_scaleup
   cluster_icache    : { git: "https://github.com/pulp-platform/cluster_icache.git"    , rev: 917ecbf908bdaa22c5713bbcff277d142506bb16 } # branch: michaero/astral
   fpnew             : { git: "https://github.com/pulp-platform/cvfpu.git"             , rev: "pulp-v0.1.3"                            }
-  fpu_ss            : { git: "https://github.com/pulp-platform/fpu_ss.git"            , rev: 6a83b1754196c3d4509ce823118a190917f3b88a } # branch: vi/bender_manifest
+  fpu_ss            : { git: "https://github.com/pulp-platform/fpu_ss.git"            , rev: 8e2eff774d9d38a1e17a46bd56a0936dac9522f0 } # branch: vi/bender_manifest
   obi               : { git: "https://github.com/pulp-platform/obi.git"               , version: 0.1.6                                }
   axi               : { git: "https://github.com/pulp-platform/axi.git"               , version: 0.39.5                               }
   register_interface: { git: "https://github.com/pulp-platform/register_interface.git", version: 0.4.4                                }
diff --git a/Makefile b/Makefile
@@ -343,4 +343,4 @@ MAGIA_NONFREE_COMMIT ?= main
 .PHONY: magia-nonfree-init
 magia-nonfree-init:
 	git clone $(MAGIA_NONFREE_REMOTE) $(MAGIA_NONFREE_DIR)
-	cd $(MAGIA_NONFREE_DIR) && git checkout $(MAGIA_NONFREE_COMMIT)
+	cd $(MAGIA_NONFREE_DIR) && git checkout $(MAGIA_NONFREE_COMMIT)
diff --git a/hw/tile/magia_tile.sv b/hw/tile/magia_tile.sv
@@ -845,7 +845,7 @@ module magia_tile
     .mgr_port_obi_a_optional_t ( magia_tile_pkg::core_data_obi_a_optional_t ),
     .mgr_port_obi_r_optional_t ( magia_tile_pkg::core_data_obi_r_optional_t ),
     .LrScEnable                (                                            ),
-    .RegisterAmo               (                                            )
+    .RegisterAmo               ( magia_tile_pkg::RegisterAmo                )
   ) i_obi_atomics (
     .clk_i          ( sys_clk                                      ),
     .rst_ni         ( rst_ni                                       ),
@@ -1272,13 +1272,14 @@ module magia_tile
 /*******************************************************/
 
   fpu_ss #(
-    .PULP_ZFINX         ( magia_tile_pkg::FPU_ZFINX          ),
-    .INPUT_BUFFER_DEPTH ( magia_tile_pkg::FPU_BUFFER_DEPTH   ),
-    .OUT_OF_ORDER       ( magia_tile_pkg::FPU_OOO            ),
-    .FORWARDING         ( magia_tile_pkg::FPU_FWD            ),
-    .PulpDivsqrt        ( magia_tile_pkg::FPU_DIVSQRT        ),
-    .FPU_FEATURES       ( magia_tile_pkg::FPU_FEATURES       ),
-    .FPU_IMPLEMENTATION ( magia_tile_pkg::FPU_IMPLEMENTATION )
+    .PULP_ZFINX                ( magia_tile_pkg::FPU_ZFINX          ),
+    .INPUT_BUFFER_DEPTH        ( magia_tile_pkg::FPU_BUFFER_DEPTH   ),
+    .INPUT_BUFFER_FALL_THROUGH ( magia_tile_pkg::FPU_BUFFER_FT      ),
+    .OUT_OF_ORDER              ( magia_tile_pkg::FPU_OOO            ),
+    .FORWARDING                ( magia_tile_pkg::FPU_FWD            ),
+    .PulpDivsqrt               ( magia_tile_pkg::FPU_DIVSQRT        ),
+    .FPU_FEATURES              ( magia_tile_pkg::FPU_FEATURES       ),
+    .FPU_IMPLEMENTATION        ( magia_tile_pkg::FPU_IMPLEMENTATION )
   ) i_fpu (
     .clk_i                ( sys_clk            ),
     .rst_ni               ( rst_ni             ),
diff --git a/hw/tile/magia_tile_pkg.sv b/hw/tile/magia_tile_pkg.sv
@@ -286,6 +286,7 @@ package magia_tile_pkg;
   // Parameters used by the FPU
   parameter bit                             FPU_ZFINX          = 0;                     // FPU use Zfinx extension instead of the F ISA extention
   parameter int unsigned                    FPU_BUFFER_DEPTH   = 8;                     // FPU FIFO depth that buffers instructions coming from core
+  parameter bit                             FPU_BUFFER_FT      = 0;                     // FPU FIFO fall through that buffers instructions coming from core
   parameter bit                             FPU_OOO            = 1;                     // FPU enable out-of-order execution
   parameter bit                             FPU_FWD            = 1;                     // FPU enable forwarding from output to input of FPnew
   parameter bit                             FPU_DIVSQRT        = 0;                     // FPU disable FPnew T-head-based DivSqrt unit (supported only for FP32 unit)
@@ -297,14 +298,14 @@ package magia_tile_pkg;
     IntFmtMask:    4'b0010
   };                                                                                    // FPU features: support only for FP32 and INT32
   parameter fpnew_pkg::fpu_implementation_t FPU_IMPLEMENTATION = '{
-    PipeRegs:   '{default: 1},
+    PipeRegs:   '{default: 2},
     UnitTypes:  '{'{default: fpnew_pkg::PARALLEL},
                   '{default: fpnew_pkg::MERGED},
                   '{default: fpnew_pkg::PARALLEL},
                   '{default: fpnew_pkg::MERGED},
                   '{default: fpnew_pkg::DISABLED}
                 },
-    PipeConfig: fpnew_pkg::BEFORE
+    PipeConfig: fpnew_pkg::DISTRIBUTED
   };                                                                                    // FPU implementation
   
   typedef struct packed {
@@ -393,6 +394,7 @@ package magia_tile_pkg;
 
   localparam obi_pkg::obi_optional_cfg_t obi_amo_optional_cfg = obi_pkg::obi_all_optional_config(AUSER_WIDTH, WUSER_WIDTH, RUSER_WIDTH, MID_WIDTH, ACHK_WIDTH, RCHK_WIDTH);
   localparam obi_pkg::obi_cfg_t          obi_amo_cfg          = obi_pkg::obi_default_cfg(magia_pkg::ADDR_W, magia_pkg::DATA_W, OBI_ID_WIDTH, obi_amo_optional_cfg);
+  localparam bit                         RegisterAmo          = 1;
   
   `OBI_TYPEDEF_ALL_A_OPTIONAL(core_data_obi_a_optional_t, AUSER_WIDTH, WUSER_WIDTH, MID_WIDTH, ACHK_WIDTH)
   `OBI_TYPEDEF_ALL_R_OPTIONAL(core_data_obi_r_optional_t, RUSER_WIDTH, RCHK_WIDTH)
