diff --git a/hw/system/spatz_cluster/test/bootrom.elf b/hw/system/spatz_cluster/test/bootrom.elf
index 7075551..1c9c64a 100755
Binary files a/hw/system/spatz_cluster/test/bootrom.elf and b/hw/system/spatz_cluster/test/bootrom.elf differ
diff --git a/sw/spatzBenchmarks/dp-db-fmatmul-4x4vl/main.c b/sw/spatzBenchmarks/dp-db-fmatmul-4x4vl/main.c
index fce3a65..e188548 100644
--- a/sw/spatzBenchmarks/dp-db-fmatmul-4x4vl/main.c
+++ b/sw/spatzBenchmarks/dp-db-fmatmul-4x4vl/main.c
@@ -301,6 +301,7 @@ int main() {
 
   // Wait for all cores to finish
   snrt_cluster_hw_barrier();
+  set_eoc();
 
   return 0;
 }
diff --git a/sw/spatzBenchmarks/dp-fdotp/main.c b/sw/spatzBenchmarks/dp-fdotp/main.c
index ee259c2..841c44e 100644
--- a/sw/spatzBenchmarks/dp-fdotp/main.c
+++ b/sw/spatzBenchmarks/dp-fdotp/main.c
@@ -167,6 +167,7 @@ int main() {
 
   // Wait for core 0 to finish displaying results
   snrt_cluster_hw_barrier();
+  set_eoc();
 
   return 0;
 }
diff --git a/sw/spatzBenchmarks/dp-fft/main.c b/sw/spatzBenchmarks/dp-fft/main.c
index 7da1de4..056fca0 100644
--- a/sw/spatzBenchmarks/dp-fft/main.c
+++ b/sw/spatzBenchmarks/dp-fft/main.c
@@ -173,6 +173,7 @@ int main() {
 
   // Wait for core 0 to finish displaying results
   snrt_cluster_hw_barrier();
+  set_eoc();
 
   return 0;
 }
diff --git a/sw/spatzBenchmarks/dp-fmatmul-4x4vl/main.c b/sw/spatzBenchmarks/dp-fmatmul-4x4vl/main.c
index 38d28d5..f5fed4a 100644
--- a/sw/spatzBenchmarks/dp-fmatmul-4x4vl/main.c
+++ b/sw/spatzBenchmarks/dp-fmatmul-4x4vl/main.c
@@ -184,6 +184,7 @@ int main() {
 
   // Wait for all cores to finish
   snrt_cluster_hw_barrier();
+  set_eoc();
 
   return 0;
 }
diff --git a/sw/spatzBenchmarks/dp-fmatmul-8x2vl/main.c b/sw/spatzBenchmarks/dp-fmatmul-8x2vl/main.c
index 82cc3c9..551321e 100644
--- a/sw/spatzBenchmarks/dp-fmatmul-8x2vl/main.c
+++ b/sw/spatzBenchmarks/dp-fmatmul-8x2vl/main.c
@@ -182,6 +182,7 @@ int main() {
 
   // Wait for all cores to finish
   snrt_cluster_hw_barrier();
+  set_eoc();
 
   return 0;
 }
diff --git a/sw/spatzBenchmarks/dp-fmatmul/main.c b/sw/spatzBenchmarks/dp-fmatmul/main.c
index bcfbfd4..22b8d4b 100644
--- a/sw/spatzBenchmarks/dp-fmatmul/main.c
+++ b/sw/spatzBenchmarks/dp-fmatmul/main.c
@@ -176,6 +176,7 @@ int main() {
 
   // Wait for all cores to finish
   snrt_cluster_hw_barrier();
+  set_eoc();
 
   return 0;
 }
diff --git a/sw/spatzBenchmarks/dp-mxfmatmul-m4n4k4-b2/main.c b/sw/spatzBenchmarks/dp-mxfmatmul-m4n4k4-b2/main.c
index 5414ab5..6391625 100644
--- a/sw/spatzBenchmarks/dp-mxfmatmul-m4n4k4-b2/main.c
+++ b/sw/spatzBenchmarks/dp-mxfmatmul-m4n4k4-b2/main.c
@@ -263,6 +263,7 @@ int main() {
 
   // Wait for all cores finish
   snrt_cluster_hw_barrier();
+  set_eoc();
 
   return 0;
 }
