From e294f495894cd2d9e217565e340284b2edda4671 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Tue, 25 Jul 2017 13:22:31 +0000 Subject: [PATCH] re PR tree-optimization/81529 (ICE in vectorizable_induction, at tree-vect-loop.c:6613) 2017-07-25 Richard Biener PR tree-optimization/81529 * tree-vect-stmts.c (process_use): Disregard live induction PHIs when optimizing backedge uses. * gfortran.dg/pr81529.f90: New testcase. From-SVN: r250517 --- gcc/ChangeLog | 6 +++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/pr81529.f90 | 32 +++++++++++++++++++++++++++ gcc/tree-vect-stmts.c | 4 +++- 4 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/pr81529.f90 diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5a623bd6ddc..cc4bcddda52 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2017-07-25 Richard Biener + + PR tree-optimization/81529 + * tree-vect-stmts.c (process_use): Disregard live induction PHIs + when optimizing backedge uses. + 2017-07-25 David Edelsohn * dwarf2asm.c (dw2_asm_output_nstring): Encode double quote diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 433b79c39d9..e28a732f2ef 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-07-25 Richard Biener + + PR tree-optimization/81529 + * gfortran.dg/pr81529.f90: New testcase. + 2017-07-25 Wilco Dijkstra * testsuite/gcc.target/aarch64/pr79041-2.c: Improve test. diff --git a/gcc/testsuite/gfortran.dg/pr81529.f90 b/gcc/testsuite/gfortran.dg/pr81529.f90 new file mode 100644 index 00000000000..92e3d48e727 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr81529.f90 @@ -0,0 +1,32 @@ +! { dg-do compile } +! { dg-options "-std=gnu -fno-tree-scev-cprop -Ofast" } + +subroutine CalcCgr(C,rmax,ordgr_max) + integer, intent(in) :: rmax,ordgr_max + double complex :: Zadj(2,2), Zadj2(2,2) + double complex, intent(out) :: C(0:rmax,0:rmax,0:rmax) + double complex, allocatable :: Cexpgr(:,:,:,:) + double complex :: Caux + integer :: rmaxB,rmaxExp,r,n0,n1,n2,k,l,i,j,m,n,nn + + rmaxB = 2*rmax + rmaxExp = rmaxB + allocate(Cexpgr(0:rmaxExp/2,0:rmaxExp,0:rmaxExp,0:ordgr_max)) + + rloop: do r=0,rmaxExp/2 + do n0=r,1,-1 + do nn=r-n0,0,-1 + do i=1,2 + Caux = Caux - Zadj(i,l) + end do + Cexpgr(n0,0,0,0) = Caux/(2*(nn+1)) + end do + end do + do n1=0,r + n2 = r-n1 + if (r.le.rmax) then + C(0,n1,n2) = Cexpgr(0,n1,n2,0) + end if + end do + end do rloop +end subroutine CalcCgr diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c index a22947d02ac..8a631046cc8 100644 --- a/gcc/tree-vect-stmts.c +++ b/gcc/tree-vect-stmts.c @@ -581,9 +581,11 @@ process_use (gimple *stmt, tree use, loop_vec_info loop_vinfo, } /* We are also not interested in uses on loop PHI backedges that are inductions. Otherwise we'll needlessly vectorize the IV increment - and cause hybrid SLP for SLP inductions. */ + and cause hybrid SLP for SLP inductions. Unless the PHI is live + of course. */ else if (gimple_code (stmt) == GIMPLE_PHI && STMT_VINFO_DEF_TYPE (stmt_vinfo) == vect_induction_def + && ! STMT_VINFO_LIVE_P (stmt_vinfo) && (PHI_ARG_DEF_FROM_EDGE (stmt, loop_latch_edge (bb->loop_father)) == use)) {