From 3eb8c928915ac186b5930b4c2e131035d2ae5a39 Mon Sep 17 00:00:00 2001
From: Mattia Sinigaglia <mattia.sinigaglia5@unibo.it>
Date: Thu, 19 Sep 2024 13:24:25 +0200
Subject: [PATCH] fix traces

---
 hw/ip/spatz_cc/src/spatz_cc.sv |  2 +-
 util/Makefrag                  | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/hw/ip/spatz_cc/src/spatz_cc.sv b/hw/ip/spatz_cc/src/spatz_cc.sv
index 02790f83..8c9672f2 100644
--- a/hw/ip/spatz_cc/src/spatz_cc.sv
+++ b/hw/ip/spatz_cc/src/spatz_cc.sv
@@ -478,7 +478,7 @@ module spatz_cc
   // pragma translate_off
   int           f;
   string        fn;
-  logic  [63:0] cycle;
+  logic  [63:0] cycle= '0;
 
   initial begin
     // We need to schedule the assignment into a safe region, otherwise
diff --git a/util/Makefrag b/util/Makefrag
index 632a72a4..171f19c6 100644
--- a/util/Makefrag
+++ b/util/Makefrag
@@ -159,15 +159,15 @@ work-vcs/compile.sh: ${VSIM_SOURCES} ${TB_SRCS}
 ########
 
 .PHONY: traces
-traces: $(shell (ls bin/logs/trace_hart_*.dasm 2>/dev/null | sed 's/\.dasm/\.txt/') || echo "")
+traces: $(shell (ls logs/trace_hart_*.dasm 2>/dev/null | sed 's/\.dasm/\.txt/') || echo "")
 
-bin/logs/trace_hart_%.txt: bin/logs/trace_hart_%.dasm ${ROOT}/util/gen_trace.py
+logs/trace_hart_%.txt: logs/trace_hart_%.dasm ${ROOT}/util/gen_trace.py
 	$(DASM) < $< | $(PYTHON) ${ROOT}/util/gen_trace.py > $@
 
 # make annotate
 # Generate source-code interleaved traces for all harts. Reads the binary from
-# the bin/logs/.rtlbinary file that is written at start of simulation in the vsim script
-bin/logs/trace_hart_%.s: bin/logs/trace_hart_%.txt ${ROOT}/util/trace/annotate.py
+# the logs/.rtlbinary file that is written at start of simulation in the vsim script
+logs/trace_hart_%.s: logs/trace_hart_%.txt ${ROOT}/util/trace/annotate.py
 	$(PYTHON) ${ROOT}/util/trace/annotate.py -q -o $@ $(BINARY) $<
-BINARY ?= $(shell cat bin/logs/.rtlbinary)
-annotate: $(shell (ls bin/logs/trace_hart_*.dasm 2>/dev/null | sed 's/\.dasm/\.s/') || echo "")
+BINARY ?= $(shell cat logs/.rtlbinary)
+annotate: $(shell (ls logs/trace_hart_*.dasm 2>/dev/null | sed 's/\.dasm/\.s/') || echo "")