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

[Chris Lattner]

Changes in directory poolalloc/test:

TEST.perf.Makefile updated: 1.13 -> 1.14
TEST.perf.report updated: 1.3 -> 1.4

---
Log message:

Add run time into the table, discard stderr output


---
Diffs of the changes:  (+12 -15)

Index: poolalloc/test/TEST.perf.Makefile
diff -u poolalloc/test/TEST.perf.Makefile:1.13 poolalloc/test/TEST.perf.Makefile:1.14
--- poolalloc/test/TEST.perf.Makefile:1.13	Tue Nov  9 23:11:09 2004
+++ poolalloc/test/TEST.perf.Makefile	Tue Nov  9 23:49:37 2004
@@ -125,7 +125,7 @@
 Output/test.$(TEST).pa.%: Output/%.poolalloc.cbe Output/test.$(TEST).%
 	@echo "========================================="
 	@echo "Running '$(TEST)' test on '$(TESTNAME)' program"
-	-$(PERFEX) -o $@ $(EVENTS) $< $(RUN_OPTIONS) > /dev/null < $(STDIN_FILENAME)
+	-$(PERFEX) -o $@ $(EVENTS) $< $(RUN_OPTIONS) > /dev/null 2>&1 < $(STDIN_FILENAME)
 
 #
 # Generate events for CBE
@@ -134,7 +134,7 @@
 Output/test.$(TEST).%: Output/%.nonpa.cbe
 	@echo "========================================="
 	@echo "Running '$(TEST)' test on '$(TESTNAME)' program"
-	-$(PERFEX) -o $@ $(EVENTS) $< $(RUN_OPTIONS) > /dev/null < $(STDIN_FILENAME)
+	-$(PERFEX) -o $@ $(EVENTS) $< $(RUN_OPTIONS) > /dev/null 2>&1 < $(STDIN_FILENAME)
 
 else
 
@@ -178,14 +178,10 @@
 	@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.$*` >> $@
-	@printf "CBE-RUN-TIME-NORMAL-USER: " >> $@
-	@grep "^user" Output/$*.nonpa.out-cbe.time >> $@
-	@printf "CBE-RUN-TIME-NORMAL-SYS: " >> $@
-	@grep "^sys" Output/$*.nonpa.out-cbe.time >> $@
-	@printf "CBE-RUN-TIME-POOLALLOC-USER: " >> $@
-	@grep "^user" Output/$*.poolalloc.out-cbe.time >> $@
-	@printf "CBE-RUN-TIME-POOLALLOC-SYS: " >> $@
-	@grep "^sys" Output/$*.poolalloc.out-cbe.time >> $@
+	@printf "CBE-RUN-TIME: " >> $@
+	@grep "^program" Output/$*.nonpa.out-cbe.time >> $@
+	@printf "CBE-PA-RUN-TIME: " >> $@
+	@grep "^program" Output/$*.poolalloc.out-cbe.time >> $@
 endif
 
 ifeq ($(EVENTS),$(P4_EVENTS))


Index: poolalloc/test/TEST.perf.report
diff -u poolalloc/test/TEST.perf.report:1.3 poolalloc/test/TEST.perf.report:1.4
--- poolalloc/test/TEST.perf.report:1.3	Tue Nov  9 23:11:09 2004
+++ poolalloc/test/TEST.perf.report	Tue Nov  9 23:49:37 2004
@@ -78,16 +78,17 @@
  ["Name:" , '\'([^\']+)\' Program'],
  [],
 # Times
+ ["Time",           'CBE-RUN-TIME: ([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]+)'],
+ ["PA Time",        'CBE-PA-RUN-TIME: ([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]+)'],
  []
 );