[llvm-commits] [llvm] r131186 - in /llvm/trunk: include/llvm/Support/Program.h lib/Support/Program.cpp lib/Support/Unix/Program.inc tools/bugpoint/ExecutionDriver.cpp tools/bugpoint/Miscompilation.cpp tools/bugpoint/ToolRunner.cpp
Andrew Trick
atrick at apple.com
Wed May 11 09:31:24 PDT 2011
Author: atrick
Date: Wed May 11 11:31:24 2011
New Revision: 131186
URL: http://llvm.org/viewvc/llvm-project?rev=131186&view=rev
Log:
Bugpoint support for miscompilations that result in a crash.
This change allows bugpoint to pinpoint the "opt" pass and bitcode
segment responsible for a crash caused by miscompilation. At least it
works well for me now, without having to create any custom execution
wrappers.
Modified:
llvm/trunk/include/llvm/Support/Program.h
llvm/trunk/lib/Support/Program.cpp
llvm/trunk/lib/Support/Unix/Program.inc
llvm/trunk/tools/bugpoint/ExecutionDriver.cpp
llvm/trunk/tools/bugpoint/Miscompilation.cpp
llvm/trunk/tools/bugpoint/ToolRunner.cpp
Modified: llvm/trunk/include/llvm/Support/Program.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/Program.h?rev=131186&r1=131185&r2=131186&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/Program.h (original)
+++ llvm/trunk/include/llvm/Support/Program.h Wed May 11 11:31:24 2011
@@ -96,9 +96,11 @@
///< expires, the child is killed and this call returns. If zero,
///< this function will wait until the child finishes or forever if
///< it doesn't.
- std::string* ErrMsg ///< If non-zero, provides a pointer to a string
+ std::string* ErrMsg, ///< If non-zero, provides a pointer to a string
///< instance in which error messages will be returned. If the string
///< is non-empty upon return an error occurred while waiting.
+ const char *SignalPrefix ///< If non-zero, provides a prefix to be
+ ///< prepended to ErrMsg if the process is terminated abnormally.
);
/// This function terminates the program.
@@ -137,7 +139,8 @@
const sys::Path** redirects = 0,
unsigned secondsToWait = 0,
unsigned memoryLimit = 0,
- std::string* ErrMsg = 0);
+ std::string* ErrMsg = 0,
+ const char *SignalPrefix = 0);
/// A convenience function equivalent to Program prg; prg.Execute(..);
/// @see Execute
Modified: llvm/trunk/lib/Support/Program.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Program.cpp?rev=131186&r1=131185&r2=131186&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Program.cpp (original)
+++ llvm/trunk/lib/Support/Program.cpp Wed May 11 11:31:24 2011
@@ -28,10 +28,11 @@
const Path** redirects,
unsigned secondsToWait,
unsigned memoryLimit,
- std::string* ErrMsg) {
+ std::string* ErrMsg,
+ const char* SignalPrefix) {
Program prg;
if (prg.Execute(path, args, envp, redirects, memoryLimit, ErrMsg))
- return prg.Wait(path, secondsToWait, ErrMsg);
+ return prg.Wait(path, secondsToWait, ErrMsg, SignalPrefix);
else
return -1;
}
Modified: llvm/trunk/lib/Support/Unix/Program.inc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Unix/Program.inc?rev=131186&r1=131185&r2=131186&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Unix/Program.inc (original)
+++ llvm/trunk/lib/Support/Unix/Program.inc Wed May 11 11:31:24 2011
@@ -298,7 +298,8 @@
int
Program::Wait(const sys::Path &path,
unsigned secondsToWait,
- std::string* ErrMsg)
+ std::string* ErrMsg,
+ const char* SignalPrefix)
{
#ifdef HAVE_SYS_WAIT_H
struct sigaction Act, Old;
@@ -376,7 +377,9 @@
}
} else if (WIFSIGNALED(status)) {
if (ErrMsg) {
- *ErrMsg = strsignal(WTERMSIG(status));
+ if (SignalPrefix)
+ *ErrMsg = SignalPrefix;
+ *ErrMsg += strsignal(WTERMSIG(status));
#ifdef WCOREDUMP
if (WCOREDUMP(status))
*ErrMsg += " (core dumped)";
Modified: llvm/trunk/tools/bugpoint/ExecutionDriver.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/bugpoint/ExecutionDriver.cpp?rev=131186&r1=131185&r2=131186&view=diff
==============================================================================
--- llvm/trunk/tools/bugpoint/ExecutionDriver.cpp (original)
+++ llvm/trunk/tools/bugpoint/ExecutionDriver.cpp Wed May 11 11:31:24 2011
@@ -475,7 +475,7 @@
/// diffProgram - This method executes the specified module and diffs the
/// output against the file specified by ReferenceOutputFile. If the output
/// is different, 1 is returned. If there is a problem with the code
-/// generator (e.g., llc crashes), this will return -1 and set Error.
+/// generator (e.g., llc crashes), this will set ErrMsg.
///
bool BugDriver::diffProgram(const Module *Program,
const std::string &BitcodeFile,
Modified: llvm/trunk/tools/bugpoint/Miscompilation.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/bugpoint/Miscompilation.cpp?rev=131186&r1=131185&r2=131186&view=diff
==============================================================================
--- llvm/trunk/tools/bugpoint/Miscompilation.cpp (original)
+++ llvm/trunk/tools/bugpoint/Miscompilation.cpp Wed May 11 11:31:24 2011
@@ -624,9 +624,10 @@
if (!BugpointIsInterrupted)
ReduceMiscompilingFunctions(BD, TestFn).reduceList(MiscompiledFunctions,
Error);
- if (!Error.empty())
+ if (!Error.empty()) {
+ errs() << "\n***Cannot reduce functions: ";
return MiscompiledFunctions;
-
+ }
outs() << "\n*** The following function"
<< (MiscompiledFunctions.size() == 1 ? " is" : "s are")
<< " being miscompiled: ";
Modified: llvm/trunk/tools/bugpoint/ToolRunner.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/bugpoint/ToolRunner.cpp?rev=131186&r1=131185&r2=131186&view=diff
==============================================================================
--- llvm/trunk/tools/bugpoint/ToolRunner.cpp (original)
+++ llvm/trunk/tools/bugpoint/ToolRunner.cpp Wed May 11 11:31:24 2011
@@ -50,6 +50,11 @@
cl::desc("Remote execution (rsh/ssh) extra options"));
}
+// Add a prefix to ErrMsg if the program is terminated by a signal to
+// distinguish compiled program crashes from other execution
+// failures. Miscompilation likely to results in SIGSEGV.
+static const char *SignalPrefix = "Signal - ";
+
/// RunProgramWithTimeout - This function provides an alternate interface
/// to the sys::Program::ExecuteAndWait interface.
/// @see sys::Program::ExecuteAndWait
@@ -77,7 +82,7 @@
return
sys::Program::ExecuteAndWait(ProgramPath, Args, 0, redirects,
- NumSeconds, MemoryLimit, ErrMsg);
+ NumSeconds, MemoryLimit, ErrMsg, SignalPrefix);
}
/// RunProgramRemotelyWithTimeout - This function runs the given program
@@ -854,9 +859,18 @@
if (RemoteClientPath.isEmpty()) {
DEBUG(errs() << "<run locally>");
- return RunProgramWithTimeout(OutputBinary, &ProgramArgs[0],
+ int ExitCode = RunProgramWithTimeout(OutputBinary, &ProgramArgs[0],
sys::Path(InputFile), sys::Path(OutputFile), sys::Path(OutputFile),
Timeout, MemoryLimit, Error);
+ // Treat a signal (usually SIGSEGV) as part of the program output so that
+ // crash-causing miscompilation is handled seamlessly.
+ if (Error->find(SignalPrefix) == 0) {
+ std::ofstream outFile(OutputFile.c_str(), std::ios_base::app);
+ outFile << *Error << '\n';
+ outFile.close();
+ Error->clear();
+ }
+ return ExitCode;
} else {
outs() << "<run remotely>"; outs().flush();
return RunProgramRemotelyWithTimeout(sys::Path(RemoteClientPath),
More information about the llvm-commits
mailing list