procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tree-vect-slp.c (vect_detect_hybrid_slp_stmts): Add assertion.

Browse source 
2019-11-25  Richard Biener  <rguenther@suse.de>

	* tree-vect-slp.c (vect_detect_hybrid_slp_stmts): Add assertion.
	(vect_detect_hybrid_slp): Swap lane and instance iteration,
	properly re-building the visited hash-map for each lane.

From-SVN: r278679
This commit is contained in:
Richard Biener 2019-11-25 11:38:37 +00:00 • committed by Richard Biener
parent 6349e4f04c
commit c6aef8d800
2 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/ChangeLog
View file

@ -1,3 +1,9 @@
2019-11-25 Richard Biener <rguenther@suse.de>
* tree-vect-slp.c (vect_detect_hybrid_slp_stmts): Add assertion.
(vect_detect_hybrid_slp): Swap lane and instance iteration,
properly re-building the visited hash-map for each lane.
2019-11-25 Tobias Burnus <tobias@codesourcery.com>
* config/gcn/gcn.c (gcn_expand_scalar_to_vector_address,

21
gcc/tree-vect-slp.c
View file

@ -2542,7 +2542,9 @@ vect_detect_hybrid_slp_stmts (slp_tree node, unsigned i, slp_vect_type stype,
/* We need to union stype over the incoming graph edges but we still
want to limit recursion to stay O(N+E). */
bool only_edge = (++visited.get_or_insert (node) < node->refcnt);
unsigned visited_cnt = ++visited.get_or_insert (node);
gcc_assert (visited_cnt <= node->refcnt);
bool only_edge = (visited_cnt != node->refcnt);
/* Propagate hybrid down the SLP tree. */
if (stype == hybrid)
@ -2680,12 +2682,19 @@ vect_detect_hybrid_slp (loop_vec_info loop_vinfo)
/* Then walk the SLP instance trees marking stmts with uses in
non-SLP stmts as hybrid, also propagating hybrid down the
SLP tree, collecting the above info on-the-fly. */
hash_map<slp_tree, unsigned> visited;
FOR_EACH_VEC_ELT (slp_instances, i, instance)
for (unsigned j = 0;; ++j)
{
for (unsigned i = 0; i < SLP_INSTANCE_GROUP_SIZE (instance); ++i)
vect_detect_hybrid_slp_stmts (SLP_INSTANCE_TREE (instance),
i, pure_slp, visited);
hash_map<slp_tree, unsigned> visited;
bool any = false;
FOR_EACH_VEC_ELT (slp_instances, i, instance)
if (j < SLP_INSTANCE_GROUP_SIZE (instance))
{
any = true;
vect_detect_hybrid_slp_stmts (SLP_INSTANCE_TREE (instance),
j, pure_slp, visited);
}
if (!any)
break;
}
}