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

[John Criswell]

Changes in directory poolalloc/test:

TEST.cputrack.Makefile updated: 1.5 -> 1.6
TEST.cputrack.report updated: 1.1 -> 1.2

---
Log message:

Added other metric tests, such as L2 cache misses and the Write
Cache miss.
Making sense of cache writes will require understanding how the Ultrasparc
IIIi Write Cache plays with the other caches, which I don't completly
understand at the moment.


---
Diffs of the changes:  (+28 -2)

Index: poolalloc/test/TEST.cputrack.Makefile
diff -u poolalloc/test/TEST.cputrack.Makefile:1.5 poolalloc/test/TEST.cputrack.Makefile:1.6
--- poolalloc/test/TEST.cputrack.Makefile:1.5	Wed Nov  3 10:34:25 2004
+++ poolalloc/test/TEST.cputrack.Makefile	Wed Nov  3 13:10:42 2004
@@ -51,12 +51,19 @@
 	@echo "========================================="
 	@echo "Running '$(TEST)' test on '$(TESTNAME)' program"
 ifeq ($(RUN_OPTIONS),)
-	$(VERB) cat $(STDIN_FILENAME) | $(CPUTRACK) $(EVENTS_DC_RD) -o $@.dcrd $<
+	$(VERB) cat $(STDIN_FILENAME) | $(CPUTRACK) $(EVENTS_DC_RD)   -o $@.dcrd $<
+	$(VERB) cat $(STDIN_FILENAME) | $(CPUTRACK) $(EVENTS_EC_MISS) -o $@.ec $<
+	$(VERB) cat $(STDIN_FILENAME) | $(CPUTRACK) $(EVENTS_WC)      -o $@.wc $<
 else
-	$(VERB) cat $(STDIN_FILENAME) | $(CPUTRACK) $(EVENTS_DC_RD) -o $@.dcrd $< $(RUN_OPTIONS)
+	$(VERB) cat $(STDIN_FILENAME) | $(CPUTRACK) $(EVENTS_DC_RD)   -o $@.dcrd $< $(RUN_OPTIONS)
+	$(VERB) cat $(STDIN_FILENAME) | $(CPUTRACK) $(EVENTS_EC_MISS) -o $@.ec $< $(RUN_OPTIONS)
+	$(VERB) cat $(STDIN_FILENAME) | $(CPUTRACK) $(EVENTS_WC)      -o $@.wc $< $(RUN_OPTIONS)
 endif
 	$(VERB) cat $@.dcrd | tail -1 | awk '{print $$4}' > $@.dcrd.total
 	$(VERB) cat $@.dcrd | tail -1 | awk '{print $$5}' > $@.dcrd.misses
+	$(VERB) cat $@.ec   | tail -1 | awk '{print $$4}' > $@.ec.rdmiss
+	$(VERB) cat $@.ec   | tail -1 | awk '{print $$5}' > $@.ec.allmiss
+	$(VERB) cat $@.wc   | tail -1 | awk '{print $$5}' > $@.wc.miss
 
 #
 # Generate events for CBE
@@ -67,11 +74,18 @@
 	@echo "Running '$(TEST)' test on '$(TESTNAME)' program"
 ifeq ($(RUN_OPTIONS),)
 	$(VERB) cat $(STDIN_FILENAME) | $(CPUTRACK) $(EVENTS_DC_RD) -o $@.dcrd $<
+	$(VERB) cat $(STDIN_FILENAME) | $(CPUTRACK) $(EVENTS_EC_MISS) -o $@.ec $<
+	$(VERB) cat $(STDIN_FILENAME) | $(CPUTRACK) $(EVENTS_WC)      -o $@.wc $<
 else
 	$(VERB) cat $(STDIN_FILENAME) | $(CPUTRACK) $(EVENTS_DC_RD) -o $@.dcrd $< $(RUN_OPTIONS)
+	$(VERB) cat $(STDIN_FILENAME) | $(CPUTRACK) $(EVENTS_EC_MISS) -o $@.ec $< $(RUN_OPTIONS)
+	$(VERB) cat $(STDIN_FILENAME) | $(CPUTRACK) $(EVENTS_WC)      -o $@.wc $< $(RUN_OPTIONS)
 endif
 	$(VERB) cat $@.dcrd | tail -1 | awk '{print $$4}' > $@.dcrd.total
 	$(VERB) cat $@.dcrd | tail -1 | awk '{print $$5}' > $@.dcrd.misses
+	$(VERB) cat $@.ec   | tail -1 | awk '{print $$4}' > $@.ec.rdmiss
+	$(VERB) cat $@.ec   | tail -1 | awk '{print $$5}' > $@.ec.allmiss
+	$(VERB) cat $@.wc   | tail -1 | awk '{print $$5}' > $@.wc.miss
 
 $(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \
 Output/%.$(TEST).report.txt: Output/test.$(TEST).pa.% Output/test.$(TEST).%
@@ -79,6 +93,12 @@
 	@printf "CBE-PA-L1-Data-Misses: %d\n" `cat Output/test.$(TEST).pa.$*.dcrd.misses` >> $@
 	@printf "CBE-L1-Data-Reads: %d\n" `cat Output/test.$(TEST).$*.dcrd.total` >> $@
 	@printf "CBE-L1-Data-Misses: %d\n" `cat Output/test.$(TEST).$*.dcrd.misses` >> $@
+	@printf "CBE-PA-L2-Data-Read-Misses: %d\n" `cat Output/test.$(TEST).pa.$*.ec.rdmiss` >> $@
+	@printf "CBE-PA-L2-Data-Misses: %d\n" `cat Output/test.$(TEST).pa.$*.ec.allmiss` >> $@
+	@printf "CBE-L2-Data-Read-Misses: %d\n" `cat Output/test.$(TEST).$*.ec.rdmiss` >> $@
+	@printf "CBE-L2-Data-Misses: %d\n" `cat Output/test.$(TEST).$*.ec.allmiss` >> $@
+	@printf "CBE-PA-WriteCache-Misses: %d\n" `cat Output/test.$(TEST).pa.$*.wc.miss` >> $@
+	@printf "CBE-WriteCache-Misses: %d\n" `cat Output/test.$(TEST).$*.wc.miss` >> $@
 	@touch $@
 
 $(PROGRAMS_TO_TEST:%=test.$(TEST).%): \


Index: poolalloc/test/TEST.cputrack.report
diff -u poolalloc/test/TEST.cputrack.report:1.1 poolalloc/test/TEST.cputrack.report:1.2
--- poolalloc/test/TEST.cputrack.report:1.1	Wed Nov  3 10:34:25 2004
+++ poolalloc/test/TEST.cputrack.report	Wed Nov  3 13:10:42 2004
@@ -80,9 +80,15 @@
 # Times
  ["NormalL1DataRead",    'CBE-L1-Data-Reads: ([0-9]+)'],
  ["NormalL1DataMiss",    'CBE-L1-Data-Misses: ([0-9]+)'],
+ ["NormalL2DataReadMiss",    'CBE-L2-Data-Read-Misses: ([0-9]+)'],
+ ["NormalL2DataMiss",    'CBE-L2-Data-Misses: ([0-9]+)'],
+ ["NormalWriteCacheMiss",    'CBE-WriteCache-Misses: ([0-9]+)'],
 
  ["PoolAllocL1DataRead",    'CBE-PA-L1-Data-Reads: ([0-9]+)'],
  ["PoolAllocL1DataMiss",    'CBE-PA-L1-Data-Misses: ([0-9]+)'],
+ ["PoolAllocL2DataReadMiss",    'CBE-PA-L2-Data-Read-Misses: ([0-9]+)'],
+ ["PoolAllocL2DataMiss",    'CBE-PA-L2-Data-Misses: ([0-9]+)'],
+ ["PoolAllocWriteCacheMiss",    'CBE-PA-WriteCache-Misses: ([0-9]+)'],
  []
 );