From 1a5da5b66a5d2d2fe87fdeddf475ec2c3c54c49f Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Fri, 19 Aug 2016 07:02:05 +0000 Subject: [PATCH] re PR tree-optimization/77286 (ICE in fold_convert_loc, at fold-const.c:2248 building 435.gromacs) 2016-08-19 Richard Biener PR tree-optimization/77286 * tree-vect-loop-manip.c (slpeel_duplicate_current_defs_from_edges): Deal with virtual PHIs being out-of-order. * gcc.dg/torture/pr77286.c: New testcase. From-SVN: r239605 --- gcc/ChangeLog | 6 ++++ gcc/testsuite/ChangeLog | 5 +++ gcc/testsuite/gcc.dg/torture/pr77286.c | 43 ++++++++++++++++++++++++++ gcc/tree-vect-loop-manip.c | 25 ++++++++++----- 4 files changed, 72 insertions(+), 7 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/torture/pr77286.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 65efe1e5513..930663a39d1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2016-08-19 Richard Biener + + PR tree-optimization/77286 + * tree-vect-loop-manip.c (slpeel_duplicate_current_defs_from_edges): + Deal with virtual PHIs being out-of-order. + 2016-08-18 David Malcolm * doc/invoke.texi (fverbose-asm): Note that source code lines diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index dd893ca414a..4567c7e1f46 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-08-19 Richard Biener + + PR tree-optimization/77286 + * gcc.dg/torture/pr77286.c: New testcase. + 2016-08-18 David Malcolm * gcc.dg/verbose-asm-2.c: New test case. diff --git a/gcc/testsuite/gcc.dg/torture/pr77286.c b/gcc/testsuite/gcc.dg/torture/pr77286.c new file mode 100644 index 00000000000..0c0610050f1 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr77286.c @@ -0,0 +1,43 @@ +/* { dg-do compile } */ +/* { dg-additional-options "-mavx2" { target x86_64-*-* i?86-*-* } } */ + +typedef float real; +typedef struct +{ + int ngtc; + real *ref_t; + real *tau_t; +} t_grpopts; +typedef struct +{ + real T; + real xi; +} t_grp_tcstat; +typedef struct +{ + t_grp_tcstat *tcstat; +} t_groups; +extern real *save_calloc (); +void +nosehoover_tcoupl (t_grpopts * opts, t_groups * grps, real dt, real SAfactor) +{ + static real *Qinv = ((void *) 0); + int i; + real reft = 0, xit, oldxi; + if (Qinv == ((void *) 0)) + { + (Qinv) = + save_calloc ("Qinv", "coupling.c", 372, (opts->ngtc), + sizeof (*(Qinv))); + for (i = 0; i < opts->ngtc; i++) + if ((opts->tau_t[i] > 0)) + Qinv[i] = 1.0 / opts->tau_t[i]; + } + for (i = 0; (i < opts->ngtc); i++) + { + reft = + (((0.0) > + (opts->ref_t[i] * SAfactor)) ? (0.0) : (opts->ref_t[i] * SAfactor)); + grps->tcstat[i].xi += dt * Qinv[i] * (grps->tcstat[i].T - reft); + } +} diff --git a/gcc/tree-vect-loop-manip.c b/gcc/tree-vect-loop-manip.c index 90b7df9063d..01d6bb1e1bc 100644 --- a/gcc/tree-vect-loop-manip.c +++ b/gcc/tree-vect-loop-manip.c @@ -735,22 +735,33 @@ slpeel_duplicate_current_defs_from_edges (edge from, edge to) gimple *from_phi = gsi_stmt (gsi_from); gimple *to_phi = gsi_stmt (gsi_to); tree from_arg = PHI_ARG_DEF_FROM_EDGE (from_phi, from); - if (TREE_CODE (from_arg) != SSA_NAME) - { + tree to_arg = PHI_ARG_DEF_FROM_EDGE (to_phi, to); + if (virtual_operand_p (from_arg)) + { gsi_next (&gsi_from); continue; } - tree to_arg = PHI_ARG_DEF_FROM_EDGE (to_phi, to); - if (TREE_CODE (to_arg) != SSA_NAME) - { + if (virtual_operand_p (to_arg)) + { gsi_next (&gsi_to); continue; } - if (get_current_def (to_arg) == NULL_TREE) - set_current_def (to_arg, get_current_def (from_arg)); + if (TREE_CODE (from_arg) != SSA_NAME) + gcc_assert (operand_equal_p (from_arg, to_arg, 0)); + else + { + if (get_current_def (to_arg) == NULL_TREE) + set_current_def (to_arg, get_current_def (from_arg)); + } gsi_next (&gsi_from); gsi_next (&gsi_to); } + + gphi *from_phi = get_virtual_phi (from->dest); + gphi *to_phi = get_virtual_phi (to->dest); + if (from_phi) + set_current_def (PHI_ARG_DEF_FROM_EDGE (to_phi, to), + get_current_def (PHI_ARG_DEF_FROM_EDGE (from_phi, from))); } -- 2.30.2