* config/i386/sse.md (sse5_pperm, sse5_pperm_pack_v2di_v4si,

	sse5_pperm_pack_v4si_v8hi, sse5_pperm_pack_v8hi_v16qi,
	sse5_perm<mode>): Fix constraints.

	* gcc.target/i386/i386.exp (check_effective_target_sse5): Use __v8hi
	rather than __v2di type.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f951aa1..37c9a52 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-01  Jakub Jelinek  <jakub@redhat.com>
+
+       * config/i386/sse.md (sse5_pperm, sse5_pperm_pack_v2di_v4si,
+       sse5_pperm_pack_v4si_v8hi, sse5_pperm_pack_v8hi_v16qi,
+       sse5_perm<mode>): Fix constraints.
+
 2007-12-31  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
        PR driver/33772

diff --git a/gcc/config/i386/sse.md b/gcc/config/i386/sse.md
index 3c0d497..617ed35 100644 (file)
--- a/gcc/config/i386/sse.md
+++ b/gcc/config/i386/sse.md
@@ -8352,9 +8352,9 @@
 ;; SSE5 permute instructions
 (define_insn "sse5_pperm"
   [(set (match_operand:V16QI 0 "register_operand" "=x,x,x,x")
-       (unspec:V16QI [(match_operand:V16QI 1 "nonimmediate_operand" "0,0,xm,xm")
-                      (match_operand:V16QI 2 "nonimmediate_operand" "x,xm,0,x")
-                      (match_operand:V16QI 3 "nonimmediate_operand" "xm,x,x,0")]
+       (unspec:V16QI [(match_operand:V16QI 1 "nonimmediate_operand" "0,0,x,xm")
+                      (match_operand:V16QI 2 "nonimmediate_operand" "x,xm,xm,x")
+                      (match_operand:V16QI 3 "nonimmediate_operand" "xm,x,0,0")]
                     UNSPEC_SSE5_PERMUTE))]
   "TARGET_SSE5 && ix86_sse5_valid_op_p (operands, insn, 4, true, 1)"
   "pperm\t{%3, %2, %1, %0|%0, %1, %2, %3}"
@@ -8455,10 +8455,10 @@
   [(set (match_operand:V4SI 0 "register_operand" "=x,x,x,x")
        (vec_concat:V4SI
         (truncate:V2SI
-         (match_operand:V2DI 1 "nonimmediate_operand" "0,0,xm,xm"))
+         (match_operand:V2DI 1 "nonimmediate_operand" "0,0,x,xm"))
         (truncate:V2SI
-         (match_operand:V2DI 2 "nonimmediate_operand" "x,xm,0,x"))))
-   (use (match_operand:V16QI 3 "nonimmediate_operand" "xm,x,x,0"))]
+         (match_operand:V2DI 2 "nonimmediate_operand" "x,xm,xm,x"))))
+   (use (match_operand:V16QI 3 "nonimmediate_operand" "xm,x,0,0"))]
   "TARGET_SSE5 && ix86_sse5_valid_op_p (operands, insn, 4, true, 1)"
   "pperm\t{%3, %2, %1, %0|%0, %1, %2, %3}"
   [(set_attr "type" "sse4arg")
@@ -8468,10 +8468,10 @@
   [(set (match_operand:V8HI 0 "register_operand" "=x,x,x,x")
        (vec_concat:V8HI
         (truncate:V4HI
-         (match_operand:V4SI 1 "nonimmediate_operand" "0,0,xm,xm"))
+         (match_operand:V4SI 1 "nonimmediate_operand" "0,0,x,xm"))
         (truncate:V4HI
-         (match_operand:V4SI 2 "nonimmediate_operand" "x,xm,0,x"))))
-   (use (match_operand:V16QI 3 "nonimmediate_operand" "xm,x,x,0"))]
+         (match_operand:V4SI 2 "nonimmediate_operand" "x,xm,xm,x"))))
+   (use (match_operand:V16QI 3 "nonimmediate_operand" "xm,x,0,0"))]
   "TARGET_SSE5 && ix86_sse5_valid_op_p (operands, insn, 4, true, 1)"
   "pperm\t{%3, %2, %1, %0|%0, %1, %2, %3}"
   [(set_attr "type" "sse4arg")
@@ -8481,10 +8481,10 @@
   [(set (match_operand:V16QI 0 "register_operand" "=x,x,x,x")
        (vec_concat:V16QI
         (truncate:V8QI
-         (match_operand:V8HI 1 "nonimmediate_operand" "0,0,xm,xm"))
+         (match_operand:V8HI 1 "nonimmediate_operand" "0,0,x,xm"))
         (truncate:V8QI
-         (match_operand:V8HI 2 "nonimmediate_operand" "x,xm,0,x"))))
-   (use (match_operand:V16QI 3 "nonimmediate_operand" "xm,x,x,0"))]
+         (match_operand:V8HI 2 "nonimmediate_operand" "x,xm,xm,x"))))
+   (use (match_operand:V16QI 3 "nonimmediate_operand" "xm,x,0,0"))]
   "TARGET_SSE5 && ix86_sse5_valid_op_p (operands, insn, 4, true, 1)"
   "pperm\t{%3, %2, %1, %0|%0, %1, %2, %3}"
   [(set_attr "type" "sse4arg")
@@ -8494,9 +8494,9 @@
 (define_insn "sse5_perm<mode>"
   [(set (match_operand:SSEMODEF2P 0 "register_operand" "=x,x,x,x")
        (unspec:SSEMODEF2P
-        [(match_operand:SSEMODEF2P 1 "nonimmediate_operand" "0,0,xm,xm")
-         (match_operand:SSEMODEF2P 2 "nonimmediate_operand" "x,xm,0,x")
-         (match_operand:V16QI 3 "nonimmediate_operand" "xm,x,x,0")]
+        [(match_operand:SSEMODEF2P 1 "nonimmediate_operand" "0,0,x,xm")
+         (match_operand:SSEMODEF2P 2 "nonimmediate_operand" "x,xm,xm,x")
+         (match_operand:V16QI 3 "nonimmediate_operand" "xm,x,0,0")]
         UNSPEC_SSE5_PERMUTE))]
   "TARGET_SSE5 && ix86_sse5_valid_op_p (operands, insn, 4, true, 1)"
   "perm<ssemodesuffixf4>\t{%3, %2, %1, %0|%0, %1, %2, %3}"

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c7a8e3e..cc0418c 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-01  Jakub Jelinek  <jakub@redhat.com>
+
+       * gcc.target/i386/i386.exp (check_effective_target_sse5): Use __v8hi
+       rather than __v2di type.
+
 2007-12-31  Paul Thomas  <pault@gcc.gnu.org>
 
        PR fortran/34558

diff --git a/gcc/testsuite/gcc.target/i386/i386.exp b/gcc/testsuite/gcc.target/i386/i386.exp
index 7cf13ab..7445477 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/i386.exp
+++ b/gcc/testsuite/gcc.target/i386/i386.exp
@@ -68,13 +68,13 @@ proc check_effective_target_sse4a { } {
 proc check_effective_target_sse5 { } {
     return [check_no_compiler_messages sse5 object {
        typedef long long __m128i __attribute__ ((__vector_size__ (16)));
-       typedef long long __v2di __attribute__ ((__vector_size__ (16)));
+       typedef short __v8hi __attribute__ ((__vector_size__ (16)));
 
        __m128i _mm_maccs_epi16(__m128i __A, __m128i __B, __m128i __C)
        {
-           return (__m128i) __builtin_ia32_pmacssww ((__v2di)__A,
-                                                     (__v2di)__B,
-                                                     (__v2di)__C);
+           return (__m128i) __builtin_ia32_pmacssww ((__v8hi)__A,
+                                                     (__v8hi)__B,
+                                                     (__v8hi)__C);
        }
     } "-O2 -msse5" ]
 }