thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-21 01:00:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

CLICKHOUSE-3800:Add if's for old llvm version

Browse Source
This commit is contained in:
Alexander Sapin 2018-09-06 12:10:40 +03:00
parent 16eaeefc6e
commit 3cbcd23a17
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dbms/src/Interpreters/ExpressionJIT.cpp
View File

@ -163,6 +163,7 @@ auto wrapJITSymbolResolver(llvm::JITSymbolResolver & jsr)
} }
#endif #endif
#if LLVM_VERSION_MAJOR >= 6
struct CountingMMapper final : public llvm::SectionMemoryManager::MemoryMapper struct CountingMMapper final : public llvm::SectionMemoryManager::MemoryMapper
{ {
MemoryTracker memory_tracker{VariableContext::Global}; MemoryTracker memory_tracker{VariableContext::Global};
@ -188,6 +189,7 @@ struct CountingMMapper final : public llvm::SectionMemoryManager::MemoryMapper
return llvm::sys::Memory::releaseMappedMemory(block); return llvm::sys::Memory::releaseMappedMemory(block);
} }
}; };
#endif
struct LLVMContext struct LLVMContext
{ {
@ -200,7 +202,9 @@ struct LLVMContext
std::shared_ptr<llvm::Module> module; std::shared_ptr<llvm::Module> module;
#endif #endif
std::unique_ptr<llvm::TargetMachine> machine; std::unique_ptr<llvm::TargetMachine> machine;
#if LLVM_VERSION_MAJOR >= 6
std::unique_ptr<CountingMMapper> memory_mapper; std::unique_ptr<CountingMMapper> memory_mapper;
#endif
std::shared_ptr<llvm::SectionMemoryManager> memory_manager; std::shared_ptr<llvm::SectionMemoryManager> memory_manager;
llvm::orc::RTDyldObjectLinkingLayer object_layer; llvm::orc::RTDyldObjectLinkingLayer object_layer;
llvm::orc::IRCompileLayer<decltype(object_layer), llvm::orc::SimpleCompiler> compile_layer; llvm::orc::IRCompileLayer<decltype(object_layer), llvm::orc::SimpleCompiler> compile_layer;
@ -216,8 +220,13 @@ struct LLVMContext
: module(std::make_shared<llvm::Module>("jit", context)) : module(std::make_shared<llvm::Module>("jit", context))
#endif #endif
, machine(getNativeMachine()) , machine(getNativeMachine())
#if LLVM_VERSION_MAJOR >= 6
, memory_mapper(std::make_unique<CountingMMapper>()) , memory_mapper(std::make_unique<CountingMMapper>())
, memory_manager(std::make_shared<llvm::SectionMemoryManager>(memory_mapper.get())) , memory_manager(std::make_shared<llvm::SectionMemoryManager>(memory_mapper.get()))
#else
, memory_manager(std::make_shared<llvm::SectionMemoryManager>())
#endif
#if LLVM_VERSION_MAJOR >= 7 #if LLVM_VERSION_MAJOR >= 7
, object_layer(execution_session, [this](llvm::orc::VModuleKey) , object_layer(execution_session, [this](llvm::orc::VModuleKey)
{ {
@ -569,6 +578,8 @@ static bool isCompilable(llvm::IRBuilderBase & builder, const IFunctionBase & fu
size_t CompiledExpressionCache::weight() const size_t CompiledExpressionCache::weight() const
{ {
#if LLVM_VERSION_MAJOR >= 6
std::lock_guard<std::mutex> lock(mutex); std::lock_guard<std::mutex> lock(mutex);
size_t result{0}; size_t result{0};
std::unordered_set<size_t> seen; std::unordered_set<size_t> seen;
@ -582,6 +593,9 @@ size_t CompiledExpressionCache::weight() const
} }
} }
return result; return result;
#else
return Base::weight();
#endif
} }
void compileFunctions(ExpressionActions::Actions & actions, const Names & output_columns, const Block & sample_block, std::shared_ptr<CompiledExpressionCache> compilation_cache) void compileFunctions(ExpressionActions::Actions & actions, const Names & output_columns, const Block & sample_block, std::shared_ptr<CompiledExpressionCache> compilation_cache)