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

[Chris Lattner]

Changes in directory llvm/test/DSGraphs:

generate_report.pl updated: 1.5 -> 1.6

---
Log message:

Lots of minor tweaks


---
Diffs of the changes:

Index: llvm/test/DSGraphs/generate_report.pl
diff -u llvm/test/DSGraphs/generate_report.pl:1.5 llvm/test/DSGraphs/generate_report.pl:1.6
--- llvm/test/DSGraphs/generate_report.pl:1.5	Thu Nov  7 01:16:05 2002
+++ llvm/test/DSGraphs/generate_report.pl	Fri Nov  8 14:48:05 2002
@@ -34,19 +34,25 @@
 # first test.
 shift @Records;
 
-printf("%-30s", "Name:");
+
+# Output the headers for the report....
+printf("%-25s ", "Name:");
 if ($SHOW_TIMES) {
-  printf("%-10s%-10s%-10s%-10s%-10s     ",
-         "LocTime:", "BUTime:", "TDTime:", "TotTime:", "AnlzTime:");
+  printf("%6s %-8s %-8s %-8s %-8s      ",
+         "Anlyz:", "LocTime:", "BUTime:", "TDTime:", "TotTime:");
 }
 
-printf("%-10s%-10s%-10s%-10s  " . "%-8s%-10s%-8s%-8s\n",
+printf("%-8s %-8s %-10s %-10s   " . "%-8s %-10s %-6s %-6s\n",
        "LocSize:", "BUSize:", "TDSize:", "TotSize:",
        "NumFold", "NumNodes", "main", "__main");
 
 foreach $Record (@Records) {
   # Print BM name
-  printField('([-a-zA-Z0-9.]+)\.bc', $Record, 30);
+  printField('([-a-zA-Z0-9.]+)\.bc', $Record, -25);
+
+  if ($SHOW_TIMES) {  # Print total elapsed time...
+    printField('real\s+([ms0-9.]+)', $Record, 6);
+  }
 
   if ($Record =~ m/Assertion/) {
     # If an assertion failure occured, print it out.
@@ -54,26 +60,24 @@
   } else {
     if ($SHOW_TIMES) {
       # Print Times
-      printField('([0-9.]+) \([^)]+\)[ ]*[0-9]+  Local', $Record, 10);
-      printField('([0-9.]+) \([^)]+\)[ ]*[0-9]+  Bottom-up', $Record, 10);
-      printField('([0-9.]+) \([^)]+\)[ ]*[0-9]+  Top-down', $Record, 10);
-      printField('([0-9.]+) \([^)]+\)[ ]*[0-9]+  TOTAL', $Record, 10);
-      printField('real\s+([ms0-9.]+)', $Record, 10);
-
+      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);
       print "|    ";
     }
 
     # Print Sizes
-    printField("([0-9]+)  Local", $Record, 10);
-    printField("([0-9]+)  Bottom-up", $Record, 10);
-    printField("([0-9]+)  Top-down", $Record, 10);
-    printField("([0-9]+)  TOTAL", $Record, 10);
+    printField("([0-9]+)  Local", $Record, -8);
+    printField("([0-9]+)  Bottom-up", $Record, -8);
+    printField("([0-9]+)  Top-down", $Record, -10);
+    printField("([0-9]+)  TOTAL", $Record, -10);
 
     print "|    ";
-    printField("([0-9]+).*completely folded", $Record, 5);
-    printField("Graphs contain \\[([0-9+]+)\\] nodes total", $Record, 10);
-    printField("\.main\.dot.... \\[([0-9+]+)\\]", $Record, 8);
-    printField("\.__main\.dot.... \\[([0-9+]+)\\]", $Record, 8);
+    printField("([0-9]+).*completely folded", $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);
   }
   print "\n";
   #print "#####\n";
@@ -85,8 +89,8 @@
   #print "Args: '$Regex' '$Record'\n";
   $Record =~ m/$Regex/;
   if (!defined($1)) {
-    printf("%-${FieldWidth}s", "*");
+    printf("%${FieldWidth}s ", "*");
   } else {
-    printf("%-${FieldWidth}s", $1);
+    printf("%${FieldWidth}s ", $1);
   }
 }