Feature: Merged kernel-fusion branch
* Fuses multiple AXPY kernel * Possibility to add thread-wise for loops in AXPY-like kernels
This commit is contained in:
@@ -12,19 +12,19 @@ namespace templates
|
||||
class map_functor : public traversal_functor
|
||||
{
|
||||
|
||||
numeric_type get_numeric_type(isaac::array_expression const * array_expression, size_t root_idx) const
|
||||
numeric_type get_numeric_type(isaac::math_expression const * math_expression, size_t root_idx) const
|
||||
{
|
||||
array_expression::node const * root_node = &array_expression->tree()[root_idx];
|
||||
math_expression::node const * root_node = &math_expression->tree()[root_idx];
|
||||
while (root_node->lhs.dtype==INVALID_NUMERIC_TYPE)
|
||||
root_node = &array_expression->tree()[root_node->lhs.node_index];
|
||||
root_node = &math_expression->tree()[root_node->lhs.node_index];
|
||||
return root_node->lhs.dtype;
|
||||
}
|
||||
|
||||
template<class T>
|
||||
std::shared_ptr<mapped_object> binary_leaf(isaac::array_expression const * array_expression, size_t root_idx, mapping_type const * mapping) const
|
||||
{
|
||||
return std::shared_ptr<mapped_object>(new T(to_string(array_expression->dtype()), binder_.get(), mapped_object::node_info(mapping, array_expression, root_idx)));
|
||||
}
|
||||
std::shared_ptr<mapped_object> binary_leaf(isaac::math_expression const * math_expression, size_t root_idx, mapping_type const * mapping) const
|
||||
{
|
||||
return std::shared_ptr<mapped_object>(new T(to_string(math_expression->dtype()), binder_.get(), mapped_object::node_info(mapping, math_expression, root_idx)));
|
||||
}
|
||||
|
||||
std::shared_ptr<mapped_object> create(numeric_type dtype, values_holder) const
|
||||
{
|
||||
@@ -32,10 +32,10 @@ class map_functor : public traversal_functor
|
||||
return std::shared_ptr<mapped_object>(new mapped_host_scalar(strdtype, binder_.get()));
|
||||
}
|
||||
|
||||
std::shared_ptr<mapped_object> create(array const * a) const
|
||||
std::shared_ptr<mapped_object> create(array const * a, bool is_assigned) const
|
||||
{
|
||||
std::string dtype = to_string(a->dtype());
|
||||
unsigned int id = binder_.get(a->data());
|
||||
unsigned int id = binder_.get(a->data(), is_assigned);
|
||||
//Scalar
|
||||
if(a->shape()[0]==1 && a->shape()[1]==1)
|
||||
return std::shared_ptr<mapped_object>(new mapped_array(dtype, id, 's'));
|
||||
@@ -50,19 +50,13 @@ class map_functor : public traversal_functor
|
||||
return std::shared_ptr<mapped_object>(new mapped_array(dtype, id, 'm'));
|
||||
}
|
||||
|
||||
std::shared_ptr<mapped_object> create(repeat_infos const &) const
|
||||
{
|
||||
//TODO: Make it less specific!
|
||||
return std::shared_ptr<mapped_object>(new mapped_tuple(size_type(device_),binder_.get(),4));
|
||||
}
|
||||
|
||||
std::shared_ptr<mapped_object> create(lhs_rhs_element const & lhs_rhs) const
|
||||
std::shared_ptr<mapped_object> create(lhs_rhs_element const & lhs_rhs, bool is_assigned = false) const
|
||||
{
|
||||
switch(lhs_rhs.type_family)
|
||||
{
|
||||
case INFOS_TYPE_FAMILY: return create(lhs_rhs.tuple);
|
||||
case VALUE_TYPE_FAMILY: return create(lhs_rhs.dtype, lhs_rhs.vscalar);
|
||||
case ARRAY_TYPE_FAMILY: return create(lhs_rhs.array);
|
||||
case ARRAY_TYPE_FAMILY: return create(lhs_rhs.array, is_assigned);
|
||||
case PLACEHOLDER_TYPE_FAMILY: return std::shared_ptr<mapped_object>(new mapped_placeholder(lhs_rhs.for_idx.level));
|
||||
default: throw "";
|
||||
}
|
||||
}
|
||||
@@ -74,40 +68,40 @@ public:
|
||||
{
|
||||
}
|
||||
|
||||
void operator()(isaac::array_expression const & array_expression, size_t root_idx, leaf_t leaf_t) const
|
||||
void operator()(isaac::math_expression const & math_expression, size_t root_idx, leaf_t leaf_t) const
|
||||
{
|
||||
{
|
||||
mapping_type::key_type key(root_idx, leaf_t);
|
||||
array_expression::node const & root_node = array_expression.tree()[root_idx];
|
||||
mapping_type::key_type key(root_idx, leaf_t);
|
||||
math_expression::node const & root_node = math_expression.tree()[root_idx];
|
||||
|
||||
if (leaf_t == LHS_NODE_TYPE && root_node.lhs.type_family != COMPOSITE_OPERATOR_FAMILY)
|
||||
mapping_.insert(mapping_type::value_type(key, create(root_node.lhs)));
|
||||
else if (leaf_t == RHS_NODE_TYPE && root_node.rhs.type_family != COMPOSITE_OPERATOR_FAMILY)
|
||||
mapping_.insert(mapping_type::value_type(key, create(root_node.rhs)));
|
||||
else if ( leaf_t== PARENT_NODE_TYPE)
|
||||
{
|
||||
if (root_node.op.type==OPERATOR_VDIAG_TYPE)
|
||||
mapping_.insert(mapping_type::value_type(key, binary_leaf<mapped_vdiag>(&array_expression, root_idx, &mapping_)));
|
||||
else if (root_node.op.type==OPERATOR_MATRIX_DIAG_TYPE)
|
||||
mapping_.insert(mapping_type::value_type(key, binary_leaf<mapped_matrix_diag>(&array_expression, root_idx, &mapping_)));
|
||||
else if (root_node.op.type==OPERATOR_MATRIX_ROW_TYPE)
|
||||
mapping_.insert(mapping_type::value_type(key, binary_leaf<mapped_matrix_row>(&array_expression, root_idx, &mapping_)));
|
||||
else if (root_node.op.type==OPERATOR_MATRIX_COLUMN_TYPE)
|
||||
mapping_.insert(mapping_type::value_type(key, binary_leaf<mapped_matrix_column>(&array_expression, root_idx, &mapping_)));
|
||||
else if (detail::is_scalar_dot(root_node))
|
||||
mapping_.insert(mapping_type::value_type(key, binary_leaf<mapped_scalar_dot>(&array_expression, root_idx, &mapping_)));
|
||||
else if (detail::is_vector_dot(root_node))
|
||||
mapping_.insert(mapping_type::value_type(key, binary_leaf<mapped_gemv>(&array_expression, root_idx, &mapping_)));
|
||||
else if (root_node.op.type_family == OPERATOR_GEMM_TYPE_FAMILY)
|
||||
mapping_.insert(mapping_type::value_type(key, binary_leaf<mapped_gemm>(&array_expression, root_idx, &mapping_)));
|
||||
else if (root_node.op.type == OPERATOR_REPEAT_TYPE)
|
||||
mapping_.insert(mapping_type::value_type(key, binary_leaf<mapped_repeat>(&array_expression, root_idx, &mapping_)));
|
||||
else if (root_node.op.type == OPERATOR_OUTER_PROD_TYPE)
|
||||
mapping_.insert(mapping_type::value_type(key, binary_leaf<mapped_outer>(&array_expression, root_idx, &mapping_)));
|
||||
else if (detail::is_cast(root_node.op))
|
||||
mapping_.insert(mapping_type::value_type(key, std::shared_ptr<mapped_object>(new mapped_cast(root_node.op.type, binder_.get()))));
|
||||
}
|
||||
}
|
||||
if (leaf_t == LHS_NODE_TYPE && root_node.lhs.type_family != COMPOSITE_OPERATOR_FAMILY)
|
||||
mapping_.insert(mapping_type::value_type(key, create(root_node.lhs, detail::is_assignment(root_node.op))));
|
||||
else if (leaf_t == RHS_NODE_TYPE && root_node.rhs.type_family != COMPOSITE_OPERATOR_FAMILY)
|
||||
mapping_.insert(mapping_type::value_type(key, create(root_node.rhs)));
|
||||
else if ( leaf_t== PARENT_NODE_TYPE)
|
||||
{
|
||||
if (root_node.op.type==OPERATOR_VDIAG_TYPE)
|
||||
mapping_.insert(mapping_type::value_type(key, binary_leaf<mapped_vdiag>(&math_expression, root_idx, &mapping_)));
|
||||
else if (root_node.op.type==OPERATOR_MATRIX_DIAG_TYPE)
|
||||
mapping_.insert(mapping_type::value_type(key, binary_leaf<mapped_matrix_diag>(&math_expression, root_idx, &mapping_)));
|
||||
else if (root_node.op.type==OPERATOR_MATRIX_ROW_TYPE)
|
||||
mapping_.insert(mapping_type::value_type(key, binary_leaf<mapped_matrix_row>(&math_expression, root_idx, &mapping_)));
|
||||
else if (root_node.op.type==OPERATOR_MATRIX_COLUMN_TYPE)
|
||||
mapping_.insert(mapping_type::value_type(key, binary_leaf<mapped_matrix_column>(&math_expression, root_idx, &mapping_)));
|
||||
else if(root_node.op.type==OPERATOR_ACCESS_INDEX_TYPE)
|
||||
mapping_.insert(mapping_type::value_type(key, binary_leaf<mapped_array_access>(&math_expression, root_idx, &mapping_)));
|
||||
else if (detail::is_scalar_dot(root_node))
|
||||
mapping_.insert(mapping_type::value_type(key, binary_leaf<mapped_scalar_dot>(&math_expression, root_idx, &mapping_)));
|
||||
else if (detail::is_vector_dot(root_node))
|
||||
mapping_.insert(mapping_type::value_type(key, binary_leaf<mapped_gemv>(&math_expression, root_idx, &mapping_)));
|
||||
else if (root_node.op.type_family == OPERATOR_GEMM_TYPE_FAMILY)
|
||||
mapping_.insert(mapping_type::value_type(key, binary_leaf<mapped_gemm>(&math_expression, root_idx, &mapping_)));
|
||||
else if (root_node.op.type == OPERATOR_REPEAT_TYPE)
|
||||
mapping_.insert(mapping_type::value_type(key, binary_leaf<mapped_repeat>(&math_expression, root_idx, &mapping_)));
|
||||
else if (root_node.op.type == OPERATOR_OUTER_PROD_TYPE)
|
||||
mapping_.insert(mapping_type::value_type(key, binary_leaf<mapped_outer>(&math_expression, root_idx, &mapping_)));
|
||||
else if (detail::is_cast(root_node.op))
|
||||
mapping_.insert(mapping_type::value_type(key, std::shared_ptr<mapped_object>(new mapped_cast(root_node.op.type, binder_.get()))));
|
||||
}
|
||||
}
|
||||
private:
|
||||
symbolic_binder & binder_;
|
||||
|
Reference in New Issue
Block a user