X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=tools%2Fbugpoint%2FToolRunner.h;h=62bf6d2c84e493bb06e3e442deedfe8d144dbd59;hb=7e6e44139429d1b8003426b29f14126b89591262;hp=37451f7439acf988c67b8663b8bf6dc5a15da77a;hpb=c8580b2aee8e0a93eb7dd2d70c81ccb33e447538;p=oota-llvm.git diff --git a/tools/bugpoint/ToolRunner.h b/tools/bugpoint/ToolRunner.h index 37451f7439a..62bf6d2c84e 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 exposes an abstraction around a platform C compiler, used to @@ -14,10 +14,11 @@ // //===----------------------------------------------------------------------===// -#ifndef TOOLRUNNER_H -#define TOOLRUNNER_H +#ifndef BUGPOINT_TOOLRUNNER_H +#define BUGPOINT_TOOLRUNNER_H -#include "Support/SystemUtils.h" +#include "llvm/Support/SystemUtils.h" +#include #include namespace llvm { @@ -25,16 +26,16 @@ 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 { +class ToolExecutionError : std::exception { std::string Message; public: - ToolExecutionError(const std::string &M) : Message(M) {} - const std::string getMessage() const { return Message; } + explicit ToolExecutionError(const std::string &M) : Message(M) {} + virtual ~ToolExecutionError() throw(); + virtual const char* what() const throw() { return Message.c_str(); } }; @@ -42,12 +43,12 @@ public: // 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 + GCC(const sys::Path &gccPath) : GCCPath(gccPath) { } public: enum FileType { AsmFile, CFile }; - static GCC* create(const std::string &ProgramPath, std::string &Message); + static GCC *create(const std::string &ProgramPath, std::string &Message); /// ExecuteProgram - Execute the program specified by "ProgramFile" (which is /// either a .s file, or a .c file, specified by FileType), with the specified @@ -61,14 +62,16 @@ 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); /// 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); }; @@ -77,19 +80,30 @@ public: /// LLVM bytecode 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 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 AbstractInterpreter* createLLI(const std::string &ProgramPath, - std::string &Message); + std::string &Message, + const std::vector *Args=0); static AbstractInterpreter* createJIT(const std::string &ProgramPath, - std::string &Message); + std::string &Message, + const std::vector *Args=0); virtual ~AbstractInterpreter() {} + /// 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) {} + /// ExecuteProgram - Run the specified bytecode file, emitting output to the /// specified filename. This returns the exit code of the program. /// @@ -97,32 +111,49 @@ struct AbstractInterpreter { 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) = 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 + /// 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, const std::vector &Args, const std::string &InputFile, const std::string &OutputFile, - const std::vector &SharedLibs = - std::vector()); + const std::vector &GCCArgs = + std::vector(), + const std::vector &SharedLibs = + std::vector(), + unsigned Timeout = 0); // 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); + virtual void OutputC(const std::string &Bytecode, sys::Path& OutputCFile); }; @@ -131,24 +162,37 @@ public: // class LLC : public AbstractInterpreter { std::string LLCPath; // The path to the LLC executable + std::vector ToolArgs; // Extra args to pass to LLC 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) : LLCPath(llcPath), gcc(Gcc) { + ToolArgs.clear (); + if (Args) { ToolArgs = *Args; } + } ~LLC() { 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, const std::vector &Args, const std::string &InputFile, const std::string &OutputFile, - const std::vector &SharedLibs = - std::vector()); + const std::vector &GCCArgs = + std::vector(), + const std::vector &SharedLibs = + std::vector(), + unsigned Timeout = 0); // 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); + void OutputAsm(const std::string &Bytecode, sys::Path &OutputAsmFile); }; } // End llvm namespace