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 8a42dc94d474f2ded2cb6dd074c780c155d81031..dd8b8e0698498db4613ad007bd2a0ee311d0227f 100644 (file)
--- a/tools/gccas/gccas.cpp
+++ b/tools/gccas/gccas.cpp
@@ -1,5 +1,11 @@
+//===-- gccas.cpp - The "optimizing assembler" used by the GCC frontend ---===//
+// 
+//                     The LLVM Compiler Infrastructure
+//
+// This file was developed by the LLVM research group and is distributed under
+// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// 
 //===----------------------------------------------------------------------===//
-// LLVM 'GCCAS' UTILITY 
 //
 // This utility is designed to be used by the GCC frontend for creating bytecode
 // files from its intermediate LLVM assembly.  The requirements for this utility
@@ -16,11 +22,13 @@
 #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>
 
+using namespace llvm;
+
 namespace {
   cl::opt<std::string>
   InputFilename(cl::Positional,cl::desc("<input llvm assembly>"),cl::init("-"));
@@ -31,6 +39,19 @@ namespace {
 
   cl::opt<bool>   
   Verify("verify", cl::desc("Verify each pass result"));
+
+  cl::opt<bool>
+  DisableInline("disable-inlining", cl::desc("Do not run the inliner pass"));
+
+  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"));
 }
 
 
@@ -45,24 +66,42 @@ static inline void addPass(PassManager &PM, Pass *P) {
 
 void AddConfiguredTransformationPasses(PassManager &PM) {
   PM.add(createVerifierPass());                  // Verify that input is correct
+  addPass(PM, createLowerSetJmpPass());          // Lower llvm.setjmp/.longjmp
   addPass(PM, createFunctionResolvingPass());    // Resolve (...) functions
+
+  if (DisableOptimizations) return;
+
   addPass(PM, createRaiseAllocationsPass());     // call %malloc -> malloc inst
-  addPass(PM, createGlobalDCEPass());            // Remove unused globals
+  addPass(PM, createCFGSimplificationPass());    // Clean up disgusting code
+  addPass(PM, createPromoteMemoryToRegister());  // Kill useless allocas
+  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
+  addPass(PM, createCFGSimplificationPass());    // Clean up after IPCP & DAE
+
   addPass(PM, createPruneEHPass());              // Remove dead EH info
-  addPass(PM, createFunctionInliningPass());     // Inline small functions
 
-  addPass(PM, createInstructionCombiningPass()); // Cleanup code for raise
+  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
   addPass(PM, createCFGSimplificationPass());    // Merge & remove BBs
   addPass(PM, createScalarReplAggregatesPass()); // Break up aggregate allocas
   addPass(PM, createInstructionCombiningPass()); // Combine silly seq's
 
-
   addPass(PM, createReassociatePass());          // Reassociate expressions
   addPass(PM, createInstructionCombiningPass()); // Combine silly seq's
+  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
@@ -70,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
@@ -80,6 +120,7 @@ void AddConfiguredTransformationPasses(PassManager &PM) {
 
 int main(int argc, char **argv) {
   cl::ParseCommandLineOptions(argc, argv, " llvm .s -> .o assembler for GCC\n");
+  sys::PrintStackTraceOnErrorSignal();
 
   std::auto_ptr<Module> M;
   try {
@@ -116,9 +157,9 @@ int main(int argc, char **argv) {
   else {
     Out = new std::ofstream(OutputFilename.c_str(), std::ios::out);
 
-    // Make sure that the Out file gets unlink'd from the disk if we get a
+    // Make sure that the Out file gets unlinked from the disk if we get a
     // signal
-    RemoveFileOnSignal(OutputFilename);
+    sys::RemoveFileOnSignal(sys::Path(OutputFilename));
   }
 
   
@@ -140,8 +181,11 @@ int main(int argc, char **argv) {
   //
   AddConfiguredTransformationPasses(Passes);
 
+  // Make sure everything is still good.
+  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());