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

[Chris Lattner]

Changes in directory poolalloc/test:

TEST.perf.Makefile updated: 1.14 -> 1.15
TEST.perf.report updated: 1.4 -> 1.5

---
Log message:

Print time correctly in the report


---
Diffs of the changes:  (+5 -3)

Index: poolalloc/test/TEST.perf.Makefile
diff -u poolalloc/test/TEST.perf.Makefile:1.14 poolalloc/test/TEST.perf.Makefile:1.15
--- poolalloc/test/TEST.perf.Makefile:1.14	Tue Nov  9 23:49:37 2004
+++ poolalloc/test/TEST.perf.Makefile	Wed Nov 10 00:44:39 2004
@@ -167,7 +167,9 @@
                      $(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.%)
+                     $(PROGRAMS_TO_TEST:%=Output/$(TEST).L2Misses.pa.%) \
+	             $(PROGRAMS_TO_TEST:%=Output/%.poolalloc.out-cbe.time) \
+                     $(PROGRAMS_TO_TEST:%=Output/%.nonpa.out-cbe.time)
 	@echo "Program:" $* > $@
 	@echo "-------------------------------------------------------------" >> $@
 	@printf "CBE-PA-TLB-Misses: %lld\n" `cat Output/$(TEST).tlbmisses.pa.$*` >> $@


Index: poolalloc/test/TEST.perf.report
diff -u poolalloc/test/TEST.perf.report:1.4 poolalloc/test/TEST.perf.report:1.5
--- poolalloc/test/TEST.perf.report:1.4	Tue Nov  9 23:49:37 2004
+++ poolalloc/test/TEST.perf.report	Wed Nov 10 00:44:39 2004
@@ -78,13 +78,13 @@
  ["Name:" , '\'([^\']+)\' Program'],
  [],
 # Times
- ["Time",           'CBE-RUN-TIME: ([0-9]+)'],
+ ["Time",           'CBE-RUN-TIME: program\s*([0-9.m]+)'],
  ["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]+)'],
  [],
- ["PA Time",        'CBE-PA-RUN-TIME: ([0-9]+)'],
+ ["PA Time",        'CBE-PA-RUN-TIME: program\s*([0-9.m]+)'],
  ["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]+)'],