From 7f500f7f2a156cd7e5be1543e1f1e9e51f39396b Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 27 Aug 2006 22:07:01 +0000 Subject: [PATCH] Merge the 'analyze' mode code with the 'opt' mode code. Eliminate the 'autodetect .ll files' functionality. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29915 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/opt/Makefile | 2 +- tools/opt/opt.cpp | 100 ++++++++++++--------------------------------- 2 files changed, 26 insertions(+), 76 deletions(-) diff --git a/tools/opt/Makefile b/tools/opt/Makefile index 9e4cddfa976..4bb9ed53b1a 100644 --- a/tools/opt/Makefile +++ b/tools/opt/Makefile @@ -10,7 +10,7 @@ LEVEL = ../.. TOOLNAME = opt REQUIRES_EH := 1 -USEDLIBS = LLVMAsmParser.a LLVMBCReader.a LLVMBCWriter.a LLVMInstrumentation.a \ +USEDLIBS = LLVMBCReader.a LLVMBCWriter.a LLVMInstrumentation.a \ LLVMScalarOpts.a LLVMipo.a LLVMipa.a LLVMDataStructure \ LLVMTransforms.a LLVMTarget.a LLVMTransformUtils.a LLVMAnalysis.a \ LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a diff --git a/tools/opt/opt.cpp b/tools/opt/opt.cpp index 6d3b3b648aa..4394c98917a 100644 --- a/tools/opt/opt.cpp +++ b/tools/opt/opt.cpp @@ -13,7 +13,6 @@ //===----------------------------------------------------------------------===// #include "llvm/Module.h" -#include "llvm/Assembly/Parser.h" #include "llvm/PassManager.h" #include "llvm/Bytecode/Reader.h" #include "llvm/Bytecode/WriteBytecodePass.h" @@ -37,9 +36,8 @@ using namespace llvm; // The OptimizationList is automatically populated with registered Passes by the // PassNameParser. // -static cl::list > -OptimizationList(cl::desc("Optimizations available:")); +static cl::list +PassList(cl::desc("Optimizations available:")); // Other command line options... @@ -74,12 +72,6 @@ QuietA("quiet", cl::desc("Alias for -q"), cl::aliasopt(Quiet)); static cl::opt AnalyzeOnly("analyze", cl::desc("Only perform analysis, no optimization")); -// The AnalysesList is automatically populated with registered Passes by the -// PassNameParser. -static - cl::list > - AnalysesList(cl::desc("Analyses available:")); - static Timer BytecodeLoadTimer("Bytecode Loader"); // ---------- Define Printers for module and function passes ------------ @@ -166,57 +158,7 @@ int main(int argc, char **argv) { " llvm .bc -> .bc modular optimizer and analysis printer \n"); sys::PrintStackTraceOnErrorSignal(); - if (AnalyzeOnly) { - Module *CurMod = 0; -#if 0 - TimeRegion RegionTimer(BytecodeLoadTimer); -#endif - CurMod = ParseBytecodeFile(InputFilename); - ParseError Err; - if (!CurMod && !(CurMod = ParseAssemblyFile(InputFilename,&Err))){ - std::cerr << argv[0] << ": " << Err.getMessage() << "\n"; - return 1; - } - - // Create a PassManager to hold and optimize the collection of passes we - // are about to build... - PassManager Passes; - - // Add an appropriate TargetData instance for this module... - Passes.add(new TargetData(CurMod)); - - // Make sure the input LLVM is well formed. - if (!NoVerify) - Passes.add(createVerifierPass()); - - // Create a new optimization pass for each one specified on the - // command line - for (unsigned i = 0; i < AnalysesList.size(); ++i) { - const PassInfo *Analysis = AnalysesList[i]; - - if (Analysis->getNormalCtor()) { - Pass *P = Analysis->getNormalCtor()(); - Passes.add(P); - - if (BasicBlockPass *BBP = dynamic_cast(P)) - Passes.add(new BasicBlockPassPrinter(Analysis)); - else if (FunctionPass *FP = dynamic_cast(P)) - Passes.add(new FunctionPassPrinter(Analysis)); - else - Passes.add(new ModulePassPrinter(Analysis)); - - } else - std::cerr << argv[0] << ": cannot create pass: " - << Analysis->getPassName() << "\n"; - } - - Passes.run(*CurMod); - - delete CurMod; - return 0; - } - - // Allocate a full target machine description only if necessary... + // Allocate a full target machine description only if necessary. // FIXME: The choice of target should be controllable on the command line. std::auto_ptr target; @@ -275,22 +217,30 @@ int main(int argc, char **argv) { Passes.add(new TargetData(M.get())); // Create a new optimization pass for each one specified on the command line - for (unsigned i = 0; i < OptimizationList.size(); ++i) { - const PassInfo *Opt = OptimizationList[i]; - - if (Opt->getNormalCtor()) - Passes.add(Opt->getNormalCtor()()); - else if (Opt->getTargetCtor()) { -#if 0 - if (target.get() == NULL) - target.reset(allocateSparcTargetMachine()); // FIXME: target option -#endif + for (unsigned i = 0; i < PassList.size(); ++i) { + const PassInfo *PassInf = PassList[i]; + Pass *P = 0; + if (PassInf->getNormalCtor()) + P = PassInf->getNormalCtor()(); + else if (PassInf->getTargetCtor()) { assert(target.get() && "Could not allocate target machine!"); - Passes.add(Opt->getTargetCtor()(*target.get())); + P = PassInf->getTargetCtor()(*target.get()); } else - std::cerr << argv[0] << ": cannot create pass: " << Opt->getPassName() - << "\n"; - + std::cerr << argv[0] << ": cannot create pass: " + << PassInf->getPassName() << "\n"; + if (P) { + Passes.add(P); + + if (AnalyzeOnly) { + if (BasicBlockPass *BBP = dynamic_cast(P)) + Passes.add(new BasicBlockPassPrinter(PassInf)); + else if (FunctionPass *FP = dynamic_cast(P)) + Passes.add(new FunctionPassPrinter(PassInf)); + else + Passes.add(new ModulePassPrinter(PassInf)); + } + } + if (PrintEachXForm) Passes.add(new PrintModulePass(&std::cerr)); }