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

[John Criswell]

Changes in directory poolalloc/test:

TEST.pavtl.Makefile updated: 1.1 -> 1.2

---
Log message:

Moved vtune output into the Output directory.
Added code to generate files in the Output directory to hold individual
statistics.  For example, Output/pavtl.L2cacherefs.bh holds the number of
L2 Cache References.

Please note that for some runs or metrics, there won't be any values and
the resultant output file will be empty.  For example, Olden/bh doesn't
seem to have any L2 Cache Misses.  I might be able to fix this by adjusting
Vtune's calibration parameters.



---
Diffs of the changes:  (+46 -6)

Index: poolalloc/test/TEST.pavtl.Makefile
diff -u poolalloc/test/TEST.pavtl.Makefile:1.1 poolalloc/test/TEST.pavtl.Makefile:1.2
--- poolalloc/test/TEST.pavtl.Makefile:1.1	Tue Mar  2 13:28:26 2004
+++ poolalloc/test/TEST.pavtl.Makefile	Tue Mar  2 15:25:18 2004
@@ -13,7 +13,7 @@
 # (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'"
+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)'"
 
 EVENTS := $(P4_EVENTS)
@@ -30,13 +30,53 @@
 	#-$(VERB) $(VTL) view > $@
 	#$(VERB)  $(VTL) delete $* -f
 
-test:: $(PROGRAMS_TO_TEST:%=test.$(TEST).pa.%)
+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.%)
+
+#
+# Once the results are generated, create files containing each individiual
+# piece of performance information.
+#
+
+# Pentium 4 Events
+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)}' > $@
+
+$(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)}' > $@
+
+$(PROGRAMS_TO_TEST:%=Output/$(TEST).L2cacherefs.%): \
+Output/$(TEST).L2cacherefs.%: Output/test.$(TEST).%
+	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)}' > $@
+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)}' > $@
+
+$(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)}' > $@
+endif
 
 #
 # Generate events for Pool Allocated CBE
 #
-$(PROGRAMS_TO_TEST:%=test.$(TEST).pa.%): \
-test.$(TEST).pa.%: Output/%.poolalloc.cbe
+$(PROGRAMS_TO_TEST:%=Output/test.$(TEST).pa.%): \
+Output/test.$(TEST).pa.%: Output/%.poolalloc.cbe
 	@echo "========================================="
 	@echo "Running '$(TEST)' test on '$(TESTNAME)' program"
 ifeq ($(RUN_OPTIONS),)
@@ -51,8 +91,8 @@
 #
 # Generate events for Pool Allocated CBE
 #
-$(PROGRAMS_TO_TEST:%=test.$(TEST).%): \
-test.$(TEST).%: Output/%.cbe
+$(PROGRAMS_TO_TEST:%=Output/test.$(TEST).%): \
+Output/test.$(TEST).%: Output/%.cbe
 	@echo "========================================="
 	@echo "Running '$(TEST)' test on '$(TESTNAME)' program"
 ifeq ($(RUN_OPTIONS),)