Fix FPU parametrization and restore shared FPU functionality

pulp-platform · Dec 3, 2024 · 20cbfe2 · 20cbfe2
1 parent 64ff5d4
commit 20cbfe2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/Bender.lock b/Bender.lock
@@ -107,6 +107,14 @@ packages:
       Git: https://github.com/pulp-platform/fpu_div_sqrt_mvp.git
     dependencies:
     - common_cells
+  fpu_interco:
+    revision: b5f7a315929308823cacd81e1e4898f1eeecfc64
+    version: null
+    source:
+      Git: https://github.com/pulp-platform/fpu_interco.git
+    dependencies:
+    - fpnew
+    - riscv
   hci:
     revision: 38fc2a7eea7978df52434e66ee04a40788fd86b7
     version: null

diff --git a/Bender.yml b/Bender.yml
@@ -22,6 +22,7 @@ dependencies:
   hier-icache:            { git: "https://github.com/pulp-platform/hier-icache.git", rev: "2886cb2a46cea3e2bd2d979b505d88fadfbe150c" } # branch: astral
   cluster_icache:         { git: "https://github.com/pulp-platform/cluster_icache.git", rev: "8114ab36fd446f76cd1e9f139f12a62ab1fb9a6a" } # michaero/branch: astral_cut_path
   cluster_peripherals:    { git: "https://github.com/pulp-platform/cluster_peripherals.git", rev: 0b8e8ab } # branch: fc/hci-v2
+  fpu_interco:            { git: "https://github.com/pulp-platform/fpu_interco.git", rev: "b5f7a315929308823cacd81e1e4898f1eeecfc64" } # branch: astral
   axi:                    { git: "https://github.com/pulp-platform/axi.git", version: 0.39.3  }
   timer_unit:             { git: "https://github.com/pulp-platform/timer_unit.git", version: 1.0.2 }
   common_cells:           { git: "https://github.com/pulp-platform/common_cells.git", version: 1.35.0 }

diff --git a/rtl/core_region.sv b/rtl/core_region.sv
@@ -236,8 +236,11 @@ import rapid_recovery_pkg::*;
       riscv_core #(
         .INSTR_RDATA_WIDTH   ( INSTR_RDATA_WIDTH           ),
         .PULP_CLUSTER        ( 1                           ),
-        .FPU                 ( FPU                         ),
-        .N_EXT_PERF_COUNTERS ( N_EXT_PERF_COUNTERS  ),
+        .FPU                 ( FPU | SHARED_FP             ),
+        .FP_DIVSQRT          ( FP_DIVSQRT                  ),
+        .SHARED_FP           ( SHARED_FP                   ),
+        .SHARED_FP_DIVSQRT   ( SHARED_FP_DIVSQRT           ),
+        .N_EXT_PERF_COUNTERS ( N_EXT_PERF_COUNTERS         ),
         .Zfinx               ( FPU                         ),
         .WAPUTYPE            ( WAPUTYPE                    ),
         .DM_HaltAddress      ( DEBUG_START_ADDR + 16'h0800 )