thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-18 21:51:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update complie expressions.

Browse Source
This commit is contained in:
Nikolai Kochetov 2020-11-05 21:08:23 +03:00
parent 46e0a53d82
commit b2155c55ff
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Interpreters/ExpressionJIT.cpp
View File

@ -596,7 +596,10 @@ static bool isCompilableFunction(const ActionsDAG::Node & node)
return node.type == ActionsDAG::Type::FUNCTION && isCompilable(*node.function_base);
}
static LLVMFunction::CompileDAG getCompilableDAG(ActionsDAG::Node * root, std::vector<ActionsDAG::Node *> & children)
static LLVMFunction::CompileDAG getCompilableDAG(
ActionsDAG::Node * root,
std::vector<ActionsDAG::Node *> & children,
const std::unordered_set<const ActionsDAG::Node *> & used_in_result)
{
LLVMFunction::CompileDAG dag;
@ -614,7 +617,7 @@ static LLVMFunction::CompileDAG getCompilableDAG(ActionsDAG::Node * root, std::v
{
auto & frame = stack.top();
bool is_const = isCompilableConstant(*frame.node);
bool is_compilable_function = !is_const && isCompilableFunction(*frame.node);
bool is_compilable_function = !is_const && !used_in_result.count(frame.node) && isCompilableFunction(*frame.node);
while (is_compilable_function && frame.next_child_to_visit < frame.node->children.size())
{
@ -623,7 +626,10 @@ static LLVMFunction::CompileDAG getCompilableDAG(ActionsDAG::Node * root, std::v
if (positions.count(child))
++frame.next_child_to_visit;
else
{
stack.emplace(Frame{.node = child});
break;
}
}
if (!is_compilable_function || frame.next_child_to_visit == frame.node->children.size())
@ -788,13 +794,13 @@ void ActionsDAG::compileFunctions()
{
struct Data
{
bool used_in_result = false;
bool is_compilable = false;
bool all_parents_compilable = false;
size_t num_inlineable_nodes = 0;
};
std::unordered_map<const Node *, Data> data;
std::unordered_set<const Node *> used_in_result;
for (const auto & node : nodes)
data[&node].is_compilable = isCompilableConstant(node) || isCompilableFunction(node);
@ -805,7 +811,7 @@ void ActionsDAG::compileFunctions()
data[child].all_parents_compilable = false;
for (const auto * node : index)
data[node].used_in_result = true;
used_in_result.insert(node);
struct Frame
{
@ -833,7 +839,10 @@ void ActionsDAG::compileFunctions()
if (visited.count(child))
++frame.next_child_to_visit;
else
{
stack.emplace(Frame{.node = child});
break;
}
}
if (frame.next_child_to_visit == frame.node->children.size())
@ -842,14 +851,17 @@ void ActionsDAG::compileFunctions()
if (cur.is_compilable)
{
cur.num_inlineable_nodes = 1;
for (const auto * child : frame.node->children)
cur.num_inlineable_nodes += data[child].num_inlineable_nodes;
if (!isCompilableConstant(*frame.node))
for (const auto * child : frame.node->children)
if (!used_in_result.count(child))
cur.num_inlineable_nodes += data[child].num_inlineable_nodes;
/// Check if we should inline current node.
bool should_compile = true;
/// Inline parents instead of node is possible.
if (!cur.used_in_result && cur.all_parents_compilable)
if (!used_in_result.count(frame.node) && cur.all_parents_compilable)
should_compile = false;
/// There is not reason to inline single node.