From fd5c626c681266845dbec0e84836823a5de3a45b Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Mon, 1 Oct 2018 13:10:48 +0000 Subject: [PATCH] re PR tree-optimization/87465 (Loop removal regression) 2018-10-01 Richard Biener PR tree-optimization/87465 * tree-ssa-loop-ivcanon.c (tree_estimate_loop_size): Fix typo causing branch miscounts. * gcc.dg/tree-ssa/cunroll-15.c: New testcase. From-SVN: r264758 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/tree-ssa/cunroll-15.c | 22 ++++++++++++++++++++++ gcc/tree-ssa-loop-ivcanon.c | 4 ++-- 4 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/cunroll-15.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b4bc5082915..fbe49a9ea58 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2018-10-01 Richard Biener + + PR tree-optimization/87465 + * tree-ssa-loop-ivcanon.c (tree_estimate_loop_size): Fix typo + causing branch miscounts. + 2018-10-01 Tamar Christina * common/config/aarch64/aarch64-common.c (TARGET_OPTION_DEFAULT_PARAM, diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e8ba7fc6659..dced1ea8895 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-10-01 Richard Biener + + PR tree-optimization/87465 + * gcc.dg/tree-ssa/cunroll-15.c: New testcase. + 2018-10-01 Tamar Christina PR target/86486 diff --git a/gcc/testsuite/gcc.dg/tree-ssa/cunroll-15.c b/gcc/testsuite/gcc.dg/tree-ssa/cunroll-15.c new file mode 100644 index 00000000000..3fc752aa548 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/cunroll-15.c @@ -0,0 +1,22 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -funroll-loops -fdump-tree-cunroll-optimized -fdump-tree-optimized" } */ + +int Test(void) +{ + int c = 0; + const int in[4] = {4,3,4,4}; + for (unsigned i = 0; i < 4; i++) { + for (unsigned j = 0; j < i; j++) { + if (in[i] == in[j]) + break; + else + ++c; + } + } + return c; +} + +/* { dg-final { scan-tree-dump-times "optimized:\[^\n\r\]*completely unrolled" 2 "cunroll" } } */ +/* When SLP vectorization is enabled the following will fail because DOM + doesn't know how to deal with the vectorized initializer of in. */ +/* { dg-final { scan-tree-dump "return 1;" "optimized" } } */ diff --git a/gcc/tree-ssa-loop-ivcanon.c b/gcc/tree-ssa-loop-ivcanon.c index 97c2ad94985..eeae2a8c54a 100644 --- a/gcc/tree-ssa-loop-ivcanon.c +++ b/gcc/tree-ssa-loop-ivcanon.c @@ -368,8 +368,8 @@ tree_estimate_loop_size (struct loop *loop, edge exit, edge edge_to_cancel, size->non_call_stmts_on_hot_path++; if (((gimple_code (stmt) == GIMPLE_COND && (!constant_after_peeling (gimple_cond_lhs (stmt), stmt, loop) - || constant_after_peeling (gimple_cond_rhs (stmt), stmt, - loop))) + || !constant_after_peeling (gimple_cond_rhs (stmt), stmt, + loop))) || (gimple_code (stmt) == GIMPLE_SWITCH && !constant_after_peeling (gimple_switch_index ( as_a (stmt)), -- 2.30.2