[llvm-commits] CVS: poolalloc/test/TEST.pavtl.Makefile

[Chris Lattner]

Changes in directory poolalloc/test:

TEST.pavtl.Makefile updated: 1.2 -> 1.3

---
Log message:

Rearrange stuff to run like a normal TEST.  Print a summary report at the end



---
Diffs of the changes:  (+41 -25)

Index: poolalloc/test/TEST.pavtl.Makefile
diff -u poolalloc/test/TEST.pavtl.Makefile:1.2 poolalloc/test/TEST.pavtl.Makefile:1.3
--- poolalloc/test/TEST.pavtl.Makefile:1.2	Tue Mar  2 15:25:18 2004
+++ poolalloc/test/TEST.pavtl.Makefile	Tue Mar  2 16:45:42 2004
@@ -13,8 +13,11 @@
 # (i.e. the Pentium 3 on Cypher has a different set of available events than
 # the Pentium 4 on Zion).
 #
-P4_EVENTS := "-ec en='2nd Level Cache Read Misses' en='2nd-Level Cache Read References' en='1st Level Cache Load Misses Retired'"
-P3_EVENTS := "-ec en='L2 Cache Request Misses (highly correlated)'"
+P4_EVENTS := -ec
+P4_EVENTS += en='2nd Level Cache Read Misses'
+P4_EVENTS += en='2nd-Level Cache Read References'
+#P4_EVENTS += en='1st Level Cache Load Misses Retired'
+P3_EVENTS := -ec en='L2 Cache Request Misses (highly correlated)'
 
 EVENTS := $(P4_EVENTS)
 
@@ -23,19 +26,12 @@
 #
 #$(PROGRAMS_TO_TEST:%=test.$(TEST).%): \
 #test.$(TEST).%: Output/%.llc
-	#@echo "========================================="
-	#@echo "Running '$(TEST)' test on '$(TESTNAME)' program"
-	#$(VERB) $(VTL) activity $* -d 50 -c sampling -o $(EVENTS) -app $<
-	#-$(VERB) $(VTL) run $*
-	#-$(VERB) $(VTL) view > $@
-	#$(VERB)  $(VTL) delete $* -f
-
-test:: $(PROGRAMS_TO_TEST:%=Output/test.$(TEST).pa.%)
-test:: $(PROGRAMS_TO_TEST:%=Output/test.$(TEST).%)
-test:: $(PROGRAMS_TO_TEST:%=Output/$(TEST).L2cachemisses.%)
-test:: $(PROGRAMS_TO_TEST:%=Output/$(TEST).L2cachemisses.pa.%)
-test:: $(PROGRAMS_TO_TEST:%=Output/$(TEST).L2cacherefs.%)
-test:: $(PROGRAMS_TO_TEST:%=Output/$(TEST).L2cacherefs.pa.%)
+#	@echo "========================================="
+#	@echo "Running '$(TEST)' test on '$(TESTNAME)' program"
+#	$(VERB) $(VTL) activity $* -d 50 -c sampling -o "$(EVENTS)" -app $<
+#	-$(VERB) $(VTL) run $*
+#	-$(VERB) $(VTL) view > $@
+#	$(VERB)  $(VTL) delete $* -f
 
 #
 # Once the results are generated, create files containing each individiual
@@ -46,30 +42,30 @@
 ifeq ($(EVENTS),$(P4_EVENTS))
 $(PROGRAMS_TO_TEST:%=Output/$(TEST).L2cachemisses.%): \
 Output/$(TEST).L2cachemisses.%: Output/test.$(TEST).%
-	grep "Output/$*.cbe" "$<" | grep "Cache Read Misses" | awk '{print $$(NF-1)}' > $@
+	grep "Output/$*.cbe" $< | grep "Cache Read Misses" | awk '{print $$(NF-1)}' > $@
 
 $(PROGRAMS_TO_TEST:%=Output/$(TEST).L2cachemisses.pa.%): \
 Output/$(TEST).L2cachemisses.pa.%: Output/test.$(TEST).pa.%
-	grep "Output/$*.poolalloc.cbe" "$<" | grep "Cache Read Misses" | awk '{print $$(NF-1)}' > $@
+	grep "Output/$*.poolalloc.cbe" $< | grep "Cache Read Misses" | awk '{print $$(NF-1)}' > $@
 
 $(PROGRAMS_TO_TEST:%=Output/$(TEST).L2cacherefs.%): \
 Output/$(TEST).L2cacherefs.%: Output/test.$(TEST).%
-	grep "Output/$*.cbe" "$<" | grep "Cache Read References" | awk '{print $$(NF-1)}' > $@
+	grep "Output/$*.cbe" $< | grep "Cache Read References" | awk '{print $$(NF-1)}' > $@
 
 $(PROGRAMS_TO_TEST:%=Output/$(TEST).L2cacherefs.pa.%): \
 Output/$(TEST).L2cacherefs.pa.%: Output/test.$(TEST).pa.%
