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

[Chris Lattner]

Changes in directory poolalloc/test:

TEST.poolalloc.Makefile updated: 1.15 -> 1.16
TEST.poolalloc.report updated: 1.10 -> 1.11

---
Log message:

Print user+sys time instead of 'real' time


---
Diffs of the changes:  (+33 -9)

Index: poolalloc/test/TEST.poolalloc.Makefile
diff -u poolalloc/test/TEST.poolalloc.Makefile:1.15 poolalloc/test/TEST.poolalloc.Makefile:1.16
--- poolalloc/test/TEST.poolalloc.Makefile:1.15	Thu Feb 26 02:04:07 2004
+++ poolalloc/test/TEST.poolalloc.Makefile	Mon Mar  1 17:15:45 2004
@@ -9,6 +9,11 @@
 
 EXTRA_PA_FLAGS := -poolalloc-force-simple-pool-init
 
+ifdef DISABLE_PROFITABILITY
+EXTRA_PA_FLAGS += -poolalloc-heuristic=AllPools
+endif
+
+
 CURDIR  := $(shell cd .; pwd)
 PROGDIR := $(shell cd $(LEVEL)/test/Programs; pwd)/
 RELDIR  := $(subst $(PROGDIR),,$(CURDIR))
@@ -83,10 +88,14 @@
 			     Output/%.poolalloc.diff-cbe
 	@echo > $@
 	@-if test -f Output/$*.poolalloc.diff-cbe; then \
-	  printf "CBE-RUN-TIME-NORMAL: " >> $@;\
-	  grep "^real" Output/$*.out-cbe.time >> $@;\
-	  printf "CBE-RUN-TIME-POOLALLOC: " >> $@;\
-	  grep "^real" Output/$*.poolalloc.out-cbe.time >> $@;\
+	  printf "CBE-RUN-TIME-NORMAL-USER: " >> $@;\
+	  grep "^user" Output/$*.out-cbe.time >> $@;\
+	  printf "CBE-RUN-TIME-NORMAL-SYS: " >> $@;\
+	  grep "^sys" Output/$*.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 >> $@;\
 	fi
 
 	@cat Output/$*.$(TEST).transformed.bc.info >> $@


Index: poolalloc/test/TEST.poolalloc.report
diff -u poolalloc/test/TEST.poolalloc.report:1.10 poolalloc/test/TEST.poolalloc.report:1.11
--- poolalloc/test/TEST.poolalloc.report:1.10	Tue Feb 17 13:10:01 2004
+++ poolalloc/test/TEST.poolalloc.report	Mon Mar  1 17:15:45 2004
@@ -10,14 +10,24 @@
 
 sub Ratio {
   my ($Cols, $Col) = @_;
-  if ($Cols->[$Col-1] ne "*" and $Cols->[$Col-2] ne "*" and
+  if ($Cols->[$Col-1] ne "*" and $Cols->[$Col-4] ne "*" and
       $Cols->[$Col-1] != "0") {
-    return sprintf "%1.3f", $Cols->[$Col-2]/$Cols->[$Col-1];
+    return sprintf "%1.3f", $Cols->[$Col-4]/$Cols->[$Col-1];
   } else {
     return "n/a";
   }
 }
 
+sub Sum {
+  my ($Cols, $Col) = @_;
+  if ($Cols->[$Col-1] ne "*" and $Cols->[$Col-2] ne "*") {
+    return sprintf "%1.3f", $Cols->[$Col-2]+$Cols->[$Col-1];
+  } else {
+    return "n/a";
+  }
+}
+
+
 sub FormatTime {
   my $Time = shift;
   if ($Time =~ m/([0-9]+)[m:]([0-9.]+)/) {
@@ -68,13 +78,18 @@
  ["Name:" , '\'([^\']+)\' Program'],
  [],
 # Times
- ["Normal<br>ExeTime"  ,  'CBE-RUN-TIME-NORMAL: real\s*([.0-9m:]+)',    \&FormatTime],
- ["PoolAlloc<br>ExeTime", 'CBE-RUN-TIME-POOLALLOC: real\s*([.0-9m:]+)', \&FormatTime],
+ ["NormalUser",    'CBE-RUN-TIME-NORMAL-USER: user\s*([.0-9m:]+)',    \&FormatTime],
+ ["NormalSys",    'CBE-RUN-TIME-NORMAL-SYS: sys\s*([.0-9m:]+)',    \&FormatTime],
+ ["NormalSum",     \&Sum],
+ ["PoolAllocUser", 'CBE-RUN-TIME-POOLALLOC-USER: user\s*([.0-9m:]+)', \&FormatTime],
+ ["PoolAllocSys", 'CBE-RUN-TIME-POOLALLOC-SYS: sys\s*([.0-9m:]+)', \&FormatTime],
+ ["NormalSum",     \&Sum],
  ["Speedup", \&Ratio],
  ["NumPools",             '([0-9]+).*Number of pools allocated'],
  ["NumTSPools",           '([0-9]+).*Number of typesafe pools'],
  ["NumArgs",              '([0-9]+).*Number of function arguments added'],
- ["NumPRElide",           '([0-9]+).*Number of poolfree.s elided'],
+ ["Nonprofit",            '([0-9]+).*Number of DSNodes not profitable'],
+ ["NumPFElide",           '([0-9]+).*Number of poolfree.s elided'],
  []
 );