//
//===----------------------------------------------------------------------===//
+#include "LTOModule.h"
+#include "LTOCodeGenerator.h"
+
+
#include "llvm/Module.h"
#include "llvm/PassManager.h"
#include "llvm/Linker.h"
#include "llvm/DerivedTypes.h"
#include "llvm/ModuleProvider.h"
#include "llvm/Bitcode/ReaderWriter.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/FileUtilities.h"
#include "llvm/Support/SystemUtils.h"
#include "llvm/Support/Mangler.h"
#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/System/Program.h"
#include "llvm/System/Signals.h"
#include "llvm/Analysis/Passes.h"
#include "llvm/Analysis/LoopPass.h"
#include "llvm/Analysis/Verifier.h"
+#include "llvm/Analysis/LoadValueNumbering.h"
#include "llvm/CodeGen/FileWriters.h"
-#include "llvm/Target/SubtargetFeature.h"
#include "llvm/Target/TargetOptions.h"
#include "llvm/Target/TargetData.h"
#include "llvm/Target/TargetMachine.h"
#include "llvm/Target/TargetAsmInfo.h"
#include "llvm/Transforms/IPO.h"
#include "llvm/Transforms/Scalar.h"
-#include "llvm/Analysis/LoadValueNumbering.h"
-#include "llvm/Support/MathExtras.h"
#include "llvm/Config/config.h"
-#include "LTOModule.h"
-#include "LTOCodeGenerator.h"
#include <fstream>
#include <unistd.h>
LTOCodeGenerator::LTOCodeGenerator()
: _linker("LinkTimeOptimizer", "ld-temp.o"), _target(NULL),
_emitDwarfDebugInfo(false), _scopeRestrictionsDone(false),
- _codeModel(LTO_CODEGEN_PIC_MODEL_DYNAMIC)
+ _codeModel(LTO_CODEGEN_PIC_MODEL_DYNAMIC),
+ _nativeObjectFile(NULL)
{
}
LTOCodeGenerator::~LTOCodeGenerator()
{
- // FIXME
+ delete _target;
+ delete _nativeObjectFile;
}
}
-void* LTOCodeGenerator::compile(size_t* length, std::string& errMsg)
+const void* LTOCodeGenerator::compile(size_t* length, std::string& errMsg)
{
- // make unqiue temp .s file to put generated assembly code
+ // make unique temp .s file to put generated assembly code
sys::Path uniqueAsmPath("lto-llvm.s");
if ( uniqueAsmPath.createTemporaryFileOnDisk(true, &errMsg) )
return NULL;
return NULL;
}
- // make unqiue temp .o file to put generated object file
+ // make unique temp .o file to put generated object file
sys::PathWithStatus uniqueObjPath("lto-llvm.o");
if ( uniqueObjPath.createTemporaryFileOnDisk(true, &errMsg) ) {
if ( uniqueAsmPath.exists() )
sys::RemoveFileOnSignal(uniqueObjPath);
// assemble the assembly code
- void* buffer = NULL;
+ const std::string& uniqueObjStr = uniqueObjPath.toString();
bool asmResult = this->assemble(uniqueAsmPath.toString(),
- uniqueObjPath.toString(), errMsg);
+ uniqueObjStr, errMsg);
if ( !asmResult ) {
+ // remove old buffer if compile() called twice
+ delete _nativeObjectFile;
+
// read .o file into memory buffer
- const sys::FileStatus* objStatus;
- objStatus = uniqueObjPath.getFileStatus(false, &errMsg);
- if ( objStatus != NULL ) {
- *length = objStatus->getSize();
- // use malloc() because caller will own this buffer and free() it
- buffer = ::malloc(*length);
- if ( buffer != NULL ) {
- int fd = ::open(uniqueObjPath.c_str(), O_RDONLY, 0);
- if ( fd != -1 ) {
- // read object file contents into buffer
- if ( ::read(fd, buffer, *length) != (ssize_t)*length ) {
- errMsg = "error reading object file";
- free(buffer);
- buffer = NULL;
- }
- close(fd);
- }
- else {
- errMsg = "error opening object file";
- free(buffer);
- buffer = NULL;
- }
- }
- else {
- errMsg = "error mallocing space for object file";
- }
- }
- else {
- errMsg = "error stat'ing object file";
- }
+ _nativeObjectFile = MemoryBuffer::getFile(&uniqueObjStr[0],
+ uniqueObjStr.size(), &errMsg);
}
- // clean up temp files
+
+ // remove temp files
uniqueAsmPath.eraseFromDisk();
uniqueObjPath.eraseFromDisk();
- return buffer;
+
+ // return buffer, unless error
+ if ( _nativeObjectFile == NULL )
+ return NULL;
+ *length = _nativeObjectFile->getBufferSize();
+ return _nativeObjectFile->getBufferStart();
}
//
//===----------------------------------------------------------------------===//
+#include "LTOModule.h"
+
#include "llvm/Module.h"
-#include "llvm/PassManager.h"
-#include "llvm/Linker.h"
-#include "llvm/Constants.h"
-#include "llvm/DerivedTypes.h"
#include "llvm/ModuleProvider.h"
+#include "llvm/ADT/OwningPtr.h"
#include "llvm/Bitcode/ReaderWriter.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/FileUtilities.h"
#include "llvm/Support/SystemUtils.h"
#include "llvm/Support/Mangler.h"
#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/System/Program.h"
+#include "llvm/Support/MathExtras.h"
#include "llvm/System/Path.h"
-#include "llvm/System/Signals.h"
-#include "llvm/Target/SubtargetFeature.h"
-#include "llvm/Target/TargetOptions.h"
-#include "llvm/Target/TargetData.h"
#include "llvm/Target/TargetMachine.h"
#include "llvm/Target/TargetMachineRegistry.h"
#include "llvm/Target/TargetAsmInfo.h"
-#include "llvm/Transforms/IPO.h"
-#include "llvm/Transforms/Scalar.h"
-#include "llvm/Analysis/LoadValueNumbering.h"
-#include "llvm/Support/MathExtras.h"
-#include "LTOModule.h"
#include <fstream>
bool LTOModule::isBitcodeFileForTarget(const void* mem,
size_t length, const char* triplePrefix)
{
- bool result = false;
- MemoryBuffer* buffer;
- buffer = MemoryBuffer::getMemBuffer((char*)mem, (char*)mem+length);
- if ( buffer != NULL ) {
- ModuleProvider* mp = getBitcodeModuleProvider(buffer);
- if ( mp != NULL ) {
- std::string actualTarget = mp->getModule()->getTargetTriple();
- if ( strncmp(actualTarget.c_str(), triplePrefix,
- strlen(triplePrefix)) == 0) {
- result = true;
- }
- // mp destructor will delete buffer
- delete mp;
- }
- else {
- // if getBitcodeModuleProvider failed, we need to delete buffer
- delete buffer;
- }
- }
- return result;
+ MemoryBuffer* buffer = MemoryBuffer::getMemBuffer((char*)mem,
+ (char*)mem+length);
+ if ( buffer == NULL )
+ return false;
+ return isTargetMatch(buffer, triplePrefix);
}
+
bool LTOModule::isBitcodeFileForTarget(const char* path,
const char* triplePrefix)
{
- bool result = false;
- MemoryBuffer* buffer;
- buffer = MemoryBuffer::getFile(path, strlen(path));
- if ( buffer != NULL ) {
- ModuleProvider* mp = getBitcodeModuleProvider(buffer);
- if ( mp != NULL ) {
- std::string actualTarget = mp->getModule()->getTargetTriple();
- if ( strncmp(actualTarget.c_str(), triplePrefix,
- strlen(triplePrefix)) == 0) {
- result = true;
- }
- // mp destructor will delete buffer
- delete mp;
- }
- else {
- // if getBitcodeModuleProvider failed, we need to delete buffer
- delete buffer;
- }
+ MemoryBuffer* buffer = MemoryBuffer::getFile(path, strlen(path));
+ if ( buffer == NULL )
+ return false;
+ return isTargetMatch(buffer, triplePrefix);
+}
+
+// takes ownership of buffer
+bool LTOModule::isTargetMatch(MemoryBuffer* buffer, const char* triplePrefix)
+{
+ OwningPtr<ModuleProvider> mp(getBitcodeModuleProvider(buffer));
+ // on success, mp owns buffer and both are deleted at end of this method
+ if ( !mp ) {
+ delete buffer;
+ return false;
}
- return result;
+ std::string actualTarget = mp->getModule()->getTargetTriple();
+ return ( strncmp(actualTarget.c_str(), triplePrefix,
+ strlen(triplePrefix)) == 0);
}
{
}
-LTOModule::~LTOModule()
+LTOModule* LTOModule::makeLTOModule(const char* path, std::string& errMsg)
{
- delete _module;
- if ( _target != NULL )
- delete _target;
+ OwningPtr<MemoryBuffer> buffer(MemoryBuffer::getFile(
+ path, strlen(path), &errMsg));
+ if ( !buffer )
+ return NULL;
+ return makeLTOModule(buffer.get(), errMsg);
}
+LTOModule* LTOModule::makeLTOModule(const void* mem, size_t length,
+ std::string& errMsg)
+{
+ OwningPtr<MemoryBuffer> buffer(MemoryBuffer::getMemBuffer((char*)mem,
+ (char*)mem+length));
+ if ( !buffer )
+ return NULL;
+ return makeLTOModule(buffer.get(), errMsg);
+}
-LTOModule* LTOModule::makeLTOModule(const char* path, std::string& errMsg)
+LTOModule* LTOModule::makeLTOModule(MemoryBuffer* buffer, std::string& errMsg)
{
- MemoryBuffer* buffer = MemoryBuffer::getFile(path, strlen(path));
- if ( buffer != NULL ) {
- Module* m = ParseBitcodeFile(buffer, &errMsg);
- delete buffer;
- if ( m != NULL ) {
- const TargetMachineRegistry::entry* march =
- TargetMachineRegistry::getClosestStaticTargetForModule(*m, errMsg);
- if ( march != NULL ) {
- std::string features;
- TargetMachine* target = march->CtorFn(*m, features);
- return new LTOModule(m, target);
- }
- }
- }
- return NULL;
+ // parse bitcode buffer
+ OwningPtr<Module> m(ParseBitcodeFile(buffer, &errMsg));
+ if ( !m )
+ return NULL;
+ // find machine architecture for this module
+ const TargetMachineRegistry::entry* march =
+ TargetMachineRegistry::getClosestStaticTargetForModule(*m, errMsg);
+ if ( march == NULL )
+ return NULL;
+ // construct LTModule, hand over ownership of module and target
+ std::string features;
+ TargetMachine* target = march->CtorFn(*m, features);
+ return new LTOModule(m.take(), target);
}
-LTOModule* LTOModule::makeLTOModule(const void* mem, size_t length,
- std::string& errMsg)
+
+const char* LTOModule::getTargetTriple()
{
- MemoryBuffer* buffer;
- buffer = MemoryBuffer::getMemBuffer((char*)mem, (char*)mem+length);
- if ( buffer != NULL ) {
- Module* m = ParseBitcodeFile(buffer, &errMsg);
- delete buffer;
- if ( m != NULL ) {
- const TargetMachineRegistry::entry* march =
- TargetMachineRegistry::getClosestStaticTargetForModule(*m, errMsg);
- if ( march != NULL ) {
- std::string features;
- TargetMachine* target = march->CtorFn(*m, features);
- return new LTOModule(m, target);
+ return _module->getTargetTriple().c_str();
+}
+
+void LTOModule::addDefinedFunctionSymbol(Function* f, Mangler &mangler)
+{
+ // add to list of defined symbols
+ addDefinedSymbol(f, mangler, true);
+
+ // add external symbols referenced by this function.
+ for (Function::iterator b = f->begin(); b != f->end(); ++b) {
+ for (BasicBlock::iterator i = b->begin(); i != b->end(); ++i) {
+ for (unsigned count = 0, total = i->getNumOperands();
+ count != total; ++count) {
+ findExternalRefs(i->getOperand(count), mangler);
}
}
}
- return NULL;
}
+void LTOModule::addDefinedDataSymbol(GlobalValue* v, Mangler &mangler)
+{
+ // add to list of defined symbols
+ addDefinedSymbol(v, mangler, false);
-const char* LTOModule::getTargetTriple()
-{
- return _module->getTargetTriple().c_str();
+ // add external symbols referenced by this data.
+ for (unsigned count = 0, total = v->getNumOperands();\
+ count != total; ++count) {
+ findExternalRefs(v->getOperand(count), mangler);
+ }
}
+
void LTOModule::addDefinedSymbol(GlobalValue* def, Mangler &mangler,
bool isFunction)
{
+ // string is owned by _defines
const char* symbolName = ::strdup(mangler.getValueName(def).c_str());
// set alignment part log2() can have rounding errors
uint32_t align = def->getAlignment();
- uint32_t attr = align ? __builtin_ctz(def->getAlignment()) : 0;
+ uint32_t attr = align ? CountTrailingZeros_32(def->getAlignment()) : 0;
// set permissions part
if ( isFunction )
}
-void LTOModule::addUndefinedSymbol(const char* name)
-{
+void LTOModule::addPotentialUndefinedSymbol(GlobalValue* decl, Mangler &mangler)
+{
+ const char* name = mangler.getValueName(decl).c_str();
// ignore all llvm.* symbols
if ( strncmp(name, "llvm.", 5) != 0 ) {
_undefines[name] = 1;
if (GlobalValue* gv = dyn_cast<GlobalValue>(value)) {
if ( !gv->hasExternalLinkage() )
- addUndefinedSymbol(mangler.getValueName(gv).c_str());
+ addPotentialUndefinedSymbol(gv, mangler);
}
// GlobalValue, even with InternalLinkage type, may have operands with
}
}
-
-uint32_t LTOModule::getSymbolCount()
+void LTOModule::lazyParseSymbols()
{
if ( !_symbolsParsed ) {
_symbolsParsed = true;
// add functions
for (Module::iterator f = _module->begin(); f != _module->end(); ++f) {
- if ( f->isDeclaration() ) {
- addUndefinedSymbol(mangler.getValueName(f).c_str());
- }
- else {
- addDefinedSymbol(f, mangler, true);
- // add external symbols referenced by this function.
- for (Function::iterator b = f->begin(); b != f->end(); ++b) {
- for (BasicBlock::iterator i = b->begin();
- i != b->end(); ++i) {
- for (unsigned count = 0, total = i->getNumOperands();
- count != total; ++count) {
- findExternalRefs(i->getOperand(count), mangler);
- }
- }
- }
- }
+ if ( f->isDeclaration() )
+ addPotentialUndefinedSymbol(f, mangler);
+ else
+ addDefinedFunctionSymbol(f, mangler);
}
// add data
for (Module::global_iterator v = _module->global_begin(),
e = _module->global_end(); v != e; ++v) {
- if ( v->isDeclaration() ) {
- addUndefinedSymbol(mangler.getValueName(v).c_str());
- }
- else {
- addDefinedSymbol(v, mangler, false);
- // add external symbols referenced by this data
- for (unsigned count = 0, total = v->getNumOperands();
- count != total; ++count) {
- findExternalRefs(v->getOperand(count), mangler);
- }
- }
+ if ( v->isDeclaration() )
+ addPotentialUndefinedSymbol(v, mangler);
+ else
+ addDefinedDataSymbol(v, mangler);
}
// make symbols for all undefines
it != _undefines.end(); ++it) {
// if this symbol also has a definition, then don't make an undefine
// because it is a tentative definition
- if ( _defines.find(it->getKeyData(), it->getKeyData()+it->getKeyLength()) == _defines.end() ) {
+ if ( _defines.count(it->getKeyData(), it->getKeyData()+
+ it->getKeyLength()) == 0 ) {
NameAndAttributes info;
info.name = it->getKeyData();
info.attributes = LTO_SYMBOL_DEFINITION_UNDEFINED;
_symbols.push_back(info);
}
}
-
- }
-
+ }
+}
+
+
+uint32_t LTOModule::getSymbolCount()
+{
+ lazyParseSymbols();
return _symbols.size();
}
lto_symbol_attributes LTOModule::getSymbolAttributes(uint32_t index)
{
+ lazyParseSymbols();
if ( index < _symbols.size() )
return _symbols[index].attributes;
else
const char* LTOModule::getSymbolName(uint32_t index)
{
+ lazyParseSymbols();
if ( index < _symbols.size() )
return _symbols[index].name;
else
#define LTO_MODULE_H
#include "llvm/Module.h"
-#include "llvm/GlobalValue.h"
-#include "llvm/Constants.h"
-#include "llvm/Support/Mangler.h"
+#include "llvm/ADT/OwningPtr.h"
#include "llvm/Target/TargetMachine.h"
#include "llvm/ADT/StringMap.h"
#include "llvm-c/lto.h"
#include <vector>
+#include <string>
+
+
+// forward references to llvm classes
+namespace llvm {
+ class Mangler;
+ class MemoryBuffer;
+ class GlobalValue;
+ class Value;
+ class Function;
+}
//
static LTOModule* makeLTOModule(const char* path, std::string& errMsg);
static LTOModule* makeLTOModule(const void* mem, size_t length,
std::string& errMsg);
- ~LTOModule();
const char* getTargetTriple();
uint32_t getSymbolCount();
lto_symbol_attributes getSymbolAttributes(uint32_t index);
const char* getSymbolName(uint32_t index);
- llvm::Module * getLLVVMModule() { return _module; }
- bool targetSupported() { return (_target != NULL); }
+ llvm::Module * getLLVVMModule() { return _module.get(); }
private:
LTOModule(llvm::Module* m, llvm::TargetMachine* t);
+ void lazyParseSymbols();
void addDefinedSymbol(llvm::GlobalValue* def,
llvm::Mangler& mangler,
bool isFunction);
- void addUndefinedSymbol(const char* name);
+ void addPotentialUndefinedSymbol(llvm::GlobalValue* decl,
+ llvm::Mangler &mangler);
void findExternalRefs(llvm::Value* value,
llvm::Mangler& mangler);
+ void addDefinedFunctionSymbol(llvm::Function* f,
+ llvm::Mangler &mangler);
+ void addDefinedDataSymbol(llvm::GlobalValue* v,
+ llvm::Mangler &mangler);
+ static bool isTargetMatch(llvm::MemoryBuffer* memBuffer,
+ const char* triplePrefix);
+ static LTOModule* makeLTOModule(llvm::MemoryBuffer* buffer,
+ std::string& errMsg);
+
typedef llvm::StringMap<uint8_t> StringSet;
struct NameAndAttributes {
lto_symbol_attributes attributes;
};
- llvm::Module * _module;
- llvm::TargetMachine * _target;
- bool _symbolsParsed;
- std::vector<NameAndAttributes> _symbols;
- StringSet _defines; // only needed to disambiguate tentative definitions
- StringSet _undefines; // only needed to disambiguate tentative definitions
+ llvm::OwningPtr<llvm::Module> _module;
+ llvm::OwningPtr<llvm::TargetMachine> _target;
+ bool _symbolsParsed;
+ std::vector<NameAndAttributes> _symbols;
+ // _defines and _undefines only needed to disambiguate tentative definitions
+ StringSet _defines;
+ StringSet _undefines;
};
#endif // LTO_MODULE_H
projects / oota-llvm.git / commitdiff