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

[John Criswell]

Changes in directory poolalloc/test:

TEST.perf.Makefile updated: 1.3 -> 1.4

---
Log message:

Added more events.
Made hex values for events capital since perfex prints them out
capitalized.
Modified the reporting to work with the LLVM report system.



---
Diffs of the changes:  (+40 -14)

Index: poolalloc/test/TEST.perf.Makefile
diff -u poolalloc/test/TEST.perf.Makefile:1.3 poolalloc/test/TEST.perf.Makefile:1.4
--- poolalloc/test/TEST.perf.Makefile:1.3	Thu Mar  4 12:47:31 2004
+++ poolalloc/test/TEST.perf.Makefile	Thu Mar  4 17:57:49 2004
@@ -11,6 +11,9 @@
 
 PERFEX := /home/vadve/criswell/local/Linux/bin/perfex
 
+PERFOUT := /home/vadve/criswell/perf.out
+PERFSCRIPT := $(BUILD_SRC_DIR)/perf.awk
+
 #
 # Events for the AMD processors
 #   Data cache refills from system.
@@ -18,8 +21,8 @@
 #   Data cache misses.
 #   Data cache accesses.
 #
-K7_REFILL_SYSTEM  := 0x00411f43
-K7_REFILL_L2      := 0x00411f42
+K7_REFILL_SYSTEM  := 0x00411F43
+K7_REFILL_L2      := 0x00411F42
 K7_CACHE_MISSES   := 0x00410041
 K7_CACHE_ACCESSES := 0x00410040
 
@@ -36,19 +39,35 @@
 ifeq ($(EVENTS),$(K7_EVENTS))
 $(PROGRAMS_TO_TEST:%=Output/$(TEST).cacheaccesses.%): \
 Output/$(TEST).cacheaccesses.%: Output/test.$(TEST).%
-	grep $(K7_CACHE_ACCESSES) $< | awk '{print $$(NF)}' > $@
+	$(VERB) grep $(K7_CACHE_ACCESSES) $< | awk '{print $$(NF)}' > $@
 
 $(PROGRAMS_TO_TEST:%=Output/$(TEST).cacheaccesses.pa.%): \
 Output/$(TEST).cacheaccesses.pa.%: Output/test.$(TEST).pa.%
-	grep $(K7_CACHE_ACCESSES) $< | awk '{print $$(NF)}' > $@
+	$(VERB) grep $(K7_CACHE_ACCESSES) $< | awk '{print $$(NF)}' > $@
 
 $(PROGRAMS_TO_TEST:%=Output/$(TEST).cachemisses.%): \
 Output/$(TEST).cachemisses.%: Output/test.$(TEST).%
-	grep $(K7_CACHE_MISSES) $< | awk '{print $$(NF)}' > $@
+	$(VERB) grep $(K7_CACHE_MISSES) $< | awk '{print $$(NF)}' > $@
 
 $(PROGRAMS_TO_TEST:%=Output/$(TEST).cachemisses.pa.%): \
 Output/$(TEST).cachemisses.pa.%: Output/test.$(TEST).pa.%
-	grep $(K7_CACHE_MISSES) $< | awk '{print $$(NF)}' > $@
+	$(VERB) grep $(K7_CACHE_MISSES) $< | awk '{print $$(NF)}' > $@
+
+$(PROGRAMS_TO_TEST:%=Output/$(TEST).L1Misses.%): \
+Output/$(TEST).L1Misses.%: Output/test.$(TEST).%
+	$(VERB) grep $(K7_REFILL_SYSTEM) $< | awk '{print $$(NF)}' > $@
+
+$(PROGRAMS_TO_TEST:%=Output/$(TEST).L1Misses.pa.%): \
+Output/$(TEST).L1Misses.pa.%: Output/test.$(TEST).pa.%
+	$(VERB) grep $(K7_REFILL_SYSTEM) $< | awk '{print $$(NF)}' > $@
+
+$(PROGRAMS_TO_TEST:%=Output/$(TEST).L2Misses.%): \
+Output/$(TEST).L2Misses.%: Output/test.$(TEST).%
+	$(VERB) grep $(K7_REFILL_L2) $< | awk '{print $$(NF)}' > $@
+
+$(PROGRAMS_TO_TEST:%=Output/$(TEST).L2Misses.pa.%): \
+Output/$(TEST).L2Misses.pa.%: Output/test.$(TEST).pa.%
+	$(VERB) grep $(K7_REFILL_L2) $< | awk '{print $$(NF)}' > $@
 endif
 
 #
