From 7dc69ec076bf4baa128a1ee660014bfefe3828df Mon Sep 17 00:00:00 2001 From: Andrey Belevantsev Date: Tue, 2 Apr 2019 18:39:22 +0300 Subject: [PATCH] sel-sched: fixup reset of first_insn (PR 85876) 2019-04-02 Andrey Belevantsev 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 --- gcc/ChangeLog | 6 ++++++ gcc/sel-sched.c | 6 ++++-- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/pr85876.c | 18 ++++++++++++++++++ 4 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/pr85876.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4cdb8029514..e02099715e3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2019-04-02 Andrey Belevantsev + + PR rtl-optimization/85876 + * sel-sched.c (code_motion_path_driver): Avoid unwinding first_insn + beyond the original fence. + 2019-04-02 Ulrich Weigand * config.gcc: Mark spu* targets as deprecated/obsolete. diff --git a/gcc/sel-sched.c b/gcc/sel-sched.c index 552dd0b9263..f6e94bfc15c 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 25b8acb0a01..04d9de44734 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-04-02 Andrey Belevantsev + + PR rtl-optimization/85876 + * gcc.dg/pr85876.c: New test. + 2019-04-02 Andreas Krebbel * 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 00000000000..64618e5258c --- /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; + } +} -- 2.30.2