diff --git a/sw/spatzBenchmarks/dp-mxfmatmul-m4n4k4-b4/main.c b/sw/spatzBenchmarks/dp-mxfmatmul-m4n4k4-b4/main.c
index e0fb491..3c525bf 100644
--- a/sw/spatzBenchmarks/dp-mxfmatmul-m4n4k4-b4/main.c
+++ b/sw/spatzBenchmarks/dp-mxfmatmul-m4n4k4-b4/main.c
@@ -259,6 +259,7 @@ int main() {
 
   // Wait for all cores finish
   snrt_cluster_hw_barrier();
+  set_eoc();
 
   return 0;
 }
diff --git a/sw/spatzBenchmarks/dp-mxfmatmul-m4n4k8-b2/main.c b/sw/spatzBenchmarks/dp-mxfmatmul-m4n4k8-b2/main.c
index 8ca9e75..ad78748 100644
--- a/sw/spatzBenchmarks/dp-mxfmatmul-m4n4k8-b2/main.c
+++ b/sw/spatzBenchmarks/dp-mxfmatmul-m4n4k8-b2/main.c
@@ -259,6 +259,7 @@ int main() {
 
   // Wait for all cores finish
   snrt_cluster_hw_barrier();
+  set_eoc();
 
   return 0;
 }
diff --git a/sw/spatzBenchmarks/dp-mxfmatmul-m4n4k8-b4/main.c b/sw/spatzBenchmarks/dp-mxfmatmul-m4n4k8-b4/main.c
index a5f2850..abbe583 100644
--- a/sw/spatzBenchmarks/dp-mxfmatmul-m4n4k8-b4/main.c
+++ b/sw/spatzBenchmarks/dp-mxfmatmul-m4n4k8-b4/main.c
@@ -259,6 +259,7 @@ int main() {
 
   // Wait for all cores finish
   snrt_cluster_hw_barrier();
+  set_eoc();
 
   return 0;
 }
diff --git a/sw/spatzBenchmarks/dp-mxfmatmul-m8n4k4-b2/main.c b/sw/spatzBenchmarks/dp-mxfmatmul-m8n4k4-b2/main.c
index d810483..6762d53 100644
--- a/sw/spatzBenchmarks/dp-mxfmatmul-m8n4k4-b2/main.c
+++ b/sw/spatzBenchmarks/dp-mxfmatmul-m8n4k4-b2/main.c
@@ -263,6 +263,7 @@ int main() {
 
   // Wait for all cores finish
   snrt_cluster_hw_barrier();
+  set_eoc();
 
   return 0;
 }
diff --git a/sw/spatzBenchmarks/dp-mxfmatmul-m8n4k4-b4/main.c b/sw/spatzBenchmarks/dp-mxfmatmul-m8n4k4-b4/main.c
index 938e096..adbd0ab 100644
--- a/sw/spatzBenchmarks/dp-mxfmatmul-m8n4k4-b4/main.c
+++ b/sw/spatzBenchmarks/dp-mxfmatmul-m8n4k4-b4/main.c
@@ -263,6 +263,7 @@ int main() {
 
   // Wait for all cores finish
   snrt_cluster_hw_barrier();
+  set_eoc();
 
   return 0;
 }
diff --git a/sw/spatzBenchmarks/sdotp-bp-fmatmul/main.c b/sw/spatzBenchmarks/sdotp-bp-fmatmul/main.c
index 0081e6f..a5bf22c 100644
--- a/sw/spatzBenchmarks/sdotp-bp-fmatmul/main.c
+++ b/sw/spatzBenchmarks/sdotp-bp-fmatmul/main.c
@@ -157,6 +157,7 @@ int main() {
 
   // Wait for all cores to finish
   snrt_cluster_hw_barrier();
+  set_eoc();
 
   return 0;
 }