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

re PR rtl-optimization/24823 (ICE in insert_save, at caller-save.c:719) 

2005-12-16  Andreas Krebbel  <krebbel1@de.ibm.com>

	PR 24823
	* flow.c (mark_used_dest_regs): New function.
	(mark_used_regs): Call mark_used_dest_regs.

2005-12-16  Andreas Krebbel  <krebbel1@de.ibm.com>

	PR 24823
	* gfortran.dg/pr24823.f: New test.

From-SVN: r108632
This commit is contained in:
Andreas Krebbel 2005-12-16 09:09:37 +00:00 committed by Andreas Krebbel
parent 7d48c9e2cc
commit 52c6b0b7dc
4 changed files with 185 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2005-12-16 Andreas Krebbel <krebbel1@de.ibm.com>
PR 24823
* flow.c (mark_used_dest_regs): New function.
(mark_used_regs): Call mark_used_dest_regs.
2005-12-16 Jeff Law <law@redhat.com>
* tree-ssa-dse.c (dse_optimize_stmt): Correctly handle PHI nodes which

162
gcc/flow.c
View File

@ -3879,6 +3879,92 @@ mark_used_reg (struct propagate_block_info *pbi, rtx reg,
}
}
/* Scan expression X for registers which have to be marked used in PBI.
X is considered to be the SET_DEST rtx of SET. TRUE is returned if
X could be handled by this function. */
static bool
mark_used_dest_regs (struct propagate_block_info *pbi, rtx x, rtx cond, rtx insn)
{
int regno;
bool mark_dest = false;
rtx dest = x;
/* On some platforms calls return values spread over several
locations. These locations are wrapped in a EXPR_LIST rtx
together with a CONST_INT offset. */
if (GET_CODE (x) == EXPR_LIST
&& GET_CODE (XEXP (x, 1)) == CONST_INT)
x = XEXP (x, 0);
if (x == NULL_RTX)
return false;
/* If storing into MEM, don't show it as being used. But do
show the address as being used. */
if (MEM_P (x))
{
#ifdef AUTO_INC_DEC
if (pbi->flags & PROP_AUTOINC)
find_auto_inc (pbi, x, insn);
#endif
mark_used_regs (pbi, XEXP (x, 0), cond, insn);
return true;
}
/* Storing in STRICT_LOW_PART is like storing in a reg
in that this SET might be dead, so ignore it in TESTREG.
but in some other ways it is like using the reg.
Storing in a SUBREG or a bit field is like storing the entire
register in that if the register's value is not used
then this SET is not needed. */
while (GET_CODE (x) == STRICT_LOW_PART
|| GET_CODE (x) == ZERO_EXTRACT
|| GET_CODE (x) == SUBREG)
{
#ifdef CANNOT_CHANGE_MODE_CLASS
if ((pbi->flags & PROP_REG_INFO) && GET_CODE (x) == SUBREG)
record_subregs_of_mode (x);
#endif
/* Modifying a single register in an alternate mode
does not use any of the old value. But these other
ways of storing in a register do use the old value. */
if (GET_CODE (x) == SUBREG
&& !((REG_BYTES (SUBREG_REG (x))
+ UNITS_PER_WORD - 1) / UNITS_PER_WORD
> (REG_BYTES (x)
+ UNITS_PER_WORD - 1) / UNITS_PER_WORD))
;
else
mark_dest = true;
x = XEXP (x, 0);
}
/* If this is a store into a register or group of registers,
recursively scan the value being stored. */
if (REG_P (x)
&& (regno = REGNO (x),
!(regno == FRAME_POINTER_REGNUM
&& (!reload_completed || frame_pointer_needed)))
#if FRAME_POINTER_REGNUM != HARD_FRAME_POINTER_REGNUM
&& !(regno == HARD_FRAME_POINTER_REGNUM
&& (!reload_completed || frame_pointer_needed))
#endif
#if FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM
&& !(regno == ARG_POINTER_REGNUM && fixed_regs[regno])
#endif
)
{
if (mark_dest)
mark_used_regs (pbi, dest, cond, insn);
return true;
}
return false;
}
/* Scan expression X and store a 1-bit in NEW_LIVE for each reg it uses.
This is done assuming the registers needed from X are those that
have 1-bits in PBI->REG_LIVE.
@ -3890,7 +3976,6 @@ static void
mark_used_regs (struct propagate_block_info *pbi, rtx x, rtx cond, rtx insn)
{
RTX_CODE code;
int regno;
int flags = pbi->flags;
retry:
@ -3991,73 +4076,18 @@ mark_used_regs (struct propagate_block_info *pbi, rtx x, rtx cond, rtx insn)
case SET:
{
rtx testreg = SET_DEST (x);
int mark_dest = 0;
rtx dest = SET_DEST (x);
int i;
bool ret = false;
/* If storing into MEM, don't show it as being used. But do
show the address as being used. */
if (MEM_P (testreg))
if (GET_CODE (dest) == PARALLEL)
for (i = 0; i < XVECLEN (dest, 0); i++)
ret |= mark_used_dest_regs (pbi, XVECEXP (dest, 0, i), cond, insn);
else
ret = mark_used_dest_regs (pbi, dest, cond, insn);
if (ret)
{
#ifdef AUTO_INC_DEC
if (flags & PROP_AUTOINC)
find_auto_inc (pbi, testreg, insn);
#endif
mark_used_regs (pbi, XEXP (testreg, 0), cond, insn);
mark_used_regs (pbi, SET_SRC (x), cond, insn);
return;
}
/* Storing in STRICT_LOW_PART is like storing in a reg
in that this SET might be dead, so ignore it in TESTREG.
but in some other ways it is like using the reg.
Storing in a SUBREG or a bit field is like storing the entire
register in that if the register's value is not used
then this SET is not needed. */
while (GET_CODE (testreg) == STRICT_LOW_PART
|| GET_CODE (testreg) == ZERO_EXTRACT
|| GET_CODE (testreg) == SUBREG)
{
#ifdef CANNOT_CHANGE_MODE_CLASS
if ((flags & PROP_REG_INFO) && GET_CODE (testreg) == SUBREG)
record_subregs_of_mode (testreg);
#endif
/* Modifying a single register in an alternate mode
does not use any of the old value. But these other
ways of storing in a register do use the old value. */
if (GET_CODE (testreg) == SUBREG
&& !((REG_BYTES (SUBREG_REG (testreg))
+ UNITS_PER_WORD - 1) / UNITS_PER_WORD
> (REG_BYTES (testreg)
+ UNITS_PER_WORD - 1) / UNITS_PER_WORD))
;
else
mark_dest = 1;
testreg = XEXP (testreg, 0);
}
/* If this is a store into a register or group of registers,
recursively scan the value being stored. */
if ((GET_CODE (testreg) == PARALLEL
&& GET_MODE (testreg) == BLKmode)
|| (REG_P (testreg)
&& (regno = REGNO (testreg),
! (regno == FRAME_POINTER_REGNUM
&& (! reload_completed || frame_pointer_needed)))
#if FRAME_POINTER_REGNUM != HARD_FRAME_POINTER_REGNUM
&& ! (regno == HARD_FRAME_POINTER_REGNUM
&& (! reload_completed || frame_pointer_needed))
#endif
#if FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM
&& ! (regno == ARG_POINTER_REGNUM && fixed_regs[regno])
#endif
))
{
if (mark_dest)
mark_used_regs (pbi, SET_DEST (x), cond, insn);
mark_used_regs (pbi, SET_SRC (x), cond, insn);
return;
}

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2005-12-16 Andreas Krebbel <krebbel1@de.ibm.com>
PR 24823
* gfortran.dg/pr24823.f: New test.
2005-12-16 Jeff Law <law@redhat.com>
* gcc.dg/tree-ssa/ssa-dse-8.c: New test.

