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

[Chris Lattner]

Changes in directory poolalloc/test:

TEST.poolalloc.Makefile updated: 1.28 -> 1.29
TEST.poolalloc.report updated: 1.17 -> 1.18

---
Log message:

Use the new user+sys time directly to allow us to remove many useless columns
and complexity from this report.  yaay!


---
Diffs of the changes:  (+17 -53)

Index: poolalloc/test/TEST.poolalloc.Makefile
diff -u poolalloc/test/TEST.poolalloc.Makefile:1.28 poolalloc/test/TEST.poolalloc.Makefile:1.29
--- poolalloc/test/TEST.poolalloc.Makefile:1.28	Sat Nov  6 13:42:18 2004
+++ poolalloc/test/TEST.poolalloc.Makefile	Sat Nov  6 13:48:11 2004
@@ -216,25 +216,17 @@
                              Output/%.LOC.txt
 	@echo > $@
 	@-if test -f Output/$*.poolalloc.diff-cbe; then \
-	  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-NORMAL: " >> $@;\
+	  grep "^program" Output/$*.nonpa.out-cbe.time >> $@;\
 		\
-	  printf "CBE-RUN-TIME-ALLNODES-USER: " >> $@;\
-	  grep "^user" Output/$*.allnodes.out-cbe.time >> $@;\
-	  printf "CBE-RUN-TIME-ALLNODES-SYS: " >> $@;\
-	  grep "^sys" Output/$*.allnodes.out-cbe.time >> $@;\
+	  printf "CBE-RUN-TIME-ALLNODES: " >> $@;\
+	  grep "^program" Output/$*.allnodes.out-cbe.time >> $@;\
 		\
-	  printf "CBE-RUN-TIME-ONLYOVERHEAD-USER: " >> $@;\
-	  grep "^user" Output/$*.onlyoverhead.out-cbe.time >> $@;\
-	  printf "CBE-RUN-TIME-ONLYOVERHEAD-SYS: " >> $@;\
-	  grep "^sys" Output/$*.onlyoverhead.out-cbe.time >> $@;\
+	  printf "CBE-RUN-TIME-ONLYOVERHEAD: " >> $@;\
+	  grep "^program" Output/$*.onlyoverhead.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-POOLALLOC: " >> $@;\
+	  grep "^program" Output/$*.poolalloc.out-cbe.time >> $@;\
 	  printf "LOC: " >> $@;\
 	  cat Output/$*.LOC.txt >> $@;\
 	fi


Index: poolalloc/test/TEST.poolalloc.report
diff -u poolalloc/test/TEST.poolalloc.report:1.17 poolalloc/test/TEST.poolalloc.report:1.18
--- poolalloc/test/TEST.poolalloc.report:1.17	Sat Nov  6 13:42:18 2004
+++ poolalloc/test/TEST.poolalloc.report	Sat Nov  6 13:48:11 2004
@@ -10,24 +10,14 @@
 
 sub Ratio {
   my ($Cols, $Col) = @_;
-  if ($Cols->[$Col-1] ne "*" and $Cols->[5] ne "*" and
+  if ($Cols->[$Col-1] ne "*" and $Cols->[3] ne "*" and
       $Cols->[$Col-1] != "0") {
-    return sprintf "%1.3f", $Cols->[5]/$Cols->[$Col-1];
+    return sprintf "%1.3f", $Cols->[3]/$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.]+)/) {
@@ -43,17 +33,6 @@
 my $PTRDIST   = 'MultiSource/Benchmarks/Ptrdist';
 
 @LatexRowMapOrder = (
-                     "bh/bh"           => 'bh',
-                     "bisort/bisort"   => 'bisort',
-                     "em3d/em3d"       => 'em3d',
-                     "health/health"   => 'health',
-                     "mst/mst"         => 'mst',
-                     "perimeter/perimeter" => 'perimeter',
-                     "power/power"     => 'power',
-                     "treeadd/treeadd" => 'treeadd',
-                     "tsp/tsp"         => 'tsp',
-                     "voronoi/voronoi" => 'voronoi',
-                     '-' => '-',
                      "anagram/anagram"       => 'anagram',
                      "bc/bc"                 => 'bc',
                      "ft/ft"                 => 'ft',
@@ -84,24 +63,17 @@
  ["LOC"   , 'LOC:\s*([0-9]+)'],
  [],
 # Times
- ["NormalUser",    'CBE-RUN-TIME-NORMAL-USER: user\s*([.0-9m:]+)',    \&FormatTime],
- ["NormalSys",    'CBE-RUN-TIME-NORMAL-SYS: sys\s*([.0-9m:]+)',    \&FormatTime],
- ["NormalSum",     \&Sum],
-
- ["AllNodesUser", 'CBE-RUN-TIME-ALLNODES-USER: user\s*([.0-9m:]+)', \&FormatTime],
- ["AllNodesSys", 'CBE-RUN-TIME-ALLNODES-SYS: sys\s*([.0-9m:]+)', \&FormatTime],
- ["AllNodesSum",     \&Sum],
- ["AN Speedup", \&Ratio],
+ ["NormalTime",   'CBE-RUN-TIME-NORMAL: program\s*([.0-9m:]+)'],
 
- ["OnlyOHUser", 'CBE-RUN-TIME-ONLYOVERHEAD-USER: user\s*([.0-9m:]+)', \&FormatTime],
- ["OnlyOHSys", 'CBE-RUN-TIME-ONLYOVERHEAD-SYS: sys\s*([.0-9m:]+)', \&FormatTime],
- ["OnlyOHSum",     \&Sum],
+ ["OnlyOHTime", 'CBE-RUN-TIME-ONLYOVERHEAD: program\s*([.0-9m:]+)'],
  ["OO Speedup", \&Ratio],
 
- ["PoolAllocUser", 'CBE-RUN-TIME-POOLALLOC-USER: user\s*([.0-9m:]+)', \&FormatTime],
- ["PoolAllocSys", 'CBE-RUN-TIME-POOLALLOC-SYS: sys\s*([.0-9m:]+)', \&FormatTime],
- ["PoolAllocSum",     \&Sum],
+ ["AllNodesTime", 'CBE-RUN-TIME-ALLNODES: program\s*([.0-9m:]+)'],
+ ["AN Speedup", \&Ratio],
+
+ ["PoolAllocTime", 'CBE-RUN-TIME-POOLALLOC: program\s*([.0-9m:]+)'],
  ["PA Speedup", \&Ratio],
+
  ["AP NumPools",          '([0-9]+).*Number of pools allocated'],
  ["AP Typesafe",          '([0-9]+).*Number of typesafe pools'],
  ["NumArgs",              '([0-9]+).*Number of function arguments added'],