git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR tree-optimization/77286 (ICE in fold_convert_loc, at fold-const.c:2248 building 435.gromacs) 

2016-08-19  Richard Biener  <rguenther@suse.de>

	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
This commit is contained in:
Richard Biener 2016-08-19 07:02:05 +00:00 committed by Richard Biener
parent 82f7214696
commit 1a5da5b66a
4 changed files with 72 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2016-08-19 Richard Biener <rguenther@suse.de>
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 <dmalcolm@redhat.com> 2016-08-18 David Malcolm <dmalcolm@redhat.com>
* doc/invoke.texi (fverbose-asm): Note that source code lines * doc/invoke.texi (fverbose-asm): Note that source code lines

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2016-08-19 Richard Biener <rguenther@suse.de>
PR tree-optimization/77286
* gcc.dg/torture/pr77286.c: New testcase.
2016-08-18 David Malcolm <dmalcolm@redhat.com> 2016-08-18 David Malcolm <dmalcolm@redhat.com>
* gcc.dg/verbose-asm-2.c: New test case. * gcc.dg/verbose-asm-2.c: New test case.

43
gcc/testsuite/gcc.dg/torture/pr77286.c Normal file
View File

@ -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);
}
}

25
gcc/tree-vect-loop-manip.c
View File

@ -735,22 +735,33 @@ slpeel_duplicate_current_defs_from_edges (edge from, edge to)
gimple *from_phi = gsi_stmt (gsi_from); gimple *from_phi = gsi_stmt (gsi_from);
gimple *to_phi = gsi_stmt (gsi_to); gimple *to_phi = gsi_stmt (gsi_to);
tree from_arg = PHI_ARG_DEF_FROM_EDGE (from_phi, from); 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); gsi_next (&gsi_from);
continue; continue;
} }
tree to_arg = PHI_ARG_DEF_FROM_EDGE (to_phi, to); if (virtual_operand_p (to_arg))
if (TREE_CODE (to_arg) != SSA_NAME) {
{
gsi_next (&gsi_to); gsi_next (&gsi_to);
continue; continue;
} }
if (get_current_def (to_arg) == NULL_TREE) if (TREE_CODE (from_arg) != SSA_NAME)
set_current_def (to_arg, get_current_def (from_arg)); 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_from);
gsi_next (&gsi_to); 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)));
} }