[llvm-commits] CVS: llvm/test/DSGraphs/generate_report.pl

[Chris Lattner]

Changes in directory llvm/test/DSGraphs:

generate_report.pl updated: 1.8 -> 1.9

---
Log message:

lots o changes


---
Diffs of the changes:

Index: llvm/test/DSGraphs/generate_report.pl
diff -u llvm/test/DSGraphs/generate_report.pl:1.8 llvm/test/DSGraphs/generate_report.pl:1.9
--- llvm/test/DSGraphs/generate_report.pl:1.8	Sun Nov 10 01:31:18 2002
+++ llvm/test/DSGraphs/generate_report.pl	Sun Nov 17 16:18:29 2002
@@ -36,23 +36,23 @@
 
 
 # Output the headers for the report....
-printf("%-25s ", "Name:");
+printf("%-20s ", "Name:");
 if ($SHOW_TIMES) {
-  printf("%6s %-8s %-8s %-8s %-8s %-8s     ",
-         "Anlyz:", "LocTime:", "BUTime:", "TDTime:", "TotTime:", "BCTime:");
+  printf("%6s %-6s %-6s %-6s %-8s %-8s     ",
+         "Anlyz:", "LocTm:", "BUTim:", "TDTim:", "TimeSum:", "BCTime:");
 }
 
-printf("%-8s %-8s %-8s %-8s %-8s   " . "%-8s %-10s %-6s %-6s %-6s\n",
-       "LocSize:", "BUSize:", "TDSize:", "TotSize:", "BCSize:",
-       "NumFold", "NumNodes", "main", "__main", "GlobGr");
+printf("%-8s %-8s %-8s %-8s %-8s   ",
+       "LocSize:", "BUSize:", "TDSize:", "BUTDSz:", "BCSize:");
+printf("%-8s %-10s %-6s %-6s %-6s " . "| %-5s %-5s %-5s %-5s %-5s %-5s" .
+       " | %7s %9s %5s\n",
+       "NumFold", "NumNodes", "MaxSz", "GlobGr", "MaxSCC",
+       "Loads", "Store", "Calls", "Allca", "Mallc", "Sum",
+       "num/ind", "indcallee", "ratio");
 
 foreach $Record (@Records) {
   # Print BM name
-  printField('([-a-zA-Z0-9.]+)\.bc', $Record, -25);
-
-  if ($SHOW_TIMES) {  # Print total elapsed time...
-    printField('real\s+([ms0-9.]+)', $Record, 6);
-  }
+  printField('([-a-zA-Z0-9.]+)\.lib\.bc', $Record, -20);
 
   if ($Record =~ m/Assertion/) {
     # If an assertion failure occured, print it out.
@@ -60,31 +60,48 @@
   } else {
     if ($SHOW_TIMES) {
       # Print Times
-      printField('([0-9.]+) \([^)]+\)[ ]*[0-9]+  Local', $Record, -8);
-      printField('([0-9.]+) \([^)]+\)[ ]*[0-9]+  Bottom-up', $Record, -8);
-      printField('([0-9.]+) \([^)]+\)[ ]*[0-9]+  Top-down', $Record, -8);
-      printField('([0-9.]+) \([^)]+\)[ ]*[0-9]+  TOTAL', $Record, -8);
+      my $B = printField('([0-9.]+) \([^)]+\)[ 0-9]+Bottom', $Record, -6);
+      my $L = printField('([0-9.]+) \([^)]+\)[ 0-9]+Local' , $Record, -6);
+      printField('([0-9.]+) \([^)]+\)[ 0-9]+Bottom', $Record, -6);
+      my $T = printField('([0-9.]+) \([^)]+\)[ 0-9]+Top'   , $Record, -6);
+      printf("%-8s ", $L+$B+$T);
       printField('([0-9.]+) \([^)]+\)[ ]*[0-9]+  Bytecode', $Record, -8);
       print "|   ";
     }
 
     # Print Sizes
     printField("([0-9]+)  Local", $Record, -8);
-    printField("([0-9]+)  Bottom-up", $Record, -8);
-    printField("([0-9]+)  Top-down", $Record, -8);
-    printField("([0-9]+)  TOTAL", $Record, -8);
+    my $B = printField("([0-9]+)  Bottom-up", $Record, -8);
+    my $T = printField("([0-9]+)  Top-down", $Record, -8);
+    printf("%-8s ", $B+$T);
     printField("([0-9]+)  Bytecode", $Record, -8);
 
     print "|    ";
-    printField("([0-9]+).*completely folded", $Record, -5);
+    printField("([0-9]+).*Number of folded nodes ", $Record, -5);
     printField("Graphs contain \\[([0-9+]+)\\] nodes total", $Record, -10);
-    printField("\\.main\\.dot'... \\[([0-9+]+)\\]", $Record, -6);
-    printField("\\.__main\\.dot'... \\[([0-9+]+)\\]", $Record, -6);
+    printField("([0-9]+).*Maximum graph size", $Record, -6);
     printField("\\.GlobalsGraph\\.dot'... \\[([0-9+]+)\\]", $Record, -6);
+    printField("([0-9]+).*Maximum SCC Size in Call Graph", $Record, -6);
+
+    print "| ";
+    my $I = printField("([0-9]+).*Number of LoadInsts", $Record, -5);
+    $I += printField("([0-9]+).*Number of StoreInsts", $Record, -5);
+    $I += printField("([0-9]+).*Number of CallInsts", $Record, -5);
+    $I += printField("([0-9]+).*Number of AllocaInsts", $Record, -5);
+    $I += printField("([0-9]+).*Number of MallocInsts", $Record, -5);
+    printf("%-5s ", $I);
+
+    print "| ";
+    my $NI = printField("([0-9]+).*number of indirect call sites", $Record, -7);
+    my $NC = printField("([0-9]+).*number of callee functions at", $Record, -9);
+    if ($NI != 0) {
+      printf("%-5s ", $NC/$NI);
+    } else {
+      printf("%-5s ", "n/a");
+    }
+
   }
   print "\n";
-  #print "#####\n";
-  #print $Record;
 }
 
 sub printField {
@@ -93,7 +110,9 @@
   $Record =~ m/$Regex/;
   if (!defined($1)) {
     printf("%${FieldWidth}s ", "*");
+    return "0";
   } else {
     printf("%${FieldWidth}s ", $1);
   }
+  return $1;
 }