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

[Reid Spencer]

Changes in directory llvm-test:

TEST.nightly.report updated: 1.30 -> 1.31
TEST.nightly.Makefile updated: 1.35 -> 1.36
---
Log message:

Revert changes to remove llc-BETA, etc. as they are still needed for the
iterative linear scan allocator.


---
Diffs of the changes:  (+22 -4)

Index: llvm-test/TEST.nightly.report
diff -u llvm-test/TEST.nightly.report:1.30 llvm-test/TEST.nightly.report:1.31
--- llvm-test/TEST.nightly.report:1.30	Mon Dec  6 12:28:11 2004
+++ llvm-test/TEST.nightly.report	Mon Dec  6 14:13:31 2004
@@ -22,8 +22,8 @@
 
 sub GCCCBERatio {
   my ($Cols, $Col) = @_;
-  my $GCC = $Cols->[$Col-4];
-  my $CBE = $Cols->[$Col-3];
+  my $GCC = $Cols->[$Col-6];
+  my $CBE = $Cols->[$Col-5];
   if ($GCC ne "*" and $CBE ne "*" and $CBE != "0") {
     return sprintf("%3.2f", $GCC/$CBE);
   } else {
@@ -33,8 +33,8 @@
 
 sub GCCLLCRatio {
   my ($Cols, $Col) = @_;
-  my $GCC = $Cols->[$Col-5];
-  my $LLC = $Cols->[$Col-3];
+  my $GCC = $Cols->[$Col-7];
+  my $LLC = $Cols->[$Col-5];
   if ($GCC ne "*" and $LLC ne "*" and $LLC != "0") {
     return sprintf("%3.2f", $GCC/$LLC);
   } else {
@@ -42,6 +42,17 @@
   }
 }
 
+sub GCCLLC_BETARatio {
+  my ($Cols, $Col) = @_;
+  my $GCC = $Cols->[$Col-8];
+  my $LLC_BETA = $Cols->[$Col-5];
+  if ($GCC ne "*" and $LLC_BETA ne "*" and $LLC_BETA != "0") {
+    return sprintf("%3.2f", $GCC/$LLC_BETA);
+  } else {
+    return "n/a";
+  }
+}
+
 # These are the columns for the report.  The first entry is the header for the
 # column, the second is the regex to use to match the value.  Empty list create
 # separators, and closures may be put in for custom processing.
@@ -53,13 +64,17 @@
  ["GCCAS"    , "TEST-RESULT-compile: $WallTimeRE"],
  ["Bytecode" , 'TEST-RESULT-compile: *([0-9]+)'],
  ["LLC<br>compile" , "TEST-RESULT-llc: $WallTimeRE"],
+ ["LLC-BETA<br>compile" , "TEST-RESULT-llc-ls: $WallTimeRE"],
  ["JIT<br>codegen" , "TEST-RESULT-jit-comptime: $WallTimeRE"],
  ["Machine<br>code", 'TEST-RESULT-jit-machcode: *([0-9]+).*bytes of machine code'],
  [],
  ["GCC"      , 'TEST-RESULT-nat-time: program\s*([.0-9m:]+)', \&FormatTime],
  ["CBE"      , 'TEST-RESULT-cbe-time: program\s*([.0-9m:]+)', \&FormatTime],
  ["LLC"      , 'TEST-RESULT-llc-time: program\s*([.0-9m:]+)', \&FormatTime],
+ ["LLC-BETA" , 'TEST-RESULT-llc-ls-time: program\s*([.0-9m:]+)', \&FormatTime],
  ["JIT"      , 'TEST-RESULT-jit-time: program\s*([.0-9m:]+)', \&FormatTime],
+ ["JIT-BETA" , 'TEST-RESULT-jit-ls-time: program\s*([.0-9m:]+)', \&FormatTime],
  ["GCC/CBE"  , \&GCCCBERatio],
  ["GCC/LLC"  , \&GCCLLCRatio],
+ ["GCC/LLC-BETA"  , \&GCCLLC_BETARatio]
 );


Index: llvm-test/TEST.nightly.Makefile
diff -u llvm-test/TEST.nightly.Makefile:1.35 llvm-test/TEST.nightly.Makefile:1.36
--- llvm-test/TEST.nightly.Makefile:1.35	Mon Dec  6 12:28:11 2004
+++ llvm-test/TEST.nightly.Makefile	Mon Dec  6 14:13:31 2004
@@ -20,6 +20,9 @@
 ifndef DISABLE_CBE
 REPORTS_TO_GEN +=  cbe
 endif
+ifdef ENABLE_LINEARSCAN
+REPORTS_TO_GEN += llc-ls jit-ls
+endif
 REPORTS_SUFFIX := $(addsuffix .report.txt, $(REPORTS_TO_GEN))