Merge pull request #79 from opencompl/sasha/makefiles-cycles

build up cycles.csv files by prepending folder names

kernels/Makefile

@@ -0,0 +1,6 @@
+
+FOLDERS =
+FOLDERS += dense
+FOLDERS += dsum
+
+include ./Makefile.folders

kernels/Makefile.folders

@@ -0,0 +1,25 @@
+.PHONY:
+
+CYCLES_CSV := cycles.csv
+
+.DEFAULT_GOAL := $(CYCLES_CSV)
+
+# Generate the target file by combining the specified files from TESTS
+$(CYCLES_CSV): $(addsuffix /cycles.csv,$(FOLDERS))
+	rm -f $(CYCLES_CSV)
+	@echo "Combining CSV files in folders specified in FOLDERS into $@"
+	@for folder in $(FOLDERS); do \
+		(cd $$folder && make cycles.csv) || { echo "Error: make in $$folder failed"; exit 1; }; \
+		awk -v folder=$$folder '{print folder "," $$0}' $$folder/cycles.csv >> $@; \
+	done
+
+# Define a pattern rule to ensure each folder's cycles.csv is up-to-date
+%/cycles.csv: FORCE
+	$(MAKE) -C $*
+
+# This target is used to force the rebuilding of the folders' cycles.csv files
+FORCE:
+
+
+clean:
+	rm -f *.csv

kernels/Makefile.kernels

@@ -23,7 +23,7 @@ CYCLES_CSV := cycles.csv
 
 # Generate the target file by combining the specified files from TESTS
 $(CYCLES_CSV): $(addsuffix .csv, $(basename $(TESTS)))
-	rm $(CYCLES_CSV)
+	rm -f $(CYCLES_CSV)
 	@echo "Combining CSV files specified in TESTS into $@"
 	@for file in $(TESTS); do \
 		filename=$$(basename $$file .x); \

kernels/cycles.csv

@@ -0,0 +1,8 @@
+dense,8x8xf64,linalg,7075
+dsum,8x16xf32,baseline,1202
+dsum,8x16xf32,noalias,1202
+dsum,8x16xf32,ssr1d,253
+dsum,8x16xf32,ssr1d_frep1d,187
+dsum,8x16xf32,ssr2d,273
+dsum,8x16xf32,linalg,1089
+dsum,8x16xf32,scf,1227

kernels/dense/8x8xf64/cycles.csv

@@ -0,0 +1 @@
+linalg,7075

kernels/dense/Makefile

@@ -0,0 +1,6 @@
+
+
+FOLDERS =
+FOLDERS += 8x8xf64
+
+include ../Makefile.folders

kernels/dense/cycles.csv

@@ -0,0 +1 @@
+8x8xf64,linalg,7075

kernels/dsum/Makefile

@@ -0,0 +1,6 @@
+
+
+FOLDERS =
+FOLDERS += 8x16xf32
+
+include ../Makefile.folders

kernels/dsum/cycles.csv

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