sw: Integrate the nr_clusters in to cluster and give default 1 …

…value
pulp-platform · Aug 1, 2024 · 668e137 · 668e137
1 parent 975ce71
commit 668e137
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/docs/schema/snitch_cluster.schema.json b/docs/schema/snitch_cluster.schema.json
@@ -14,6 +14,11 @@
             "description": "Optional name for the generated wrapper.",
             "default": "snitch_cluster"
         },
+        "nr_clusters": {
+            "type": "number",
+            "description": "Number of clusters. Only relevant for the SW runtime.",
+            "default": 1
+        },
         "boot_addr": {
             "type": "number",
             "description": "Address from which all harts of the cluster start to boot. The default setting is `0x8000_0000`.",

diff --git a/target/snitch_cluster/cfg/default.hjson b/target/snitch_cluster/cfg/default.hjson
@@ -4,9 +4,6 @@
 
 // Cluster configuration for a simple testbench system.
 {
-    // Needed only for multi-cluster SW environment
-    nr_clusters: 1,
-
     cluster: {
         boot_addr: 4096, // 0x1000
         cluster_base_addr: 268435456, // 0x1000_0000

diff --git a/target/snitch_cluster/cfg/fdiv.hjson b/target/snitch_cluster/cfg/fdiv.hjson
@@ -4,9 +4,6 @@
 
 // Cluster configuration for a simple testbench system.
 {
-    // Needed only for multi-cluster SW environment
-    nr_clusters: 1,
-
     cluster: {
         boot_addr: 4096, // 0x1000
         cluster_base_addr: 268435456, // 0x1000_0000

diff --git a/target/snitch_cluster/cfg/omega.hjson b/target/snitch_cluster/cfg/omega.hjson
@@ -4,9 +4,6 @@
 
 // Cluster configuration for a simple testbench system.
 {
-    // Needed only for multi-cluster SW environment
-    nr_clusters: 1,
-
     cluster: {
         boot_addr: 4096, // 0x1000
         cluster_base_addr: 268435456, // 0x1000_0000

diff --git a/target/snitch_cluster/sw/runtime/common/snitch_cluster_defs.h.tpl b/target/snitch_cluster/sw/runtime/common/snitch_cluster_defs.h.tpl
@@ -9,7 +9,7 @@
 // Hardware parameters
 #define SNRT_BASE_HARTID CFG_CLUSTER_BASE_HARTID
 #define SNRT_CLUSTER_CORE_NUM CFG_CLUSTER_NR_CORES
-#define SNRT_CLUSTER_NUM ${cfg['nr_clusters']}
+#define SNRT_CLUSTER_NUM ${cfg['cluster']['nr_clusters']}
 #define SNRT_CLUSTER_DM_CORE_NUM 1
 #define SNRT_TCDM_START_ADDR CLUSTER_TCDM_BASE_ADDR
 #define SNRT_TCDM_SIZE (CLUSTER_PERIPH_BASE_ADDR - CLUSTER_TCDM_BASE_ADDR)