Bump kul and ethcluster

pulp-platform · Oct 23, 2024 · 54895e2 · 54895e2
1 parent b170c19
commit 54895e2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/Bender.lock b/Bender.lock
@@ -150,7 +150,7 @@ packages:
     - fpnew
     - tech_cells_generic
   ethcluster:
-    revision: 8ab985c7965ec0c3c4dd7e99227439d23804a157
+    revision: 49adaab00aa652adf8601e296b13dedc3f3b6197
     version: null
     source:
       Git: git@gitlab.tue.nl:es/convolve-private/ethcluster.git
@@ -192,7 +192,7 @@ packages:
     - common_cells
     - register_interface
   kulcluster:
-    revision: e348b6275c79e1b20510f2ee6d497a49fb2699b6
+    revision: 6da824eb38f6db629cdbca0d7727fec8be545d6b
     version: null
     source:
       Git: git@gitlab.tue.nl:es/convolve-private/kulcluster.git

diff --git a/Bender.yml b/Bender.yml
@@ -20,8 +20,8 @@ dependencies:
   TUEDCIM:                  { git: "git@gitlab.tue.nl:es/convolve-private/tuedcim.git",           rev: 10102024}
   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: 11102024-6}
-  KULCLUSTER:               { git: "git@gitlab.tue.nl:es/convolve-private/kulcluster.git",        rev: 11102024}
-  ETHCluster:               { git: "git@gitlab.tue.nl:es/convolve-private/ethcluster.git",        rev: 8ab985c}
+  KULCLUSTER:               { git: "git@gitlab.tue.nl:es/convolve-private/kulcluster.git",        rev: 17102024}
+  ETHCluster:               { git: "git@gitlab.tue.nl:es/convolve-private/ethcluster.git",        rev: 17102024-4}
 
 export_include_dirs:
   - hw/include

diff --git a/bender.mk b/bender.mk
@@ -9,4 +9,4 @@ COMMON_TARGS ?=
 COMMON_TARGS += -t snitch_cluster -t cv32a6_convolve -t cva6 -t rtl
 
 SIM_TARGS = -t test -t sim
-EXT_TARGS = -t tuedcim -t tuemega -t kulcluster -t tuddcim
+EXT_TARGS = -t tuedcim -t tuemega -t kulcluster -t tuddcim -t ethcluster
diff --git a/sw/tests/testCluster.c b/sw/tests/testCluster.c
@@ -26,11 +26,15 @@ int main() {
     clusterMemPtr = (volatile int32_t *)CLUSTERMEMORYSTART;
     for (int i = 0; i < NUMCLUSTERS; i++) {
         result = *(clusterMemPtr);
-        ret += (result == TESTVAL);
+        if (result == TESTVAL) {
+            ret += 1;
+        } else {
+            ret += 1 << (NUMCLUSTERS + i);
+        }
         clusterMemPtr += CLUSTERDISTANCE / 4;
     }
 
-    if (ret == NUMCLUSTERS) {
+    if ((ret & ((1 << NUMCLUSTERS) - 1)) == NUMCLUSTERS) {
         return 0;
     }