PR tree-optimization/51074

	* fold-const.c (fold_binary_loc): Fix up VEC_INTERLEAVE_*_EXPR
	handling for BYTES_BIG_ENDIAN.
	* optabs.c (can_vec_perm_for_code_p): Likewise.

	* gcc.dg/vect/pr51074.c: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@181627 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d77a380bfaa659e9e2e13cfbe5f2b43d3fc32830..8fdeef271e4ddc8b97dce412b56b3408ce90fa61 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2011-11-22  Jakub Jelinek  <jakub@redhat.com>
+
+       PR tree-optimization/51074
+       * fold-const.c (fold_binary_loc): Fix up VEC_INTERLEAVE_*_EXPR
+       handling for BYTES_BIG_ENDIAN.
+       * optabs.c (can_vec_perm_for_code_p): Likewise.
+
 2011-11-22  Michael Matz  <matz@suse.de>
 
        PR other/51125

diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index e590377265e4d5f3f037fc93e8ca2e1d438f735a..8f31a5fdb0e091f980eb25304a88469d14916757 100644 (file)
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -13483,10 +13483,12 @@ fold_binary_loc (location_t loc,
                sel[i] = i * 2 + 1;
                break;
              case VEC_INTERLEAVE_HIGH_EXPR:
-               sel[i] = (i + nelts) / 2 + ((i & 1) ? nelts : 0);
+               sel[i] = (i + (BYTES_BIG_ENDIAN ? 0 : nelts)) / 2
+                        + ((i & 1) ? nelts : 0);
                break;
              case VEC_INTERLEAVE_LOW_EXPR:
-               sel[i] = i / 2 + ((i & 1) ? nelts : 0);
+               sel[i] = (i + (BYTES_BIG_ENDIAN ? nelts : 0)) / 2
+                        + ((i & 1) ? nelts : 0);
                break;
              default:
                gcc_unreachable ();

diff --git a/gcc/optabs.c b/gcc/optabs.c
index 2468efd273b1045c0cd9f8424f36636fe54f2316..647805b392339a3175ab16a205b19871284e2327 100644 (file)
--- a/gcc/optabs.c
+++ b/gcc/optabs.c
@@ -6932,9 +6932,9 @@ can_vec_perm_for_code_p (enum tree_code code, enum machine_mode mode,
          break;
 
        case VEC_INTERLEAVE_HIGH_EXPR:
-         alt = nelt / 2;
-         /* FALLTHRU */
        case VEC_INTERLEAVE_LOW_EXPR:
+         if ((BYTES_BIG_ENDIAN != 0) ^ (code == VEC_INTERLEAVE_HIGH_EXPR))
+           alt = nelt / 2;
          for (i = 0; i < nelt / 2; ++i)
            {
              data[i * 2] = i + alt;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0502af90351159771e6877054aeafd068142afb2..c21ee616c756b8833e17887e937f4f7f24fefe1e 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-22  Jakub Jelinek  <jakub@redhat.com>
+
+       PR tree-optimization/51074
+       * gcc.dg/vect/pr51074.c: New test.
+
 2011-11-22  Dodji Seketeli  <dodji@redhat.com>
 
        PR c++/51143

diff --git a/gcc/testsuite/gcc.dg/vect/pr51074.c b/gcc/testsuite/gcc.dg/vect/pr51074.c
new file mode 100644 (file)
index 0000000..3091399
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/vect/pr51074.c
@@ -0,0 +1,24 @@
+/* PR tree-optimization/51074 */
+
+#include "tree-vect.h"
+
+struct S { int a, b; } s[8];
+
+int
+main ()
+{
+  int i;
+  check_vect ();
+  for (i = 0; i < 8; i++)
+    {
+      s[i].b = 0;
+      s[i].a = i;
+    }
+  asm volatile ("" : : : "memory");
+  for (i = 0; i < 8; i++)
+    if (s[i].b != 0 || s[i].a != i)
+      abort ();
+  return 0;
+}
+
+/* { dg-final { cleanup-tree-dump "vect" } } */