107 lines
3.2 KiB
Diff
107 lines
3.2 KiB
Diff
|
From aff0ca6587a2f0849db55eef62a85bc8721869f2 Mon Sep 17 00:00:00 2001
|
||
|
|
From: froydnj <froydnj@138bc75d-0d04-0410-961f-82ee72b054a4>
|
||
|
|
Date: Tue, 1 Feb 2011 02:11:54 +0000
|
||
|
|
Subject: [PATCH 3/6] 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.
|
||
|
|
|
||
|
|
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_4-branch@169465 138bc75d-0d04-0410-961f-82ee72b054a4
|
||
|
|
---
|
||
|
|
gcc/reload1.c | 11 --------
|
||
|
|
gcc/testsuite/gcc.dg/pr44606.c | 52 ++++++++++++++++++++++++++++++++++++++++
|
||
|
|
2 files changed, 52 insertions(+), 11 deletions(-)
|
||
|
|
create mode 100644 gcc/testsuite/gcc.dg/pr44606.c
|
||
|
|
|
||
|
|
diff --git a/gcc/reload1.c b/gcc/reload1.c
|
||
|
|
index 02fef2d..5732677 100644
|
||
|
|
--- a/gcc/reload1.c
|
||
|
|
+++ b/gcc/reload1.c
|
||
|
|
@@ -6273,17 +6273,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/gcc.dg/pr44606.c b/gcc/testsuite/gcc.dg/pr44606.c
|
||
|
|
new file mode 100644
|
||
|
|
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;
|
||
|
|
+}
|
||
|
|
--
|
||
|
|
1.7.4
|
||
|
|
|