X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2Fbugpoint%2FToolRunner.h;h=5d67a9426870a3a3faccefb2146eaa95919b0603;hb=00552e3875ee5f382db6c98286a241a7d0efe1b8;hp=e64d0054f0a71c2796bf43dd694786a935cafdc0;hpb=c600f3c337f18c62116ac58b701e4f7ae6d2fb1a;p=oota-llvm.git diff --git a/tools/bugpoint/ToolRunner.h b/tools/bugpoint/ToolRunner.h index e64d0054f0a..5d67a942687 100644 --- a/tools/bugpoint/ToolRunner.h +++ b/tools/bugpoint/ToolRunner.h @@ -2,8 +2,8 @@ // // 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. +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. // //===----------------------------------------------------------------------===// // @@ -14,41 +14,42 @@ // //===----------------------------------------------------------------------===// -#ifndef BUGPOINT_TOOLRUNNER_H -#define BUGPOINT_TOOLRUNNER_H +#ifndef LLVM_TOOLS_BUGPOINT_TOOLRUNNER_H +#define LLVM_TOOLS_BUGPOINT_TOOLRUNNER_H +#include "llvm/ADT/Triple.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/ErrorHandling.h" +#include "llvm/Support/Path.h" #include "llvm/Support/SystemUtils.h" #include #include namespace llvm { -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(); } -}; +extern cl::opt SaveTemps; +extern Triple TargetTriple; +class LLC; //===---------------------------------------------------------------------===// // GCC abstraction // class GCC { - sys::Path GCCPath; // The path to the gcc executable - GCC(const sys::Path &gccPath) : GCCPath(gccPath) { } + std::string GCCPath; // The path to the gcc executable. + std::string RemoteClientPath; // The path to the rsh / ssh executable. + std::vector gccArgs; // GCC-specific arguments. + GCC(StringRef gccPath, StringRef RemotePath, + const std::vector *GCCArgs) + : GCCPath(gccPath), RemoteClientPath(RemotePath) { + if (GCCArgs) gccArgs = *GCCArgs; + } public: - enum FileType { AsmFile, CFile }; + enum FileType { AsmFile, ObjectFile, CFile }; - static GCC *create(const std::string &ProgramPath, std::string &Message); + static GCC *create(std::string &Message, + const std::string &GCCBinary, + 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 @@ -62,145 +63,136 @@ public: FileType fileType, const std::string &InputFile, const std::string &OutputFile, + std::string *Error = nullptr, const std::vector &GCCArgs = - std::vector(), - unsigned Timeout = 0); + 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, - const std::vector &ArgsForGCC); + const std::vector &ArgsForGCC, + std::string &Error); }; //===---------------------------------------------------------------------===// /// 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. /// class AbstractInterpreter { + virtual void anchor(); public: - static CBE *createCBE(const std::string &ProgramPath, std::string &Message, - const std::vector *Args = 0); - static LLC *createLLC(const std::string &ProgramPath, std::string &Message, - const std::vector *Args = 0); + static LLC *createLLC(const char *Argv0, std::string &Message, + const std::string &GCCBinary, + const std::vector *Args = nullptr, + const std::vector *GCCArgs = nullptr, + bool UseIntegratedAssembler = false); + + static AbstractInterpreter* + createLLI(const char *Argv0, std::string &Message, + const std::vector *Args = nullptr); + + static AbstractInterpreter* + createJIT(const char *Argv0, std::string &Message, + const std::vector *Args = nullptr); - static AbstractInterpreter* createLLI(const std::string &ProgramPath, - std::string &Message, - const std::vector *Args=0); + static AbstractInterpreter* + createCustomCompiler(std::string &Message, + const std::string &CompileCommandLine); - static AbstractInterpreter* createJIT(const std::string &ProgramPath, - std::string &Message, - const std::vector *Args=0); + static AbstractInterpreter* + createCustomExecutor(std::string &Message, + const std::string &ExecCommandLine); virtual ~AbstractInterpreter() {} - /// compileProgram - Compile the specified program from bytecode to executable + /// 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 &Bytecode) {} + /// the code generator. It returns false if the code generator fails. + virtual void compileProgram(const std::string &Bitcode, std::string *Error, + unsigned Timeout = 0, unsigned MemoryLimit = 0) {} - /// OutputCode - Compile the specified program from bytecode to code + /// 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 &Bytecode, - sys::Path &OutFile) { - throw std::string("OutputCode not supported by this AbstractInterpreter!"); + /// fails, it sets Error, otherwise, this function returns the type of code + /// emitted. + virtual GCC::FileType OutputCode(const std::string &Bitcode, + std::string &OutFile, std::string &Error, + unsigned Timeout = 0, + unsigned MemoryLimit = 0) { + Error = "OutputCode not supported by this AbstractInterpreter!"; + return GCC::AsmFile; } - - /// ExecuteProgram - Run the specified bytecode file, emitting output to the - /// specified filename. This returns the exit code of the program. - /// - virtual int ExecuteProgram(const std::string &Bytecode, - const std::vector &Args, - const std::string &InputFile, - const std::string &OutputFile, - const std::vector &GCCArgs = - std::vector(), - const std::vector &SharedLibs = - std::vector(), - unsigned Timeout = 0) = 0; -}; -//===---------------------------------------------------------------------===// -// CBE Implementation of AbstractIntepreter interface -// -class CBE : public AbstractInterpreter { - sys::Path LLCPath; // The path to the `llc' executable - std::vector ToolArgs; // Extra args to pass to LLC - GCC *gcc; -public: - CBE(const sys::Path &llcPath, GCC *Gcc, - const std::vector *Args) : LLCPath(llcPath), gcc(Gcc) { - ToolArgs.clear (); - if (Args) { ToolArgs = *Args; } - } - ~CBE() { delete gcc; } - - /// compileProgram - Compile the specified program from bytecode 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 &Bytecode); - - virtual int ExecuteProgram(const std::string &Bytecode, + /// ExecuteProgram - Run the specified bitcode file, emitting output to the + /// specified filename. This sets RetVal to the exit code of the program or + /// returns false if a problem was encountered that prevented execution of + /// the program. + /// + virtual int ExecuteProgram(const std::string &Bitcode, const std::vector &Args, const std::string &InputFile, const std::string &OutputFile, + std::string *Error, const std::vector &GCCArgs = std::vector(), const std::vector &SharedLibs = std::vector(), - unsigned Timeout = 0); - - /// OutputCode - Compile the specified program from bytecode 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 &Bytecode, - sys::Path &OutFile); + unsigned Timeout = 0, + unsigned MemoryLimit = 0) = 0; }; - //===---------------------------------------------------------------------===// // LLC Implementation of AbstractIntepreter interface // class LLC : public AbstractInterpreter { - std::string LLCPath; // The path to the LLC executable - std::vector ToolArgs; // Extra args to pass to LLC + std::string LLCPath; // The path to the LLC executable. + std::vector ToolArgs; // Extra args to pass to LLC. GCC *gcc; + bool UseIntegratedAssembler; public: LLC(const std::string &llcPath, GCC *Gcc, - const std::vector *Args) : LLCPath(llcPath), gcc(Gcc) { - ToolArgs.clear (); - if (Args) { ToolArgs = *Args; } + const std::vector *Args, + bool useIntegratedAssembler) + : LLCPath(llcPath), gcc(Gcc), + UseIntegratedAssembler(useIntegratedAssembler) { + ToolArgs.clear(); + if (Args) ToolArgs = *Args; } - ~LLC() { delete gcc; } + ~LLC() override { delete gcc; } - /// compileProgram - Compile the specified program from bytecode to executable + /// 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 &Bytecode); + /// the code generator. Returns false if the code generator fails. + void compileProgram(const std::string &Bitcode, std::string *Error, + unsigned Timeout = 0, unsigned MemoryLimit = 0) override; - virtual int ExecuteProgram(const std::string &Bytecode, - const std::vector &Args, - const std::string &InputFile, - const std::string &OutputFile, - const std::vector &GCCArgs = - std::vector(), - const std::vector &SharedLibs = - std::vector(), - unsigned Timeout = 0); + int ExecuteProgram(const std::string &Bitcode, + const std::vector &Args, + const std::string &InputFile, + const std::string &OutputFile, + std::string *Error, + const std::vector &GCCArgs = + std::vector(), + const std::vector &SharedLibs = + std::vector(), + unsigned Timeout = 0, + unsigned MemoryLimit = 0) override; - virtual GCC::FileType OutputCode(const std::string &Bytecode, - sys::Path &OutFile); - + /// OutputCode - Compile the specified program from bitcode to code + /// understood by the GCC driver (either C or asm). If the code generator + /// fails, it sets Error, otherwise, this function returns the type of code + /// emitted. + GCC::FileType OutputCode(const std::string &Bitcode, + std::string &OutFile, std::string &Error, + unsigned Timeout = 0, + unsigned MemoryLimit = 0) override; }; } // End llvm namespace