[gcc(refs/users/wschmidt/heads/builtins4)] rs6000: More bug fixes

[William Schmidt <wschmidt@gcc.gnu.org>]

https://gcc.gnu.org/g:81f9be479db8a83927e659a7e892fe8ec9af3cc1

commit 81f9be479db8a83927e659a7e892fe8ec9af3cc1
Author: Bill Schmidt <wschmidt@linux.ibm.com>
Date:   Fri Jan 8 14:42:22 2021 -0600

    rs6000: More bug fixes
    
    2021-01-08  Bill Schmidt  <wschmidt@linux.ibm.com>
    
    gcc/
            * config/rs6000/emmintrin.h: Change deprecated built-in calls.
            * config/rs6000/rs6000-builtin-new.def
            (__builtin_altivec_vcmpgtud_p): Fix arguments.
            (__builtin_altivec_vcmpaeb_p et al.): Remove {pred}.
    
    gcc/testsuite/
            * gcc.target/powerpc/dfp/dtstsfi-11.c: Add second expected error
            message.

Diff:
---
 gcc/config/rs6000/emmintrin.h                     | 30 +++++++++++------------
 gcc/config/rs6000/rs6000-builtin-new.def          | 26 ++++++++++----------
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-11.c |  2 +-
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/gcc/config/rs6000/emmintrin.h b/gcc/config/rs6000/emmintrin.h
index ce1287edf78..9c4d5fa13c7 100644
--- a/gcc/config/rs6000/emmintrin.h
+++ b/gcc/config/rs6000/emmintrin.h
@@ -892,8 +892,8 @@ _mm_cvtpd_epi32 (__m128d __A)
 #else
   temp = vec_mergee (temp, temp);
 #endif
-  result = (__v4si) vec_vpkudum ((__vector long long) temp,
-				 (__vector long long) vzero);
+  result = (__v4si) vec_pack ((__vector long long) temp,
+			      (__vector long long) vzero);
 #else
   {
     const __v16qu pkperm = {0x00, 0x01, 0x02, 0x03, 0x08, 0x09, 0x0a, 0x0b,
@@ -931,8 +931,8 @@ _mm_cvtpd_ps (__m128d __A)
 #else
   temp = vec_mergee (temp, temp);
 #endif
-  result = (__v4sf) vec_vpkudum ((__vector long long) temp,
-				 (__vector long long) vzero);
+  result = (__v4sf) vec_pack ((__vector long long) temp,
+			      (__vector long long) vzero);
 #else
   {
     const __v16qu pkperm = {0x00, 0x01, 0x02, 0x03, 0x08, 0x09, 0x0a, 0x0b,
@@ -964,8 +964,8 @@ _mm_cvttpd_epi32 (__m128d __A)
 #else
   temp = vec_mergee (temp, temp);
 #endif
-  result = (__v4si) vec_vpkudum ((__vector long long) temp,
-				 (__vector long long) vzero);
+  result = (__v4si) vec_pack ((__vector long long) temp,
+			      (__vector long long) vzero);
 #else
   {
     const __v16qu pkperm = {0x00, 0x01, 0x02, 0x03, 0x08, 0x09, 0x0a, 0x0b,
@@ -1254,8 +1254,8 @@ _mm_movemask_pd (__m128d  __A)
     };
 
   result = ((__vector unsigned long long)
-	    vec_vbpermq ((__vector unsigned char) __A,
-			 (__vector unsigned char) perm_mask));
+	    vec_bperm ((__vector unsigned char) __A,
+		       (__vector unsigned char) perm_mask));
 
 #ifdef __LITTLE_ENDIAN__
   return result[1];
@@ -1434,7 +1434,7 @@ _mm_madd_epi16 (__m128i __A, __m128i __B)
 {
   __vector signed int zero = {0, 0, 0, 0};
 
-  return (__m128i) vec_vmsumshm ((__v8hi)__A, (__v8hi)__B, zero);
+  return (__m128i) vec_msum ((__v8hi)__A, (__v8hi)__B, zero);
 }
 
 extern __inline __m128i __attribute__((__gnu_inline__, __always_inline__, __artificial__))
@@ -1452,8 +1452,8 @@ _mm_mulhi_epi16 (__m128i __A, __m128i __B)
 #endif
     };
 
-  w0 = vec_vmulesh ((__v8hi)__A, (__v8hi)__B);
-  w1 = vec_vmulosh ((__v8hi)__A, (__v8hi)__B);
+  w0 = vec_mule ((__v8hi)__A, (__v8hi)__B);
+  w1 = vec_mulo ((__v8hi)__A, (__v8hi)__B);
   return (__m128i) vec_perm (w0, w1, xform1);
 }
 
@@ -2046,8 +2046,8 @@ _mm_movemask_epi8 (__m128i __A)
     };
 
   result = ((__vector unsigned long long)
-	    vec_vbpermq ((__vector unsigned char) __A,
-			 (__vector unsigned char) perm_mask));
+	    vec_bperm ((__vector unsigned char) __A,
+		       (__vector unsigned char) perm_mask));
 
 #ifdef __LITTLE_ENDIAN__
   return result[1];
