mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-28 16:01:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR rtl-optimization/42388 (ICE in move_bb_info with sel-sched and modulo-sched for 176.gcc)

Browse Source 
PR rtl-optimization/42388
        * sel-sched-ir.c (maybe_tidy_empty_bb): Do not delete empty blocks
        that have no predecessors nor successors.  Do not call move_bb_info
        for empty blocks outside of current region.

From-SVN: r155894
This commit is contained in:
Andrey Belevantsev 2010-01-14 14:02:18 +03:00
parent 14f30b877f
commit 762bffbac1
4 changed files with 86 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ChangeLog
View File

@ -1,3 +1,10 @@
2010-01-14 Andrey Belevantsev <abel@ispras.ru>
PR rtl-optimization/42388
* sel-sched-ir.c (maybe_tidy_empty_bb): Do not delete empty blocks
that have no predecessors nor successors. Do not call move_bb_info
for empty blocks outside of current region.
2010-01-14 Alexander Monakov <amonakov@ispras.ru>
PR rtl-optimization/42294

10
gcc/sel-sched-ir.c
View File

@ -3540,12 +3540,15 @@ maybe_tidy_empty_bb (basic_block bb, bool recompute_toporder_p)
bool rescan_p;
/* Keep empty bb only if this block immediately precedes EXIT and
has incoming non-fallthrough edge. Otherwise remove it. */
has incoming non-fallthrough edge, or it has no predecessors or
successors. Otherwise remove it. */
if (!sel_bb_empty_p (bb)
|| (single_succ_p (bb)
&& single_succ (bb) == EXIT_BLOCK_PTR
&& (!single_pred_p (bb)
|| !(single_pred_edge (bb)->flags & EDGE_FALLTHRU))))
|| !(single_pred_edge (bb)->flags & EDGE_FALLTHRU)))
|| EDGE_COUNT (bb->preds) == 0
|| EDGE_COUNT (bb->succs) == 0)
return false;
/* Do not attempt to redirect complex edges. */
@ -3595,7 +3598,8 @@ maybe_tidy_empty_bb (basic_block bb, bool recompute_toporder_p)
{
gcc_assert (pred_bb != NULL);
move_bb_info (pred_bb, bb);
if (in_current_region_p (pred_bb))
move_bb_info (pred_bb, bb);
remove_empty_bb (bb, true);
}

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2010-01-14 Alexander Monakov <amonakov@ispras.ru>
PR rtl-optimization/42388
* gcc.dg/pr42388.c: New.
2010-01-14 Alexander Monakov <amonakov@ispras.ru>
PR rtl-optimization/42294

67
gcc/testsuite/gcc.dg/pr42388.c Normal file
View File

@ -0,0 +1,67 @@
/* { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } } */
/* { dg-options "-O2 -fselective-scheduling -fmodulo-sched" } */
enum rtx_code
{
INSN, ADDR_VEC, ADDR_DIFF_VEC, CALL_INSN, CODE_LABEL, BARRIER, NOTE
};
typedef union rtunion_def
{
int rtint;
char *rtstr;
struct rtx_def *rtx;
struct rtvec_def *rtvec;
}
rtunion;
typedef struct rtx_def
{
unsigned short code;
rtunion fld[1];
}
*rtx;
typedef struct rtvec_def
{
unsigned num_elem;
rtunion elem[1];
}
*rtvec;
extern rtx emit_barrier (void);
extern rtx emit_note (char *);
static void
copy_loop_body (rtx *map)
{
int i;
rtx insn, copy;
rtx pat = copy->fld[3].rtx;
switch (insn->code)
{
case INSN:
if (insn->fld[7].rtx)
{
}
else if (pat->code == ADDR_VEC || pat->code == ADDR_DIFF_VEC)
{
int diff_vec_p = pat->code == ADDR_DIFF_VEC;
int len = pat->fld[diff_vec_p].rtvec->num_elem;
for (i = 0; i < len; i++)
pat->fld[diff_vec_p].rtvec->elem[i].rtx->fld[5].rtint++;
}
case CALL_INSN:
for (i = 0; i < 64; i++)
map[i] = 0;
case CODE_LABEL:
case BARRIER:
copy = emit_barrier ();
case NOTE:
copy = emit_note ("x");
}
}
void
unroll_loop (int insn_count, rtx *map)
{
if (insn_count > 50)
copy_loop_body (map);
}