diff options
| author | Dehao Chen <dehao@google.com> | 2014-06-03 21:36:05 +0000 |
|---|---|---|
| committer | Dehao Chen <dehao@gcc.gnu.org> | 2014-06-03 21:36:05 +0000 |
| commit | 47e78f984ef151c621587a4dcdebc48dd577a36a (patch) | |
| tree | 830ac6e9ad7a9571a908b35acefb2b113b8183f3 /gcc | |
| parent | eb7404d46ae0ac7ec733e7b3850a00f11df2d4b7 (diff) | |
| download | gcc-47e78f984ef151c621587a4dcdebc48dd577a36a.zip gcc-47e78f984ef151c621587a4dcdebc48dd577a36a.tar.gz gcc-47e78f984ef151c621587a4dcdebc48dd577a36a.tar.bz2 | |
tree-cfg.c (gimple_merge_blocks): Only reset count when BBs are in the same loop.
2014-06-03 Dehao Chen <dehao@google.com>
* tree-cfg.c (gimple_merge_blocks): Only reset count when BBs are in
the same loop.
* gcc.dg/tree-prof/merge_block.c: New test.
From-SVN: r211202
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/tree-prof/merge_block.c | 21 | ||||
| -rw-r--r-- | gcc/tree-cfg.c | 7 |
4 files changed, 35 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 406179f..0d61afe 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2014-06-03 Dehao Chen <dehao@google.com> + + * tree-cfg.c (gimple_merge_blocks): Only reset count when BBs are in + the same loop. + 2014-06-03 Marek Polacek <polacek@redhat.com> PR c/60439 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index dbe2e44..db89ee3 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2014-06-03 Dehao Chen <dehao@google.com> + + * gcc.dg/tree-prof/merge_block.c: New test. + 2014-06-03 Uros Bizjak <ubizjak@gmail.com> * g++.dg/ext/mv14.C (dg-options): Add -march=x86-64. diff --git a/gcc/testsuite/gcc.dg/tree-prof/merge_block.c b/gcc/testsuite/gcc.dg/tree-prof/merge_block.c new file mode 100644 index 0000000..62f7f22 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-prof/merge_block.c @@ -0,0 +1,21 @@ + +/* { dg-options "-O2 -fno-ipa-pure-const -fdump-tree-optimized-blocks-details -fno-early-inlining" } */ +int a[8]; +int t() +{ + int i; + for (i = 0; i < 3; i++) + if (a[i]) + break; + return i; +} +main () +{ + int i; + /* The loop will be optimized away after ipa-inline. */ + for (i = 0; i < 1000; i++) + t (); + return 0; +} +/* { dg-final-use { scan-tree-dump-not "Invalid sum" "optimized"} } */ +/* { dg-final-use { cleanup-tree-dump "optimized" } } */ diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c index 126a1a9..acf08fc 100644 --- a/gcc/tree-cfg.c +++ b/gcc/tree-cfg.c @@ -1880,8 +1880,11 @@ gimple_merge_blocks (basic_block a, basic_block b) /* When merging two BBs, if their counts are different, the larger count is selected as the new bb count. This is to handle inconsistent profiles. */ - a->count = MAX (a->count, b->count); - a->frequency = MAX (a->frequency, b->frequency); + if (a->loop_father == b->loop_father) + { + a->count = MAX (a->count, b->count); + a->frequency = MAX (a->frequency, b->frequency); + } /* Merge the sequences. */ last = gsi_last_bb (a); |