X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2Fbugpoint%2FToolRunner.h;h=3e3d7d5e5acf136b5184ad1d414d4d743b951208;hb=ca7409664273fed4b473127295af3af0836b3077;hp=3652ff65ed212d1100e006057a54418aa746c539;hpb=eeed98382158c5049e7700c768a74b9122fffd71;p=oota-llvm.git diff --git a/tools/bugpoint/ToolRunner.h b/tools/bugpoint/ToolRunner.h index 3652ff65ed2..3e3d7d5e5ac 100644 --- a/tools/bugpoint/ToolRunner.h +++ b/tools/bugpoint/ToolRunner.h @@ -1,4 +1,11 @@ -//===-- Support/ToolRunner.h ------------------------------------*- C++ -*-===// +//===-- tools/bugpoint/ToolRunner.h -----------------------------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// // // This file exposes an abstraction around a platform C compiler, used to // compile C and assembly code. It also exposes an "AbstractIntepreter" @@ -7,25 +14,53 @@ // //===----------------------------------------------------------------------===// -#ifndef TOOLRUNNER_H -#define TOOLRUNNER_H +#ifndef BUGPOINT_TOOLRUNNER_H +#define BUGPOINT_TOOLRUNNER_H -#include "Support/SystemUtils.h" +#include "llvm/ADT/Triple.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/SystemUtils.h" +#include #include +namespace llvm { + +extern cl::opt SaveTemps; +extern Triple TargetTriple; + class CBE; class LLC; +/// ToolExecutionError - An instance of this class is thrown by the +/// AbstractInterpreter instances if there is an error running a tool (e.g., LLC +/// crashes) which prevents execution of the program. +/// +class ToolExecutionError : std::exception { + std::string Message; +public: + explicit ToolExecutionError(const std::string &M) : Message(M) {} + virtual ~ToolExecutionError() throw(); + virtual const char* what() const throw() { return Message.c_str(); } +}; + + //===---------------------------------------------------------------------===// // GCC abstraction // class GCC { - std::string GCCPath; // The path to the gcc executable - GCC(const std::string &gccPath) : GCCPath(gccPath) { } + sys::Path GCCPath; // The path to the gcc executable. + sys::Path RemoteClientPath; // The path to the rsh / ssh executable. + std::vector gccArgs; // GCC-specific arguments. + GCC(const sys::Path &gccPath, const sys::Path &RemotePath, + const std::vector *GCCArgs) + : GCCPath(gccPath), RemoteClientPath(RemotePath) { + if (GCCArgs) gccArgs = *GCCArgs; + } public: enum FileType { AsmFile, CFile }; - static GCC* create(const std::string &ProgramPath, std::string &Message); + static GCC *create(std::string &Message, + const std::vector *Args); /// ExecuteProgram - Execute the program specified by "ProgramFile" (which is /// either a .s file, or a .c file, specified by FileType), with the specified @@ -39,70 +74,115 @@ public: FileType fileType, const std::string &InputFile, const std::string &OutputFile, - const std::vector &SharedLibs = - std::vector()); + const std::vector &GCCArgs = + std::vector(), + unsigned Timeout = 0, + unsigned MemoryLimit = 0); /// MakeSharedObject - This compiles the specified file (which is either a .c /// file or a .s file) into a shared object. /// int MakeSharedObject(const std::string &InputFile, FileType fileType, - std::string &OutputFile); - -private: - void ProcessFailure(const char **Args); + std::string &OutputFile, + const std::vector &ArgsForGCC); }; //===---------------------------------------------------------------------===// /// AbstractInterpreter Class - Subclasses of this class are used to execute -/// LLVM bytecode in a variety of ways. This abstract interface hides this +/// LLVM bitcode in a variety of ways. This abstract interface hides this /// complexity behind a simple interface. /// -struct AbstractInterpreter { - static CBE* createCBE(const std::string &ProgramPath, std::string &Message); - static LLC *createLLC(const std::string &ProgramPath, std::string &Message); +class AbstractInterpreter { +public: + static CBE *createCBE(const char *Argv0, std::string &Message, + const std::vector *Args = 0, + const std::vector *GCCArgs = 0); + static LLC *createLLC(const char *Argv0, std::string &Message, + const std::vector *Args = 0, + const std::vector *GCCArgs = 0); + + static AbstractInterpreter* createLLI(const char *Argv0, std::string &Message, + const std::vector *Args=0); - static AbstractInterpreter* createLLI(const std::string &ProgramPath, - std::string &Message); + static AbstractInterpreter* createJIT(const char *Argv0, std::string &Message, + const std::vector *Args=0); - static AbstractInterpreter* createJIT(const std::string &ProgramPath, - std::string &Message); + static AbstractInterpreter* createCustom(std::string &Message, + const std::string &ExecCommandLine); virtual ~AbstractInterpreter() {} - /// ExecuteProgram - Run the specified bytecode file, emitting output to the + /// compileProgram - Compile the specified program from bitcode to executable + /// code. This does not produce any output, it is only used when debugging + /// the code generator. If the code generator fails, an exception should be + /// thrown, otherwise, this function will just return. + virtual void compileProgram(const std::string &Bitcode) {} + + /// OutputCode - Compile the specified program from bitcode to code + /// understood by the GCC driver (either C or asm). If the code generator + /// fails, an exception should be thrown, otherwise, this function returns the + /// type of code emitted. + virtual GCC::FileType OutputCode(const std::string &Bitcode, + sys::Path &OutFile) { + throw std::string("OutputCode not supported by this AbstractInterpreter!"); + } + + /// ExecuteProgram - Run the specified bitcode file, emitting output to the /// specified filename. This returns the exit code of the program. /// - virtual int ExecuteProgram(const std::string &Bytecode, + virtual int ExecuteProgram(const std::string &Bitcode, const std::vector &Args, const std::string &InputFile, const std::string &OutputFile, - const std::vector &SharedLibs = - std::vector()) = 0; + const std::vector &GCCArgs = + std::vector(), + const std::vector &SharedLibs = + std::vector(), + unsigned Timeout = 0, + unsigned MemoryLimit = 0) = 0; }; //===---------------------------------------------------------------------===// // CBE Implementation of AbstractIntepreter interface // class CBE : public AbstractInterpreter { - std::string DISPath; // The path to the `llvm-dis' executable + sys::Path LLCPath; // The path to the `llc' executable. + std::vector ToolArgs; // Extra args to pass to LLC. GCC *gcc; public: - CBE(const std::string &disPath, GCC *Gcc) : DISPath(disPath), gcc(Gcc) { } + CBE(const sys::Path &llcPath, GCC *Gcc, + const std::vector *Args) + : LLCPath(llcPath), gcc(Gcc) { + ToolArgs.clear (); + if (Args) ToolArgs = *Args; + } ~CBE() { delete gcc; } - virtual int ExecuteProgram(const std::string &Bytecode, + /// compileProgram - Compile the specified program from bitcode to executable + /// code. This does not produce any output, it is only used when debugging + /// the code generator. If the code generator fails, an exception should be + /// thrown, otherwise, this function will just return. + virtual void compileProgram(const std::string &Bitcode); + + virtual int ExecuteProgram(const std::string &Bitcode, const std::vector &Args, const std::string &InputFile, const std::string &OutputFile, - const std::vector &SharedLibs = - std::vector()); - - // Sometimes we just want to go half-way and only generate the .c file, - // not necessarily compile it with GCC and run the program. - // - virtual int OutputC(const std::string &Bytecode, std::string &OutputCFile); + const std::vector &GCCArgs = + std::vector(), + const std::vector &SharedLibs = + std::vector(), + unsigned Timeout = 0, + unsigned MemoryLimit = 0); + + /// OutputCode - Compile the specified program from bitcode to code + /// understood by the GCC driver (either C or asm). If the code generator + /// fails, an exception should be thrown, otherwise, this function returns the + /// type of code emitted. + virtual GCC::FileType OutputCode(const std::string &Bitcode, + sys::Path &OutFile); }; @@ -110,24 +190,43 @@ public: // LLC Implementation of AbstractIntepreter interface // class LLC : public AbstractInterpreter { - std::string LLCPath; // The path to the LLC executable + std::string LLCPath; // The path to the LLC executable. + std::vector ToolArgs; // Extra args to pass to LLC. + std::vector gccArgs; // Extra args to pass to GCC. GCC *gcc; public: - LLC(const std::string &llcPath, GCC *Gcc) - : LLCPath(llcPath), gcc(Gcc) { } + LLC(const std::string &llcPath, GCC *Gcc, + const std::vector *Args, + const std::vector *GCCArgs) + : LLCPath(llcPath), gcc(Gcc) { + ToolArgs.clear(); + if (Args) ToolArgs = *Args; + if (GCCArgs) gccArgs = *GCCArgs; + } ~LLC() { delete gcc; } - virtual int ExecuteProgram(const std::string &Bytecode, + /// compileProgram - Compile the specified program from bitcode to executable + /// code. This does not produce any output, it is only used when debugging + /// the code generator. If the code generator fails, an exception should be + /// thrown, otherwise, this function will just return. + virtual void compileProgram(const std::string &Bitcode); + + virtual int ExecuteProgram(const std::string &Bitcode, const std::vector &Args, const std::string &InputFile, const std::string &OutputFile, - const std::vector &SharedLibs = - std::vector()); - - // Sometimes we just want to go half-way and only generate the .s file, - // not necessarily compile it all the way and run the program. - // - int OutputAsm(const std::string &Bytecode, std::string &OutputAsmFile); + const std::vector &GCCArgs = + std::vector(), + const std::vector &SharedLibs = + std::vector(), + unsigned Timeout = 0, + unsigned MemoryLimit = 0); + + virtual GCC::FileType OutputCode(const std::string &Bitcode, + sys::Path &OutFile); + }; +} // End llvm namespace + #endif