[llvm-commits] [llvm] r53886 - in /llvm/trunk/tools/lto-bugpoint: LTOBugPoint.cpp LTOBugPoint.h Makefile lto-bugpoint.cpp
Devang Patel
dpatel at apple.com
Mon Jul 21 16:04:39 PDT 2008
Author: dpatel
Date: Mon Jul 21 18:04:39 2008
New Revision: 53886
URL: http://llvm.org/viewvc/llvm-project?rev=53886&view=rev
Log:
Provide llvm bitcode file to native object file interface.
Modified:
llvm/trunk/tools/lto-bugpoint/LTOBugPoint.cpp
llvm/trunk/tools/lto-bugpoint/LTOBugPoint.h
llvm/trunk/tools/lto-bugpoint/Makefile
llvm/trunk/tools/lto-bugpoint/lto-bugpoint.cpp
Modified: llvm/trunk/tools/lto-bugpoint/LTOBugPoint.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lto-bugpoint/LTOBugPoint.cpp?rev=53886&r1=53885&r2=53886&view=diff
==============================================================================
--- llvm/trunk/tools/lto-bugpoint/LTOBugPoint.cpp (original)
+++ llvm/trunk/tools/lto-bugpoint/LTOBugPoint.cpp Mon Jul 21 18:04:39 2008
@@ -13,10 +13,26 @@
//===----------------------------------------------------------------------===//
#include "LTOBugPoint.h"
+#include "llvm/PassManager.h"
+#include "llvm/Module.h"
+#include "llvm/ModuleProvider.h"
+#include "llvm/CodeGen/FileWriters.h"
+#include "llvm/Target/SubtargetFeature.h"
+#include "llvm/Target/TargetOptions.h"
+#include "llvm/Target/TargetMachine.h"
+#include "llvm/Target/TargetData.h"
+#include "llvm/Target/TargetAsmInfo.h"
+#include "llvm/Target/TargetMachineRegistry.h"
#include "llvm/Support/SystemUtils.h"
+#include "llvm/Support/MemoryBuffer.h"
+#include "llvm/Bitcode/ReaderWriter.h"
#include "llvm/System/Path.h"
+#include "llvm/Config/config.h"
+#include <fstream>
#include <iostream>
+using namespace llvm;
+using namespace Reloc;
/// LTOBugPoint -- Constructor. Popuate list of linker options and
/// list of linker input files.
LTOBugPoint::LTOBugPoint(std::istream &args, std::istream &ins) {
@@ -35,23 +51,184 @@
/// findTroubleMakers - Find minimum set of input files that causes error
/// identified by the script.
bool
-LTOBugPoint::findTroubleMakers(llvm::SmallVector<std::string, 4> &TroubleMakers,
+LTOBugPoint::findTroubleMakers(SmallVector<std::string, 4> &TroubleMakers,
std::string &Script) {
// First, build native object files set.
bool bitcodeFileSeen = false;
- for(llvm::SmallVector<std::string, 16>::iterator I = LinkerInputFiles.begin(),
- E = LinkerInputFiles.end(); I != E; ++I) {
- std::string &path = *I;
- if (llvm::sys::Path(path.c_str()).isBitcodeFile())
+ unsigned Size = LinkerInputFiles.size();
+ for (unsigned I = 0; I < Size; ++I) {
+ std::string &FileName = LinkerInputFiles[I];
+ sys::Path InputFile(FileName.c_str());
+ if (InputFile.isDynamicLibrary() || InputFile.isArchive()) {
+ ErrMsg = "Unable to handle input file ";
+ ErrMsg += FileName;
+ return false;
+ }
+ else if (InputFile.isBitcodeFile()) {
bitcodeFileSeen = true;
+ if (getNativeObjectFile(FileName) == false)
+ return false;
+ }
+ else
+ NativeInputFiles.push_back(FileName);
}
if (!bitcodeFileSeen) {
- std::cerr << "lto-bugpoint: Error: Unable to help!";
- std::cerr << " Need at least one input file that contains llvm bitcode\n";
+ ErrMsg = "Unable to help!";
+ ErrMsg += " Need at least one input file that contains llvm bitcode";
return false;
}
return true;
}
+
+/// getFeatureString - Return a string listing the features associated with the
+/// target triple.
+///
+/// FIXME: This is an inelegant way of specifying the features of a
+/// subtarget. It would be better if we could encode this information into the
+/// IR.
+std::string LTOBugPoint::getFeatureString(const char *TargetTriple) {
+ SubtargetFeatures Features;
+
+ if (strncmp(TargetTriple, "powerpc-apple-", 14) == 0) {
+ Features.AddFeature("altivec", true);
+ } else if (strncmp(TargetTriple, "powerpc64-apple-", 16) == 0) {
+ Features.AddFeature("64bit", true);
+ Features.AddFeature("altivec", true);
+ }
+
+ return Features.getString();
+}
+
+/// assembleBitcode - Generate assembly code from the module. Return false
+/// in case of an error.
+bool LTOBugPoint::assembleBitcode(llvm::Module *M, const char *AsmFileName) {
+ std::string TargetTriple = M->getTargetTriple();
+ std::string FeatureStr =
+ getFeatureString(TargetTriple.c_str());
+
+ const TargetMachineRegistry::entry* Registry =
+ TargetMachineRegistry::getClosestStaticTargetForModule(
+ *M, ErrMsg);
+ if ( Registry == NULL )
+ return false;
+
+ TargetMachine *Target = Registry->CtorFn(*M, FeatureStr.c_str());
+
+ // If target supports exception handling then enable it now.
+ if (Target->getTargetAsmInfo()->doesSupportExceptionHandling())
+ ExceptionHandling = true;
+
+ // FIXME
+ Target->setRelocationModel(Reloc::PIC_);
+
+ FunctionPassManager* CGPasses =
+ new FunctionPassManager(new ExistingModuleProvider(M));
+
+ CGPasses->add(new TargetData(*Target->getTargetData()));
+ MachineCodeEmitter* mce = NULL;
+
+ std::ofstream *Out = new std::ofstream(AsmFileName, std::ios::out);
+
+ switch (Target->addPassesToEmitFile(*CGPasses, *Out,
+ TargetMachine::AssemblyFile, true)) {
+ case FileModel::MachOFile:
+ mce = AddMachOWriter(*CGPasses, *Out, *Target);
+ break;
+ case FileModel::ElfFile:
+ mce = AddELFWriter(*CGPasses, *Out, *Target);
+ break;
+ case FileModel::AsmFile:
+ break;
+ case FileModel::Error:
+ case FileModel::None:
+ ErrMsg = "target file type not supported";
+ return false;
+ }
+
+ if (Target->addPassesToEmitFileFinish(*CGPasses, mce, true)) {
+ ErrMsg = "target does not support generation of this file type";
+ return false;
+ }
+
+ CGPasses->doInitialization();
+ for (Module::iterator
+ it = M->begin(), e = M->end(); it != e; ++it)
+ if (!it->isDeclaration())
+ CGPasses->run(*it);
+ CGPasses->doFinalization();
+ delete Out;
+ return true;
+}
+
+/// getNativeObjectFile - Generate native object file based from llvm
+/// bitcode file. Return false in case of an error.
+bool LTOBugPoint::getNativeObjectFile(std::string &FileName) {
+
+ std::auto_ptr<Module> M;
+ MemoryBuffer *Buffer
+ = MemoryBuffer::getFile(FileName.c_str(), &ErrMsg);
+ if (!Buffer) {
+ ErrMsg = "Unable to read ";
+ ErrMsg += FileName;
+ return false;
+ }
+ M.reset(ParseBitcodeFile(Buffer, &ErrMsg));
+ std::string TargetTriple = M->getTargetTriple();
+
+ sys::Path AsmFile(sys::Path::GetTemporaryDirectory());
+ if(AsmFile.createTemporaryFileOnDisk(false, &ErrMsg))
+ return false;
+
+ if (assembleBitcode(M.get(), AsmFile.c_str()) == false)
+ return false;
+
+ sys::Path NativeFile(sys::Path::GetTemporaryDirectory());
+ if(NativeFile.createTemporaryFileOnDisk(false, &ErrMsg))
+ return false;
+
+ // find compiler driver
+ const sys::Path gcc = sys::Program::FindProgramByName("gcc");
+ if ( gcc.isEmpty() ) {
+ ErrMsg = "can't locate gcc";
+ return false;
+ }
+
+ // build argument list
+ std::vector<const char*> args;
+ args.push_back(gcc.c_str());
+ if ( TargetTriple.find("darwin") != TargetTriple.size() ) {
+ if (strncmp(TargetTriple.c_str(), "i686-apple-", 11) == 0) {
+ args.push_back("-arch");
+ args.push_back("i386");
+ }
+ else if (strncmp(TargetTriple.c_str(), "x86_64-apple-", 13) == 0) {
+ args.push_back("-arch");
+ args.push_back("x86_64");
+ }
+ else if (strncmp(TargetTriple.c_str(), "powerpc-apple-", 14) == 0) {
+ args.push_back("-arch");
+ args.push_back("ppc");
+ }
+ else if (strncmp(TargetTriple.c_str(), "powerpc64-apple-", 16) == 0) {
+ args.push_back("-arch");
+ args.push_back("ppc64");
+ }
+ }
+ args.push_back("-c");
+ args.push_back("-x");
+ args.push_back("assembler");
+ args.push_back("-o");
+ args.push_back(NativeFile.c_str());
+ args.push_back(AsmFile.c_str());
+ args.push_back(0);
+
+ // invoke assembler
+ if (sys::Program::ExecuteAndWait(gcc, &args[0], 0, 0, 0, 0, &ErrMsg)) {
+ ErrMsg = "error in assembly";
+ return false;
+ }
+ return true;
+}
Modified: llvm/trunk/tools/lto-bugpoint/LTOBugPoint.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lto-bugpoint/LTOBugPoint.h?rev=53886&r1=53885&r2=53886&view=diff
==============================================================================
--- llvm/trunk/tools/lto-bugpoint/LTOBugPoint.h (original)
+++ llvm/trunk/tools/lto-bugpoint/LTOBugPoint.h Mon Jul 21 18:04:39 2008
@@ -13,6 +13,7 @@
//===----------------------------------------------------------------------===//
#include "llvm/ADT/SmallVector.h"
+#include "llvm/Module.h"
#include <string>
#include <fstream>
@@ -25,6 +26,13 @@
/// identified by the script.
bool findTroubleMakers(llvm::SmallVector<std::string, 4> &TroubleMakers,
std::string &Script);
+
+ /// getNativeObjectFile - Generate native object file based from llvm
+ /// bitcode file. Return false in case of an error.
+ bool getNativeObjectFile(std::string &FileName);
+
+ std::string &getErrMsg() { return ErrMsg; }
+
private:
/// LinkerInputFiles - This is a list of linker input files. Once populated
/// this list is not modified.
@@ -39,4 +47,11 @@
/// at index 4 in NativeInputFiles is corresponding native object file.
llvm::SmallVector<std::string, 16> NativeInputFiles;
+ std::string getFeatureString(const char *TargetTriple);
+ std::string ErrMsg;
+
+private:
+ /// assembleBitcode - Generate assembly code from the module. Return false
+ /// in case of an error.
+ bool assembleBitcode(llvm::Module *M, const char *AsmFileName);
};
Modified: llvm/trunk/tools/lto-bugpoint/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lto-bugpoint/Makefile?rev=53886&r1=53885&r2=53886&view=diff
==============================================================================
--- llvm/trunk/tools/lto-bugpoint/Makefile (original)
+++ llvm/trunk/tools/lto-bugpoint/Makefile Mon Jul 21 18:04:39 2008
@@ -10,7 +10,12 @@
TOOLNAME = lto-bugpoint
-LINK_COMPONENTS := system
+# Include this here so we can get the configuration of the targets
+# that have been configured for construction. We have to do this
+# early so we can set up LINK_COMPONENTS before including Makefile.rules
+include $(LEVEL)/Makefile.config
+
+LINK_COMPONENTS := $(TARGETS_TO_BUILD) bitreader
REQUIRES_EH := 1
Modified: llvm/trunk/tools/lto-bugpoint/lto-bugpoint.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lto-bugpoint/lto-bugpoint.cpp?rev=53886&r1=53885&r2=53886&view=diff
==============================================================================
--- llvm/trunk/tools/lto-bugpoint/lto-bugpoint.cpp (original)
+++ llvm/trunk/tools/lto-bugpoint/lto-bugpoint.cpp Mon Jul 21 18:04:39 2008
@@ -51,8 +51,10 @@
LTOBugPoint bugFinder(*LinkerArgsFile, *LinkerInputsFile);
llvm::SmallVector<std::string, 4> TroubleMakers;
- if (!bugFinder.findTroubleMakers(TroubleMakers, ValidationScript))
+ if (!bugFinder.findTroubleMakers(TroubleMakers, ValidationScript)) {
+ std::cerr << "lto-bugpoint:" << bugFinder.getErrMsg() << "\n";
return 1;
+ }
return 0;
} catch (const std::string& msg) {
More information about the llvm-commits
mailing list