@@ -77,18 +96,25 @@
 	$(VERB) cat $(STDIN_FILENAME) | $(PERFEX) -o $@ $(EVENTS) $< $(RUN_OPTIONS)
 endif
 
-
 $(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \
 Output/%.$(TEST).report.txt: $(PROGRAMS_TO_TEST:%=Output/$(TEST).cacheaccesses.%)     \
                      $(PROGRAMS_TO_TEST:%=Output/$(TEST).cacheaccesses.pa.%) \
                      $(PROGRAMS_TO_TEST:%=Output/$(TEST).cachemisses.%) \
-                     $(PROGRAMS_TO_TEST:%=Output/$(TEST).cachemisses.pa.%)
-	@echo $* > $@
-	@printf "CBE-PA-Cache-Accesses: %11lld\n" `cat Output/$(TEST).cacheaccesses.pa.$*` | tee -a $@
-	@printf "CBE-Cache-Accesses   : %11lld\n" `cat Output/$(TEST).cacheaccesses.$*` | tee -a $@
-	@printf "CBE-PA-Cache-Misses  : %11lld\n" `cat Output/$(TEST).cachemisses.pa.$*` | tee -a $@
-	@printf "CBE-Cache-Misses     : %11lld\n" `cat Output/$(TEST).cachemisses.$*` | tee -a $@
-
+                     $(PROGRAMS_TO_TEST:%=Output/$(TEST).cachemisses.pa.%) \
+                     $(PROGRAMS_TO_TEST:%=Output/$(TEST).L1Misses.%) \
+                     $(PROGRAMS_TO_TEST:%=Output/$(TEST).L1Misses.pa.%) \
+                     $(PROGRAMS_TO_TEST:%=Output/$(TEST).L2Misses.%) \
+                     $(PROGRAMS_TO_TEST:%=Output/$(TEST).L2Misses.pa.%)
+	@echo "Program:" $* > $@
+	@echo "-------------------------------------------------------------" >> $@
+	@printf "CBE-PA-Cache-Accesses: %lld\n" `cat Output/$(TEST).cacheaccesses.pa.$*` >> $@
+	@printf "CBE-Cache-Accesses: %lld\n" `cat Output/$(TEST).cacheaccesses.$*` >> $@
+	@printf "CBE-PA-Cache-Misses: %lld\n" `cat Output/$(TEST).cachemisses.pa.$*` >> $@
+	@printf "CBE-Cache-Misses: %lld\n" `cat Output/$(TEST).cachemisses.$*` >> $@
+	@printf "CBE-PA-L1-Cache-Misses: %lld\n" `cat Output/$(TEST).L1Misses.pa.$*` >> $@
+	@printf "CBE-L1-Cache-Misses: %lld\n" `cat Output/$(TEST).L1Misses.$*` >> $@
+	@printf "CBE-PA-L2-Cache-Misses: %lld\n" `cat Output/$(TEST).L2Misses.pa.$*` >> $@
+	@printf "CBE-L2-Cache-Misses: %lld\n" `cat Output/$(TEST).L2Misses.$*` >> $@
 
 $(PROGRAMS_TO_TEST:%=test.$(TEST).%): \
 test.$(TEST).%: Output/%.$(TEST).report.txt