From: rguenth Date: Wed, 25 Nov 2015 08:53:22 +0000 (+0000) Subject: 2015-11-25 Richard Biener X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3dee266192a3a797afc5b2964199c7c5b5e6eae;p=thirdparty%2Fgcc.git 2015-11-25 Richard Biener PR tree-optimization/68492 * tree-vect-slp.c (vect_build_slp_tree): Consistently build up op from scalars after operand swapping. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230855 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 362f21f1a9ca..28def7d3e3a3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2015-11-25 Richard Biener + + PR tree-optimization/68492 + * tree-vect-slp.c (vect_build_slp_tree): Consistently build up + op from scalars after operand swapping. + 2015-11-25 Richard Biener PR tree-optimization/68502 diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c index 446ef9840642..320248cff1c3 100644 --- a/gcc/tree-vect-slp.c +++ b/gcc/tree-vect-slp.c @@ -1078,6 +1078,35 @@ vect_build_slp_tree (vec_info *vinfo, tem, npermutes, &this_tree_size, max_tree_size)) { + /* If we have all children of child built up from scalars then + just throw that away and build it up this node from scalars. */ + if (!SLP_TREE_CHILDREN (child).is_empty ()) + { + unsigned int j; + slp_tree grandchild; + + FOR_EACH_VEC_ELT (SLP_TREE_CHILDREN (child), j, grandchild) + if (grandchild != NULL) + break; + if (!grandchild) + { + /* Roll back. */ + *max_nunits = old_max_nunits; + loads->truncate (old_nloads); + FOR_EACH_VEC_ELT (SLP_TREE_CHILDREN (child), j, grandchild) + vect_free_slp_tree (grandchild); + SLP_TREE_CHILDREN (child).truncate (0); + + dump_printf_loc (MSG_NOTE, vect_location, + "Building parent vector operands from " + "scalars instead\n"); + oprnd_info->def_stmts = vNULL; + vect_free_slp_tree (child); + SLP_TREE_CHILDREN (*node).quick_push (NULL); + continue; + } + } + /* ... so if successful we can apply the operand swapping to the GIMPLE IL. This is necessary because for example vect_get_slp_defs uses operand indexes and thus expects