-	grep "Output/$*.poolalloc.cbe" "$<" | grep "Cache Read References" | awk '{print $$(NF-1)}' > $@
+	grep "Output/$*.poolalloc.cbe" $< | grep "Cache Read References" | awk '{print $$(NF-1)}' > $@
 endif
 
 # Pentium 3 Events
 ifeq ($(EVENTS),$(P3_EVENTS))
 $(PROGRAMS_TO_TEST:%=Output/$(TEST).L2cachemisses.%): \
 Output/$(TEST).L2cachemisses.%: Output/test.$(TEST).%
-	grep "Output/$*.cbe" "$<" | grep " L2 Cache Request Misses" | awk '{print $$(NF-1)}' > $@
+	grep "Output/$*.cbe" $< | grep " L2 Cache Request Misses" | awk '{print $$(NF-1)}' > $@
 
 $(PROGRAMS_TO_TEST:%=Output/$(TEST).L2cachemisses.pa.%): \
 Output/$(TEST).L2cachemisses.pa.%: Output/test.$(TEST).pa.%
-	grep "Output/$*.poolalloc.cbe" "$<" | grep " L2 Cache Request Misses" | awk '{print $$(NF-1)}' > $@
+	grep "Output/$*.poolalloc.cbe" $< | grep " L2 Cache Request Misses" | awk '{print $$(NF-1)}' > $@
 endif
 
 #
@@ -80,9 +76,9 @@
 	@echo "========================================="
 	@echo "Running '$(TEST)' test on '$(TESTNAME)' program"
 ifeq ($(RUN_OPTIONS),)
-	$(VERB) cat $(STDIN_FILENAME) | $(VTL) activity $* -d 50 -c sampling -o $(EVENTS) -app $<
+	$(VERB) cat $(STDIN_FILENAME) | $(VTL) activity $* -d 50 -c sampling -o "$(EVENTS)" -app $<
 else
-	$(VERB) cat $(STDIN_FILENAME) | $(VTL) activity $* -d 50 -c sampling -o $(EVENTS) -app $<,"$(RUN_OPTIONS)"
+	$(VERB) cat $(STDIN_FILENAME) | $(VTL) activity $* -d 50 -c sampling -o "$(EVENTS)" -app $<,"$(RUN_OPTIONS)"
 endif
 	-$(VERB) $(VTL) run $*
 	-$(VERB) $(VTL) view > $@
@@ -96,11 +92,31 @@
 	@echo "========================================="
 	@echo "Running '$(TEST)' test on '$(TESTNAME)' program"
 ifeq ($(RUN_OPTIONS),)
-	$(VERB) cat $(STDIN_FILENAME) | $(VTL) activity $* -d 50 -c sampling -o $(EVENTS) -app $<
+	$(VERB) cat $(STDIN_FILENAME) | $(VTL) activity $* -d 50 -c sampling -o "$(EVENTS)" -app $<
 else
-	$(VERB) cat $(STDIN_FILENAME) | $(VTL) activity $* -d 50 -c sampling -o $(EVENTS) -app $<,"$(RUN_OPTIONS)"
+	$(VERB) cat $(STDIN_FILENAME) | $(VTL) activity $* -d 50 -c sampling -o "$(EVENTS)" -app $<,"$(RUN_OPTIONS)"
 endif
 	-$(VERB) $(VTL) run $*
 	-$(VERB) $(VTL) view > $@
 	$(VERB)  $(VTL) delete $* -f
+
+
+$(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \
+Output/%.$(TEST).report.txt: $(PROGRAMS_TO_TEST:%=Output/$(TEST).L2cachemisses.%)     \
+                     $(PROGRAMS_TO_TEST:%=Output/$(TEST).L2cachemisses.pa.%)  \
+                     $(PROGRAMS_TO_TEST:%=Output/$(TEST).L2cacherefs.%)       \
+                     $(PROGRAMS_TO_TEST:%=Output/$(TEST).L2cacherefs.pa.%)
+	@echo > $@
+	@echo CBE-PA-L2-Misses `cat Output/$(TEST).L2cachemisses.pa.$*`
+	@echo CBE-PA-L2-Refs   `cat Output/$(TEST).L2cacherefs.pa.$*`
+	@echo CBE-L2-Misses    `cat Output/$(TEST).L2cachemisses.$*`
+	@echo CBE-L2-Refs      `cat Output/$(TEST).L2cacherefs.$*`
+
+
+$(PROGRAMS_TO_TEST:%=test.$(TEST).%): \
+test.$(TEST).%: Output/%.$(TEST).report.txt
+	@echo "---------------------------------------------------------------"
+	@echo ">>> ========= '$(RELDIR)/$*' Program"
+	@echo "---------------------------------------------------------------"
+	@cat $<