mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-12-11 21:45:16 +00:00
I hate it when bugpoint is all ready to give me a bytecode file, then crashes
in final cleanups. Then you had to run the whole mess again with -disable-final-cleanups. This makes bugpoint run the cleanups in a protected environment so that if they crash, bugpoint itself doesn't crash. This makes things much happier, implements a FIXME, and gets rid of YABPO (yet another bugpoint option). llvm-svn: 9743
This commit is contained in:
parent
5c551d6bd5
commit
62b495bd5c
@ -120,7 +120,7 @@ private:
|
||||
|
||||
|
||||
/// EmitProgressBytecode - This function is used to output the current Program
|
||||
/// to a file named "bugpoing-ID.bc".
|
||||
/// to a file named "bugpoint-ID.bc".
|
||||
///
|
||||
void EmitProgressBytecode(const std::string &ID, bool NoFlyer = false);
|
||||
|
||||
@ -162,7 +162,7 @@ private:
|
||||
/// the MayModifySemantics argument is true, then the cleanups is allowed to
|
||||
/// modify how the code behaves.
|
||||
///
|
||||
void performFinalCleanups(Module *M, bool MayModifySemantics = false) const;
|
||||
Module *performFinalCleanups(Module *M, bool MayModifySemantics = false);
|
||||
|
||||
/// initializeExecutionEnvironment - This method is used to set up the
|
||||
/// environment for executing LLVM programs.
|
||||
|
@ -224,8 +224,8 @@ bool ReduceMisCodegenFunctions::TestFuncs(const std::vector<Function*> &Funcs,
|
||||
}
|
||||
|
||||
// Clean up the modules, removing extra cruft that we don't need anymore...
|
||||
BD.performFinalCleanups(SafeModule);
|
||||
BD.performFinalCleanups(TestModule);
|
||||
SafeModule = BD.performFinalCleanups(SafeModule);
|
||||
TestModule = BD.performFinalCleanups(TestModule);
|
||||
|
||||
if (BD.writeProgramToFile(TestModuleBC, TestModule)) {
|
||||
std::cerr << "Error writing bytecode to `" << SafeModuleBC << "'\nExiting.";
|
||||
|
@ -379,7 +379,7 @@ bool BugDriver::debugCrash() {
|
||||
// Try to clean up the testcase by running funcresolve and globaldce...
|
||||
std::cout << "\n*** Attempting to perform final cleanups: ";
|
||||
Module *M = CloneModule(Program);
|
||||
performFinalCleanups(M, true);
|
||||
M = performFinalCleanups(M, true);
|
||||
std::swap(Program, M);
|
||||
|
||||
// Find out if the pass still crashes on the cleaned up program...
|
||||
|
@ -37,9 +37,6 @@ namespace {
|
||||
cl::opt<bool, true>
|
||||
NoSCFG("disable-simplifycfg", cl::location(DisableSimplifyCFG),
|
||||
cl::desc("Do not use the -simplifycfg pass to reduce testcases"));
|
||||
cl::opt<bool>
|
||||
NoFinalCleanup("disable-final-cleanup",
|
||||
cl::desc("Disable the final cleanup phase of narrowing"));
|
||||
}
|
||||
|
||||
/// deleteInstructionFromProgram - This method clones the current Program and
|
||||
@ -89,29 +86,42 @@ Module *BugDriver::deleteInstructionFromProgram(Instruction *I,
|
||||
return Result;
|
||||
}
|
||||
|
||||
static const PassInfo *getPI(Pass *P) {
|
||||
const PassInfo *PI = P->getPassInfo();
|
||||
delete P;
|
||||
return PI;
|
||||
}
|
||||
|
||||
/// performFinalCleanups - This method clones the current Program and performs
|
||||
/// a series of cleanups intended to get rid of extra cruft on the module
|
||||
/// before handing it to the user...
|
||||
///
|
||||
void BugDriver::performFinalCleanups(Module *M, bool MayModifySemantics) const {
|
||||
// Allow disabling these passes if they crash bugpoint.
|
||||
//
|
||||
// FIXME: This should eventually run these passes in a pass list to prevent
|
||||
// them from being able to crash bugpoint at all!
|
||||
//
|
||||
if (NoFinalCleanup) return;
|
||||
|
||||
Module *BugDriver::performFinalCleanups(Module *M, bool MayModifySemantics) {
|
||||
// Make all functions external, so GlobalDCE doesn't delete them...
|
||||
for (Module::iterator I = M->begin(), E = M->end(); I != E; ++I)
|
||||
I->setLinkage(GlobalValue::ExternalLinkage);
|
||||
|
||||
PassManager CleanupPasses;
|
||||
// Make sure that the appropriate target data is always used...
|
||||
CleanupPasses.add(new TargetData("bugpoint", M));
|
||||
CleanupPasses.add(createFunctionResolvingPass());
|
||||
CleanupPasses.add(createGlobalDCEPass());
|
||||
CleanupPasses.add(createDeadTypeEliminationPass());
|
||||
CleanupPasses.add(createDeadArgEliminationPass(MayModifySemantics));
|
||||
CleanupPasses.add(createVerifierPass());
|
||||
CleanupPasses.run(*M);
|
||||
std::vector<const PassInfo*> CleanupPasses;
|
||||
CleanupPasses.push_back(getPI(createFunctionResolvingPass()));
|
||||
CleanupPasses.push_back(getPI(createGlobalDCEPass()));
|
||||
CleanupPasses.push_back(getPI(createDeadTypeEliminationPass()));
|
||||
CleanupPasses.push_back(getPI(createDeadArgHackingPass()));
|
||||
|
||||
std::swap(Program, M);
|
||||
std::string Filename;
|
||||
bool Failed = runPasses(CleanupPasses, Filename);
|
||||
std::swap(Program, M);
|
||||
|
||||
if (Failed) {
|
||||
std::cerr << "Final cleanups failed. Sorry. :(\n";
|
||||
} else {
|
||||
delete M;
|
||||
M = ParseInputFile(Filename);
|
||||
if (M == 0) {
|
||||
std::cerr << getToolName() << ": Error reading bytecode file '"
|
||||
<< Filename << "'!\n";
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
return M;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user