[llvm-commits] CVS: poolalloc/test/TEST.perf.Makefile TEST.perf.report
Chris Lattner
lattner at cs.uiuc.edu
Tue Nov 9 21:11:20 PST 2004
Changes in directory poolalloc/test:
TEST.perf.Makefile updated: 1.12 -> 1.13
TEST.perf.report updated: 1.2 -> 1.3
---
Log message:
Change the report to print L1,L2, and TLB misses. Since we have an extra
slot, print out information about misaligned data refs.
---
Diffs of the changes: (+44 -36)
Index: poolalloc/test/TEST.perf.Makefile
diff -u poolalloc/test/TEST.perf.Makefile:1.12 poolalloc/test/TEST.perf.Makefile:1.13
--- poolalloc/test/TEST.perf.Makefile:1.12 Mon Nov 8 21:33:50 2004
+++ poolalloc/test/TEST.perf.Makefile Tue Nov 9 23:11:09 2004
@@ -17,12 +17,15 @@
#
# Events for the AMD K7 (Athlon) processors
#
-K7_REFILL_SYSTEM := 0x00411F43
-K7_REFILL_L2 := 0x00411F42
-K7_CACHE_MISSES := 0x00410041
-K7_CACHE_ACCESSES := 0x00410040
+K7_REFILL_SYSTEM := 0x00411F43
+K7_REFILL_L2 := 0x00411F42
+#K7_CACHE_MISSES := 0x00410041
+#K7_CACHE_ACCESSES := 0x00410040
+K7_TLB_MISSES := 0x00410046
+K7_MISALIGNED_DATA := 0x00410047
-K7_EVENTS := -e $(K7_REFILL_SYSTEM) -e $(K7_REFILL_L2) -e $(K7_CACHE_MISSES) -e $(K7_CACHE_ACCESSES)
+K7_EVENTS := -e $(K7_REFILL_SYSTEM) -e $(K7_REFILL_L2) \
+ -e $(K7_MISALIGNED_DATA) -e $(K7_TLB_MISSES)
#
# Events for the Pentium 4/Xeon processors
@@ -49,6 +52,14 @@
Output/$(TEST).cacheaccesses.pa.%: Output/test.$(TEST).pa.%
$(VERB) grep $(K7_CACHE_ACCESSES) $< | awk '{print $$(NF)}' > $@
+$(PROGRAMS_TO_TEST:%=Output/$(TEST).tlbmisses.%): \
+Output/$(TEST).tlbmisses.%: Output/test.$(TEST).%
+ $(VERB) grep $(K7_TLB_MISSES) $< | awk '{print $$(NF)}' > $@
+
+$(PROGRAMS_TO_TEST:%=Output/$(TEST).tlbmisses.pa.%): \
+Output/$(TEST).tlbmisses.pa.%: Output/test.$(TEST).pa.%
+ $(VERB) grep $(K7_TLB_MISSES) $< | awk '{print $$(NF)}' > $@
+
$(PROGRAMS_TO_TEST:%=Output/$(TEST).cachemisses.%): \
Output/$(TEST).cachemisses.%: Output/test.$(TEST).%
$(VERB) grep $(K7_CACHE_MISSES) $< | awk '{print $$(NF)}' > $@
@@ -57,6 +68,14 @@
Output/$(TEST).cachemisses.pa.%: Output/test.$(TEST).pa.%
$(VERB) grep $(K7_CACHE_MISSES) $< | awk '{print $$(NF)}' > $@
+$(PROGRAMS_TO_TEST:%=Output/$(TEST).misaligned.%): \
+Output/$(TEST).misaligned.%: Output/test.$(TEST).%
+ $(VERB) grep $(K7_MISALIGNED_DATA) $< | awk '{print $$(NF)}' > $@
+
+$(PROGRAMS_TO_TEST:%=Output/$(TEST).misaligned.pa.%): \
+Output/$(TEST).misaligned.pa.%: Output/test.$(TEST).pa.%
+ $(VERB) grep $(K7_MISALIGNED_DATA) $< | awk '{print $$(NF)}' > $@
+
$(PROGRAMS_TO_TEST:%=Output/$(TEST).L1Misses.%): \
Output/$(TEST).L1Misses.%: Output/test.$(TEST).%
$(VERB) grep $(K7_REFILL_SYSTEM) $< | awk '{print $$(NF)}' > $@
@@ -106,11 +125,7 @@
Output/test.$(TEST).pa.%: Output/%.poolalloc.cbe Output/test.$(TEST).%
@echo "========================================="
@echo "Running '$(TEST)' test on '$(TESTNAME)' program"
-ifeq ($(RUN_OPTIONS),)
- $(VERB) cat $(STDIN_FILENAME) | $(PERFEX) -o $@ $(EVENTS) $< > /dev/null
-else
- $(VERB) cat $(STDIN_FILENAME) | $(PERFEX) -o $@ $(EVENTS) $< $(RUN_OPTIONS) > /dev/null
-endif
+ -$(PERFEX) -o $@ $(EVENTS) $< $(RUN_OPTIONS) > /dev/null < $(STDIN_FILENAME)
#
# Generate events for CBE
@@ -119,11 +134,7 @@
Output/test.$(TEST).%: Output/%.nonpa.cbe
@echo "========================================="
@echo "Running '$(TEST)' test on '$(TESTNAME)' program"
-ifeq ($(RUN_OPTIONS),)
- $(VERB) cat $(STDIN_FILENAME) | $(PERFEX) -o $@ $(EVENTS) $< > /dev/null
-else
- $(VERB) cat $(STDIN_FILENAME) | $(PERFEX) -o $@ $(EVENTS) $< $(RUN_OPTIONS) > /dev/null
-endif
+ -$(PERFEX) -o $@ $(EVENTS) $< $(RUN_OPTIONS) > /dev/null < $(STDIN_FILENAME)
else
@@ -149,20 +160,20 @@
############################################################################
ifeq ($(EVENTS),$(K7_EVENTS))
$(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.%) \
+Output/%.$(TEST).report.txt: $(PROGRAMS_TO_TEST:%=Output/$(TEST).tlbmisses.%) \
+ $(PROGRAMS_TO_TEST:%=Output/$(TEST).tlbmisses.pa.%) \
+ $(PROGRAMS_TO_TEST:%=Output/$(TEST).misaligned.%) \
+ $(PROGRAMS_TO_TEST:%=Output/$(TEST).misaligned.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-TLB-Misses: %lld\n" `cat Output/$(TEST).tlbmisses.pa.$*` >> $@
+ @printf "CBE-TLB-Misses: %lld\n" `cat Output/$(TEST).tlbmisses.$*` >> $@
+ @printf "CBE-PA-Misaligned: %lld\n" `cat Output/$(TEST).misaligned.pa.$*` >> $@
+ @printf "CBE-Misaligned: %lld\n" `cat Output/$(TEST).misaligned.$*` >> $@
@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.$*` >> $@
Index: poolalloc/test/TEST.perf.report
diff -u poolalloc/test/TEST.perf.report:1.2 poolalloc/test/TEST.perf.report:1.3
--- poolalloc/test/TEST.perf.report:1.2 Mon Nov 8 21:33:50 2004
+++ poolalloc/test/TEST.perf.report Tue Nov 9 23:11:09 2004
@@ -78,19 +78,16 @@
["Name:" , '\'([^\']+)\' Program'],
[],
# Times
- ["NormUserTime", 'CBE-RUN-TIME-NORMAL-USER: user\s*([.0-9m:]+)', \&FormatTime],
- ["NormSysTime", 'CBE-RUN-TIME-NORMAL-SYS: sys\s*([.0-9m:]+)', \&FormatTime],
- ["NormCacheAccess", 'CBE-Cache-Accesses: ([0-9]+)'],
- ["NormCacheMisses", 'CBE-Cache-Misses: ([0-9]+)'],
- ["NormRefillFromL2", 'CBE-L1-Cache-Misses: ([0-9]+)'],
- ["NormRefillFromSys", 'CBE-L2-Cache-Misses: ([.0-9]+)'],
-
- ["PAUserTime", 'CBE-RUN-TIME-POOLALLOC-USER: user\s*([.0-9m:]+)', \&FormatTime],
- ["PASysTime", 'CBE-RUN-TIME-POOLALLOC-SYS: sys\s*([.0-9m:]+)', \&FormatTime],
- ["PACacheAccess", 'CBE-PA-Cache-Accesses: ([0-9]+)'],
- ["PACacheMisses", 'CBE-PA-Cache-Misses: ([0-9]+)'],
- ["PARefillFromL2", 'CBE-PA-L1-Cache-Misses: ([0-9]+)'],
- ["PARefillFromSys", 'CBE-PA-L2-Cache-Misses: ([.0-9]+)'],
+ ["L1 Misses", 'CBE-L1-Cache-Misses: ([0-9]+)'],
+ ["L2 Misses", 'CBE-L2-Cache-Misses: ([.0-9]+)'],
+ ["TLBMisses", 'CBE-TLB-Misses: ([0-9]+)'],
+ ["Misaligned", 'CBE-Misaligned: ([0-9]+)'],
+ [],
+# ["PACacheMisses", 'CBE-PA-Cache-Misses: ([0-9]+)'],
+ ["PA L1 Misses", 'CBE-PA-L1-Cache-Misses: ([0-9]+)'],
+ ["PA L2 Misses", 'CBE-PA-L2-Cache-Misses: ([.0-9]+)'],
+ ["PA TLB Misses", 'CBE-PA-TLB-Misses: ([0-9]+)'],
+ ["PA Misaligned", 'CBE-PA-Misaligned: ([0-9]+)'],
[]
);
More information about the llvm-commits
mailing list