diff options
| author | Richard Biener <rguenther@suse.de> | 2020-09-04 14:35:39 +0200 |
|---|---|---|
| committer | Richard Biener <rguenther@suse.de> | 2020-09-04 15:42:43 +0200 |
| commit | 46a58c779af3055a4b10b285a1f4be28abe4351c (patch) | |
| tree | baefb67199cad573cf5461dbfc4c9f8be57a2001 /gcc/tree-vect-stmts.c | |
| parent | 09fa6acd8d96013cf97046b273642fdefeef7559 (diff) | |
| download | gcc-46a58c779af3055a4b10b285a1f4be28abe4351c.zip gcc-46a58c779af3055a4b10b285a1f4be28abe4351c.tar.gz gcc-46a58c779af3055a4b10b285a1f4be28abe4351c.tar.bz2 | |
tree-optimization/96920 - another ICE when vectorizing nested cycles
This refines the previous fix for PR96698 by re-doing how and where
we arrange for setting vectorized cycle PHI backedge values.
2020-09-04 Richard Biener <rguenther@suse.de>
PR tree-optimization/96698
PR tree-optimization/96920
* tree-vectorizer.h (loop_vec_info::reduc_latch_defs): Remove.
(loop_vec_info::reduc_latch_slp_defs): Likewise.
* tree-vect-stmts.c (vect_transform_stmt): Remove vectorized
cycle PHI latch code.
* tree-vect-loop.c (maybe_set_vectorized_backedge_value): New
helper to set vectorized cycle PHI latch values.
(vect_transform_loop): Walk over all PHIs again after
vectorizing them, calling maybe_set_vectorized_backedge_value.
Call maybe_set_vectorized_backedge_value for each vectorized
stmt. Remove delayed update code.
* tree-vect-slp.c (vect_analyze_slp_instance): Initialize
SLP instance reduc_phis member.
(vect_schedule_slp): Set vectorized cycle PHI latch values.
* gfortran.dg/vect/pr96920.f90: New testcase.
* gcc.dg/vect/pr96920.c: Likewise.
Diffstat (limited to 'gcc/tree-vect-stmts.c')
| -rw-r--r-- | gcc/tree-vect-stmts.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c index 7e072a2..c733967 100644 --- a/gcc/tree-vect-stmts.c +++ b/gcc/tree-vect-stmts.c @@ -10921,33 +10921,6 @@ vect_transform_stmt (vec_info *vinfo, if (STMT_VINFO_TYPE (stmt_info) == store_vec_info_type) return is_store; - /* If this stmt defines a value used on a backedge, record it so - we can update the vectorized PHIs later. */ - stmt_vec_info orig_stmt_info = vect_orig_stmt (stmt_info); - stmt_vec_info reduc_info; - if (STMT_VINFO_REDUC_DEF (orig_stmt_info) - && vect_stmt_to_vectorize (orig_stmt_info) == stmt_info - && (reduc_info = info_for_reduction (vinfo, orig_stmt_info)) - && STMT_VINFO_REDUC_TYPE (reduc_info) != FOLD_LEFT_REDUCTION - && STMT_VINFO_REDUC_TYPE (reduc_info) != EXTRACT_LAST_REDUCTION) - { - gphi *phi; - edge e; - if (!slp_node - && (phi = dyn_cast <gphi *> - (STMT_VINFO_REDUC_DEF (orig_stmt_info)->stmt)) - && dominated_by_p (CDI_DOMINATORS, - gimple_bb (orig_stmt_info->stmt), gimple_bb (phi)) - && (e = loop_latch_edge (gimple_bb (phi)->loop_father)) - && (PHI_ARG_DEF_FROM_EDGE (phi, e) - == gimple_get_lhs (orig_stmt_info->stmt))) - as_a <loop_vec_info> (vinfo)->reduc_latch_defs.safe_push (stmt_info); - else if (slp_node - && slp_node != slp_node_instance->reduc_phis) - as_a <loop_vec_info> (vinfo)->reduc_latch_slp_defs.safe_push - (std::make_pair (slp_node, slp_node_instance->reduc_phis)); - } - /* Handle stmts whose DEF is used outside the loop-nest that is being vectorized. */ if (is_a <loop_vec_info> (vinfo)) |