From aecd36c68c8ff16deeeba0bf3084fc8243c5f1fe Mon Sep 17 00:00:00 2001
From: Luca Bertaccini <lbertaccini@iis.ee.ethz.ch>
Date: Thu, 8 Aug 2024 17:39:40 +0200
Subject: [PATCH] Align to Occamy cluster configuration

---
 target/snitch_cluster/cfg/default.hjson   | 26 +++++++++++++++++++----
 target/snitch_cluster/test/testharness.sv |  1 -
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/target/snitch_cluster/cfg/default.hjson b/target/snitch_cluster/cfg/default.hjson
index 7f28a1073..39749787f 100644
--- a/target/snitch_cluster/cfg/default.hjson
+++ b/target/snitch_cluster/cfg/default.hjson
@@ -23,8 +23,22 @@
         cluster_periph_size: 64, // kB
         zero_mem_size: 64, // kB
         dma_data_width: 512,
-        dma_axi_req_fifo_depth: 3,
-        dma_req_fifo_depth: 3,
+        dma_axi_req_fifo_depth: 24,
+        dma_req_fifo_depth: 8,
+        narrow_trans: 4,
+        wide_trans: 32,
+        dma_user_width: 1,
+        // We don't need Snitch debugging in Occamy
+        enable_debug: false,
+        // We don't need Snitch (core-internal) virtual memory support
+        vm_support: false,
+        // Memory configuration inputs
+        sram_cfg_expose: true,
+        sram_cfg_fields: {
+            ema: 3,
+            emaw: 2,
+            emas: 1
+        },
         // Timing parameters
         timing: {
             lat_comp_fp32: 3,
@@ -36,14 +50,17 @@
             lat_noncomp: 1,
             lat_conv: 2,
             lat_sdotp: 3,
-            fpu_pipe_config: "BEFORE"
+            fpu_pipe_config: "BEFORE",
             narrow_xbar_latency: "CUT_ALL_PORTS",
             wide_xbar_latency: "CUT_ALL_PORTS",
             // Isolate the core.
             register_core_req: true,
             register_core_rsp: true,
             register_offload_req: true,
-            register_offload_rsp: true
+            register_offload_rsp: true,
+            register_fpu_req: true,
+            register_ext_narrow: false,
+            register_ext_wide: false
         },
         hives: [
             // Hive 0
@@ -93,6 +110,7 @@
         xf8alt: true,
         xfdotp: true,
         xfvec: true,
+        ssr_nr_credits: 4,
         num_int_outstanding_loads: 1,
         num_int_outstanding_mem: 4,
         num_fp_outstanding_loads: 4,
diff --git a/target/snitch_cluster/test/testharness.sv b/target/snitch_cluster/test/testharness.sv
index afc6972ed..6058d4e38 100644
--- a/target/snitch_cluster/test/testharness.sv
+++ b/target/snitch_cluster/test/testharness.sv
@@ -25,7 +25,6 @@ module testharness import snitch_cluster_pkg::*; (
   snitch_cluster_wrapper i_snitch_cluster (
     .clk_i,
     .rst_ni,
-    .debug_req_i ('0),
     .meip_i ('0),
     .mtip_i ('0),
     .msip_i (msip),