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

backport: sh.c (shiftcosts): Return MAX_COST when the first operand is CONST_INT. 

Backport from mainline
	2012-03-03  Kaz Kojima  <kkojima@gcc.gnu.org>

	* config/sh/sh.c (shiftcosts): Return MAX_COST when the first
	operand is CONST_INT.  Take COSTS_N_INSNS into account.
	(sh_rtx_costs): Don't apply COSTS_N_INSNS to the return value of
	shiftcosts.

From-SVN: r188084
This commit is contained in:
Oleg Endo 2012-05-31 22:54:21 +00:00
parent 16b8af9e2e
commit 88da6cddaa
2 changed files with 20 additions and 6 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-06-01 Oleg Endo <olegendo@gcc.gnu.org>
Backport from mainline
2012-03-03 Kaz Kojima <kkojima@gcc.gnu.org>
* config/sh/sh.c (shiftcosts): Return MAX_COST when the first
operand is CONST_INT. Take COSTS_N_INSNS into account.
(sh_rtx_costs): Don't apply COSTS_N_INSNS to the return value of
shiftcosts.
2012-05-31 Georg-Johann Lay <avr@gjlay.de>
* config/avr/avr.opt (-msp8): Document it.

16
gcc/config/sh/sh.c
View File

@ -2811,22 +2811,26 @@ shiftcosts (rtx x)
{
int value;
/* There is no pattern for constant first operand. */
if (CONST_INT_P (XEXP (x, 0)))
return MAX_COST;
if (TARGET_SHMEDIA)
return 1;
return COSTS_N_INSNS (1);
if (GET_MODE_SIZE (GET_MODE (x)) > UNITS_PER_WORD)
{
if (GET_MODE (x) == DImode
&& CONST_INT_P (XEXP (x, 1))
&& INTVAL (XEXP (x, 1)) == 1)
return 2;
return COSTS_N_INSNS (2);
/* Everything else is invalid, because there is no pattern for it. */
return MAX_COST;
}
/* If shift by a non constant, then this will be expensive. */
if (!CONST_INT_P (XEXP (x, 1)))
return SH_DYNAMIC_SHIFT_COST;
return COSTS_N_INSNS (SH_DYNAMIC_SHIFT_COST);
/* Otherwise, return the true cost in instructions. Cope with out of range
shift counts more or less arbitrarily. */
@ -2838,10 +2842,10 @@ shiftcosts (rtx x)
/* If SH3, then we put the constant in a reg and use shad. */
if (cost > 1 + SH_DYNAMIC_SHIFT_COST)
cost = 1 + SH_DYNAMIC_SHIFT_COST;
return cost;
return COSTS_N_INSNS (cost);
}
else
return shift_insns[value];
return COSTS_N_INSNS (shift_insns[value]);
}
/* Return the cost of an AND/XOR/IOR operation. */
@ -3074,7 +3078,7 @@ sh_rtx_costs (rtx x, int code, int outer_code, int opno ATTRIBUTE_UNUSED,
case ASHIFT:
case ASHIFTRT:
case LSHIFTRT:
*total = COSTS_N_INSNS (shiftcosts (x));
*total = shiftcosts (x);
return true;
case DIV: