aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorRichard Sandiford <richard.sandiford@arm.com>2019-11-20 21:15:54 +0000
committerRichard Sandiford <rsandifo@gcc.gnu.org>2019-11-20 21:15:54 +0000
commit0f6e9b2946bfde1086263f4457ef9f11b0edded3 (patch)
treef42b1facd139ac6240d204e095aec25049c6a5d7 /gcc
parent28cebdb178ecfad17726711c78e1aa669cb5393c (diff)
downloadgcc-0f6e9b2946bfde1086263f4457ef9f11b0edded3.zip
gcc-0f6e9b2946bfde1086263f4457ef9f11b0edded3.tar.gz
gcc-0f6e9b2946bfde1086263f4457ef9f11b0edded3.tar.bz2
Restore stmt def types after scheduling two-operation SLP
2019-11-20 Richard Sandiford <richard.sandiford@arm.com> gcc/ * tree-vect-slp.c (vect_schedule_slp_instance): Restore stmt def types for two-operation SLP. From-SVN: r278533
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/tree-vect-slp.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3ddaa8a..cf06e3a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
2019-11-20 Richard Sandiford <richard.sandiford@arm.com>
+ * tree-vect-slp.c (vect_schedule_slp_instance): Restore stmt
+ def types for two-operation SLP.
+
+2019-11-20 Richard Sandiford <richard.sandiford@arm.com>
+
PR testsuite/92366
* doc/sourcebuild.texi (vect_char_add): Document.
diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c
index 36ea0b1..dfbde1a 100644
--- a/gcc/tree-vect-slp.c
+++ b/gcc/tree-vect-slp.c
@@ -4153,6 +4153,7 @@ vect_schedule_slp_instance (slp_tree node, slp_instance instance)
/* Handle two-operation SLP nodes by vectorizing the group with
both operations and then performing a merge. */
+ bool done_p = false;
if (SLP_TREE_TWO_OPERATORS (node))
{
gassign *stmt = as_a <gassign *> (stmt_info->stmt);
@@ -4223,10 +4224,11 @@ vect_schedule_slp_instance (slp_tree node, slp_instance instance)
}
v0.release ();
v1.release ();
- return;
+ done_p = true;
}
}
- vect_transform_stmt (stmt_info, &si, node, instance);
+ if (!done_p)
+ vect_transform_stmt (stmt_info, &si, node, instance);
/* Restore stmt def-types. */
FOR_EACH_VEC_ELT (SLP_TREE_CHILDREN (node), i, child)