X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2Fbugpoint%2FToolRunner.h;h=cfa8acf6b24043ba74f573e66211e4d7d85b3365;hb=d589099eec8d120b5a7227072c4e717856e2276f;hp=9cbbf7f51e0a0f618b224fc6b11a313ccf35efa8;hpb=1d29a6d6c7a7f6203065c003d3d2d002870e38a1;p=oota-llvm.git diff --git a/tools/bugpoint/ToolRunner.h b/tools/bugpoint/ToolRunner.h index 9cbbf7f51e0..cfa8acf6b24 100644 --- a/tools/bugpoint/ToolRunner.h +++ b/tools/bugpoint/ToolRunner.h @@ -1,10 +1,10 @@ -//===-- Support/ToolRunner.h ------------------------------------*- C++ -*-===// -// +//===-- tools/bugpoint/ToolRunner.h -----------------------------*- C++ -*-===// +// // 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. +// //===----------------------------------------------------------------------===// // // This file exposes an abstraction around a platform C compiler, used to @@ -14,42 +14,43 @@ // //===----------------------------------------------------------------------===// -#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/ErrorHandling.h" +#include "llvm/Support/SystemUtils.h" +#include "llvm/Support/Path.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 }; + 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 @@ -63,80 +64,134 @@ public: FileType fileType, const std::string &InputFile, const std::string &OutputFile, - const std::vector &SharedLibs = - std::vector()); + std::string *Error = 0, + 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); + std::string &OutputFile, + 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. /// -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::string &GCCBinary, + const std::vector *Args = 0, + const std::vector *GCCArgs = 0); + static LLC *createLLC(const char *Argv0, std::string &Message, + const std::string &GCCBinary, + const std::vector *Args = 0, + const std::vector *GCCArgs = 0, + bool UseIntegratedAssembler = false); + + 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* + createCustomCompiler(std::string &Message, + const std::string &CompileCommandLine); + + 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) {} - - /// ExecuteProgram - Run the specified bytecode file, emitting output to the - /// specified filename. This returns the exit code of the program. + /// 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 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. + virtual GCC::FileType OutputCode(const std::string &Bitcode, + sys::Path &OutFile, std::string &Error, + unsigned Timeout = 0, + unsigned MemoryLimit = 0) { + Error = "OutputCode not supported by this AbstractInterpreter!"; + return GCC::AsmFile; + } + + /// 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 &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; + std::string *Error, + 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 LLCPath; // The path to the `llc' 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 &llcPath, GCC *Gcc) : LLCPath(llcPath), 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; } - /// 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. + virtual void compileProgram(const std::string &Bitcode, std::string *Error, + unsigned Timeout = 0, unsigned MemoryLimit = 0); - 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()); - - // Sometimes we just want to go half-way and only generate the .c file, not - // necessarily compile it with GCC and run the program. This throws an - // exception if LLC crashes. - // - virtual void OutputC(const std::string &Bytecode, std::string &OutputCFile); + std::string *Error, + 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, it sets Error, otherwise, this function returns the type of code + /// emitted. + virtual GCC::FileType OutputCode(const std::string &Bitcode, + sys::Path &OutFile, std::string &Error, + unsigned Timeout = 0, + unsigned MemoryLimit = 0); }; @@ -144,32 +199,47 @@ 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. GCC *gcc; + bool UseIntegratedAssembler; public: - LLC(const std::string &llcPath, GCC *Gcc) - : LLCPath(llcPath), gcc(Gcc) { } + LLC(const std::string &llcPath, GCC *Gcc, + const std::vector *Args, + bool useIntegratedAssembler) + : LLCPath(llcPath), gcc(Gcc), + UseIntegratedAssembler(useIntegratedAssembler) { + ToolArgs.clear(); + if (Args) ToolArgs = *Args; + } ~LLC() { 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. + virtual void compileProgram(const std::string &Bitcode, std::string *Error, + unsigned Timeout = 0, unsigned MemoryLimit = 0); - 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()); - - // 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. This throws - // an exception if execution of LLC fails. - // - void OutputAsm(const std::string &Bytecode, std::string &OutputAsmFile); + std::string *Error, + 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, it sets Error, otherwise, this function returns the type of code + /// emitted. + virtual GCC::FileType OutputCode(const std::string &Bitcode, + sys::Path &OutFile, std::string &Error, + unsigned Timeout = 0, + unsigned MemoryLimit = 0); }; } // End llvm namespace