backport: re PR target/44606 (Wrong SPE floating point during computation)

gcc/
	Backport from mainline:
	2010-12-30  Nathan Froyd  <froydnj@codesourcery.com>

        PR target/44606
        * reload1.c (choose_reload_regs): Don't look for equivalences for
        output reloads of constant loads.

gcc/testsuite/
	Backport from mainline:
	2010-12-30  Nathan Froyd  <froydnj@codesourcery.com>

        PR target/44606
        * gcc.dg/pr44606.c: New test.

From-SVN: r169465

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 412ceccfbff4864aaf83bd58af8c923b23d5f765..c59b37427ff9b9c93a39c02e247438d36f252770 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-31  Nathan Froyd  <froydnj@codesourcery.com>
+
+       Backport from mainline:
+       2010-12-30  Nathan Froyd  <froydnj@codesourcery.com>
+
+        PR target/44606
+        * reload1.c (choose_reload_regs): Don't look for equivalences for
+        output reloads of constant loads.
+
 2011-01-17  H.J. Lu  <hongjiu.lu@intel.com>
 
        Backport from mainline

diff --git a/gcc/reload1.c b/gcc/reload1.c
index 08cd75a8f4cf8c690eb73399f5125805a1b86c79..d579dc51885dcb5810b617b7ae2b9086536044b3 100644 (file)
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -6200,17 +6200,6 @@ choose_reload_regs (struct insn_chain *chain)
              && (rld[r].nregs == max_group_size
                  || ! reg_classes_intersect_p (rld[r].rclass, group_class)))
            search_equiv = rld[r].in;
-         /* If this is an output reload from a simple move insn, look
-            if an equivalence for the input is available.  */
-         else if (inheritance && rld[r].in == 0 && rld[r].out != 0)
-           {
-             rtx set = single_set (insn);
-
-             if (set
-                 && rtx_equal_p (rld[r].out, SET_DEST (set))
-                 && CONSTANT_P (SET_SRC (set)))
-               search_equiv = SET_SRC (set);
-           }
 
          if (search_equiv)
            {

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f67a8f3e89688522f78b299b609343a33dda1b74..dc19e213f65e79c5a3141048958e66fb278feda9 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-31  Nathan Froyd  <froydnj@codesourcery.com>
+
+       Backport from mainline:
+       2010-12-30  Nathan Froyd  <froydnj@codesourcery.com>
+
+        PR target/44606
+        * gcc.dg/pr44606.c: New test.
+
 2011-01-24  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        * gfortran.dg/cray_pointers_2.f90: Avoid cycling through

diff --git a/gcc/testsuite/gcc.dg/pr44606.c b/gcc/testsuite/gcc.dg/pr44606.c
new file mode 100644 (file)
index 0000000..3929775
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr44606.c
@@ -0,0 +1,52 @@
+/* PR target/44606 */
+/* { dg-do run } */
+/* { dg-options "-O2" } */
+
+#include <stdio.h>
+
+extern void abort (void);
+
+ typedef struct _PixelPacket {         unsigned char r, g, b; }
+ PixelPacket;
+#define ARRAYLEN(X) (sizeof(X)/sizeof(X[0]))
+PixelPacket q[6];
+#define COLS (ARRAYLEN(q) - 1)
+PixelPacket p[2*COLS + 22];
+#define Minify(POS, WEIGHT) do {       \
+       total_r += (WEIGHT)*(p[POS].r); \
+       total_g += (WEIGHT)*(p[POS].g); \
+       total_b += (WEIGHT)*(p[POS].b); \
+} while (0)
+unsigned long columns = COLS;
+int main(void)
+{
+       static const unsigned char answers[COLS] = { 31, 32, 34, 35, 36 };
+       unsigned long x;
+       for (x = 0; x < sizeof(p)/sizeof(p[0]); x++) {
+               p[x].b = (x + 34) | 1;
+       }
+       for (x = 0; x < columns; x++) {
+               double total_r = 0, total_g = 0, total_b = 0;
+               double saved_r = 0, saved_g = 0, saved_b = 0;
+               Minify(2*x +  0,  3.0);
+               Minify(2*x +  1,  7.0);
+               Minify(2*x +  2,  7.0);
+               saved_r = total_r;
+               saved_g = total_g;
+               Minify(2*x + 11, 15.0);
+               Minify(2*x + 12,  7.0);
+               Minify(2*x + 18,  7.0);
+               Minify(2*x + 19, 15.0);
+               Minify(2*x + 20, 15.0);
+               Minify(2*x + 21,  7.0);
+               q[x].r = (unsigned char)(total_r/128.0 + 0.5);
+               q[x].g = (unsigned char)(total_g/128.0 + 0.5);
+               q[x].b = (unsigned char)(total_b/128.0 + 0.5);
+               fprintf(stderr, "r:%f g:%f b:%f\n", saved_r, saved_g, saved_b);
+       }
+       for (x = 0; x < COLS; x++) {
+               if (answers[x] != q[x].b)
+                       abort();
+       }
+       return 0;
+}