git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR rtl-optimization/52203 (ICE: in reset_sched_cycles_in_current_ebb, at sel-sched.c:7136 with -fsel-sched-pipelining -fselective-scheduling2 and other custom flags) 

PR rtl-optimization/52203
        PR rtl-optimization/52715

        Revert the 2012-03-07 fix for PR 52203.
        * sel-sched.c (reset_sched_cycles_in_current_ebb): Check that
        the insn does not modify DFA right before issuing, adjust
        issue_rate accordingly.

From-SVN: r186410
This commit is contained in:
Andrey Belevantsev 2012-04-13 13:36:42 +04:00 committed by Andrey Belevantsev
parent 1e867b228f
commit d66b8f4bfb
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gcc/ChangeLog
View File

@ -1,3 +1,13 @@
2012-04-13 Andrey Belevantsev <abel@ispras.ru>
PR rtl-optimization/52203
PR rtl-optimization/52715
Revert the 2012-03-07 fix for PR 52203.
* sel-sched.c (reset_sched_cycles_in_current_ebb): Check that
the insn does not modify DFA right before issuing, adjust
issue_rate accordingly.
2012-04-13 Richard Guenther <rguenther@suse.de>
PR c/52549

25
gcc/sel-sched.c
View File

@ -4265,10 +4265,9 @@ invoke_aftermath_hooks (fence_t fence, rtx best_insn, int issue_more)
return issue_more;
}
/* Estimate the cost of issuing INSN on DFA state STATE. Write to PEMPTY
true when INSN does not change the processor state. */
/* Estimate the cost of issuing INSN on DFA state STATE. */
static int
estimate_insn_cost (rtx insn, state_t state, bool *pempty)
estimate_insn_cost (rtx insn, state_t state)
{
static state_t temp = NULL;
int cost;
@ -4278,8 +4277,6 @@ estimate_insn_cost (rtx insn, state_t state, bool *pempty)
memcpy (temp, state, dfa_state_size);
cost = state_transition (temp, insn);
if (pempty)
*pempty = (memcmp (temp, state, dfa_state_size) == 0);
if (cost < 0)
return 0;
@ -4310,7 +4307,7 @@ get_expr_cost (expr_t expr, fence_t fence)
return 0;
}
else
return estimate_insn_cost (insn, FENCE_STATE (fence), NULL);
return estimate_insn_cost (insn, FENCE_STATE (fence));
}
/* Find the best insn for scheduling, either via max_issue or just take
@ -7023,7 +7020,7 @@ reset_sched_cycles_in_current_ebb (void)
{
int cost, haifa_cost;
int sort_p;
bool asm_p, real_insn, after_stall, all_issued, empty;
bool asm_p, real_insn, after_stall, all_issued;
int clock;
if (!INSN_P (insn))
@ -7050,7 +7047,7 @@ reset_sched_cycles_in_current_ebb (void)
haifa_cost = 0;
}
else
haifa_cost = estimate_insn_cost (insn, curr_state, &empty);
haifa_cost = estimate_insn_cost (insn, curr_state);
/* Stall for whatever cycles we've stalled before. */
after_stall = 0;
@ -7084,7 +7081,7 @@ reset_sched_cycles_in_current_ebb (void)
if (!after_stall
&& real_insn
&& haifa_cost > 0
&& estimate_insn_cost (insn, curr_state, NULL) == 0)
&& estimate_insn_cost (insn, curr_state) == 0)
break;
/* When the data dependency stall is longer than the DFA stall,
@ -7096,7 +7093,7 @@ reset_sched_cycles_in_current_ebb (void)
if ((after_stall || all_issued)
&& real_insn
&& haifa_cost == 0)
haifa_cost = estimate_insn_cost (insn, curr_state, NULL);
haifa_cost = estimate_insn_cost (insn, curr_state);
}
haifa_clock += i;
@ -7127,8 +7124,14 @@ reset_sched_cycles_in_current_ebb (void)
if (real_insn)
{
static state_t temp = NULL;
if (!temp)
temp = xmalloc (dfa_state_size);
memcpy (temp, curr_state, dfa_state_size);
cost = state_transition (curr_state, insn);
if (!empty)
if (memcmp (temp, curr_state, dfa_state_size))
issued_insns++;
if (sched_verbose >= 2)