forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-21 20:26:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Clean up ExecutionEngine

Browse source
This commit is contained in:
Paweł Bylica 2014-12-31 13:54:43 +01:00
parent ece7fe7782
commit de024259c2
1 changed files with 10 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
libevmjit/ExecutionEngine.cpp
View file

@ -35,12 +35,6 @@ namespace jit
ReturnCode ExecutionEngine::run(bytes const& _code, RuntimeData* _data, Env* _env)
{
std::string key{reinterpret_cast<char const*>(_code.data()), _code.size()};
/*if (auto cachedExec = Cache::findExec(key))
{
return run(*cachedExec, _data, _env);
}*/
auto module = Compiler({}).compile(_code);
//module->dump();
return run(std::move(module), _data, _env, _code);
@ -77,10 +71,12 @@ ReturnCode ExecutionEngine::run(std::unique_ptr<llvm::Module> _module, RuntimeDa
static std::unique_ptr<llvm::ExecutionEngine> ee; // TODO: Use Managed Objects from LLVM?
typedef ReturnCode(*EntryFuncPtr)(Runtime*);
EntryFuncPtr entryFuncPtr{};
Runtime runtime(_data, _env);
auto&& mainFuncName = _module->getModuleIdentifier();
if (!ee)
@ -108,47 +104,29 @@ ReturnCode ExecutionEngine::run(std::unique_ptr<llvm::Module> _module, RuntimeDa
memoryManager.release(); // and memory manager
//ee->setObjectCache(Cache::getObjectCache());
entryFuncPtr = (EntryFuncPtr)ee->getFunctionAddress(mainFuncName);
}
else
{
if (entryFuncPtr = (EntryFuncPtr)ee->getFunctionAddress(_module->getModuleIdentifier()))
{
entryFuncPtr = nullptr;
}
else
entryFuncPtr = (EntryFuncPtr)ee->getFunctionAddress(mainFuncName);
if (!entryFuncPtr)
{
ee->addModule(_module.get());
//std::cerr << _module->getModuleIdentifier() << "\n";
_module.release();
entryFuncPtr = (EntryFuncPtr)ee->getFunctionAddress(mainFuncName);
}
}
assert(entryFuncPtr);
assert(ee);
//ExecBundle exec;
//exec.engine.reset(builder.create());
//if (!exec.engine)
// return ReturnCode::LLVMConfigError;
// TODO: Finalization not needed when llvm::ExecutionEngine::getFunctionAddress used
//auto finalizationStartTime = std::chrono::high_resolution_clock::now();
//exec.engine->finalizeObject();
//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();
std::string key{reinterpret_cast<char const*>(_code.data()), _code.size()};
//auto& cachedExec = Cache::registerExec(key, std::move(exec));
Runtime runtime(_data, _env);
auto mainFunc = (EntryFuncPtr)ee->getFunctionAddress(mainFuncName);
auto returnCode = runEntryFunc(mainFunc, &runtime);
//auto mainFunc = (EntryFuncPtr)ee->getFunctionAddress(mainFuncName);
auto returnCode = runEntryFunc(entryFuncPtr, &runtime);
if (returnCode == ReturnCode::Return)
this->returnData = runtime.getReturnData();
auto executionEndTime = std::chrono::high_resolution_clock::now();
clog(JIT) << " + " << std::chrono::duration_cast<std::chrono::milliseconds>(executionEndTime - executionStartTime).count() << " ms ";
//clog(JIT) << "Max stack size: " << Stack::maxStackSize;
clog(JIT) << "\n";