[spatz] Fix synthesis

pulp-platform · Apr 9, 2023 · d987811 · d987811
1 parent aec5522
commit d987811
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,3 +25,4 @@ mems
 *.o
 install
 .projectBender.lock
+Bender.lock
diff --git a/cfg/config.mk b/cfg/config.mk
@@ -34,7 +34,7 @@ axi_uw ?= 1
 n_fpu ?= 0
 
 # Number of words in each TCDM bank
-tcdm_bank_depth ?= 2048
+tcdm_bank_depth ?= 1024
 
 # Boot address (in dec)
 boot_addr ?= 4096

diff --git a/hw/system/spatz_cluster/src/spatz_cluster.sv b/hw/system/spatz_cluster/src/spatz_cluster.sv
@@ -199,7 +199,8 @@ module spatz_cluster import spatz_pkg::*; import fpnew_pkg::fpu_implementation_t
     UniqueIds         : 1'b0,
     AxiAddrWidth      : AxiAddrWidth,
     AxiDataWidth      : NarrowDataWidth,
-    NoAddrRules       : NrNarrowRules
+    NoAddrRules       : NrNarrowRules,
+    default           : '0
   };
 
   // DMA configuration struct
@@ -215,7 +216,8 @@ module spatz_cluster import spatz_pkg::*; import fpnew_pkg::fpu_implementation_t
     UniqueIds         : 1'b0,
     AxiAddrWidth      : AxiAddrWidth,
     AxiDataWidth      : AxiDataWidth,
-    NoAddrRules       : 3
+    NoAddrRules       : 3,
+    default           : '0
   };
 
   // --------
@@ -942,7 +944,9 @@ module spatz_cluster import spatz_pkg::*; import fpnew_pkg::fpu_implementation_t
     }
   };
 
-  localparam bit [ClusterXbarCfg.NoSlvPorts-1:0] ClusterEnableDefaultMstPort = '1;
+  localparam bit   [ClusterXbarCfg.NoSlvPorts-1:0]                                                        ClusterEnableDefaultMstPort = '1;
+  localparam logic [ClusterXbarCfg.NoSlvPorts-1:0][cf_math_pkg::idx_width(ClusterXbarCfg.NoMstPorts)-1:0] ClusterXbarDefaultPort      = '{default: SoC};
+
   axi_xbar #(
     .Cfg           (ClusterXbarCfg   ),
     .slv_aw_chan_t (axi_mst_aw_chan_t),
@@ -969,7 +973,7 @@ module spatz_cluster import spatz_pkg::*; import fpnew_pkg::fpu_implementation_t
     .mst_ports_resp_i      (narrow_axi_slv_rsp         ),
     .addr_map_i            (cluster_xbar_rules         ),
     .en_default_mst_port_i (ClusterEnableDefaultMstPort),
-    .default_mst_port_i    ('{default: SoC}            )
+    .default_mst_port_i    (ClusterXbarDefaultPort     )
   );
 
   // ---------

diff --git a/hw/system/spatz_cluster/src/spatz_cluster_wrapper.sv b/hw/system/spatz_cluster/src/spatz_cluster_wrapper.sv
@@ -95,9 +95,9 @@ module spatz_cluster_wrapper import spatz_pkg::*; import spatz_cluster_pkg::*; #
     .NrCores                 (NumCores            ),
     .TCDMDepth               (TCDMDepth           ),
     .NrBanks                 (NumBanks            ),
-    .ICacheLineWidth         (AxiDataWidth        ),
-    .ICacheSets              (8                   ),
-    .ICacheLineCount         (8                   ),
+    .ICacheLineWidth         (256                 ),
+    .ICacheSets              (2                   ),
+    .ICacheLineCount         (64                  ),
     .FPUImplementation       (FPUImplementation   ),
     .NumIntOutstandingLoads  (8                   ),
     .NumIntOutstandingMem    (8                   ),
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,3 +25,4 @@ mems @@
     *.o
     install
     .projectBender.lock
+    Bender.lock