X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2Fbugpoint%2FToolRunner.h;h=bc2be46b32c8d703858d7b62d757ab5658f7681f;hb=d6f0c34273dd3536102f2d643403252468dfc4a3;hp=d5c82f4da4cce7a27112baf243d6652b7cfbaf96;hpb=df2cf418a8449d60512ab42e14c7a0b2608ce438;p=oota-llvm.git diff --git a/tools/bugpoint/ToolRunner.h b/tools/bugpoint/ToolRunner.h index d5c82f4da4c..bc2be46b32c 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,27 +14,42 @@ // //===----------------------------------------------------------------------===// -#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/Path.h" +#include "llvm/Support/SystemUtils.h" +#include #include namespace llvm { -class CBE; +extern cl::opt SaveTemps; +extern Triple TargetTriple; + class LLC; //===---------------------------------------------------------------------===// // GCC abstraction // class GCC { - std::string GCCPath; // The path to the gcc executable - GCC(const std::string &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 @@ -48,95 +63,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); - -private: - void ProcessFailure(const char **Args); + 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 { + virtual void anchor(); +public: + 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 std::string &ProgramPath, - std::string &Message); + static AbstractInterpreter* createLLI(const char *Argv0, std::string &Message, + const std::vector *Args=0); - static AbstractInterpreter* createJIT(const std::string &ProgramPath, - std::string &Message); + static AbstractInterpreter* createJIT(const char *Argv0, std::string &Message, + const std::vector *Args=0); + static AbstractInterpreter* + createCustomCompiler(std::string &Message, + const std::string &CompileCommandLine); - virtual ~AbstractInterpreter() {} + static AbstractInterpreter* + createCustomExecutor(std::string &Message, + const std::string &ExecCommandLine); - /// 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 &SharedLibs = - std::vector()) = 0; -}; -//===---------------------------------------------------------------------===// -// CBE Implementation of AbstractIntepreter interface -// -class CBE : public AbstractInterpreter { - std::string LLCPath; // The path to the `llc' executable - GCC *gcc; -public: - CBE(const std::string &llcPath, GCC *Gcc) : LLCPath(llcPath), gcc(Gcc) { } - ~CBE() { delete gcc; } + virtual ~AbstractInterpreter() {} - 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. 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, + 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 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, - 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); + std::string *Error, + const std::vector &GCCArgs = + std::vector(), + const std::vector &SharedLibs = + std::vector(), + 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::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; } - 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. 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 &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); + 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, + std::string &OutFile, std::string &Error, + unsigned Timeout = 0, + unsigned MemoryLimit = 0); }; } // End llvm namespace