Also committed to gcc-6 branch.
PR target/72802
* config/rs6000/rs6000.md (mov<mode>_hardfloat): Sort
alternatives. Put loads first, then stores, and reg/reg moves
within same class later. Delete attr length.
testsuite/
* gcc.c-torture/compile/pr72802.c: New.
diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md
index ffcefe4..29d82c9 100644
--- a/gcc/config/rs6000/rs6000.md
+++ b/gcc/config/rs6000/rs6000.md
@@ -6516,32 +6516,37 @@
}")
(define_insn "mov<mode>_hardfloat"
- [(set (match_operand:FMOVE32 0 "nonimmediate_operand"
"=!r,!r,m,f,<f32_vsx>,<f32_vsx>,!r,<f32_lr>,<f32_lr2>,<f32_sm>,<f32_sm2>,<f32_av>,Z,?<f32_dm>,?r,*c*l,!r,*h")
- (match_operand:FMOVE32 1 "input_operand"
"r,m,r,f,<f32_vsx>,<zero_fp>,<zero_fp>,<f32_lm>,<f32_lm2>,<f32_sr>,<f32_sr2>,Z,<f32_av>,r,<f32_dm>,r,h,0"))]
+ [(set (match_operand:FMOVE32 0 "nonimmediate_operand"
+ "=!r, <f32_lr>, <f32_lr2>, <f32_av>, m, <f32_sm>,
+ <f32_sm2>, Z, <f32_vsx>, !r, ?<f32_dm>, ?r,
+ f, <f32_vsx>, !r, *c*l, !r, *h")
+ (match_operand:FMOVE32 1 "input_operand"
+ "m, <f32_lm>, <f32_lm2>, Z, r, <f32_sr>,
+ <f32_sr2>, <f32_av>, <zero_fp>, <zero_fp>, r, <f32_dm>,
+ f, <f32_vsx>, r, r, *h, 0"))]
"(gpc_reg_operand (operands[0], <MODE>mode)
|| gpc_reg_operand (operands[1], <MODE>mode))
&& (TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_SINGLE_FLOAT)"
"@
- mr %0,%1
lwz%U1%X1 %0,%1
- stw%U0%X0 %1,%0
- fmr %0,%1
- xscpsgndp %x0,%x1,%x1
- xxlxor %x0,%x0,%x0
- li %0,0
<f32_li>
<f32_li2>
+ <f32_lv>
+ stw%U0%X0 %1,%0
<f32_si>
<f32_si2>
- <f32_lv>
<f32_sv>
+ xxlxor %x0,%x0,%x0
+ li %0,0
mtvsrwz %x0,%1
mfvsrwz %0,%x1
+ fmr %0,%1
+ xscpsgndp %x0,%x1,%x1
+ mr %0,%1
mt%0 %1
mf%1 %0
nop"
- [(set_attr "type"
"*,load,store,fpsimple,fpsimple,veclogical,integer,fpload,fpload,fpstore,fpstore,fpload,fpstore,mffgpr,mftgpr,mtjmpr,mfjmpr,*")
- (set_attr "length" "4")])
+ [(set_attr "type"
"load,fpload,fpload,fpload,store,fpstore,fpstore,fpstore,veclogical,integer,mffgpr,mftgpr,fpsimple,fpsimple,*,mtjmpr,mfjmpr,*")])
(define_insn "*mov<mode>_softfloat"
[(set (match_operand:FMOVE32 0 "nonimmediate_operand"
"=r,cl,r,r,m,r,r,r,r,*h")
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr72802.c
b/gcc/testsuite/gcc.c-torture/compile/pr72802.c
new file mode 100644
index 0000000..b9e1ab3
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr72802.c
@@ -0,0 +1,211 @@
+static a[];
+static b, h, m, n, o, p, q, t, u, v, t5, t6, t16, t17, t18, t25;
+c;
+static volatile d;
+static volatile e;
+static volatile f;
+static volatile g;
+j;
+static volatile k;
+static volatile l;
+static volatile r;
+const volatile s;
+static volatile w;
+static volatile x;
+const volatile y;
+static volatile z;
+static volatile t1;
+static volatile t2;
+const t3;
+t4;
+const volatile t8;
+const volatile t9;
+const volatile t10;
+static volatile t11;
+static volatile t12;
+static volatile t13;
+static volatile t14;
+const volatile t15;
+static volatile t19;
+static volatile t20;
+const volatile t21;
+static volatile t22;
+static volatile t23;
+const volatile t24;
+*t29;
+fn1() { b = 5; }
+fn2(long);
+#pragma pack(1)
+struct S0 {
+ short f3;
+ float f4;
+ signed f5
+};
+const struct S0 t7[] = {};
+static fn3() {
+ int t26[] = {};
+ int t27[10] = {};
+ --t25;
+ if (fn4()) {
+ t5++;
+ fn5();
+ int t28[] = {t26, t27};
+ return;
+ }
+}
+fn6() {
+ int i, t30 = 0;
+ if (fn6 == 2)
+ t30 = 1;
+ {
+ int t31, i = 0;
+ for (; i < 256; i++) {
+ t31 = i;
+ if (i & 1)
+ t31 = 0;
+ a[i] = t31;
+ }
+ i = 0;
+ for (; i < 3; i++)
+ t29[i] = t6;
+ fn7();
+ fn3();
+ t4 = c = j = 0;
+ }
+ fn2(h);
+ if (t30)
+ printf(b);
+ g;
+ fn2(g);
+ printf(b);
+ f;
+ fn2(f);
+ if (t30)
+ printf(b);
+ e;
+ fn2(e);
+ printf(b);
+ fn8();
+ d;
+ fn2(d);
+ if (t30)
+ printf(b);
+ l;
+ fn2(l);
+ printf(b);
+ k;
+ fn2(k);
+ if (t30)
+ printf(b);
+ printf(b);
+ for (; i; i++) {
+ y;
+ fn2(y);
+ printf(b);
+ x;
+ fn2(x);
+ if (t30)
+ printf(b);
+ w;
+ fn2(w);
+ printf(b);
+ fn2(v);
+ printf(b);
+ fn2(u);
+ if (t30)
+ printf(b);
+ fn2(t);
+ printf(b);
+ s;
+ fn2(s);
+ if (t30)
+ printf(b);
+ r;
+ fn2(r);
+ printf(b);
+ fn2(q);
+ if (t30)
+ printf(b);
+ fn2(p);
+ printf("", b);
+ fn2(o);
+ printf(b);
+ fn2(n);
+ if (t30)
+ printf(b);
+ fn2(m);
+ printf(b);
+ }
+ fn2(z);
+ if (t30)
+ printf(b);
+ printf("", t3);
+ t2;
+ fn2(t2);
+ printf(b);
+ t1;
+ fn2(t1);
+ if (t30)
+ printf(b);
+ for (; i < 6; i++) {
+ t10;
+ fn2(t10);
+ printf(b);
+ t9;
+ fn2(t9);
+ if (t30)
+ printf(b);
+ t8;
+ fn2(t8);
+ printf(b);
+ fn2(t7[i].f3);
+ if (t30)
+ printf(b);
+ fn2(t7[i].f4);
+ printf(b);
+ fn2(t7[i].f5);
+ if (t30)
+ printf(b);
+ t15;
+ fn2(t15);
+ printf(b);
+ t14;
+ fn2(t14);
+ if (t30)
+ printf(b);
+ t13;
+ fn2(t13);
+ printf(b);
+ t12;
+ fn2(t12);
+ if (t30)
+ printf(b);
+ t11;
+ fn2(t11);
+ printf(b);
+ t21;
+ fn2(t21);
+ if (t30)
+ printf(b);
+ t20;
+ fn2(t20);
+ fn2(t19);
+ if (t30)
+ printf(b);
+ fn2(t18);
+ printf(b);
+ fn2(t17);
+ printf(b);
+ fn2(t16);
+ printf(b);
+ }
+ t24;
+ t24;
+ if (t30)
+ printf(b);
+ printf(t23);
+ t22;
+ t22;
+ if (t30)
+ printf(b);
+}
--
Alan Modra
Australia Development Lab, IBM
