Commit b0b45e58 by Richard Sandiford Committed by Richard Sandiford

[03/11] Remove vect_transform_stmt grouped_store argument

Nothing now uses the grouped_store value passed back by
vect_transform_stmt, so we might as well remove it.

2018-08-01  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* tree-vectorizer.h (vect_transform_stmt): Remove grouped_store
	argument.
	* tree-vect-stmts.c (vect_transform_stmt): Likewise.
	* tree-vect-loop.c (vect_transform_loop_stmt): Update call accordingly.
	(vect_transform_loop): Likewise.
	* tree-vect-slp.c (vect_schedule_slp_instance): Likewise.

From-SVN: r263216
parent 8fe1bd30
2018-08-01 Richard Sandiford <richard.sandiford@arm.com> 2018-08-01 Richard Sandiford <richard.sandiford@arm.com>
* tree-vectorizer.h (vect_transform_stmt): Remove grouped_store
argument.
* tree-vect-stmts.c (vect_transform_stmt): Likewise.
* tree-vect-loop.c (vect_transform_loop_stmt): Update call accordingly.
(vect_transform_loop): Likewise.
* tree-vect-slp.c (vect_schedule_slp_instance): Likewise.
2018-08-01 Richard Sandiford <richard.sandiford@arm.com>
* tree-vectorizer.h (vect_schedule_slp): Return void. * tree-vectorizer.h (vect_schedule_slp): Return void.
* tree-vect-slp.c (vect_schedule_slp_instance): Likewise. * tree-vect-slp.c (vect_schedule_slp_instance): Likewise.
(vect_schedule_slp): Likewise. (vect_schedule_slp): Likewise.
......
...@@ -8243,8 +8243,7 @@ vect_transform_loop_stmt (loop_vec_info loop_vinfo, stmt_vec_info stmt_info, ...@@ -8243,8 +8243,7 @@ vect_transform_loop_stmt (loop_vec_info loop_vinfo, stmt_vec_info stmt_info,
if (dump_enabled_p ()) if (dump_enabled_p ())
dump_printf_loc (MSG_NOTE, vect_location, "transform statement.\n"); dump_printf_loc (MSG_NOTE, vect_location, "transform statement.\n");
bool grouped_store = false; if (vect_transform_stmt (stmt_info, gsi, NULL, NULL))
if (vect_transform_stmt (stmt_info, gsi, &grouped_store, NULL, NULL))
*seen_store = stmt_info; *seen_store = stmt_info;
} }
...@@ -8425,7 +8424,7 @@ vect_transform_loop (loop_vec_info loop_vinfo) ...@@ -8425,7 +8424,7 @@ vect_transform_loop (loop_vec_info loop_vinfo)
{ {
if (dump_enabled_p ()) if (dump_enabled_p ())
dump_printf_loc (MSG_NOTE, vect_location, "transform phi.\n"); dump_printf_loc (MSG_NOTE, vect_location, "transform phi.\n");
vect_transform_stmt (stmt_info, NULL, NULL, NULL, NULL); vect_transform_stmt (stmt_info, NULL, NULL, NULL);
} }
} }
......
...@@ -3853,7 +3853,6 @@ static void ...@@ -3853,7 +3853,6 @@ static void
vect_schedule_slp_instance (slp_tree node, slp_instance instance, vect_schedule_slp_instance (slp_tree node, slp_instance instance,
scalar_stmts_to_slp_tree_map_t *bst_map) scalar_stmts_to_slp_tree_map_t *bst_map)
{ {
bool grouped_store;
gimple_stmt_iterator si; gimple_stmt_iterator si;
stmt_vec_info stmt_info; stmt_vec_info stmt_info;
unsigned int group_size; unsigned int group_size;
...@@ -3945,11 +3944,11 @@ vect_schedule_slp_instance (slp_tree node, slp_instance instance, ...@@ -3945,11 +3944,11 @@ vect_schedule_slp_instance (slp_tree node, slp_instance instance,
vec<stmt_vec_info> v1; vec<stmt_vec_info> v1;
unsigned j; unsigned j;
tree tmask = NULL_TREE; tree tmask = NULL_TREE;
vect_transform_stmt (stmt_info, &si, &grouped_store, node, instance); vect_transform_stmt (stmt_info, &si, node, instance);
v0 = SLP_TREE_VEC_STMTS (node).copy (); v0 = SLP_TREE_VEC_STMTS (node).copy ();
SLP_TREE_VEC_STMTS (node).truncate (0); SLP_TREE_VEC_STMTS (node).truncate (0);
gimple_assign_set_rhs_code (stmt, ocode); gimple_assign_set_rhs_code (stmt, ocode);
vect_transform_stmt (stmt_info, &si, &grouped_store, node, instance); vect_transform_stmt (stmt_info, &si, node, instance);
gimple_assign_set_rhs_code (stmt, code0); gimple_assign_set_rhs_code (stmt, code0);
v1 = SLP_TREE_VEC_STMTS (node).copy (); v1 = SLP_TREE_VEC_STMTS (node).copy ();
SLP_TREE_VEC_STMTS (node).truncate (0); SLP_TREE_VEC_STMTS (node).truncate (0);
...@@ -3994,7 +3993,7 @@ vect_schedule_slp_instance (slp_tree node, slp_instance instance, ...@@ -3994,7 +3993,7 @@ vect_schedule_slp_instance (slp_tree node, slp_instance instance,
return; return;
} }
} }
vect_transform_stmt (stmt_info, &si, &grouped_store, node, instance); vect_transform_stmt (stmt_info, &si, node, instance);
/* Restore stmt def-types. */ /* Restore stmt def-types. */
FOR_EACH_VEC_ELT (SLP_TREE_CHILDREN (node), i, child) FOR_EACH_VEC_ELT (SLP_TREE_CHILDREN (node), i, child)
......
...@@ -9662,8 +9662,7 @@ vect_analyze_stmt (stmt_vec_info stmt_info, bool *need_to_vectorize, ...@@ -9662,8 +9662,7 @@ vect_analyze_stmt (stmt_vec_info stmt_info, bool *need_to_vectorize,
bool bool
vect_transform_stmt (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi, vect_transform_stmt (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
bool *grouped_store, slp_tree slp_node, slp_tree slp_node, slp_instance slp_node_instance)
slp_instance slp_node_instance)
{ {
vec_info *vinfo = stmt_info->vinfo; vec_info *vinfo = stmt_info->vinfo;
bool is_store = false; bool is_store = false;
...@@ -9727,7 +9726,6 @@ vect_transform_stmt (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi, ...@@ -9727,7 +9726,6 @@ vect_transform_stmt (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi,
last store in the chain is reached. Store stmts before the last last store in the chain is reached. Store stmts before the last
one are skipped, and there vec_stmt_info shouldn't be freed one are skipped, and there vec_stmt_info shouldn't be freed
meanwhile. */ meanwhile. */
*grouped_store = true;
stmt_vec_info group_info = DR_GROUP_FIRST_ELEMENT (stmt_info); stmt_vec_info group_info = DR_GROUP_FIRST_ELEMENT (stmt_info);
if (DR_GROUP_STORE_COUNT (group_info) == DR_GROUP_SIZE (group_info)) if (DR_GROUP_STORE_COUNT (group_info) == DR_GROUP_SIZE (group_info))
is_store = true; is_store = true;
......
...@@ -1459,7 +1459,7 @@ extern tree vect_init_vector (stmt_vec_info, tree, tree, ...@@ -1459,7 +1459,7 @@ extern tree vect_init_vector (stmt_vec_info, tree, tree,
gimple_stmt_iterator *); gimple_stmt_iterator *);
extern tree vect_get_vec_def_for_stmt_copy (vec_info *, tree); extern tree vect_get_vec_def_for_stmt_copy (vec_info *, tree);
extern bool vect_transform_stmt (stmt_vec_info, gimple_stmt_iterator *, extern bool vect_transform_stmt (stmt_vec_info, gimple_stmt_iterator *,
bool *, slp_tree, slp_instance); slp_tree, slp_instance);
extern void vect_remove_stores (stmt_vec_info); extern void vect_remove_stores (stmt_vec_info);
extern bool vect_analyze_stmt (stmt_vec_info, bool *, slp_tree, slp_instance, extern bool vect_analyze_stmt (stmt_vec_info, bool *, slp_tree, slp_instance,
stmt_vector_for_cost *); stmt_vector_for_cost *);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment