thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 15:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tweak the jit compilation API to be more amenable to lazy computation

Browse Source
This commit is contained in:
pyos 2018-04-24 21:10:22 +03:00
parent b2077a466a
commit df2d2e0b25
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbms/src/Functions/FunctionsLLVMTest.cpp
View File

@ -32,8 +32,8 @@ public:
llvm::Value * compile(llvm::IRBuilderBase & builder, const DataTypes & types, const ValuePlaceholders & values) const override
{
if (types[0]->equals(DataTypeFloat32{}) || types[0]->equals(DataTypeFloat64{}))
return static_cast<llvm::IRBuilder<>&>(builder).CreateFAdd(values[0], values[1]);
return static_cast<llvm::IRBuilder<>&>(builder).CreateAdd(values[0], values[1]);
return static_cast<llvm::IRBuilder<>&>(builder).CreateFAdd(values[0](), values[1]());
return static_cast<llvm::IRBuilder<>&>(builder).CreateAdd(values[0](), values[1]());
}
//#endif

2
dbms/src/Functions/IFunction.h
View File

@ -76,7 +76,7 @@ private:
bool defaultImplementationForConstantArguments(Block & block, const ColumnNumbers & args, size_t result);
};
using ValuePlaceholders = std::vector<llvm::Value *>;
using ValuePlaceholders = std::vector<std::function<llvm::Value * ()>>;
/// Function with known arguments and return type.
class IFunctionBase

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

@ -170,7 +170,7 @@ LLVMFunction::LLVMFunction(ExpressionActions::Actions actions_, LLVMContext cont
context->builder.CreateBr(loop); // assume nonzero initial value in `counter`
context->builder.SetInsertPoint(loop);
std::unordered_map<std::string, llvm::Value *> by_name;
std::unordered_map<std::string, std::function<llvm::Value * ()>> by_name;
std::vector<llvm::PHINode *> phi(inputs_v.size());
for (size_t i = 0; i < inputs_v.size(); i++)
{
@ -183,7 +183,7 @@ LLVMFunction::LLVMFunction(ExpressionActions::Actions actions_, LLVMContext cont
counter_phi->addIncoming(counter, entry);
for (size_t i = 0; i < phi.size(); i++)
if (!by_name.emplace(arg_names[i], context->builder.CreateLoad(phi[i])).second)
if (!by_name.emplace(arg_names[i], [&, i]() { return context->builder.CreateLoad(phi[i]); }).second)
throw Exception("duplicate input column name", ErrorCodes::LOGICAL_ERROR);
for (const auto & action : actions)
{
@ -191,15 +191,20 @@ LLVMFunction::LLVMFunction(ExpressionActions::Actions actions_, LLVMContext cont
action_input.reserve(action.argument_names.size());
for (const auto & name : action.argument_names)
action_input.push_back(by_name.at(name));
if (!by_name.emplace(action.result_name, action.function->compile(context->builder, action_input)).second)
auto generator = [&action, &context, action_input{std::move(action_input)}]()
{
return action.function->compile(context->builder, action_input);
};
if (!by_name.emplace(action.result_name, std::move(generator)).second)
throw Exception("duplicate action result name", ErrorCodes::LOGICAL_ERROR);
}
context->builder.CreateStore(by_name.at(actions.back().result_name), output_phi);
context->builder.CreateStore(by_name.at(actions.back().result_name)(), output_phi);
auto * cur_block = context->builder.GetInsertBlock();
for (size_t i = 0; i < phi.size(); i++)
phi[i]->addIncoming(context->builder.CreateGEP(phi[i], deltas_v[i]), loop);
output_phi->addIncoming(context->builder.CreateConstGEP1_32(output_phi, 1), loop);
counter_phi->addIncoming(context->builder.CreateSub(counter_phi, llvm::ConstantInt::get(counter_phi->getType(), 1)), loop);
phi[i]->addIncoming(context->builder.CreateGEP(phi[i], deltas_v[i]), cur_block);
output_phi->addIncoming(context->builder.CreateConstGEP1_32(output_phi, 1), cur_block);
counter_phi->addIncoming(context->builder.CreateSub(counter_phi, llvm::ConstantInt::get(counter_phi->getType(), 1)), cur_block);
auto * end = llvm::BasicBlock::Create(context->context, "end", func);
context->builder.CreateCondBr(context->builder.CreateICmpNE(counter_phi, llvm::ConstantInt::get(counter_phi->getType(), 1)), loop, end);