//
// 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.
//
//===----------------------------------------------------------------------===//
//
#include "llvm/Module.h"
#include "llvm/PassManager.h"
#include "llvm/Analysis/Verifier.h"
-#include "llvm/Bytecode/WriteBytecodePass.h"
+#include "llvm/Bitcode/ReaderWriter.h"
#include "llvm/Target/TargetData.h"
#include "llvm/Support/FileUtilities.h"
#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Streams.h"
#include "llvm/System/Path.h"
#include "llvm/System/Program.h"
#include "llvm/Config/alloca.h"
#include <fstream>
using namespace llvm;
+
namespace {
// ChildOutput - This option captures the name of the child output file that
// is set up by the parent bugpoint process
cl::opt<std::string> ChildOutput("child-output", cl::ReallyHidden);
+ cl::opt<bool> UseValgrind("enable-valgrind",
+ cl::desc("Run optimizations through valgrind"));
}
-/// writeProgramToFile - This writes the current "Program" to the named bytecode
+/// writeProgramToFile - This writes the current "Program" to the named bitcode
/// file. If an error occurs, true is returned.
///
bool BugDriver::writeProgramToFile(const std::string &Filename,
std::ios::binary;
std::ofstream Out(Filename.c_str(), io_mode);
if (!Out.good()) return true;
- try {
- WriteBytecodeToFile(M ? M : Program, Out, /*compression=*/true);
- } catch (...) {
- return true;
- }
+
+ WriteBitcodeToFile(M ? M : Program, Out);
return false;
}
-/// EmitProgressBytecode - This function is used to output the current Program
+/// EmitProgressBitcode - This function is used to output the current Program
/// to a file named "bugpoint-ID.bc".
///
-void BugDriver::EmitProgressBytecode(const std::string &ID, bool NoFlyer) {
- // Output the input to the current pass to a bytecode file, emit a message
+void BugDriver::EmitProgressBitcode(const std::string &ID, bool NoFlyer) {
+ // Output the input to the current pass to a bitcode file, emit a message
// telling the user how to reproduce it: opt -foo blah.bc
//
std::string Filename = "bugpoint-" + ID + ".bc";
if (writeProgramToFile(Filename)) {
- std::cerr << "Error opening file '" << Filename << "' for writing!\n";
+ cerr << "Error opening file '" << Filename << "' for writing!\n";
return;
}
- std::cout << "Emitted bytecode to '" << Filename << "'\n";
+ cout << "Emitted bitcode to '" << Filename << "'\n";
if (NoFlyer || PassesToRun.empty()) return;
- std::cout << "\n*** You can reproduce the problem with: ";
-
- unsigned PassType = PassesToRun[0]->getPassType();
- for (unsigned i = 1, e = PassesToRun.size(); i != e; ++i)
- PassType &= PassesToRun[i]->getPassType();
-
- if (PassType & PassInfo::Analysis)
- std::cout << "analyze";
- else if (PassType & PassInfo::Optimization)
- std::cout << "opt";
- else
- std::cout << "bugpoint";
- std::cout << " " << Filename << " ";
- std::cout << getPassesString(PassesToRun) << "\n";
+ cout << "\n*** You can reproduce the problem with: ";
+ cout << "opt " << Filename << " ";
+ cout << getPassesString(PassesToRun) << "\n";
}
int BugDriver::runPassesAsChild(const std::vector<const PassInfo*> &Passes) {
std::ios::binary;
std::ofstream OutFile(ChildOutput.c_str(), io_mode);
if (!OutFile.good()) {
- std::cerr << "Error opening bytecode file: " << ChildOutput << "\n";
+ cerr << "Error opening bitcode file: " << ChildOutput << "\n";
return 1;
}
if (Passes[i]->getNormalCtor())
PM.add(Passes[i]->getNormalCtor()());
else
- std::cerr << "Cannot create pass yet: " << Passes[i]->getPassName()
- << "\n";
+ cerr << "Cannot create pass yet: " << Passes[i]->getPassName() << "\n";
}
// Check that the module is well formed on completion of optimization
PM.add(createVerifierPass());
- // Write bytecode out to disk as the last step...
- PM.add(new WriteBytecodePass(&OutFile));
+ // Write bitcode out to disk as the last step...
+ PM.add(CreateBitcodeWriterPass(OutFile));
// Run all queued passes.
PM.run(*Program);
return 0;
}
-/// runPasses - Run the specified passes on Program, outputting a bytecode file
+/// runPasses - Run the specified passes on Program, outputting a bitcode file
/// and writing the filename into OutputFile if successful. If the
/// optimizations fail for some reason (optimizer crashes), return true,
-/// otherwise return false. If DeleteOutput is set to true, the bytecode is
+/// otherwise return false. If DeleteOutput is set to true, the bitcode is
/// deleted on success, and the filename string is undefined. This prints to
/// cout a single line message indicating whether compilation was successful or
/// failed.
///
bool BugDriver::runPasses(const std::vector<const PassInfo*> &Passes,
std::string &OutputFilename, bool DeleteOutput,
- bool Quiet) const{
+ bool Quiet, unsigned NumExtraArgs,
+ const char * const *ExtraArgs) const {
// setup the output file name
- std::cout << std::flush;
+ cout << std::flush;
sys::Path uniqueFilename("bugpoint-output.bc");
- uniqueFilename.makeUnique();
+ std::string ErrMsg;
+ if (uniqueFilename.makeUnique(true, &ErrMsg)) {
+ cerr << getToolName() << ": Error making unique filename: "
+ << ErrMsg << "\n";
+ return(1);
+ }
OutputFilename = uniqueFilename.toString();
// set up the input file name
sys::Path inputFilename("bugpoint-input.bc");
- inputFilename.makeUnique();
+ if (inputFilename.makeUnique(true, &ErrMsg)) {
+ cerr << getToolName() << ": Error making unique filename: "
+ << ErrMsg << "\n";
+ return(1);
+ }
std::ios::openmode io_mode = std::ios::out | std::ios::trunc |
std::ios::binary;
std::ofstream InFile(inputFilename.c_str(), io_mode);
if (!InFile.good()) {
- std::cerr << "Error opening bytecode file: " << inputFilename << "\n";
+ cerr << "Error opening bitcode file: " << inputFilename << "\n";
return(1);
}
- WriteBytecodeToFile(Program,InFile,false);
+ WriteBitcodeToFile(Program, InFile);
InFile.close();
// setup the child process' arguments
const char** args = (const char**)
alloca(sizeof(const char*) *
- (Passes.size()+10+2*PluginLoader::getNumPlugins()));
+ (Passes.size()+13+2*PluginLoader::getNumPlugins()+NumExtraArgs));
int n = 0;
- args[n++] = ToolName.c_str();
+ sys::Path tool = sys::Program::FindProgramByName(ToolName);
+ if (UseValgrind) {
+ args[n++] = "valgrind";
+ args[n++] = "--error-exitcode=1";
+ args[n++] = "-q";
+ args[n++] = tool.c_str();
+ } else
+ args[n++] = ToolName.c_str();
+
args[n++] = "-as-child";
args[n++] = "-child-output";
args[n++] = OutputFilename.c_str();
E = pass_args.end(); I != E; ++I )
args[n++] = I->c_str();
args[n++] = inputFilename.c_str();
+ for (unsigned i = 0; i < NumExtraArgs; ++i)
+ args[n++] = *ExtraArgs;
args[n++] = 0;
- sys::Path prog(sys::Program::FindProgramByName(ToolName));
- std::string ErrMsg;
- int result = sys::Program::ExecuteAndWait(prog,args,0,0,Timeout,&ErrMsg);
+ sys::Path prog;
+ if (UseValgrind)
+ prog = sys::Program::FindProgramByName("valgrind");
+ else
+ prog = tool;
+ int result = sys::Program::ExecuteAndWait(prog, args, 0, 0,
+ Timeout, MemoryLimit, &ErrMsg);
- // If we are supposed to delete the bytecode file or if the passes crashed,
+ // If we are supposed to delete the bitcode file or if the passes crashed,
// remove it now. This may fail if the file was never created, but that's ok.
if (DeleteOutput || result != 0)
sys::Path(OutputFilename).eraseFromDisk();
if (!Quiet) {
if (result == 0)
- std::cout << "Success!\n";
+ cout << "Success!\n";
else if (result > 0)
- std::cout << "Exited with error code '" << result << "'\n";
+ cout << "Exited with error code '" << result << "'\n";
else if (result < 0) {
if (result == -1)
- std::cout << "Execute failed: " << ErrMsg << "\n";
+ cout << "Execute failed: " << ErrMsg << "\n";
else
- std::cout << "Crashed with signal #" << abs(result) << "\n";
+ cout << "Crashed with signal #" << abs(result) << "\n";
}
if (result & 0x01000000)
- std::cout << "Dumped core\n";
+ cout << "Dumped core\n";
}
// Was the child successful?
/// failure.
Module *BugDriver::runPassesOn(Module *M,
const std::vector<const PassInfo*> &Passes,
- bool AutoDebugCrashes) {
+ bool AutoDebugCrashes, unsigned NumExtraArgs,
+ const char * const *ExtraArgs) {
Module *OldProgram = swapProgramIn(M);
- std::string BytecodeResult;
- if (runPasses(Passes, BytecodeResult, false/*delete*/, true/*quiet*/)) {
+ std::string BitcodeResult;
+ if (runPasses(Passes, BitcodeResult, false/*delete*/, true/*quiet*/,
+ NumExtraArgs, ExtraArgs)) {
if (AutoDebugCrashes) {
- std::cerr << " Error running this sequence of passes"
- << " on the input program!\n";
+ cerr << " Error running this sequence of passes"
+ << " on the input program!\n";
delete OldProgram;
- EmitProgressBytecode("pass-error", false);
+ EmitProgressBitcode("pass-error", false);
exit(debugOptimizerCrash());
}
swapProgramIn(OldProgram);
// Restore the current program.
swapProgramIn(OldProgram);
- Module *Ret = ParseInputFile(BytecodeResult);
+ Module *Ret = ParseInputFile(BitcodeResult);
if (Ret == 0) {
- std::cerr << getToolName() << ": Error reading bytecode file '"
- << BytecodeResult << "'!\n";
+ cerr << getToolName() << ": Error reading bitcode file '"
+ << BitcodeResult << "'!\n";
exit(1);
}
- sys::Path(BytecodeResult).eraseFromDisk(); // No longer need the file on disk
+ sys::Path(BitcodeResult).eraseFromDisk(); // No longer need the file on disk
return Ret;
}
projects / oota-llvm.git / blobdiff