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

Fixed tests

Browse Source
This commit is contained in:
Maksim Kita 2021-04-30 14:18:27 +03:00
parent 231433d951
commit 69fdcdcc4a
2 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/Interpreters/ExpressionJIT.cpp
View File

@ -112,23 +112,18 @@ public:
bool useDefaultImplementationForConstants() const override { return true; } bool useDefaultImplementationForConstants() const override { return true; }
ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t block_size) const override ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
{ {
// std::cerr << "LLVMExecutableFunction::execute" << std::endl;
// for (const auto & argument : arguments)
// std::cerr << argument.name << " " << argument.type->getName() << std::endl;
auto col_res = result_type->createColumn(); auto col_res = result_type->createColumn();
if (block_size) if (input_rows_count)
{ {
if (!castToEitherWithNullable< if (!castToEitherWithNullable<
ColumnUInt8, ColumnUInt16, ColumnUInt32, ColumnUInt64, ColumnUInt8, ColumnUInt16, ColumnUInt32, ColumnUInt64,
ColumnInt8, ColumnInt16, ColumnInt32, ColumnInt64, ColumnInt8, ColumnInt16, ColumnInt32, ColumnInt64,
ColumnFloat32, ColumnFloat64>(col_res.get())) ColumnFloat32, ColumnFloat64>(col_res.get()))
throw Exception("Unexpected column in LLVMExecutableFunction: " + col_res->getName(), ErrorCodes::LOGICAL_ERROR); throw Exception("Unexpected column in LLVMExecutableFunction: " + col_res->getName(), ErrorCodes::LOGICAL_ERROR);
col_res = col_res->cloneResized(block_size); col_res = col_res->cloneResized(input_rows_count);
std::vector<ColumnData> columns(arguments.size() + 1); std::vector<ColumnData> columns(arguments.size() + 1);
for (size_t i = 0; i < arguments.size(); ++i) for (size_t i = 0; i < arguments.size(); ++i)
{ {
@ -138,7 +133,7 @@ public:
columns[i] = getColumnData(column); columns[i] = getColumnData(column);
} }
columns[arguments.size()] = getColumnData(col_res.get()); columns[arguments.size()] = getColumnData(col_res.get());
reinterpret_cast<void (*) (size_t, ColumnData *)>(function)(block_size, columns.data()); reinterpret_cast<void (*) (size_t, ColumnData *)>(function)(input_rows_count, columns.data());
/// Memory sanitizer don't know about stores from JIT-ed code. /// Memory sanitizer don't know about stores from JIT-ed code.
/// But maybe we can generate this code with MSan instrumentation? /// But maybe we can generate this code with MSan instrumentation?
@ -703,39 +698,40 @@ void ActionsDAG::compileFunctions(size_t min_count_to_compile_expression)
if (should_compile) if (should_compile)
{ {
// std::cerr << "ActionsDAG::should compileFunction " << frame.node->result_name; for (const auto * child_node : frame.node->children)
// std::cerr << " children size " << frame.node->children.size() << std::endl; std::cerr << child_node->result_name << std::endl;
// for (const auto * child_node : frame.node->children)
// std::cerr << child_node->result_name << std::endl;
NodeRawConstPtrs new_children; NodeRawConstPtrs new_children;
auto dag = getCompilableDAG(frame.node, new_children, used_in_result); auto dag = getCompilableDAG(frame.node, new_children, used_in_result);
// std::cerr << "ActionsDAG::new children size " << new_children.size() << std::endl; bool all_constants = true;
// for (const auto * child_node : new_children)
// std::cerr << child_node->result_name << std::endl;
// std::cerr << "DAG dump " << dag.dump() << std::endl; for (const auto & compiled_node : dag)
{
if (compiled_node.type == LLVMFunction::CompileNode::NodeType::INPUT)
{
all_constants = false;
break;
}
}
if (!all_constants)
{
if (auto fn = compile(dag, min_count_to_compile_expression)) if (auto fn = compile(dag, min_count_to_compile_expression))
{ {
/// Replace current node to compilable function.
ColumnsWithTypeAndName arguments; ColumnsWithTypeAndName arguments;
arguments.reserve(new_children.size()); arguments.reserve(new_children.size());
for (const auto * child : new_children) for (const auto * child : new_children)
arguments.emplace_back(child->column, child->result_type, child->result_name); arguments.emplace_back(child->column, child->result_type, child->result_name);
// std::cerr << "Compile node arguments " << arguments.size() << std::endl;
auto * frame_node = const_cast<Node *>(frame.node); auto * frame_node = const_cast<Node *>(frame.node);
frame_node->type = ActionsDAG::ActionType::FUNCTION; frame_node->type = ActionsDAG::ActionType::FUNCTION;
frame_node->function_base = fn; frame_node->function_base = fn;
frame_node->function = fn->prepare(arguments); frame_node->function = fn->prepare(arguments);
frame_node->children.swap(new_children); frame_node->children.swap(new_children);
frame_node->is_function_compiled = true; frame_node->is_function_compiled = true;
frame_node->column = nullptr; /// Just in case. frame_node->column = nullptr;
}
} }
} }
} }

3
src/Interpreters/JIT/CHJIT.cpp
View File

@ -147,6 +147,9 @@ CHJIT::CHJIT()
, compiler(std::make_unique<JITCompiler>(*machine)) , compiler(std::make_unique<JITCompiler>(*machine))
, symbol_resolver(std::make_unique<JITSymbolResolver>()) , symbol_resolver(std::make_unique<JITSymbolResolver>())
{ {
symbol_resolver->registerSymbol("memset", reinterpret_cast<void *>(&memset));
symbol_resolver->registerSymbol("memcpy", reinterpret_cast<void *>(&memcpy));
symbol_resolver->registerSymbol("memcmp", reinterpret_cast<void *>(&memcmp));
} }
CHJIT::~CHJIT() = default; CHJIT::~CHJIT() = default;