From 85edc5427eab0663684c5025fb1bac9dcd9501d2 Mon Sep 17 00:00:00 2001 From: MoritzScherer Date: Wed, 23 Oct 2024 18:11:59 +0200 Subject: [PATCH] Bump kul and ethcluster (#49) --- Bender.lock | 4 ++-- Bender.yml | 4 ++-- bender.mk | 2 +- sw/tests/testCluster.c | 8 ++++++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Bender.lock b/Bender.lock index f657354..2aabc52 100644 --- 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 @@ -202,7 +202,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 index 6582be2..4737649 100644 --- a/Bender.yml +++ b/Bender.yml @@ -22,8 +22,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 index 8aac967..fbd496b 100644 --- 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 = $(COMMON_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 index 1cc4a24..ba38fed 100644 --- 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; }