@@ -2071,8 +2071,8 @@ _mm_mulhi_epu16 (__m128i __A, __m128i __B)
 #endif
     };
 
-  w0 = vec_vmuleuh ((__v8hu)__A, (__v8hu)__B);
-  w1 = vec_vmulouh ((__v8hu)__A, (__v8hu)__B);
+  w0 = vec_mule ((__v8hu)__A, (__v8hu)__B);
+  w1 = vec_mulo ((__v8hu)__A, (__v8hu)__B);
   return (__m128i) vec_perm (w0, w1, xform1);
 }
 
diff --git a/gcc/config/rs6000/rs6000-builtin-new.def b/gcc/config/rs6000/rs6000-builtin-new.def
index 2c1eabd4fde..645d4b0425f 100644
--- a/gcc/config/rs6000/rs6000-builtin-new.def
+++ b/gcc/config/rs6000/rs6000-builtin-new.def
@@ -2214,7 +2214,7 @@
   const vsll __builtin_altivec_vcmpgtud (vull, vull);
     VCMPGTUD vector_gtuv2di {}
 
-  const int __builtin_altivec_vcmpgtud_p (vull, vull);
+  const int __builtin_altivec_vcmpgtud_p (int, vull, vull);
     VCMPGTUD_P vector_gtu_v2di_p {pred}
 
   const vsll __builtin_altivec_vmaxsd (vsll, vsll);
@@ -2582,49 +2582,49 @@
     VCTZLSBB_V8HI vctzlsbb_v8hi {}
 
   const signed int __builtin_altivec_vcmpaeb_p (vsc, vsc);
-    VCMPAEB_P vector_ae_v16qi_p {pred}
+    VCMPAEB_P vector_ae_v16qi_p {}
 
   const signed int __builtin_altivec_vcmpaed_p (vsll, vsll);
-    VCMPAED_P vector_ae_v2di_p {pred}
+    VCMPAED_P vector_ae_v2di_p {}
 
   const signed int __builtin_altivec_vcmpaedp_p (vd, vd);
-    VCMPAEDP_P vector_ae_v2df_p {pred}
+    VCMPAEDP_P vector_ae_v2df_p {}
 
   const signed int __builtin_altivec_vcmpaefp_p (vf, vf);
-    VCMPAEFP_P vector_ae_v4sf_p {pred}
+    VCMPAEFP_P vector_ae_v4sf_p {}
 
   const signed int __builtin_altivec_vcmpaeh_p (vss, vss);
-    VCMPAEH_P vector_ae_v8hi_p {pred}
+    VCMPAEH_P vector_ae_v8hi_p {}
 
   const signed int __builtin_altivec_vcmpaew_p (vsi, vsi);
-    VCMPAEW_P vector_ae_v4si_p {pred}
+    VCMPAEW_P vector_ae_v4si_p {}
 
   const vsc __builtin_altivec_vcmpneb (vsc, vsc);
     VCMPNEB vcmpneb {}
 
   const signed int __builtin_altivec_vcmpneb_p (vsc, vsc);
-    VCMPNEB_P vector_ne_v16qi_p {pred}
+    VCMPNEB_P vector_ne_v16qi_p {}
 
   const signed int __builtin_altivec_vcmpned_p (vsll, vsll);
-    VCMPNED_P vector_ne_v2di_p {pred}
+    VCMPNED_P vector_ne_v2di_p {}
 
   const signed int __builtin_altivec_vcmpnedp_p (vd, vd);
-    VCMPNEDP_P vector_ne_v2df_p {pred}
+    VCMPNEDP_P vector_ne_v2df_p {}
 
   const signed int __builtin_altivec_vcmpnefp_p (vf, vf);
-    VCMPNEFP_P vector_ne_v4sf_p {pred}
+    VCMPNEFP_P vector_ne_v4sf_p {}
 
   const vss __builtin_altivec_vcmpneh (vss, vss);
     VCMPNEH vcmpneh {}
 
   const signed int __builtin_altivec_vcmpneh_p (vss, vss);
-    VCMPNEH_P vector_ne_v8hi_p {pred}
+    VCMPNEH_P vector_ne_v8hi_p {}
 
   const vsi __builtin_altivec_vcmpnew (vsi, vsi);
     VCMPNEW vcmpnew {}
 
   const signed int __builtin_altivec_vcmpnew_p (vsi, vsi);
-    VCMPNEW_P vector_ne_v4si_p {pred}
+    VCMPNEW_P vector_ne_v4si_p {}
 
   const vsc __builtin_altivec_vcmpnezb (vsc, vsc);
     CMPNEZB vcmpnezb {}
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-11.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-11.c
index c56a24e0db4..b5bea3cf1a0 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-11.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-11.c
@@ -8,6 +8,6 @@ int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  return __builtin_dfp_dtstsfi_lt (5, source);	/* { dg-error "'__builtin_dtstsfi_lt' requires" } */
+  return __builtin_dfp_dtstsfi_lt (5, source);	/* { dg-error "'__builtin_dtstsfi_lt' requires" } */ /* { dg-error "'__builtin_dtstsfi_lt_dd' requires" }  */
 }