OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ignore ignored operands in vect_get_and_check_slp_defs

Browse Source 
This passes down skip_args to vect_get_and_check_slp_defs to skip
ignored ops there, too and not fail SLP discovery.  This fixes
gcc.target/aarch64/sve/reduc_strict_5.c

2020-10-28  Richard Biener  <rguenther@suse.de>

	* tree-vect-slp.c (vect_get_and_check_slp_defs): For skipped
	args just push NULLs and vect_uninitialized_def.
	(vect_build_slp_tree_2): Allocate skip_args for all ops
	and pass it down to vect_get_and_check_slp_defs.
This commit is contained in:
Richard Biener 2020-10-28 15:07:02 +01:00
parent a4b9620d56
commit 6f62d8dd33
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gcc/tree-vect-slp.c
View File

@ -413,6 +413,7 @@ vect_def_types_match (enum vect_def_type dta, enum vect_def_type dtb)
ok return 0. */
static int
vect_get_and_check_slp_defs (vec_info *vinfo, unsigned char swap,
bool *skip_args,
vec<stmt_vec_info> stmts, unsigned stmt_num,
vec<slp_oprnd_info> *oprnds_info)
{
@ -507,6 +508,14 @@ vect_get_and_check_slp_defs (vec_info *vinfo, unsigned char swap,
return -1;
}
if (skip_args[i])
{
oprnd_info->def_stmts.quick_push (NULL);
oprnd_info->ops.quick_push (NULL_TREE);
oprnd_info->first_dt = vect_uninitialized_def;
continue;
}
if (def_stmt_info && is_pattern_stmt_p (def_stmt_info))
oprnd_info->any_pattern = true;
@ -589,6 +598,12 @@ vect_get_and_check_slp_defs (vec_info *vinfo, unsigned char swap,
/* Now match the operand definition types to that of the first stmt. */
for (i = 0; i < number_of_oprnds;)
{
if (skip_args[i])
{
++i;
continue;
}
oprnd_info = (*oprnds_info)[i];
dt = dts[i];
stmt_vec_info def_stmt_info = oprnd_info->def_stmts[stmt_num];
@ -1412,7 +1427,8 @@ vect_build_slp_tree_2 (vec_info *vinfo, slp_tree node,
/* If the SLP node is a PHI (induction or reduction), terminate
the recursion. */
bool skip_args[2] = { false, false };
bool *skip_args = XALLOCAVEC (bool, nops);
memset (skip_args, 0, nops);
if (loop_vec_info loop_vinfo = dyn_cast <loop_vec_info> (vinfo))
if (gphi *stmt = dyn_cast <gphi *> (stmt_info->stmt))
{
@ -1557,7 +1573,7 @@ vect_build_slp_tree_2 (vec_info *vinfo, slp_tree node,
slp_oprnd_info oprnd_info;
FOR_EACH_VEC_ELT (stmts, i, stmt_info)
{
int res = vect_get_and_check_slp_defs (vinfo, swap[i],
int res = vect_get_and_check_slp_defs (vinfo, swap[i], skip_args,
stmts, i, &oprnds_info);
if (res != 0)
matches[(res == -1) ? 0 : i] = false;
@ -1582,6 +1598,14 @@ vect_build_slp_tree_2 (vec_info *vinfo, slp_tree node,
slp_tree child;
unsigned int j;
/* We're skipping certain operands from processing, for example
outer loop reduction initial defs. */
if (skip_args[i])
{
children.safe_push (NULL);
continue;
}
if (oprnd_info->first_dt == vect_uninitialized_def)
{
/* COND_EXPR have one too many eventually if the condition
@ -1590,14 +1614,6 @@ vect_build_slp_tree_2 (vec_info *vinfo, slp_tree node,
continue;
}
/* We're skipping certain operands from processing, for example
outer loop reduction initial defs. */
if (i <= 1 && skip_args[i])
{
children.safe_push (NULL);
continue;
}
if (is_a <bb_vec_info> (vinfo)
&& oprnd_info->first_dt == vect_internal_def
&& !oprnd_info->any_pattern)