Integrate new KUL cluster with only 2 cores.

- Change the number of CLINT,PLIC and PLIC_INTRS cores to build the system - Modify offload.h and chimera_pkg.sv to map only 2 cores in KULCluster
pulp-platform · Dec 4, 2024 · 167a1db · 167a1db
1 parent f1b8d06
commit 167a1db
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/Bender.lock b/Bender.lock
@@ -202,7 +202,7 @@ packages:
     - common_cells
     - register_interface
   kulcluster:
-    revision: 6ecccdbe71edbbde6a5bf149938065369616c96e
+    revision: 40cc14bcae5b0a3a7346d8d45b027e5ab16170d3
     version: null
     source:
       Git: git@gitlab.tue.nl:es/convolve-private/kulcluster.git

diff --git a/Bender.yml b/Bender.yml
@@ -22,7 +22,7 @@ dependencies:
   TUEDCIM:                  { git: "git@gitlab.tue.nl:es/convolve-private/tuedcim.git",           rev: 22112024-2}
   TUEMEGA:                  { git: "git@gitlab.tue.nl:es/convolve-private/tuemega.git",           rev: 11102024}
   TUDDCIM:                  { git: "git@gitlab.tue.nl:es/convolve-private/tuddcim.git",           rev: 04122024-2}
-  KULCLUSTER:               { git: "git@gitlab.tue.nl:es/convolve-private/kulcluster.git",        rev: 29112024}
+  KULCLUSTER:               { git: "git@gitlab.tue.nl:es/convolve-private/kulcluster.git",        rev: 04122024-3}
   ETHCluster:               { git: "git@gitlab.tue.nl:es/convolve-private/ethcluster.git",        rev: 31102024-3}
 
 export_include_dirs:

diff --git a/chimera.mk b/chimera.mk
@@ -6,9 +6,9 @@
 # Lorenzo Leone <lleone@iis.ee.ethz.ch>
 
 
-CLINTCORES = 19
-PLICCORES = 38
-PLIC_NUM_INTRS = 38
+CLINTCORES = 18
+PLICCORES = 36
+PLIC_NUM_INTRS = 36
 
 
 .PHONY: update_plic

diff --git a/hw/chimera_pkg.sv b/hw/chimera_pkg.sv
@@ -36,7 +36,7 @@ package chimera_pkg;
 
   localparam cluster_config_t ChimeraClusterCfg = '{
       hasWideMasterPort: {1'b1, 1'b1, 1'b1, 1'b1, 1'b1},
-      NrCores: {8'h9, 8'h3, 8'h2, 8'h2, 8'h2}
+      NrCores: {8'h9, 8'h2, 8'h2, 8'h2, 8'h2}
   };
 
   function automatic int _sumVector(byte_bt [iomsb(ExtClusters):0] vector, int vectorLen);

diff --git a/sw/include/soc_addr_map.h b/sw/include/soc_addr_map.h
@@ -23,7 +23,7 @@
 #define CLUSTER_0_NUMCORES 2
 #define CLUSTER_1_NUMCORES 2
 #define CLUSTER_2_NUMCORES 2
-#define CLUSTER_3_NUMCORES 3
+#define CLUSTER_3_NUMCORES 2
 #define CLUSTER_4_NUMCORES 9
 
 static uint8_t _chimera_numCores[] = {CLUSTER_0_NUMCORES, CLUSTER_1_NUMCORES, CLUSTER_2_NUMCORES,