From c30587c0200f52f8845a5aea21bd7bef6cbe0bf4 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Tue, 15 Oct 2019 10:09:10 +0000 Subject: [PATCH] re PR fortran/92094 (ice in vect_transform_stmt at tree-vect-stmts.c:10921) 2019-10-15 Richard Biener PR tree-optimization/92094 * tree-vect-loop.c (vectorizable_reduction): For nested cycles do not adjust the reduction definition def type. * tree-vect-stmts.c (vect_transform_stmt): Verify the scalar stmt defines the latch argument of the PHI. * gfortran.dg/pr92094.f90: New testcase. From-SVN: r276987 --- gcc/ChangeLog | 8 ++++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/pr92094.f90 | 28 +++++++++++++++++++++++++++ gcc/tree-vect-loop.c | 17 +++------------- gcc/tree-vect-stmts.c | 9 ++++++--- 5 files changed, 50 insertions(+), 17 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/pr92094.f90 diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 40726e96354..6e16ee81e53 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2019-10-15 Richard Biener + + PR tree-optimization/92094 + * tree-vect-loop.c (vectorizable_reduction): For nested cycles + do not adjust the reduction definition def type. + * tree-vect-stmts.c (vect_transform_stmt): Verify the scalar stmt + defines the latch argument of the PHI. + 2019-10-15 Hongyu Wang PR target/92035 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 34854d29cf7..7fbb8dd64e8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-10-15 Richard Biener + + PR tree-optimization/92094 + * gfortran.dg/pr92094.f90: New testcase. + 2019-10-15 Hongyu Wang PR target/92035 diff --git a/gcc/testsuite/gfortran.dg/pr92094.f90 b/gcc/testsuite/gfortran.dg/pr92094.f90 new file mode 100644 index 00000000000..6793391af24 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr92094.f90 @@ -0,0 +1,28 @@ +! { dg-do compile } +! { dg-options "-O3" } + subroutine hesfcn(n, x, h, ldh) + integer n,ldh + double precision x(n), h(ldh) + + integer i,j,k,kj + double precision th,u1,u2,v2 + + kj = 0 + do 770 j = 1, n + kj = kj - j + do 760 k = 1, j + kj = kj + 1 + v2 = 2 * x(k) - 1 + u1 = 0 + u2 = 2 + do 750 i = 1, n + h(kj) = h(kj) + u2 + th = 4 * v2 + u2 - u1 + u1 = u2 + u2 = th + th = v2 - 1 + 750 continue + 760 continue + 770 continue + + end diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c index de018acefad..455251070d0 100644 --- a/gcc/tree-vect-loop.c +++ b/gcc/tree-vect-loop.c @@ -5742,20 +5742,9 @@ vectorizable_reduction (stmt_vec_info stmt_info, slp_tree slp_node, if (STMT_VINFO_DEF_TYPE (stmt_info) == vect_nested_cycle) { if (is_a (stmt_info->stmt)) - { - /* Analysis for double-reduction is done on the outer - loop PHI, nested cycles have no further restrictions. */ - STMT_VINFO_TYPE (stmt_info) = cycle_phi_info_type; - /* For nested cycles we want to let regular vectorizable_* - routines handle code-generation. */ - if (STMT_VINFO_DEF_TYPE (reduc_info) != vect_double_reduction_def) - { - stmt_info = STMT_VINFO_REDUC_DEF (stmt_info); - STMT_VINFO_DEF_TYPE (stmt_info) = vect_internal_def; - STMT_VINFO_DEF_TYPE (vect_stmt_to_vectorize (stmt_info)) - = vect_internal_def; - } - } + /* Analysis for double-reduction is done on the outer + loop PHI, nested cycles have no further restrictions. */ + STMT_VINFO_TYPE (stmt_info) = cycle_phi_info_type; else STMT_VINFO_TYPE (stmt_info) = reduc_vec_info_type; return true; diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c index e606945d536..ff9863f290f 100644 --- a/gcc/tree-vect-stmts.c +++ b/gcc/tree-vect-stmts.c @@ -10906,13 +10906,16 @@ vect_transform_stmt (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi, && STMT_VINFO_REDUC_TYPE (reduc_info) != EXTRACT_LAST_REDUCTION) { gphi *phi; + edge e; if (!slp_node && (phi = dyn_cast (STMT_VINFO_REDUC_DEF (orig_stmt_info)->stmt)) && dominated_by_p (CDI_DOMINATORS, - gimple_bb (orig_stmt_info->stmt), gimple_bb (phi))) + 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))) { - edge e = loop_latch_edge (gimple_bb (phi)->loop_father); stmt_vec_info phi_info = STMT_VINFO_VEC_STMT (STMT_VINFO_REDUC_DEF (orig_stmt_info)); stmt_vec_info vec_stmt = STMT_VINFO_VEC_STMT (stmt_info); @@ -10932,7 +10935,7 @@ vect_transform_stmt (stmt_vec_info stmt_info, gimple_stmt_iterator *gsi, { slp_tree phi_node = slp_node_instance->reduc_phis; gphi *phi = as_a (SLP_TREE_SCALAR_STMTS (phi_node)[0]->stmt); - edge e = loop_latch_edge (gimple_bb (phi)->loop_father); + e = loop_latch_edge (gimple_bb (phi)->loop_father); gcc_assert (SLP_TREE_VEC_STMTS (phi_node).length () == SLP_TREE_VEC_STMTS (slp_node).length ()); for (unsigned i = 0; i < SLP_TREE_VEC_STMTS (phi_node).length (); ++i) -- 2.30.2