forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-22 04:36:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Using llvm::ExecutionEngine::getFunctionAddress() instead of getPointerToFunction(). Cleanups.

Browse source
This commit is contained in:
Paweł Bylica 2014-12-17 15:38:33 +01:00
parent dd63bb30eb
commit a4927609d7
2 changed files with 13 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libevmjit/Cache.h
View file

@ -16,12 +16,11 @@ class ExecBundle
{ {
public: public:
std::unique_ptr<llvm::ExecutionEngine> engine; std::unique_ptr<llvm::ExecutionEngine> engine;
llvm::Function* entryFunc = nullptr;
ExecBundle() = default; ExecBundle() = default;
ExecBundle(ExecBundle&& _other): ExecBundle(ExecBundle&& _other):
engine(std::move(_other.engine)), engine(std::move(_other.engine))
entryFunc(_other.entryFunc) {} {}
ExecBundle(ExecBundle const&) = delete; ExecBundle(ExecBundle const&) = delete;
void operator=(ExecBundle) = delete; void operator=(ExecBundle) = delete;

29
libevmjit/ExecutionEngine.cpp
View file

@ -53,23 +53,15 @@ ReturnCode ExecutionEngine::run(std::unique_ptr<llvm::Module> _module, RuntimeDa
static const auto program = "EVM JIT"; static const auto program = "EVM JIT";
llvm::PrettyStackTraceProgram X(1, &program); llvm::PrettyStackTraceProgram X(1, &program);
auto&& context = llvm::getGlobalContext();
llvm::InitializeNativeTarget(); llvm::InitializeNativeTarget();
llvm::InitializeNativeTargetAsmPrinter(); llvm::InitializeNativeTargetAsmPrinter();
llvm::InitializeNativeTargetAsmParser(); llvm::InitializeNativeTargetAsmParser();
std::string errorMsg;
llvm::EngineBuilder builder(module); llvm::EngineBuilder builder(module);
//builder.setMArch(MArch);
//builder.setMCPU(MCPU);
//builder.setMAttrs(MAttrs);
//builder.setRelocationModel(RelocModel);
//builder.setCodeModel(CMModel);
builder.setErrorStr(&errorMsg);
builder.setEngineKind(llvm::EngineKind::JIT); builder.setEngineKind(llvm::EngineKind::JIT);
builder.setUseMCJIT(true); builder.setUseMCJIT(true);
builder.setMCJITMemoryManager(new llvm::SectionMemoryManager()); std::unique_ptr<llvm::SectionMemoryManager> memoryManager(new llvm::SectionMemoryManager);
builder.setMCJITMemoryManager(memoryManager.get());
builder.setOptLevel(llvm::CodeGenOpt::None); builder.setOptLevel(llvm::CodeGenOpt::None);
auto triple = llvm::Triple(llvm::sys::getProcessTriple()); auto triple = llvm::Triple(llvm::sys::getProcessTriple());
@ -82,18 +74,16 @@ ReturnCode ExecutionEngine::run(std::unique_ptr<llvm::Module> _module, RuntimeDa
if (!exec.engine) if (!exec.engine)
return ReturnCode::LLVMConfigError; return ReturnCode::LLVMConfigError;
_module.release(); // Successfully created llvm::ExecutionEngine takes ownership of the module _module.release(); // Successfully created llvm::ExecutionEngine takes ownership of the module
memoryManager.release(); // and memory manager
auto finalizationStartTime = std::chrono::high_resolution_clock::now(); // TODO: Finalization not needed when llvm::ExecutionEngine::getFunctionAddress used
exec.engine->finalizeObject(); //auto finalizationStartTime = std::chrono::high_resolution_clock::now();
auto finalizationEndTime = std::chrono::high_resolution_clock::now(); //exec.engine->finalizeObject();
clog(JIT) << " + " << std::chrono::duration_cast<std::chrono::milliseconds>(finalizationEndTime - finalizationStartTime).count(); //auto finalizationEndTime = std::chrono::high_resolution_clock::now();
//clog(JIT) << " + " << std::chrono::duration_cast<std::chrono::milliseconds>(finalizationEndTime - finalizationStartTime).count();
auto executionStartTime = std::chrono::high_resolution_clock::now(); auto executionStartTime = std::chrono::high_resolution_clock::now();
exec.entryFunc = module->getFunction("main");
if (!exec.entryFunc)
return ReturnCode::LLVMLinkError;
std::string key{reinterpret_cast<char const*>(_code.data()), _code.size()}; std::string key{reinterpret_cast<char const*>(_code.data()), _code.size()};
//auto& cachedExec = Cache::registerExec(key, std::move(exec)); //auto& cachedExec = Cache::registerExec(key, std::move(exec));
auto returnCode = run(exec, _data, _env); auto returnCode = run(exec, _data, _env);
@ -120,8 +110,7 @@ ReturnCode runEntryFunc(ExecBundle const& _exec, Runtime* _runtime)
// to allow function to be executed. // to allow function to be executed.
// That might be related to memory manager. Can we share one? // That might be related to memory manager. Can we share one?
typedef ReturnCode(*EntryFuncPtr)(Runtime*); typedef ReturnCode(*EntryFuncPtr)(Runtime*);
auto entryFuncVoidPtr = _exec.engine->getPointerToFunction(_exec.entryFunc); auto entryFuncPtr = (EntryFuncPtr)_exec.engine->getFunctionAddress("main");
auto entryFuncPtr = static_cast<EntryFuncPtr>(entryFuncVoidPtr);
ReturnCode returnCode{}; ReturnCode returnCode{};
auto sj = setjmp(_runtime->getJmpBuf()); auto sj = setjmp(_runtime->getJmpBuf());