Skip to content

R
riscv-gcc-1
Commit b8b139c7 by Jakub Jelinek Committed by Jakub Jelinek
Options

expr.c (expand_assignment): Reenable bitfield += optimizations. 

	* expr.c (expand_assignment): Reenable bitfield += optimizations.
	Use alias set 0 for memory, do proper mode calculations and adjust
	address for memories.

	* gcc.c-torture/execute/20040709-1.c: New test.
	* gcc.c-torture/execute/20040709-2.c: New test.

From-SVN: r84722
parent aa3c6dc1
Showing with 372 additions and 21 deletions
gcc/ChangeLog
2004-07-15 Jakub Jelinek <jakub@redhat.com>
* expr.c (expand_assignment): Reenable bitfield += optimizations.
Use alias set 0 for memory, do proper mode calculations and adjust
address for memories.
2004-07-14 Per Bothner <per@bothner.com> 2004-07-14 Per Bothner <per@bothner.com>
* input.h: If USE_MAPPED_LOCATION, define separate expanded_location * input.h: If USE_MAPPED_LOCATION, define separate expanded_location
......
gcc/expr.c
...@@ -3528,18 +3528,16 @@ expand_assignment (tree to, tree from, int want_value) ...@@ -3528,18 +3528,16 @@ expand_assignment (tree to, tree from, int want_value)
MEM_KEEP_ALIAS_SET_P (to_rtx) = 1; MEM_KEEP_ALIAS_SET_P (to_rtx) = 1;
} }
/* Disabled temporarily. GET_MODE (to_rtx) is often not the right /* Optimize bitfld op= val in certain cases. */
mode. */ while (mode1 == VOIDmode && !want_value
while (0 && mode1 == VOIDmode && !want_value && bitsize > 0 && bitsize < BITS_PER_WORD
&& bitpos + bitsize <= BITS_PER_WORD
&& bitsize < BITS_PER_WORD
&& GET_MODE_BITSIZE (GET_MODE (to_rtx)) <= BITS_PER_WORD && GET_MODE_BITSIZE (GET_MODE (to_rtx)) <= BITS_PER_WORD
&& !TREE_SIDE_EFFECTS (to) && !TREE_SIDE_EFFECTS (to)
&& !TREE_THIS_VOLATILE (to)) && !TREE_THIS_VOLATILE (to))
{ {
tree src, op0, op1; tree src, op0, op1;
rtx value; rtx value, str_rtx = to_rtx;
HOST_WIDE_INT count = bitpos; HOST_WIDE_INT bitpos1 = bitpos;
optab binop; optab binop;
src = from; src = from;
...@@ -3555,45 +3553,87 @@ expand_assignment (tree to, tree from, int want_value) ...@@ -3555,45 +3553,87 @@ expand_assignment (tree to, tree from, int want_value)
if (! operand_equal_p (to, op0, 0)) if (! operand_equal_p (to, op0, 0))
break; break;
if (MEM_P (str_rtx))
{
enum machine_mode mode = GET_MODE (str_rtx);
HOST_WIDE_INT offset1;
if (GET_MODE_BITSIZE (mode) == 0
|| GET_MODE_BITSIZE (mode) > BITS_PER_WORD)
mode = word_mode;
mode = get_best_mode (bitsize, bitpos1, MEM_ALIGN (str_rtx),
mode, 0);
if (mode == VOIDmode)
break;
offset1 = bitpos1;
bitpos1 %= GET_MODE_BITSIZE (mode);
offset1 = (offset1 - bitpos1) / BITS_PER_UNIT;
str_rtx = adjust_address (str_rtx, mode, offset1);
}
else if (!REG_P (str_rtx) && GET_CODE (str_rtx) != SUBREG)
break;
/* If the bit field covers the whole REG/MEM, store_field
will likely generate better code. */
if (bitsize >= GET_MODE_BITSIZE (GET_MODE (str_rtx)))
break;
/* We can't handle fields split accross multiple entities. */
if (bitpos1 + bitsize > GET_MODE_BITSIZE (GET_MODE (str_rtx)))
break;
if (BYTES_BIG_ENDIAN) if (BYTES_BIG_ENDIAN)
count = GET_MODE_BITSIZE (GET_MODE (to_rtx)) - bitpos - bitsize; bitpos1 = GET_MODE_BITSIZE (GET_MODE (str_rtx)) - bitpos1
- bitsize;
/* Special case some bitfield op= exp. */ /* Special case some bitfield op= exp. */
switch (TREE_CODE (src)) switch (TREE_CODE (src))
{ {
case PLUS_EXPR: case PLUS_EXPR:
case MINUS_EXPR: case MINUS_EXPR:
if (count <= 0)
break;
/* For now, just optimize the case of the topmost bitfield /* For now, just optimize the case of the topmost bitfield
where we don't need to do any masking and also where we don't need to do any masking and also
1 bit bitfields where xor can be used. 1 bit bitfields where xor can be used.
We might win by one instruction for the other bitfields We might win by one instruction for the other bitfields
too if insv/extv instructions aren't used, so that too if insv/extv instructions aren't used, so that
can be added later. */ can be added later. */
if (count + bitsize != GET_MODE_BITSIZE (GET_MODE (to_rtx)) if (bitpos1 + bitsize != GET_MODE_BITSIZE (GET_MODE (str_rtx))
&& (bitsize != 1 || TREE_CODE (op1) != INTEGER_CST)) && (bitsize != 1 || TREE_CODE (op1) != INTEGER_CST))
break; break;
value = expand_expr (op1, NULL_RTX, VOIDmode, 0); value = expand_expr (op1, NULL_RTX, GET_MODE (str_rtx), 0);
value = convert_modes (GET_MODE (str_rtx),
TYPE_MODE (TREE_TYPE (op1)), value,
TYPE_UNSIGNED (TREE_TYPE (op1)));
/* We may be accessing data outside the field, which means
we can alias adjacent data. */
if (MEM_P (str_rtx))
{
str_rtx = shallow_copy_rtx (str_rtx);
set_mem_alias_set (str_rtx, 0);
set_mem_expr (str_rtx, 0);
}
binop = TREE_CODE (src) == PLUS_EXPR ? add_optab : sub_optab; binop = TREE_CODE (src) == PLUS_EXPR ? add_optab : sub_optab;
if (bitsize == 1 if (bitsize == 1
&& count + bitsize != GET_MODE_BITSIZE (GET_MODE (to_rtx))) && bitpos1 + bitsize != GET_MODE_BITSIZE (GET_MODE (str_rtx)))
{ {
value = expand_and (GET_MODE (to_rtx), value, const1_rtx, value = expand_and (GET_MODE (str_rtx), value, const1_rtx,
NULL_RTX); NULL_RTX);
binop = xor_optab; binop = xor_optab;
} }
value = expand_shift (LSHIFT_EXPR, GET_MODE (to_rtx), value = expand_shift (LSHIFT_EXPR, GET_MODE (str_rtx),
value, build_int_2 (count, 0), value, build_int_2 (bitpos1, 0),
NULL_RTX, 1); NULL_RTX, 1);
result = expand_binop (GET_MODE (to_rtx), binop, to_rtx, result = expand_binop (GET_MODE (str_rtx), binop, str_rtx,
value, to_rtx, 1, OPTAB_WIDEN); value, str_rtx, 1, OPTAB_WIDEN);
if (result != to_rtx) if (result != str_rtx)
emit_move_insn (to_rtx, result); emit_move_insn (str_rtx, result);
free_temp_slots (); free_temp_slots ();
pop_temp_slots (); pop_temp_slots ();
return NULL_RTX; return NULL_RTX;
default: default:
break; break;
} }
......
gcc/testsuite/ChangeLog
2004-07-15 Jakub Jelinek <jakub@redhat.com>
* gcc.c-torture/execute/20040709-1.c: New test.
* gcc.c-torture/execute/20040709-2.c: New test.
2004-07-14 Mike Stump <mrs@apple.com> 2004-07-14 Mike Stump <mrs@apple.com>
* gcc.dg/wint_t-1.c: Expect to pass on darwin 10.3.x and later. * gcc.dg/wint_t-1.c: Expect to pass on darwin 10.3.x and later.
......
gcc/testsuite/gcc.c-torture/execute/20040709-1.c 0 → 100644
/* Test arithmetics on bitfields. */
extern void abort (void);
extern void exit (int);
unsigned int
myrnd (void)
{
static unsigned int s = 1388815473;
s *= 1103515245;
s += 12345;
return (s / 65536) % 2048;
}
#define T(S) \
struct S s##S; \
struct S retme##S (struct S x) \
{ \
return x; \
} \
\
unsigned int fn1##S (unsigned int x) \
{ \
struct S y = s##S; \
y.k += x; \
y = retme##S (y); \
return y.k; \
} \
\
unsigned int fn2##S (unsigned int x) \
{ \
struct S y = s##S; \
y.k += x; \
y.k %= 15; \
return y.k; \
} \
\
unsigned int retit##S (void) \
{ \
return s##S.k; \
} \
\
unsigned int fn3##S (unsigned int x) \
{ \
s##S.k += x; \
return retit##S (); \
} \
\
void test##S (void) \
{ \
int i; \
unsigned int mask, v, a, r; \
struct S x; \
char *p = (char *) &s##S; \
for (i = 0; i < sizeof (s##S); ++i) \
*p++ = myrnd (); \
if (__builtin_classify_type (s##S.l) == 8) \
s##S.l = 5.25; \
s##S.k = -1; \
mask = s##S.k; \
v = myrnd (); \
a = myrnd (); \
s##S.k = v; \
x = s##S; \
r = fn1##S (a); \
if (x.i != s##S.i || x.j != s##S.j \
|| x.k != s##S.k || x.l != s##S.l \
|| ((v + a) & mask) != r) \
abort (); \
v = myrnd (); \
a = myrnd (); \
s##S.k = v; \
x = s##S; \
r = fn2##S (a); \
if (x.i != s##S.i || x.j != s##S.j \
|| x.k != s##S.k || x.l != s##S.l \
|| ((((v + a) & mask) % 15) & mask) != r) \
abort (); \
v = myrnd (); \
a = myrnd (); \
s##S.k = v; \
x = s##S; \
r = fn3##S (a); \
if (x.i != s##S.i || x.j != s##S.j \
|| s##S.k != r || x.l != s##S.l \
|| ((v + a) & mask) != r) \
abort (); \
}
struct A { unsigned int i : 6, l : 1, j : 10, k : 15; }; T(A)
struct B { unsigned int i : 6, j : 11, k : 15; unsigned int l; }; T(B)
struct C { unsigned int l; unsigned int i : 6, j : 11, k : 15; }; T(C)
struct D { unsigned long long l : 6, i : 6, j : 23, k : 29; }; T(D)
struct E { unsigned long long l, i : 12, j : 23, k : 29; }; T(E)
struct F { unsigned long long i : 12, j : 23, k : 29, l; }; T(F)
struct G { unsigned int i : 12, j : 13, k : 7; unsigned long long l; }; T(G)
struct H { unsigned int i : 12, j : 11, k : 9; unsigned long long l; }; T(H)
struct I { unsigned short i : 1, j : 6, k : 9; unsigned long long l; }; T(I)
struct J { unsigned short i : 1, j : 8, k : 7; unsigned short l; }; T(J)
struct K { unsigned int k : 6, l : 1, j : 10, i : 15; }; T(K)
struct L { unsigned int k : 6, j : 11, i : 15; unsigned int l; }; T(L)
struct M { unsigned int l; unsigned int k : 6, j : 11, i : 15; }; T(M)
struct N { unsigned long long l : 6, k : 6, j : 23, i : 29; }; T(N)
struct O { unsigned long long l, k : 12, j : 23, i : 29; }; T(O)
struct P { unsigned long long k : 12, j : 23, i : 29, l; }; T(P)
struct Q { unsigned int k : 12, j : 13, i : 7; unsigned long long l; }; T(Q)
struct R { unsigned int k : 12, j : 11, i : 9; unsigned long long l; }; T(R)
struct S { unsigned short k : 1, j : 6, i : 9; unsigned long long l; }; T(S)
struct T { unsigned short k : 1, j : 8, i : 7; unsigned short l; }; T(T)
struct U { unsigned short j : 6, k : 1, i : 9; unsigned long long l; }; T(U)
struct V { unsigned short j : 8, k : 1, i : 7; unsigned short l; }; T(V)
struct W { long double l; unsigned int k : 12, j : 13, i : 7; }; T(W)
struct X { unsigned int k : 12, j : 13, i : 7; long double l; }; T(X)
struct Y { unsigned int k : 12, j : 11, i : 9; long double l; }; T(Y)
struct Z { long double l; unsigned int j : 13, i : 7, k : 12; }; T(Z)
int
main (void)
{
testA ();
testB ();
testC ();
testD ();
testE ();
testF ();
testG ();
testH ();
testI ();
testJ ();
testK ();
testL ();
testM ();
testN ();
testO ();
testP ();
testQ ();
testR ();
testS ();
testT ();
testU ();
testV ();
testW ();
testX ();
testY ();
testZ ();
exit (0);
}
gcc/testsuite/gcc.c-torture/execute/20040709-2.c 0 → 100644
/* Test arithmetics on bitfields. */
extern void abort (void);
extern void exit (int);
unsigned int
myrnd (void)
{
static unsigned int s = 1388815473;
s *= 1103515245;
s += 12345;
return (s / 65536) % 2048;
}
#define T(S) \
struct S s##S; \
struct S retme##S (struct S x) \
{ \
return x; \
} \
\
unsigned int fn1##S (unsigned int x) \
{ \
struct S y = s##S; \
y.k += x; \
y = retme##S (y); \
return y.k; \
} \
\
unsigned int fn2##S (unsigned int x) \
{ \
struct S y = s##S; \
y.k += x; \
y.k %= 15; \
return y.k; \
} \
\
unsigned int retit##S (void) \
{ \
return s##S.k; \
} \
\
unsigned int fn3##S (unsigned int x) \
{ \
s##S.k += x; \
return retit##S (); \
} \
\
void test##S (void) \
{ \
int i; \
unsigned int mask, v, a, r; \
struct S x; \
char *p = (char *) &s##S; \
for (i = 0; i < sizeof (s##S); ++i) \
*p++ = myrnd (); \
if (__builtin_classify_type (s##S.l) == 8) \
s##S.l = 5.25; \
s##S.k = -1; \
mask = s##S.k; \
v = myrnd (); \
a = myrnd (); \
s##S.k = v; \
x = s##S; \
r = fn1##S (a); \
if (x.i != s##S.i || x.j != s##S.j \
|| x.k != s##S.k || x.l != s##S.l \
|| ((v + a) & mask) != r) \
abort (); \
v = myrnd (); \
a = myrnd (); \
s##S.k = v; \
x = s##S; \
r = fn2##S (a); \
if (x.i != s##S.i || x.j != s##S.j \
|| x.k != s##S.k || x.l != s##S.l \
|| ((((v + a) & mask) % 15) & mask) != r) \
abort (); \
v = myrnd (); \
a = myrnd (); \
s##S.k = v; \
x = s##S; \
r = fn3##S (a); \
if (x.i != s##S.i || x.j != s##S.j \
|| s##S.k != r || x.l != s##S.l \
|| ((v + a) & mask) != r) \
abort (); \
}
#ifdef __powerpc64__
/* Temporary hack for broken PPC64 unaligned handling PR rtl-optimization/13674 */
# define pck
#else
# define pck __attribute__((packed))
#endif
struct pck A { unsigned short i : 1, l : 1, j : 3, k : 11; }; T(A)
struct pck B { unsigned short i : 4, j : 1, k : 11; unsigned int l; }; T(B)
struct pck C { unsigned int l; unsigned short i : 4, j : 1, k : 11; }; T(C)
struct pck D { unsigned long long l : 6, i : 6, j : 23, k : 29; }; T(D)
struct pck E { unsigned long long l, i : 12, j : 23, k : 29; }; T(E)
struct pck F { unsigned long long i : 12, j : 23, k : 29, l; }; T(F)
struct pck G { unsigned short i : 1, j : 1, k : 6; unsigned long long l; }; T(G)
struct pck H { unsigned short i : 6, j : 2, k : 8; unsigned long long l; }; T(H)
struct pck I { unsigned short i : 1, j : 6, k : 1; unsigned long long l; }; T(I)
struct pck J { unsigned short i : 1, j : 8, k : 7; unsigned short l; }; T(J)
struct pck K { unsigned int k : 6, l : 1, j : 10, i : 15; }; T(K)
struct pck L { unsigned int k : 6, j : 11, i : 15; unsigned int l; }; T(L)
struct pck M { unsigned int l; unsigned short k : 6, j : 11, i : 15; }; T(M)
struct pck N { unsigned long long l : 6, k : 6, j : 23, i : 29; }; T(N)
struct pck O { unsigned long long l, k : 12, j : 23, i : 29; }; T(O)
struct pck P { unsigned long long k : 12, j : 23, i : 29, l; }; T(P)
struct pck Q { unsigned short k : 12, j : 1, i : 3; unsigned long long l; }; T(Q)
struct pck R { unsigned short k : 2, j : 11, i : 3; unsigned long long l; }; T(R)
struct pck S { unsigned short k : 1, j : 6, i : 9; unsigned long long l; }; T(S)
struct pck T { unsigned short k : 1, j : 8, i : 7; unsigned short l; }; T(T)
struct pck U { unsigned short j : 6, k : 1, i : 9; unsigned long long l; }; T(U)
struct pck V { unsigned short j : 8, k : 1, i : 7; unsigned short l; }; T(V)
struct pck W { long double l; unsigned int k : 12, j : 13, i : 7; }; T(W)
struct pck X { unsigned int k : 12, j : 13, i : 7; long double l; }; T(X)
struct pck Y { unsigned int k : 12, j : 11, i : 9; long double l; }; T(Y)
struct pck Z { long double l; unsigned int j : 13, i : 7, k : 12; }; T(Z)
int
main (void)
{
testA ();
testB ();
testC ();
testD ();
testE ();
testF ();
testG ();
testH ();
testI ();
testJ ();
testK ();
testL ();
testM ();
testN ();
testO ();
testP ();
testQ ();
testR ();
testS ();
testT ();
testU ();
testV ();
testW ();
testX ();
testY ();
testZ ();
exit (0);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment