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

[John Criswell]

Changes in directory poolalloc/test:

TEST.cputrack.Makefile updated: 1.8 -> 1.9
TEST.cputrack.report updated: 1.3 -> 1.4

---
Log message:

Added support for getting some TLB misses.


---
Diffs of the changes:  (+32 -1)

Index: poolalloc/test/TEST.cputrack.Makefile
diff -u poolalloc/test/TEST.cputrack.Makefile:1.8 poolalloc/test/TEST.cputrack.Makefile:1.9
--- poolalloc/test/TEST.cputrack.Makefile:1.8	Fri Nov 12 14:08:19 2004
+++ poolalloc/test/TEST.cputrack.Makefile	Fri Nov 12 14:21:03 2004
@@ -71,6 +71,12 @@
 	@echo "Running '$(TEST)' test on '$(TESTNAME)' program"
 	$(VERB) $(CPUTRACK) $(EVENTS_WC)      -o $@ $< $(RUN_OPTIONS) < $(STDIN_FILENAME) > /dev/null 2>&1
 
+$(PROGRAMS_TO_TEST:%=Output/$(TEST).pa.%.tlb): \
+Output/$(TEST).pa.%.tlb: Output/%.poolalloc.cbe
+	@echo "========================================="
+	@echo "Running '$(TEST)' test on '$(TESTNAME)' program"
+	$(VERB) $(CPUTRACK) $(EVENTS_TLB)      -o $@ $< $(RUN_OPTIONS) < $(STDIN_FILENAME) > /dev/null 2>&1
+
 #
 # Generate events for CBE
 #
@@ -92,6 +98,12 @@
 	@echo "Running '$(TEST)' test on '$(TESTNAME)' program"
 	$(VERB) $(CPUTRACK) $(EVENTS_WC)      -o $@ $< $(RUN_OPTIONS) < $(STDIN_FILENAME) > /dev/null 2>&1
 
+$(PROGRAMS_TO_TEST:%=Output/$(TEST).%.tlb): \
+Output/$(TEST).%.tlb: Output/%.nonpa.cbe
+	@echo "========================================="
+	@echo "Running '$(TEST)' test on '$(TESTNAME)' program"
+	$(VERB) $(CPUTRACK) $(EVENTS_TLB)      -o $@ $< $(RUN_OPTIONS) < $(STDIN_FILENAME) > /dev/null 2>&1
+
 else
 
 # This rule runs the generated executable, generating timing information, for
@@ -102,7 +114,6 @@
              $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
                   $(CPUTRACK) $(EVENTS_DC_RD)   -o $(BUILD_OBJ_DIR)/$@ $(BUILD_OBJ_DIR)/$< $(RUN_OPTIONS)
 
-
 $(PROGRAMS_TO_TEST:%=Output/$(TEST).pa.%.ec): \
 Output/$(TEST).pa.%.ec: Output/%.poolalloc.cbe
 	-$(SPEC_SANDBOX) poolalloccbe-$(RUN_TYPE) $@.out $(REF_IN_DIR) \
@@ -115,6 +126,12 @@
              $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
                   $(CPUTRACK) $(EVENTS_WC)      -o $(BUILD_OBJ_DIR)/$@ $(BUILD_OBJ_DIR)/$< $(RUN_OPTIONS)
 
+$(PROGRAMS_TO_TEST:%=Output/$(TEST).pa.%.tlb): \
+Output/$(TEST).pa.%.tlb: Output/%.poolalloc.cbe
+	-$(SPEC_SANDBOX) poolalloccbe-$(RUN_TYPE) $@.out $(REF_IN_DIR) \
+             $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
+                  $(CPUTRACK) $(EVENTS_TLB)      -o $(BUILD_OBJ_DIR)/$@ $(BUILD_OBJ_DIR)/$< $(RUN_OPTIONS)
+
 # This rule runs the generated executable, generating timing information, for
 # SPEC
 $(PROGRAMS_TO_TEST:%=Output/$(TEST).%.dcrd): \
@@ -134,6 +151,12 @@
 	-$(SPEC_SANDBOX) nonpacbe-$(RUN_TYPE) $@.out $(REF_IN_DIR) \
              $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
                   $(CPUTRACK) $(EVENTS_WC)      -o $(BUILD_OBJ_DIR)/$@ $(BUILD_OBJ_DIR)/$< $(RUN_OPTIONS)
+
+$(PROGRAMS_TO_TEST:%=Output/$(TEST).%.tlb): \
+Output/$(TEST).%.tlb: Output/%.nonpa.cbe
+	-$(SPEC_SANDBOX) nonpacbe-$(RUN_TYPE) $@.out $(REF_IN_DIR) \
+             $(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
+                  $(CPUTRACK) $(EVENTS_TLB)      -o $(BUILD_OBJ_DIR)/$@ $(BUILD_OBJ_DIR)/$< $(RUN_OPTIONS)
 endif
 
 ############################################################################
@@ -147,6 +170,8 @@
                      $(PROGRAMS_TO_TEST:%=Output/$(TEST).pa.%.wc)     \
                      $(PROGRAMS_TO_TEST:%=Output/$(TEST).%.ec)     \
                      $(PROGRAMS_TO_TEST:%=Output/$(TEST).pa.%.ec)     \
+                     $(PROGRAMS_TO_TEST:%=Output/$(TEST).%.tlb)     \
+                     $(PROGRAMS_TO_TEST:%=Output/$(TEST).pa.%.tlb)     \
 	                   $(PROGRAMS_TO_TEST:%=Output/%.poolalloc.out-cbe.time) \
                      $(PROGRAMS_TO_TEST:%=Output/%.nonpa.out-cbe.time)
 	@echo "Program:" $* > $@
@@ -171,6 +196,10 @@
 	@cat  Output/$(TEST).$*.ec | tail -1 | awk '{print $$4}' >> $@
 	@printf "CBE-L2-Data-Misses: " >> $@
 	@cat  Output/$(TEST).$*.ec | tail -1 | awk '{print $$5}' >> $@
+	@printf "CBE-PA-DTLB-Misses: " >> $@
+	@cat  Output/$(TEST).pa.$*.tlb | tail -1 | awk '{print $$5}' >> $@
+	@printf "CBE-DTLB-Misses: " >> $@
+	@cat  Output/$(TEST).$*.tlb | tail -1 | awk '{print $$5}' >> $@
 	@printf "CBE-RUN-TIME: " >> $@
 	@grep "^program" Output/$*.nonpa.out-cbe.time >> $@
 	@printf "CBE-PA-RUN-TIME: " >> $@


Index: poolalloc/test/TEST.cputrack.report
diff -u poolalloc/test/TEST.cputrack.report:1.3 poolalloc/test/TEST.cputrack.report:1.4
--- poolalloc/test/TEST.cputrack.report:1.3	Fri Nov 12 14:08:35 2004
+++ poolalloc/test/TEST.cputrack.report	Fri Nov 12 14:21:03 2004
@@ -83,12 +83,14 @@
  ["NormalL2DataReadMiss",    'CBE-L2-Data-Read-Misses: ([0-9]+)'],
  ["NormalL2DataMiss",    'CBE-L2-Data-Misses: ([0-9]+)'],
  ["NormalWriteCacheMiss",    'CBE-WCache-Misses: ([0-9]+)'],
+ ["NormalDTLBMiss",    'CBE-DTLB-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-WCache-Misses: ([0-9]+)'],
+ ["PoolAllocDTLBMiss",    'CBE-PA-DTLB-Misses: ([0-9]+)'],
  []
 );