Fix usage of changed function prototype

[oota-llvm.git] / tools / gccas / gccas.cpp

diff --git a/tools/gccas/gccas.cpp b/tools/gccas/gccas.cpp
index 7b5018a5198ee148172947a3918da5e715d9e112..dd8b8e0698498db4613ad007bd2a0ee311d0227f 100644 (file)
--- a/tools/gccas/gccas.cpp
+++ b/tools/gccas/gccas.cpp
@@ -22,8 +22,8 @@
 #include "llvm/Target/TargetData.h"
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Transforms/Scalar.h"
-#include "Support/CommandLine.h"
-#include "Support/Signals.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/System/Signals.h"
 #include <memory>
 #include <fstream>
 
@@ -46,6 +46,12 @@ namespace {
   cl::opt<bool>
   DisableOptimizations("disable-opt",
                        cl::desc("Do not run any optimization passes"));
+
+  cl::opt<bool>
+  DisableDSE("disable-dse", cl::desc("Do not run dead store elimination"));
+  cl::opt<bool> 
+  NoCompress("disable-compression", cl::init(false),
+             cl::desc("Don't ompress the generated bytecode"));
 }
 
 
@@ -68,7 +74,8 @@ void AddConfiguredTransformationPasses(PassManager &PM) {
   addPass(PM, createRaiseAllocationsPass());     // call %malloc -> malloc inst
   addPass(PM, createCFGSimplificationPass());    // Clean up disgusting code
   addPass(PM, createPromoteMemoryToRegister());  // Kill useless allocas
-  addPass(PM, createGlobalDCEPass());            // Remove unused globals
+  addPass(PM, createGlobalOptimizerPass());      // Optimize out global vars
+  addPass(PM, createGlobalDCEPass());            // Remove unused fns and globs
   addPass(PM, createIPConstantPropagationPass());// IP Constant Propagation
   addPass(PM, createDeadArgEliminationPass());   // Dead argument elimination
   addPass(PM, createInstructionCombiningPass()); // Clean up after IPCP & DAE
@@ -78,6 +85,7 @@ void AddConfiguredTransformationPasses(PassManager &PM) {
 
   if (!DisableInline)
     addPass(PM, createFunctionInliningPass());   // Inline small functions
+  addPass(PM, createArgumentPromotionPass());    // Scalarize uninlined fn args
 
   addPass(PM, createRaisePointerReferencesPass());// Recover type information
   addPass(PM, createTailDuplicationPass());      // Simplify cfg by copying code
@@ -90,6 +98,10 @@ void AddConfiguredTransformationPasses(PassManager &PM) {
   addPass(PM, createTailCallEliminationPass());  // Eliminate tail calls
   addPass(PM, createCFGSimplificationPass());    // Merge & remove BBs
   addPass(PM, createLICMPass());                 // Hoist loop invariants
+  addPass(PM, createInstructionCombiningPass()); // Clean up after the unroller
+  addPass(PM, createIndVarSimplifyPass());       // Canonicalize indvars
+  addPass(PM, createLoopUnrollPass());           // Unroll small loops
+  addPass(PM, createInstructionCombiningPass()); // Clean up after the unroller
   addPass(PM, createLoadValueNumberingPass());   // GVN for load instructions
   addPass(PM, createGCSEPass());                 // Remove common subexprs
   addPass(PM, createSCCPPass());                 // Constant prop with SCCP
@@ -97,7 +109,8 @@ void AddConfiguredTransformationPasses(PassManager &PM) {
   // Run instcombine after redundancy elimination to exploit opportunities
   // opened up by them.
   addPass(PM, createInstructionCombiningPass());
-  addPass(PM, createIndVarSimplifyPass());       // Canonicalize indvars
+  if (!DisableDSE)
+    addPass(PM, createDeadStoreEliminationPass()); // Delete dead stores
   addPass(PM, createAggressiveDCEPass());        // SSA based 'Aggressive DCE'
   addPass(PM, createCFGSimplificationPass());    // Merge & remove BBs
   addPass(PM, createDeadTypeEliminationPass());  // Eliminate dead types
@@ -107,7 +120,7 @@ void AddConfiguredTransformationPasses(PassManager &PM) {
 
 int main(int argc, char **argv) {
   cl::ParseCommandLineOptions(argc, argv, " llvm .s -> .o assembler for GCC\n");
-  PrintStackTraceOnErrorSignal();
+  sys::PrintStackTraceOnErrorSignal();
 
   std::auto_ptr<Module> M;
   try {
@@ -146,7 +159,7 @@ int main(int argc, char **argv) {
 
     // Make sure that the Out file gets unlinked from the disk if we get a
     // signal
-    RemoveFileOnSignal(OutputFilename);
+    sys::RemoveFileOnSignal(sys::Path(OutputFilename));
   }
 
   
@@ -172,7 +185,7 @@ int main(int argc, char **argv) {
   Passes.add(createVerifierPass());
 
   // Write bytecode to file...
-  Passes.add(new WriteBytecodePass(Out));
+  Passes.add(new WriteBytecodePass(Out,false,!NoCompress));
 
   // Run our queue of passes all at once now, efficiently.
   Passes.run(*M.get());