OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

reorg.c (try_merge_delay_insns): Improve correctness checking for targets with multiple delay slots. 

* reorg.c (try_merge_delay_insns): Improve correctness checking
        for targets with multiple delay slots.

From-SVN: r222245
This commit is contained in:
Selim Belbachir 2015-04-20 17:47:10 +00:00 committed by Jeff Law
parent 6581c1cffb
commit 87e0ceb78c
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -1,3 +1,8 @@
2015-04-20 Selim Belbachir <selim.belbachir@fr.thalesgroup.com>
* reorg.c (try_merge_delay_insns): Improve correctness checking
for targets with multiple delay slots.
2015-04-20 Jeff Law <law@redhat.com>
PR tree-optimization/65658

20
gcc/reorg.c
View File

@ -1338,9 +1338,9 @@ try_merge_delay_insns (rtx insn, rtx_insn *thread)
int slot_number = 1;
int num_slots = XVECLEN (PATTERN (insn), 0);
rtx next_to_match = XVECEXP (PATTERN (insn), 0, slot_number);
struct resources set, needed;
struct resources set, needed, modified;
rtx_insn_list *merged_insns = 0;
int i;
int i, j;
int flags;
flags = get_jump_flags (delay_insn, JUMP_LABEL (delay_insn));
@ -1432,6 +1432,17 @@ try_merge_delay_insns (rtx insn, rtx_insn *thread)
{
rtx_insn *dtrial = pat->insn (i);
CLEAR_RESOURCE (&modified);
/* Account for resources set by the the insn following NEXT_TO_MATCH
inside INSN's delay list. */
for (j = 1; slot_number + j < num_slots; j++)
mark_set_resources (XVECEXP (PATTERN (insn), 0, slot_number + j),
&modified, 0, MARK_SRC_DEST_CALL);
/* Account for resources set by the the insn before DTRIAL and inside
TRIAL's delay list. */
for (j = 1; j < i; j++)
mark_set_resources (XVECEXP (pat, 0, j),
&modified, 0, MARK_SRC_DEST_CALL);
if (! insn_references_resource_p (dtrial, &set, true)
&& ! insn_sets_resource_p (dtrial, &set, true)
&& ! insn_sets_resource_p (dtrial, &needed, true)
@ -1439,6 +1450,11 @@ try_merge_delay_insns (rtx insn, rtx_insn *thread)
&& ! sets_cc0_p (PATTERN (dtrial))
#endif
&& rtx_equal_p (PATTERN (next_to_match), PATTERN (dtrial))
/* Check that DTRIAL and NEXT_TO_MATCH does not reference a
resource modified between them (only dtrial is checked because
next_to_match and dtrial shall to be equal in order to hit
this line) */
&& ! insn_references_resource_p (dtrial, &modified, true)
&& eligible_for_delay (delay_insn, slot_number - 1, dtrial, flags))
{
if (! annul_p)