|
 |
dc1507 |
2012-05-03 Michael Meissner <meissner@linux.vnet.ibm.com>
|
|
|
dc1507 |
|
|
|
dc1507 |
PR target/53199
|
|
|
dc1507 |
* config/rs6000/rs6000.md (bswapdi splitters): If
|
|
|
dc1507 |
-mavoid-indexed-addresses (or -mcpu=power6 which sets it by
|
|
|
dc1507 |
default) is used, generate an alternate sequence that does not
|
|
|
dc1507 |
depend on using indexed addressing.
|
|
|
dc1507 |
|
|
|
dc1507 |
* gcc.target/powwerpc/pr53199.c: New file.
|
|
|
dc1507 |
|
|
|
dc1507 |
--- gcc/config/rs6000/rs6000.md (revision 187118)
|
|
|
dc1507 |
+++ gcc/config/rs6000/rs6000.md (revision 187119)
|
|
|
dc1507 |
@@ -2456,7 +2456,18 @@ (define_split
|
|
|
dc1507 |
if (GET_CODE (addr1) == PLUS)
|
|
|
dc1507 |
{
|
|
|
dc1507 |
emit_insn (gen_add3_insn (op2, XEXP (addr1, 0), GEN_INT (4)));
|
|
|
dc1507 |
- addr2 = gen_rtx_PLUS (Pmode, op2, XEXP (addr1, 1));
|
|
|
dc1507 |
+ if (TARGET_AVOID_XFORM)
|
|
|
dc1507 |
+ {
|
|
|
dc1507 |
+ emit_insn (gen_add3_insn (op2, XEXP (addr1, 1), op2));
|
|
|
dc1507 |
+ addr2 = op2;
|
|
|
dc1507 |
+ }
|
|
|
dc1507 |
+ else
|
|
|
dc1507 |
+ addr2 = gen_rtx_PLUS (Pmode, op2, XEXP (addr1, 1));
|
|
|
dc1507 |
+ }
|
|
|
dc1507 |
+ else if (TARGET_AVOID_XFORM)
|
|
|
dc1507 |
+ {
|
|
|
dc1507 |
+ emit_insn (gen_add3_insn (op2, addr1, GEN_INT (4)));
|
|
|
dc1507 |
+ addr2 = op2;
|
|
|
dc1507 |
}
|
|
|
dc1507 |
else
|
|
|
dc1507 |
{
|
|
|
dc1507 |
@@ -2506,7 +2517,18 @@ (define_split
|
|
|
dc1507 |
if (GET_CODE (addr1) == PLUS)
|
|
|
dc1507 |
{
|
|
|
dc1507 |
emit_insn (gen_add3_insn (op2, XEXP (addr1, 0), GEN_INT (4)));
|
|
|
dc1507 |
- addr2 = gen_rtx_PLUS (Pmode, op2, XEXP (addr1, 1));
|
|
|
dc1507 |
+ if (TARGET_AVOID_XFORM)
|
|
|
dc1507 |
+ {
|
|
|
dc1507 |
+ emit_insn (gen_add3_insn (op2, XEXP (addr1, 1), op2));
|
|
|
dc1507 |
+ addr2 = op2;
|
|
|
dc1507 |
+ }
|
|
|
dc1507 |
+ else
|
|
|
dc1507 |
+ addr2 = gen_rtx_PLUS (Pmode, op2, XEXP (addr1, 1));
|
|
|
dc1507 |
+ }
|
|
|
dc1507 |
+ else if (TARGET_AVOID_XFORM)
|
|
|
dc1507 |
+ {
|
|
|
dc1507 |
+ emit_insn (gen_add3_insn (op2, addr1, GEN_INT (4)));
|
|
|
dc1507 |
+ addr2 = op2;
|
|
|
dc1507 |
}
|
|
|
dc1507 |
else
|
|
|
dc1507 |
{
|
|
|
dc1507 |
@@ -2587,7 +2609,18 @@ (define_split
|
|
|
dc1507 |
if (GET_CODE (addr1) == PLUS)
|
|
|
dc1507 |
{
|
|
|
dc1507 |
emit_insn (gen_add3_insn (op2, XEXP (addr1, 0), GEN_INT (4)));
|
|
|
dc1507 |
- addr2 = gen_rtx_PLUS (SImode, op2, XEXP (addr1, 1));
|
|
|
dc1507 |
+ if (TARGET_AVOID_XFORM)
|
|
|
dc1507 |
+ {
|
|
|
dc1507 |
+ emit_insn (gen_add3_insn (op2, XEXP (addr1, 1), op2));
|
|
|
dc1507 |
+ addr2 = op2;
|
|
|
dc1507 |
+ }
|
|
|
dc1507 |
+ else
|
|
|
dc1507 |
+ addr2 = gen_rtx_PLUS (SImode, op2, XEXP (addr1, 1));
|
|
|
dc1507 |
+ }
|
|
|
dc1507 |
+ else if (TARGET_AVOID_XFORM)
|
|
|
dc1507 |
+ {
|
|
|
dc1507 |
+ emit_insn (gen_add3_insn (op2, addr1, GEN_INT (4)));
|
|
|
dc1507 |
+ addr2 = op2;
|
|
|
dc1507 |
}
|
|
|
dc1507 |
else
|
|
|
dc1507 |
{
|
|
|
dc1507 |
@@ -2632,7 +2665,18 @@ (define_split
|
|
|
dc1507 |
if (GET_CODE (addr1) == PLUS)
|
|
|
dc1507 |
{
|
|
|
dc1507 |
emit_insn (gen_add3_insn (op2, XEXP (addr1, 0), GEN_INT (4)));
|
|
|
dc1507 |
- addr2 = gen_rtx_PLUS (SImode, op2, XEXP (addr1, 1));
|
|
|
dc1507 |
+ if (TARGET_AVOID_XFORM)
|
|
|
dc1507 |
+ {
|
|
|
dc1507 |
+ emit_insn (gen_add3_insn (op2, XEXP (addr1, 1), op2));
|
|
|
dc1507 |
+ addr2 = op2;
|
|
|
dc1507 |
+ }
|
|
|
dc1507 |
+ else
|
|
|
dc1507 |
+ addr2 = gen_rtx_PLUS (SImode, op2, XEXP (addr1, 1));
|
|
|
dc1507 |
+ }
|
|
|
dc1507 |
+ else if (TARGET_AVOID_XFORM)
|
|
|
dc1507 |
+ {
|
|
|
dc1507 |
+ emit_insn (gen_add3_insn (op2, addr1, GEN_INT (4)));
|
|
|
dc1507 |
+ addr2 = op2;
|
|
|
dc1507 |
}
|
|
|
dc1507 |
else
|
|
|
dc1507 |
{
|
|
|
dc1507 |
--- gcc/testsuite/gcc.target/powerpc/pr53199.c (revision 0)
|
|
|
dc1507 |
+++ gcc/testsuite/gcc.target/powerpc/pr53199.c (revision 187119)
|
|
|
dc1507 |
@@ -0,0 +1,50 @@
|
|
|
dc1507 |
+/* { dg-do compile { target { powerpc*-*-* } } } */
|
|
|
dc1507 |
+/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */
|
|
|
dc1507 |
+/* { dg-options "-O2 -mcpu=power6 -mavoid-indexed-addresses" } */
|
|
|
dc1507 |
+/* { dg-final { scan-assembler-times "lwbrx" 6 } } */
|
|
|
dc1507 |
+/* { dg-final { scan-assembler-times "stwbrx" 6 } } */
|
|
|
dc1507 |
+
|
|
|
dc1507 |
+/* PR 51399: bswap gets an error if -mavoid-indexed-addresses was used in
|
|
|
dc1507 |
+ creating the two lwbrx instructions. */
|
|
|
dc1507 |
+
|
|
|
dc1507 |
+long long
|
|
|
dc1507 |
+load64_reverse_1 (long long *p)
|
|
|
dc1507 |
+{
|
|
|
dc1507 |
+ return __builtin_bswap64 (*p);
|
|
|
dc1507 |
+}
|
|
|
dc1507 |
+
|
|
|
dc1507 |
+long long
|
|
|
dc1507 |
+load64_reverse_2 (long long *p)
|
|
|
dc1507 |
+{
|
|
|
dc1507 |
+ return __builtin_bswap64 (p[1]);
|
|
|
dc1507 |
+}
|
|
|
dc1507 |
+
|
|
|
dc1507 |
+long long
|
|
|
dc1507 |
+load64_reverse_3 (long long *p, int i)
|
|
|
dc1507 |
+{
|
|
|
dc1507 |
+ return __builtin_bswap64 (p[i]);
|
|
|
dc1507 |
+}
|
|
|
dc1507 |
+
|
|
|
dc1507 |
+void
|
|
|
dc1507 |
+store64_reverse_1 (long long *p, long long x)
|
|
|
dc1507 |
+{
|
|
|
dc1507 |
+ *p = __builtin_bswap64 (x);
|
|
|
dc1507 |
+}
|
|
|
dc1507 |
+
|
|
|
dc1507 |
+void
|
|
|
dc1507 |
+store64_reverse_2 (long long *p, long long x)
|
|
|
dc1507 |
+{
|
|
|
dc1507 |
+ p[1] = __builtin_bswap64 (x);
|
|
|
dc1507 |
+}
|
|
|
dc1507 |
+
|
|
|
dc1507 |
+void
|
|
|
dc1507 |
+store64_reverse_3 (long long *p, long long x, int i)
|
|
|
dc1507 |
+{
|
|
|
dc1507 |
+ p[i] = __builtin_bswap64 (x);
|
|
|
dc1507 |
+}
|
|
|
dc1507 |
+
|
|
|
dc1507 |
+long long
|
|
|
dc1507 |
+reg_reverse (long long x)
|
|
|
dc1507 |
+{
|
|
|
dc1507 |
+ return __builtin_bswap64 (x);
|
|
|
dc1507 |
+}
|