mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-10-19 02:52:53 +02:00
CodeGeneratorBug.cpp:
* Temporarily externing InputArgv to print it out for the benefit of LLI command needed to reproduce the result. * Print out the list of functions currently being tested * ListReducer now returns a bool if there was a failure, so test for it ListReducer.h: * Handle the case where there is no problem by returning true if failure is found. Also correctly handles the case when there is only 1 pass/function. Miscompilation.cpp: * ListReducer now returns a bool if there was a failure, so test for it llvm-svn: 7434
This commit is contained in:
parent
10e9e036c2
commit
3c2462bb76
@ -20,11 +20,14 @@
|
|||||||
#include "llvm/Transforms/Utils/BasicBlockUtils.h"
|
#include "llvm/Transforms/Utils/BasicBlockUtils.h"
|
||||||
#include "llvm/Transforms/Utils/Cloning.h"
|
#include "llvm/Transforms/Utils/Cloning.h"
|
||||||
#include "llvm/Transforms/Utils/Linker.h"
|
#include "llvm/Transforms/Utils/Linker.h"
|
||||||
|
#include "Support/CommandLine.h"
|
||||||
#include "Support/Statistic.h"
|
#include "Support/Statistic.h"
|
||||||
#include "Support/StringExtras.h"
|
#include "Support/StringExtras.h"
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <set>
|
#include <set>
|
||||||
|
|
||||||
|
extern cl::list<std::string> InputArgv;
|
||||||
|
|
||||||
class ReduceMisCodegenFunctions : public ListReducer<Function*> {
|
class ReduceMisCodegenFunctions : public ListReducer<Function*> {
|
||||||
BugDriver &BD;
|
BugDriver &BD;
|
||||||
public:
|
public:
|
||||||
@ -47,10 +50,9 @@ public:
|
|||||||
bool ReduceMisCodegenFunctions::TestFuncs(const std::vector<Function*> &Funcs,
|
bool ReduceMisCodegenFunctions::TestFuncs(const std::vector<Function*> &Funcs,
|
||||||
bool KeepFiles)
|
bool KeepFiles)
|
||||||
{
|
{
|
||||||
DEBUG(std::cerr << "Test functions are:\n");
|
std::cout << "Testing functions: ";
|
||||||
for (std::vector<Function*>::const_iterator I = Funcs.begin(),E = Funcs.end();
|
BD.PrintFunctionList(Funcs);
|
||||||
I != E; ++I)
|
std::cout << "\t";
|
||||||
DEBUG(std::cerr << "\t" << (*I)->getName() << "\n");
|
|
||||||
|
|
||||||
// Clone the module for the two halves of the program we want.
|
// Clone the module for the two halves of the program we want.
|
||||||
Module *SafeModule = CloneModule(BD.Program);
|
Module *SafeModule = CloneModule(BD.Program);
|
||||||
@ -150,7 +152,7 @@ bool ReduceMisCodegenFunctions::TestFuncs(const std::vector<Function*> &Funcs,
|
|||||||
// cast the result from the resolver to correctly-typed function
|
// cast the result from the resolver to correctly-typed function
|
||||||
CastInst *castResolver =
|
CastInst *castResolver =
|
||||||
new CastInst(resolve, PointerType::get(F->getFunctionType()),
|
new CastInst(resolve, PointerType::get(F->getFunctionType()),
|
||||||
"", Inst);
|
"resolverCast", Inst);
|
||||||
// actually use the resolved function
|
// actually use the resolved function
|
||||||
Inst->replaceUsesOfWith(F, castResolver);
|
Inst->replaceUsesOfWith(F, castResolver);
|
||||||
} else {
|
} else {
|
||||||
@ -227,8 +229,12 @@ bool ReduceMisCodegenFunctions::TestFuncs(const std::vector<Function*> &Funcs,
|
|||||||
if (KeepFiles) {
|
if (KeepFiles) {
|
||||||
std::cout << "You can reproduce the problem with the command line: \n"
|
std::cout << "You can reproduce the problem with the command line: \n"
|
||||||
<< (BD.isExecutingJIT() ? "lli" : "llc")
|
<< (BD.isExecutingJIT() ? "lli" : "llc")
|
||||||
<< " -load " << SharedObject << " " << TestModuleBC
|
<< " -load " << SharedObject << " " << TestModuleBC;
|
||||||
<< "\n";
|
for (unsigned i=0, e = InputArgv.size(); i != e; ++i)
|
||||||
|
std::cout << " " << InputArgv[i];
|
||||||
|
std::cout << "\n";
|
||||||
|
std::cout << "The shared object " << SharedObject << " was created from "
|
||||||
|
<< SafeModuleBC << ", using `dis -c'.\n";
|
||||||
} else {
|
} else {
|
||||||
removeFile(TestModuleBC);
|
removeFile(TestModuleBC);
|
||||||
removeFile(SafeModuleBC);
|
removeFile(SafeModuleBC);
|
||||||
@ -346,7 +352,11 @@ bool BugDriver::debugCodeGenerator() {
|
|||||||
DisambiguateGlobalSymbols(Program);
|
DisambiguateGlobalSymbols(Program);
|
||||||
|
|
||||||
// Do the reduction...
|
// Do the reduction...
|
||||||
ReduceMisCodegenFunctions(*this).reduceList(MisCodegenFunctions);
|
if (!ReduceMisCodegenFunctions(*this).reduceList(MisCodegenFunctions)) {
|
||||||
|
std::cerr << "*** Execution matches reference output! No problem "
|
||||||
|
<< "detected...\nbugpoint can't help you with your problem!\n";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
std::cout << "\n*** The following functions are being miscompiled: ";
|
std::cout << "\n*** The following functions are being miscompiled: ";
|
||||||
PrintFunctionList(MisCodegenFunctions);
|
PrintFunctionList(MisCodegenFunctions);
|
||||||
|
@ -30,7 +30,24 @@ struct ListReducer {
|
|||||||
// list while still maintaining the "test" property. This is the core of the
|
// list while still maintaining the "test" property. This is the core of the
|
||||||
// "work" that bugpoint does.
|
// "work" that bugpoint does.
|
||||||
//
|
//
|
||||||
void reduceList(std::vector<ElTy> &TheList) {
|
bool reduceList(std::vector<ElTy> &TheList) {
|
||||||
|
std::vector<ElTy> empty;
|
||||||
|
switch (doTest(TheList, empty)) {
|
||||||
|
case KeepPrefix:
|
||||||
|
if (TheList.size() == 1) // we are done, it's the base case and it fails
|
||||||
|
return true;
|
||||||
|
else
|
||||||
|
break; // there's definitely an error, but we need to narrow it down
|
||||||
|
|
||||||
|
case KeepSuffix:
|
||||||
|
// cannot be reached!
|
||||||
|
std::cerr << "bugpoint ListReducer internal error: selected empty set.\n";
|
||||||
|
abort();
|
||||||
|
|
||||||
|
case NoFailure:
|
||||||
|
return false; // there is no failure with the full set of passes/funcs!
|
||||||
|
}
|
||||||
|
|
||||||
unsigned MidTop = TheList.size();
|
unsigned MidTop = TheList.size();
|
||||||
while (MidTop > 1) {
|
while (MidTop > 1) {
|
||||||
unsigned Mid = MidTop / 2;
|
unsigned Mid = MidTop / 2;
|
||||||
@ -80,6 +97,8 @@ struct ListReducer {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return true; // there are some failure and we've narrowed them down
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -268,12 +268,8 @@ bool BugDriver::debugMiscompilation() {
|
|||||||
return false; // Problem found
|
return false; // Problem found
|
||||||
}
|
}
|
||||||
|
|
||||||
// Figure out which transformations miscompile the input program.
|
|
||||||
unsigned OldSize = PassesToRun.size();
|
|
||||||
ReduceMiscompilingPasses(*this).reduceList(PassesToRun);
|
|
||||||
|
|
||||||
// Make sure something was miscompiled...
|
// Make sure something was miscompiled...
|
||||||
if (PassesToRun.size() == OldSize) {
|
if (!ReduceMiscompilingPasses(*this).reduceList(PassesToRun)) {
|
||||||
std::cerr << "*** Optimized program matches reference output! No problem "
|
std::cerr << "*** Optimized program matches reference output! No problem "
|
||||||
<< "detected...\nbugpoint can't help you with your problem!\n";
|
<< "detected...\nbugpoint can't help you with your problem!\n";
|
||||||
return false;
|
return false;
|
||||||
|
Loading…
Reference in New Issue
Block a user