From 30c6ec2f5309f78a1ded63243ae0037b63974d29 Mon Sep 17 00:00:00 2001 From: Jan Hubicka Date: Fri, 3 Feb 2017 15:03:35 +0100 Subject: [PATCH] tree-ssa-ifcombine.c (update_profile_after_ifcombine): New function. * tree-ssa-ifcombine.c (update_profile_after_ifcombine): New function. (ifcombine_ifandif): Use it. * gcc.dg/tree-ssa/ssa-ifcombine-1.c: Check for no profile mismatches. * gcc.dg/tree-ssa/ssa-ifcombine-2.c: Check for no profile mismatches. * gcc.dg/tree-ssa/ssa-ifcombine-3.c: Check for no profile mismatches. * gcc.dg/tree-ssa/ssa-ifcombine-4.c: Check for no profile mismatches. * gcc.dg/tree-ssa/ssa-ifcombine-5.c: Check for no profile mismatches. * gcc.dg/tree-ssa/ssa-ifcombine-6.c: Check for no profile mismatches. * gcc.dg/tree-ssa/ssa-ifcombine-7.c: Check for no profile mismatches. * gcc.dg/tree-ssa/ssa-ifcombine-8.c: Check for no profile mismatches. * gcc.dg/tree-ssa/ssa-ifcombine-9.c: Check for no profile mismatches. * gcc.dg/tree-ssa/ssa-ifcombine-10.c: Check for no profile mismatches. * gcc.dg/tree-ssa/ssa-ifcombine-11.c: Check for no profile mismatches. * gcc.dg/tree-ssa/ssa-ifcombine-12.c: Check for no profile mismatches. * gcc.dg/tree-ssa/ssa-ifcombine-13.c: Check for no profile mismatches. From-SVN: r245151 --- gcc/ChangeLog | 5 ++ gcc/testsuite/ChangeLog | 16 ++++++ .../gcc.dg/tree-ssa/ssa-ifcombine-1.c | 3 +- .../gcc.dg/tree-ssa/ssa-ifcombine-10.c | 3 +- .../gcc.dg/tree-ssa/ssa-ifcombine-11.c | 3 +- .../gcc.dg/tree-ssa/ssa-ifcombine-12.c | 3 +- .../gcc.dg/tree-ssa/ssa-ifcombine-13.c | 3 +- .../gcc.dg/tree-ssa/ssa-ifcombine-2.c | 3 +- .../gcc.dg/tree-ssa/ssa-ifcombine-3.c | 3 +- .../gcc.dg/tree-ssa/ssa-ifcombine-4.c | 3 +- .../gcc.dg/tree-ssa/ssa-ifcombine-5.c | 3 +- .../gcc.dg/tree-ssa/ssa-ifcombine-6.c | 3 +- .../gcc.dg/tree-ssa/ssa-ifcombine-7.c | 3 +- .../gcc.dg/tree-ssa/ssa-ifcombine-8.c | 3 +- .../gcc.dg/tree-ssa/ssa-ifcombine-9.c | 3 +- gcc/tree-ssa-ifcombine.c | 49 +++++++++++++++++++ 16 files changed, 96 insertions(+), 13 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 445f27b5e0e..7fd658ef999 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2017-02-02 Jan Hubicka + + * tree-ssa-ifcombine.c (update_profile_after_ifcombine): New function. + (ifcombine_ifandif): Use it. + 2017-02-03 Martin Liska * doc/invoke.texi: Document default value for diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1289892dada..ddcc87e86eb 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,19 @@ +2017-02-02 Jan Hubicka + + * gcc.dg/tree-ssa/ssa-ifcombine-1.c: Check for no profile mismatches. + * gcc.dg/tree-ssa/ssa-ifcombine-2.c: Check for no profile mismatches. + * gcc.dg/tree-ssa/ssa-ifcombine-3.c: Check for no profile mismatches. + * gcc.dg/tree-ssa/ssa-ifcombine-4.c: Check for no profile mismatches. + * gcc.dg/tree-ssa/ssa-ifcombine-5.c: Check for no profile mismatches. + * gcc.dg/tree-ssa/ssa-ifcombine-6.c: Check for no profile mismatches. + * gcc.dg/tree-ssa/ssa-ifcombine-7.c: Check for no profile mismatches. + * gcc.dg/tree-ssa/ssa-ifcombine-8.c: Check for no profile mismatches. + * gcc.dg/tree-ssa/ssa-ifcombine-9.c: Check for no profile mismatches. + * gcc.dg/tree-ssa/ssa-ifcombine-10.c: Check for no profile mismatches. + * gcc.dg/tree-ssa/ssa-ifcombine-11.c: Check for no profile mismatches. + * gcc.dg/tree-ssa/ssa-ifcombine-12.c: Check for no profile mismatches. + * gcc.dg/tree-ssa/ssa-ifcombine-13.c: Check for no profile mismatches. + 2017-02-02 Martin Sebor PR middle-end/79275 diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-1.c index edbe287d1db..e38c1113de5 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fdump-tree-optimized" } */ +/* { dg-options "-O -fdump-tree-optimized-details-blocks" } */ /* Testcase for PR31657. */ @@ -14,3 +14,4 @@ int foo (int x, int a, int b) } /* { dg-final { scan-tree-dump "\\|" "optimized" } } */ +/* { dg-final { scan-tree-dump-not "Invalid sum" "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-10.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-10.c index 94221d0983f..1948af82896 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-10.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-10.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-tree-optimized" } */ +/* { dg-options "-O2 -fdump-tree-optimized-details-blocks" } */ /* Testcase for PR31657. */ @@ -17,3 +17,4 @@ int f(int x, int a, int b) return t; } /* { dg-final { scan-tree-dump "& 5" "optimized" } } */ +/* { dg-final { scan-tree-dump-not "Invalid sum" "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-11.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-11.c index d192911c4ff..780ecf57b3a 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-11.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-11.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fdump-tree-optimized" } */ +/* { dg-options "-O -fdump-tree-optimized-details-blocks" } */ /* Testcase for PR31657. */ int g(void); @@ -18,3 +18,4 @@ int f(int x, int a, int b) } /* { dg-final { scan-tree-dump "& 5" "optimized" } } */ +/* { dg-final { scan-tree-dump-not "Invalid sum" "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-12.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-12.c index 88502c3278b..72ffaf503fa 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-12.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-12.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fno-tree-vrp -fdump-tree-optimized" } */ +/* { dg-options "-O2 -fno-tree-vrp -fdump-tree-optimized-details-blocks" } */ /* Testcase for PR31657. */ @@ -17,3 +17,4 @@ int f(int x, int a, int b) return t; } /* { dg-final { scan-tree-dump "& 5" "optimized" } } */ +/* { dg-final { scan-tree-dump-not "Invalid sum" "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-13.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-13.c index bbafe7b82db..7f4f011faee 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-13.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-13.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O1 -fdump-tree-optimized" } */ +/* { dg-options "-O1 -fdump-tree-optimized-details-blocks" } */ /* { dg-additional-options "-mbranch-cost=2" { target { i?86-*-* x86_64-*-* s390*-*-* avr*-*-* } } } */ _Bool f1(_Bool a, _Bool b) @@ -18,3 +18,4 @@ _Bool f1(_Bool a, _Bool b) /* For LOGICAL_OP_NON_SHORT_CIRCUIT, this should be optimized into return a & b;, with no ifs. */ /* { dg-final { scan-tree-dump-not "if" "optimized" { target { i?86-*-* x86_64-*-* s390*-*-* avr*-*-* } } } } */ +/* { dg-final { scan-tree-dump-not "Invalid sum" "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-2.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-2.c index c2a1a087c44..ac70d4b639a 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-2.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-2.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fdump-tree-optimized" } */ +/* { dg-options "-O -fdump-tree-optimized-details-blocks" } */ /* Testcase for PR31657. */ @@ -20,3 +20,4 @@ doit: } /* { dg-final { scan-tree-dump "\\|" "optimized" } } */ +/* { dg-final { scan-tree-dump-not "Invalid sum" "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-3.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-3.c index ff543c17acb..c51fdf3a9c4 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-3.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-3.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fdump-tree-optimized" } */ +/* { dg-options "-O -fdump-tree-optimized-details-blocks" } */ /* Testcase extracted from PR15353. */ @@ -20,3 +20,4 @@ doit: } /* { dg-final { scan-tree-dump ">=" "optimized" } } */ +/* { dg-final { scan-tree-dump-not "Invalid sum" "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-4.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-4.c index 83171940b1a..178ebda4758 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-4.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-4.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fdump-tree-optimized" } */ +/* { dg-options "-O -fdump-tree-optimized-details-blocks" } */ /* Testcase extracted from PR15353. */ @@ -18,3 +18,4 @@ void foo (int x, int a) } /* { dg-final { scan-tree-dump "!=" "optimized" } } */ +/* { dg-final { scan-tree-dump-not "Invalid sum" "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-5.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-5.c index d8349c1a5d7..c16a0d9a94b 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-5.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-5.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fdump-tree-optimized" } */ +/* { dg-options "-O -fdump-tree-optimized-details-blocks" } */ /* Testcase from PR15353. */ @@ -17,3 +17,4 @@ int f(int *i, int *j) } /* { dg-final { scan-tree-dump ">=" "optimized" } } */ +/* { dg-final { scan-tree-dump-not "Invalid sum" "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-6.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-6.c index 55450abd205..a85531d19ec 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-6.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-6.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fdump-tree-ifcombine" } */ +/* { dg-options "-O -fdump-tree-ifcombine-details-blocks" } */ void bar (void); @@ -34,3 +34,4 @@ foo2 (unsigned int a) /* { dg-final { scan-tree-dump "optimizing bits or bits test" "ifcombine" } } */ /* { dg-final { scan-tree-dump "optimizing double bit test" "ifcombine" } } */ +/* { dg-final { scan-tree-dump-not "Invalid sum" "ifcombine" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-7.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-7.c index 20530900544..7eab7fd4636 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-7.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-7.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fdump-tree-ifcombine" } */ +/* { dg-options "-O -fdump-tree-ifcombine-details-blocks" } */ int test1 (int i, int j) { @@ -12,3 +12,4 @@ int test1 (int i, int j) /* The above should be optimized to a i > j test by ifcombine. */ /* { dg-final { scan-tree-dump " > " "ifcombine" } } */ +/* { dg-final { scan-tree-dump-not "Invalid sum" "ifcombine" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-8.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-8.c index c89d264d465..5bddf68e2d1 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-8.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-8.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O -fno-trapping-math -fdump-tree-ifcombine" } */ +/* { dg-options "-O -fno-trapping-math -fdump-tree-ifcombine-details-blocks" } */ double test1 (double i, double j) { @@ -22,3 +22,4 @@ plouf: Instead we get u<=, which is acceptable with -fno-trapping-math. */ /* { dg-final { scan-tree-dump " u<= " "ifcombine" } } */ +/* { dg-final { scan-tree-dump-not "Invalid sum" "ifcombine" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-9.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-9.c index c4c55732e45..bb18e0f01b0 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-9.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-9.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fno-trapping-math -fdump-tree-ifcombine" } */ +/* { dg-options "-O2 -fno-trapping-math -fdump-tree-ifcombine-details-blocks" } */ void f (); enum Sign { NEG=-1, ZERO, POS }; @@ -19,3 +19,4 @@ void g (double x) The transformation would also be legal with -ftrapping-math. */ /* { dg-final { scan-tree-dump "optimizing.* < " "ifcombine" } } */ +/* { dg-final { scan-tree-dump-not "Invalid sum" "ifcombine" } } */ diff --git a/gcc/tree-ssa-ifcombine.c b/gcc/tree-ssa-ifcombine.c index 6e43b5c25a2..16f6c73d7e6 100644 --- a/gcc/tree-ssa-ifcombine.c +++ b/gcc/tree-ssa-ifcombine.c @@ -332,6 +332,51 @@ recognize_bits_test (gcond *cond, tree *name, tree *bits, bool inv) return true; } + +/* Update profile after code in outer_cond_bb was adjusted so + outer_cond_bb has no condition. */ + +static void +update_profile_after_ifcombine (basic_block inner_cond_bb, + basic_block outer_cond_bb) +{ + edge outer_to_inner = find_edge (outer_cond_bb, inner_cond_bb); + edge outer2 = (EDGE_SUCC (outer_cond_bb, 0) == outer_to_inner + ? EDGE_SUCC (outer_cond_bb, 1) + : EDGE_SUCC (outer_cond_bb, 0)); + edge inner_taken = EDGE_SUCC (inner_cond_bb, 0); + edge inner_not_taken = EDGE_SUCC (inner_cond_bb, 1); + + if (inner_taken->dest != outer2->dest) + std::swap (inner_taken, inner_not_taken); + gcc_assert (inner_taken->dest == outer2->dest); + + /* In the following we assume that inner_cond_bb has single predecessor. */ + gcc_assert (single_pred_p (inner_cond_bb)); + + /* Path outer_cond_bb->(outer2) needs to be merged into path + outer_cond_bb->(outer_to_inner)->inner_cond_bb->(inner_taken) + and probability of inner_not_taken updated. */ + + outer_to_inner->count = outer_cond_bb->count; + inner_cond_bb->count = outer_cond_bb->count; + inner_taken->count += outer2->count; + outer2->count = 0; + + inner_taken->probability = outer2->probability + + RDIV (outer_to_inner->probability + * inner_taken->probability, + REG_BR_PROB_BASE); + if (inner_taken->probability > REG_BR_PROB_BASE) + inner_taken->probability = REG_BR_PROB_BASE; + inner_not_taken->probability = REG_BR_PROB_BASE + - inner_taken->probability; + + outer_to_inner->probability = REG_BR_PROB_BASE; + inner_cond_bb->frequency = outer_cond_bb->frequency; + outer2->probability = 0; +} + /* If-convert on a and pattern with a common else block. The inner if is specified by its INNER_COND_BB, the outer by OUTER_COND_BB. inner_inv, outer_inv and result_inv indicate whether the conditions @@ -394,6 +439,8 @@ ifcombine_ifandif (basic_block inner_cond_bb, bool inner_inv, outer_inv ? boolean_false_node : boolean_true_node); update_stmt (outer_cond); + update_profile_after_ifcombine (inner_cond_bb, outer_cond_bb); + if (dump_file) { fprintf (dump_file, "optimizing double bit test to "); @@ -471,6 +518,7 @@ ifcombine_ifandif (basic_block inner_cond_bb, bool inner_inv, gimple_cond_set_condition_from_tree (outer_cond, outer_inv ? boolean_false_node : boolean_true_node); update_stmt (outer_cond); + update_profile_after_ifcombine (inner_cond_bb, outer_cond_bb); if (dump_file) { @@ -554,6 +602,7 @@ ifcombine_ifandif (basic_block inner_cond_bb, bool inner_inv, gimple_cond_set_condition_from_tree (outer_cond, outer_inv ? boolean_false_node : boolean_true_node); update_stmt (outer_cond); + update_profile_after_ifcombine (inner_cond_bb, outer_cond_bb); if (dump_file) { -- 2.30.2