Fix Tracer Bug (#354)

KULeuven-MICAS · Sep 29, 2024 · 245d5cd · 245d5cd
1 parent 442f22f
commit 245d5cd
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/target/common/common.mk b/target/common/common.mk
@@ -251,9 +251,9 @@ endef
 # Traces #
 ##########
 
-DASM_TRACES      = $(shell (ls $(LOGS_DIR)/trace_chip_????_hart_*.dasm 2>/dev/null))
+DASM_TRACES      = $(shell (ls $(LOGS_DIR)/trace_chip_??_hart_*.dasm 2>/dev/null))
 TXT_TRACES       = $(shell (echo $(DASM_TRACES) | sed 's/\.dasm/\.txt/g'))
-PERF_TRACES      = $(shell (echo $(DASM_TRACES) | sed 's/trace_hart/hart/g' | sed 's/.dasm/_perf.json/g'))
+PERF_TRACES      = $(shell (echo $(DASM_TRACES) | sed 's/.dasm/_perf.json/g'))
 ANNOTATED_TRACES = $(shell (echo $(DASM_TRACES) | sed 's/\.dasm/\.s/g'))
 DIFF_TRACES      = $(shell (echo $(DASM_TRACES) | sed 's/\.dasm/\.diff/g'))
 
@@ -271,7 +271,7 @@ perf-csv: $(PERF_CSV)
 event-csv: $(EVENT_CSV)
 layout: $(TRACE_CSV) $(TRACE_JSON)
 
-$(LOGS_DIR)/trace_%.txt $(LOGS_DIR)/%_perf.json: $(LOGS_DIR)/%.dasm $(GENTRACE_PY)
+$(LOGS_DIR)/%.txt $(LOGS_DIR)/%_perf.json: $(LOGS_DIR)/%.dasm $(GENTRACE_PY)
 	@CHIP=$(word 3,$(subst _, ,$*)) && \
 	HART=$(word 5,$(subst _, ,$*)) && \
 	echo "Processing Chip $$CHIP Hart $$HART" && \
@@ -285,11 +285,6 @@ $(LOGS_DIR)/%.s: $(LOGS_DIR)/%.txt $(ANNOTATE_PY)
 $(LOGS_DIR)/%.diff: $(LOGS_DIR)/%.txt $(ANNOTATE_PY)
 	$(PYTHON) $(ANNOTATE_PY) $(ANNOTATE_FLAGS) -o $@ $(BINARY) $< -d
 
-# $(LOGS_DIR)/trace_chip_%_hart_%.s: $(LOGS_DIR)/trace_chip_%_hart_%.txt $(ANNOTATE_PY)
-# 	$(PYTHON) $(ANNOTATE_PY) $(ANNOTATE_FLAGS) -o $@ $(BINARY) $<
-# $(LOGS_DIR)/trace_chip_%_hart_%.diff: $(LOGS_DIR)/trace_chip_%_hart_%.txt $(ANNOTATE_PY)
-# 	$(PYTHON) $(ANNOTATE_PY) $(ANNOTATE_FLAGS) -o $@ $(BINARY) $< -d
-
 $(PERF_CSV): $(PERF_TRACES) $(PERF_CSV_PY)
 	$(PYTHON) $(PERF_CSV_PY) -o $@ -i $(PERF_TRACES)