diff options
| author | Andrey Belevantsev <abel@ispras.ru> | 2019-04-02 18:39:22 +0300 |
|---|---|---|
| committer | Alexander Monakov <amonakov@gcc.gnu.org> | 2019-04-02 18:39:22 +0300 |
| commit | 7dc69ec076bf4baa128a1ee660014bfefe3828df (patch) | |
| tree | 6a4c4969fc000c5ac257c5db95ba979607693dfe | |
| parent | 43f47cdf13b6c1c7c648d0d04aa0404a7e899528 (diff) | |
| download | gcc-7dc69ec076bf4baa128a1ee660014bfefe3828df.zip gcc-7dc69ec076bf4baa128a1ee660014bfefe3828df.tar.gz gcc-7dc69ec076bf4baa128a1ee660014bfefe3828df.tar.bz2 | |
sel-sched: fixup reset of first_insn (PR 85876)
2019-04-02 Andrey Belevantsev <abel@ispras.ru>
PR rtl-optimization/85876
* sel-sched.c (code_motion_path_driver): Avoid unwinding first_insn
beyond the original fence.
* gcc.dg/pr85876.c: New test.
From-SVN: r270095
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/sel-sched.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/pr85876.c | 18 |
4 files changed, 33 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4cdb802..e020997 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2019-04-02 Andrey Belevantsev <abel@ispras.ru> + + PR rtl-optimization/85876 + * sel-sched.c (code_motion_path_driver): Avoid unwinding first_insn + beyond the original fence. + 2019-04-02 Ulrich Weigand <uweigand@de.ibm.com> * config.gcc: Mark spu* targets as deprecated/obsolete. diff --git a/gcc/sel-sched.c b/gcc/sel-sched.c index 552dd0b..f6e94bf 100644 --- a/gcc/sel-sched.c +++ b/gcc/sel-sched.c @@ -6439,7 +6439,7 @@ code_motion_path_driver (insn_t insn, av_set_t orig_ops, ilist_t path, { expr_t expr = NULL; basic_block bb = BLOCK_FOR_INSN (insn); - insn_t first_insn, bb_tail, before_first; + insn_t first_insn, original_insn, bb_tail, before_first; bool removed_last_insn = false; if (sched_verbose >= 6) @@ -6523,7 +6523,7 @@ code_motion_path_driver (insn_t insn, av_set_t orig_ops, ilist_t path, /* It is enough to place only heads and tails of visited basic blocks into the PATH. */ ilist_add (&path, insn); - first_insn = insn; + first_insn = original_insn = insn; bb_tail = sel_bb_end (bb); /* Descend the basic block in search of the original expr; this part @@ -6630,6 +6630,8 @@ code_motion_path_driver (insn_t insn, av_set_t orig_ops, ilist_t path, { insn = sel_bb_end (bb); first_insn = sel_bb_head (bb); + if (first_insn != original_insn) + first_insn = original_insn; } /* Remove bb tail from path. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 25b8acb..04d9de4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-04-02 Andrey Belevantsev <abel@ispras.ru> + + PR rtl-optimization/85876 + * gcc.dg/pr85876.c: New test. + 2019-04-02 Andreas Krebbel <krebbel@linux.ibm.com> * gcc.target/s390/zvector/vec-double-compile.c: New test. diff --git a/gcc/testsuite/gcc.dg/pr85876.c b/gcc/testsuite/gcc.dg/pr85876.c new file mode 100644 index 0000000..64618e5 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr85876.c @@ -0,0 +1,18 @@ +/* { dg-do compile { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } } */ +/* { dg-options "-O2 -fschedule-insns -fsel-sched-pipelining -fselective-scheduling -fno-if-conversion -fno-tree-dce" } */ +/* { dg-additional-options "-march=bdver1" { target i?86-*-* x86_64-*-* } } */ + +int ov, rq, ac; + +int +y2 (int); + +void +f8 (int vn) +{ + while (rq < 1) + { + ov *= y2 (ac); + vn += (!!ov && !!ac) + ac; + } +} |