diff options
| author | Richard Biener <rguenther@suse.de> | 2018-11-26 15:37:35 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2018-11-26 15:37:35 +0000 |
| commit | ef6e6914c8245ca24dae952bc054ae2328e751ab (patch) | |
| tree | 99a95accf31970bfb7c5ca83ed8d9a15a5e4db6f /gcc | |
| parent | c393c7482fa7c6953f256724e8c6bd282d404e7c (diff) | |
| download | gcc-ef6e6914c8245ca24dae952bc054ae2328e751ab.zip gcc-ef6e6914c8245ca24dae952bc054ae2328e751ab.tar.gz gcc-ef6e6914c8245ca24dae952bc054ae2328e751ab.tar.bz2 | |
re PR tree-optimization/88182 (ICE in vectorizable_reduction, at tree-vect-loop.c:6465)
2018-11-26 Richard Biener <rguenther@suse.de>
PR tree-optimization/88182
* tree-vect-loop.c (vectorizable_reduction): Pick up single
correct reduc_def_info.
* tree-vect-slp.c (vect_analyze_slp_instance): Set
STMT_VINFO_REDUC_DEF of the first stmt.
libgomp/
* testsuite/libgomp.c++/pr88182.C: New testcase.
From-SVN: r266467
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/tree-vect-loop.c | 29 | ||||
| -rw-r--r-- | gcc/tree-vect-slp.c | 2 |
3 files changed, 22 insertions, 17 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6be4605..b68fdad 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2018-11-26 Richard Biener <rguenther@suse.de> + + PR tree-optimization/88182 + * tree-vect-loop.c (vectorizable_reduction): Pick up single + correct reduc_def_info. + * tree-vect-slp.c (vect_analyze_slp_instance): Set + STMT_VINFO_REDUC_DEF of the first stmt. + 2018-11-26 Andreas Krebbel <krebbel@linux.ibm.com> * doc/invoke.texi: Document z14/arch12 -march option. diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c index 07a22d7..9589a8e 100644 --- a/gcc/tree-vect-loop.c +++ b/gcc/tree-vect-loop.c @@ -6223,7 +6223,14 @@ vectorizable_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi, The last use is the reduction variable. In case of nested cycle this assumption is not true: we use reduc_index to record the index of the reduction variable. */ - stmt_vec_info reduc_def_info = NULL; + stmt_vec_info reduc_def_info; + if (orig_stmt_info) + reduc_def_info = STMT_VINFO_REDUC_DEF (orig_stmt_info); + else + reduc_def_info = STMT_VINFO_REDUC_DEF (stmt_info); + gcc_assert (reduc_def_info); + gphi *reduc_def_phi = as_a <gphi *> (reduc_def_info->stmt); + tree reduc_def = PHI_RESULT (reduc_def_phi); int reduc_index = -1; for (i = 0; i < op_type; i++) { @@ -6236,9 +6243,9 @@ vectorizable_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi, &def_stmt_info); dt = dts[i]; gcc_assert (is_simple_use); - if (dt == vect_reduction_def) + if (dt == vect_reduction_def + && ops[i] == reduc_def) { - reduc_def_info = def_stmt_info; reduc_index = i; continue; } @@ -6259,10 +6266,10 @@ vectorizable_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi, && !(dt == vect_nested_cycle && nested_cycle)) return false; - if (dt == vect_nested_cycle) + if (dt == vect_nested_cycle + && ops[i] == reduc_def) { found_nested_cycle_def = true; - reduc_def_info = def_stmt_info; reduc_index = i; } @@ -6298,20 +6305,8 @@ vectorizable_reduction (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi, "in-order reduction chain without SLP.\n"); return false; } - - if (orig_stmt_info) - reduc_def_info = STMT_VINFO_REDUC_DEF (orig_stmt_info); - else - reduc_def_info = STMT_VINFO_REDUC_DEF (stmt_info); } - if (! reduc_def_info) - return false; - - gphi *reduc_def_phi = dyn_cast <gphi *> (reduc_def_info->stmt); - if (!reduc_def_phi) - return false; - if (!(reduc_index == -1 || dts[reduc_index] == vect_reduction_def || dts[reduc_index] == vect_nested_cycle diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c index 9e805d0..4267cc9 100644 --- a/gcc/tree-vect-slp.c +++ b/gcc/tree-vect-slp.c @@ -1952,6 +1952,8 @@ vect_analyze_slp_instance (vec_info *vinfo, transform the node. In the reduction analysis phase only the last element of the chain is marked as reduction. */ STMT_VINFO_DEF_TYPE (stmt_info) = vect_reduction_def; + STMT_VINFO_REDUC_DEF (vect_orig_stmt (stmt_info)) + = STMT_VINFO_REDUC_DEF (vect_orig_stmt (scalar_stmts.last ())); } else { |