From 7537039010e71509b307f9a73eb33ec75e0744f4 Mon Sep 17 00:00:00 2001 From: rguenth Date: Wed, 12 Sep 2018 12:14:27 +0000 Subject: [PATCH] 2018-09-12 Richard Biener PR tree-optimization/87266 * tree-ssa-sccvn.c (do_rpo_vn): Always iterate to not yet visited blocks. * gcc.dg/torture/pr87266-1.c: New testcase. * gcc.dg/torture/pr87266-2.c: Likewise. * gcc.dg/torture/pr87266-3.c: Likewise. * gcc.dg/torture/pr87266-4.c: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@264237 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 +++++ gcc/testsuite/ChangeLog | 8 +++++++ gcc/testsuite/gcc.dg/torture/pr87266-1.c | 32 +++++++++++++++++++++++++++ gcc/testsuite/gcc.dg/torture/pr87266-2.c | 32 +++++++++++++++++++++++++++ gcc/testsuite/gcc.dg/torture/pr87266-3.c | 32 +++++++++++++++++++++++++++ gcc/testsuite/gcc.dg/torture/pr87266-4.c | 38 ++++++++++++++++++++++++++++++++ gcc/tree-ssa-sccvn.c | 12 +++++++++- 7 files changed, 159 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/torture/pr87266-1.c create mode 100644 gcc/testsuite/gcc.dg/torture/pr87266-2.c create mode 100644 gcc/testsuite/gcc.dg/torture/pr87266-3.c create mode 100644 gcc/testsuite/gcc.dg/torture/pr87266-4.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 77ef4bb08cc..c96b5eb5480 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2018-09-12 Richard Biener + + PR tree-optimization/87266 + * tree-ssa-sccvn.c (do_rpo_vn): Always iterate to not yet + visited blocks. + 2018-09-12 Andreas Krebbel * config/s390/s390.md (PFPO_RND_MODE_DFP, PFPO_RND_MODE_BFP): New diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a29d014e64b..5f73cd8fe2a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2018-09-12 Richard Biener + + PR tree-optimization/87266 + * gcc.dg/torture/pr87266-1.c: New testcase. + * gcc.dg/torture/pr87266-2.c: Likewise. + * gcc.dg/torture/pr87266-3.c: Likewise. + * gcc.dg/torture/pr87266-4.c: Likewise. + 2018-09-12 Andreas Krebbel * gcc.target/s390/dfp_to_bfp_rounding.c: New test. diff --git a/gcc/testsuite/gcc.dg/torture/pr87266-1.c b/gcc/testsuite/gcc.dg/torture/pr87266-1.c new file mode 100644 index 00000000000..dc0a4a11df8 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr87266-1.c @@ -0,0 +1,32 @@ +/* { dg-do compile } */ +/* { dg-additional-options "-fno-tree-ccp -fno-tree-forwprop" } */ + +void +iw (int gu, int mq, int r2) +{ + int yn = 0; + + while (gu < 1) + { + for (;;) + ; + + bb:; + int ay = 0; + + while (ay < 1) + ++mq; + } + + if (yn != 0) + goto up; + + if (0) + { + up: + if (r2 == 0) + goto bb; + } + + goto up; +} diff --git a/gcc/testsuite/gcc.dg/torture/pr87266-2.c b/gcc/testsuite/gcc.dg/torture/pr87266-2.c new file mode 100644 index 00000000000..cf0254feae1 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr87266-2.c @@ -0,0 +1,32 @@ +/* { dg-do compile } */ +/* { dg-additional-options "-fno-tree-ccp -fno-tree-forwprop" } */ + +void +iw (int gu, int mq, int r2) +{ + int yn = 0; + + while (gu < 1) + { + for (;;) + ; + + bb:; + int ay = 0; + + while (yn < 1) + ++mq; + } + + if (yn != 0) + goto up; + + if (0) + { + up: + if (r2 == 0) + goto bb; + } + + goto up; +} diff --git a/gcc/testsuite/gcc.dg/torture/pr87266-3.c b/gcc/testsuite/gcc.dg/torture/pr87266-3.c new file mode 100644 index 00000000000..0f3f3ba1f6b --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr87266-3.c @@ -0,0 +1,32 @@ +/* { dg-do compile } */ +/* { dg-additional-options "-fno-tree-ccp -fno-tree-forwprop" } */ + +void +iw (int gu, int mq, int r2) +{ + int yn = 0; + + while (gu < 1) + { + int ay = 0; + + for (;;) + ; + + bb: + while (ay < 1) + ++mq; + } + + if (yn != 0) + goto up; + + if (0) + { + up: + if (r2 == 0) + goto bb; + } + + goto up; +} diff --git a/gcc/testsuite/gcc.dg/torture/pr87266-4.c b/gcc/testsuite/gcc.dg/torture/pr87266-4.c new file mode 100644 index 00000000000..e8d5ff1812b --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr87266-4.c @@ -0,0 +1,38 @@ +/* { dg-do compile } */ +/* { dg-additional-options "-fno-tree-dominator-opts -fno-tree-forwprop" } */ + +unsigned long int +re (long int j9) +{ + if (j9 == 0) + return 1; + + return j9; +} + +void +zq (int bt, int yy) +{ + int p3 = 0, go = 4, ez = go; + + while (go != 0) + { + if (ez + !!bt - re (bt) != 0 && go != 0) + { + if (yy != 0) + p3 = yy; + } + else + return; + + go = 2; + } +} + +void +my (unsigned long int n6, int bt, int yy) +{ + zq (bt, yy); + n6 = n6 == bt; + zq (bt, yy); +} diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c index 6fec6243a59..8bf724e793a 100644 --- a/gcc/tree-ssa-sccvn.c +++ b/gcc/tree-ssa-sccvn.c @@ -6471,6 +6471,17 @@ do_rpo_vn (function *fn, edge entry, bitmap exit_bbs, == (EDGE_DFS_BACK|EDGE_EXECUTABLE) && rpo_state[bb_to_rpo[e->dest->index]].iterate) { + int destidx = bb_to_rpo[e->dest->index]; + if (!rpo_state[destidx].visited) + { + if (dump_file && (dump_flags & TDF_DETAILS)) + fprintf (dump_file, "Unvisited destination %d\n", + e->dest->index); + if (iterate_to == -1 + || destidx < iterate_to) + iterate_to = destidx; + continue; + } if (dump_file && (dump_flags & TDF_DETAILS)) fprintf (dump_file, "Looking for changed values of backedge " "%d->%d destination PHIs\n", @@ -6497,7 +6508,6 @@ do_rpo_vn (function *fn, edge entry, bitmap exit_bbs, && dump_file && (dump_flags & TDF_DETAILS)) fprintf (dump_file, "PHI was CSEd and hashtable " "state (changed)\n"); - int destidx = bb_to_rpo[e->dest->index]; if (iterate_to == -1 || destidx < iterate_to) iterate_to = destidx; -- 2.11.4.GIT