Excise the linear scan llc-BETA and cbe-BETA columns as linear scan is

now the default. llvm-svn: 18573
michaelmaitland · Dec 6, 2004 · 2cfbaaa · 2cfbaaa
1 parent f09278e
commit 2cfbaaa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 22 deletions.
diff --git a/TEST.nightly.Makefile b/TEST.nightly.Makefile
@@ -20,9 +20,6 @@ endif
 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))
 
 

diff --git a/TEST.nightly.report b/TEST.nightly.report
@@ -22,8 +22,8 @@ sub FormatTime {
 
 sub GCCCBERatio {
   my ($Cols, $Col) = @_;
-  my $GCC = $Cols->[$Col-6];
-  my $CBE = $Cols->[$Col-5];
+  my $GCC = $Cols->[$Col-4];
+  my $CBE = $Cols->[$Col-3];
   if ($GCC ne "*" and $CBE ne "*" and $CBE != "0") {
     return sprintf("%3.2f", $GCC/$CBE);
   } else {
@@ -33,26 +33,15 @@ sub GCCCBERatio {
 
 sub GCCLLCRatio {
   my ($Cols, $Col) = @_;
-  my $GCC = $Cols->[$Col-7];
-  my $LLC = $Cols->[$Col-5];
+  my $GCC = $Cols->[$Col-5];
+  my $LLC = $Cols->[$Col-3];
   if ($GCC ne "*" and $LLC ne "*" and $LLC != "0") {
     return sprintf("%3.2f", $GCC/$LLC);
   } else {
     return "n/a";
   }
 }
 
-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.
@@ -64,17 +53,13 @@ sub GCCLLC_BETARatio {
  ["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]
 );