Merge pull request #61 from opencompl/sasha/make-csv

add a cycles.csv target which recomputes only if the inputs or the xdsl commit change

kernels/Makefile.kernels

@@ -19,5 +19,18 @@ all: $(TESTS)
 
 allrun: $(RUN)
 
+CYCLES_CSV := cycles.csv
+
+# Generate the target file by combining the specified files from TESTS
+$(CYCLES_CSV): $(addsuffix .csv, $(basename $(TESTS)))
+	rm $(CYCLES_CSV)
+	@echo "Combining CSV files specified in TESTS into $@"
+	@for file in $(TESTS); do \
+		filename=$$(basename $$file .x); \
+		csv_file=$$filename.csv; \
+		value=$$(cat $$csv_file); \
+		echo "$$filename,$$value" >> $@; \
+	done
+
 clean:
-	rm -fr *.ll12 *.x *.o *.logs/ logs/
+	rm -fr *.ll12 *.x *.o *.logs/ logs/ *.csv

kernels/dsum/8x16xf32/baseline.csv

@@ -0,0 +1 @@
+1202

kernels/dsum/8x16xf32/cycles.csv

@@ -0,0 +1,7 @@
+baseline,1202
+noalias,1202
+ssr1d,253
+ssr1d_frep1d,187
+ssr2d,273
+linalg,1089
+scf,1227

kernels/dsum/8x16xf32/linalg.csv

@@ -0,0 +1 @@
+1089

kernels/dsum/8x16xf32/maybe_update_xdsl_commit

@@ -0,0 +1 @@
+6a9d83ca561182afb9135daa5cca5e2bf8397158

kernels/dsum/8x16xf32/noalias.csv

@@ -0,0 +1 @@
+1202

kernels/dsum/8x16xf32/scf.csv

@@ -0,0 +1 @@
+1227

kernels/dsum/8x16xf32/ssr1d.csv

@@ -0,0 +1 @@
+253

kernels/dsum/8x16xf32/ssr1d_frep1d.csv

@@ -0,0 +1 @@
+187

kernels/dsum/8x16xf32/ssr2d.csv

@@ -0,0 +1 @@
+273

snitch/Makefile.rules

@@ -1,7 +1,7 @@
 
 # vim: set ft=make:
 
-.PHONY: traces
+.PHONY: traces, force_xdsl_commit, maybe_update_xdsl_commit
 
 MAKEFILE_RULES_DIRNAME := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 
@@ -17,6 +17,29 @@ MLIROPT       = mlir-opt-16
 MLIRTRANSLATE = mlir-translate-16
 XDSLOPT       = xdsl-opt
 
+XDSL_DIR         = /src/xdsl
+XDSL_COMMIT_FILE = /src/xdsl_commit.txt
+
+# Get the current commit hash of xdsl
+CURRENT_XDSL_COMMIT := $(shell git -C $(XDSL_DIR) rev-parse HEAD)
+
+# Read the last recorded commit hash from a file, if it exists
+LAST_XDSL_COMMIT := $(shell cat $(XDSL_COMMIT_FILE) 2>/dev/null)
+
+# Rule to update the recorded commit hash in a file
+$(XDSL_COMMIT_FILE): maybe_update_xdsl_commit
+
+
+# Rule to update the recorded commit hash in a file
+maybe_update_xdsl_commit:
+	@if [ "$(CURRENT_XDSL_COMMIT)" != "$(LAST_XDSL_COMMIT)" ]; then \
+		echo $(CURRENT_XDSL_COMMIT) > $(XDSL_COMMIT_FILE); \
+	fi
+
+# Phony target to force re-reading xdsl commit
+force_xdsl_commit:
+	$(RM) $(SUBMODULE_COMMIT_FILE)
+
 CFLAGS =
 # Mixing .c and .ll files makes some flags, useful for the former,
 # unused for the latter (e.g. -I)
@@ -101,7 +124,7 @@ XDSLOPTFLAGS += -t riscv-asm
 
 # Assembly rules
 
-%.S: %.xdsl.mlir
+%.S: %.xdsl.mlir $(XDSL_COMMIT_FILE)
 	$(XDSLOPT) $(XDSLOPTFLAGS) $< -o $@
 
 %.S: %.c
@@ -149,6 +172,9 @@ sim_%: %.logs/trace_hart_00000000.dasm
 %.trace.txt %.trace.json: %.dasm
 	$(DASM) < $< | $(GENTRACE) --permissive -d $*.trace.json > $*.trace.txt
 
+%.csv: %.x.logs/trace_hart_00000000.trace.json
+	grep -o '"cycles": [0-9]*' $< | cut -d " " -f 2 | sed -n '2p' > $@
+
 define get_trace_targets
 	$(addsuffix .trace.txt, $(basename $(shell find $(1) -name 'trace_hart_*.dasm')))
 endef

xdsl_commit.txt

@@ -0,0 +1 @@
+bd0de9285a21d5ca081c79710fc1d5eda0a289d1