78
gcc/testsuite/gfortran.dg/pr24823.f Normal file
View File

@ -0,0 +1,78 @@
! { dg-do compile }
! { dg-options "-O2" }
! PR24823 Flow didn't handle a PARALLEL as destination of a SET properly.
SUBROUTINE ZLATMR( M, N, DIST, ISEED, SYM, D, MODE, COND, DMAX,
$ RSIGN, GRADE, DL, MODEL, CONDL, DR, MODER,
$ PACK, A, LDA, IWORK, INFO )
COMPLEX*16 A( LDA, * ), D( * ), DL( * ), DR( * )
LOGICAL BADPVT, DZERO, FULBND
COMPLEX*16 ZLATM2, ZLATM3
IF( IGRADE.EQ.4 .AND. MODEL.EQ.0 ) THEN
END IF
IF( IPVTNG.GT.0 ) THEN
END IF
IF( M.LT.0 ) THEN
ELSE IF( IPACK.EQ.-1 .OR. ( ( IPACK.EQ.1 .OR. IPACK.EQ.2 .OR.
$ IPACK.EQ.5 .OR. IPACK.EQ.6 ) .AND. ISYM.EQ.1 ) .OR.
$ ( IPACK.EQ.3 .AND. ISYM.EQ.1 .AND. ( KL.NE.0 .OR. M.NE.
$ 6 ) .AND. LDA.LT.KUU+1 ) .OR.
$ ( IPACK.EQ.7 .AND. LDA.LT.KLL+KUU+1 ) ) THEN
INFO = -26
END IF
IF( INFO.NE.0 ) THEN
RETURN
END IF
IF( KUU.EQ.N-1 .AND. KLL.EQ.M-1 )
$ FULBND = .TRUE.
IF( MODE.NE.0 .AND. MODE.NE.-6 .AND. MODE.NE.6 ) THEN
TEMP = ABS( D( 1 ) )
IF( TEMP.EQ.ZERO .AND. DMAX.NE.CZERO ) THEN
INFO = 2
END IF
END IF
IF( ISYM.EQ.0 ) THEN
END IF
IF( IGRADE.EQ.1 .OR. IGRADE.EQ.3 .OR. IGRADE.EQ.4 .OR. IGRADE.EQ.
$ 5 .OR. IGRADE.EQ.6 ) THEN
IF( INFO.NE.0 ) THEN
END IF
END IF
IF( FULBND ) THEN
IF( IPACK.EQ.0 ) THEN
IF( ISYM.EQ.0 ) THEN
CTEMP = ZLATM3( M, N, I, J, ISUB, JSUB, KL, KU,
$ IWORK, SPARSE )
DO 120 I = 1, M
CTEMP = ZLATM3( M, N, I, J, ISUB, JSUB, KL, KU,
$ IWORK, SPARSE )
120 CONTINUE
END IF
IF( I.LT.1 ) THEN
IF( ISYM.EQ.0 ) THEN
A( J-I+1, I ) = DCONJG( ZLATM2( M, N, I, J, KL,
$ DR, IPVTNG, IWORK, SPARSE ) )
ELSE
A( J-I+1, I ) = ZLATM2( M, N, I, J, KL, KU,
$ IPVTNG, IWORK, SPARSE )
END IF
END IF
IF( ISYM.NE.1 ) THEN
IF( I.GE.1 .AND. I.NE.J ) THEN
IF( ISYM.EQ.0 ) THEN
END IF
END IF
A( I-J+KUU+1, J ) = ZLATM2( M, N, I, J, KL, KU,
$ DR, IPVTNG, IWORK, SPARSE )
END IF
END IF
END IF
IF( IPACK.EQ.0 ) THEN
ONORM = ZLANGB( 'M', N, KLL, KUU, A, LDA, TEMPA )
END IF
IF( ANORM.GE.ZERO ) THEN
IF( ANORM.GT.ZERO .AND. ONORM.EQ.ZERO ) THEN
IF( IPACK.LE.2 ) THEN
END IF
END IF
END IF
END