diff mbox series

rs6000: Add missing prototypes for vec_ld/vec_st

Message ID 6ec34045-1305-cc17-15df-0cc28e5c8c77@linux.vnet.ibm.com
State New
Headers show
Series rs6000: Add missing prototypes for vec_ld/vec_st | expand

Commit Message

Kewen.Lin Jan. 16, 2019, 2:08 p.m. UTC 
Hi,

On target rs6000, for all types, use of vec_ld/vec_st historically permits the dereferenced pointer to be of a scalar type or the corresponding vector type. But for vector unsigned/signed long long and double, we have an omission in our table for vec_ld/vec_st. 

Ok for trunk, and eventual backport to GCC 7 and 8 aftersome burn-in time?

---
Changelog:

gcc/ChangeLog

2019-01-16  Kewen Lin  <linkw@gcc.gnu.org>

	* doc/extend.texi: Add four new prototypes for vec_ld and seven new
	prototypes for vec_st.
	* config/rs6000/rs6000-c.c (altivec_overloaded_builtins): Add entries
	for scalar address type variants of altivec_vec_ld/altivec_vec_st,
	mainly on signed/unsigned long long and double.

gcc/testsuite/ChangeLog

2019-01-16  Kewen Lin  <linkw@gcc.gnu.org>

	* gcc.target/powerpc/altivec_vld_vst_addr.c: New test.

Comments

Segher Boessenkool Jan. 16, 2019, 5:08 p.m. UTC | #1 
Hi Kewen,

On Wed, Jan 16, 2019 at 10:08:46PM +0800, Kewen.Lin wrote:
> On target rs6000, for all types, use of vec_ld/vec_st historically permits the dereferenced pointer to be of a scalar type or the corresponding vector type. But for vector unsigned/signed long long and double, we have an omission in our table for vec_ld/vec_st. 
> 
> Ok for trunk, and eventual backport to GCC 7 and 8 aftersome burn-in time?

This looks fine, thanks!  Okay for trunk.  Also okay for 8 and 7 (do the
backports in that order please) after a week or so.


Segher


> 2019-01-16  Kewen Lin  <linkw@gcc.gnu.org>
> 
> 	* doc/extend.texi: Add four new prototypes for vec_ld and seven new
> 	prototypes for vec_st.
> 	* config/rs6000/rs6000-c.c (altivec_overloaded_builtins): Add entries
> 	for scalar address type variants of altivec_vec_ld/altivec_vec_st,
> 	mainly on signed/unsigned long long and double.
> 
> gcc/testsuite/ChangeLog
> 
> 2019-01-16  Kewen Lin  <linkw@gcc.gnu.org>
> 
> 	* gcc.target/powerpc/altivec_vld_vst_addr.c: New test.
Jakub Jelinek Jan. 18, 2019, 10:15 p.m. UTC | #2 
On Wed, Jan 16, 2019 at 10:08:46PM +0800, Kewen.Lin wrote:
> 	* gcc.target/powerpc/altivec_vld_vst_addr.c: New test.

This test fails on powerpc64-linux, both with -m32 and -m64:

/.../gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr.c:35:1: error: use of 'long long' in AltiVec types is invalid without '-mvsx'
/.../gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr.c:59:1: error: use of 'long long' in AltiVec types is invalid without '-mvsx'
/.../gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr.c:83:1: error: use of 'long long' in AltiVec types is invalid without '-mvsx'
/.../gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr.c:107:1: error: use of 'long long' in AltiVec types is invalid without '-mvsx'
/.../gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr.c:117:7: error: expected ';' before 'double'
/.../gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr.c:120:10: error: incompatible types when returning type '__vector double' {aka '__vector(2) double'} but 'double' was expected
/.../gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr.c:129:7: error: expected ';' before 'double'
/.../gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr.c:130:26: warning: type defaults to 'int' in declaration of 'vector' [-Wimplicit-int]
/.../gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr.c:130:33: error: expected ';', ',' or ')' before 'double'
/.../gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr.c:156:1: error: use of 'long long' in AltiVec types is invalid without '-mvsx'
/.../gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr.c:180:1: error: use of 'long long' in AltiVec types is invalid without '-mvsx'
/.../gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr.c:204:1: error: use of 'long long' in AltiVec types is invalid without '-mvsx'
/.../gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr.c:205:7: error: use of 'long long' in AltiVec types is invalid without '-mvsx'
/.../gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr.c:229:1: error: use of 'long long' in AltiVec types is invalid without '-mvsx'
/.../gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr.c:229:1: error: use of 'long long' in AltiVec types is invalid without '-mvsx'
/.../gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr.c:247:20: error: unknown type name 'vector'
/.../gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr.c:253:20: error: unknown type name 'vector'
/.../gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr.c:253:37: error: unknown type name 'vector'

	Jakub
Segher Boessenkool Jan. 19, 2019, 1:04 a.m. UTC | #3 
On Fri, Jan 18, 2019 at 11:15:12PM +0100, Jakub Jelinek wrote:
> On Wed, Jan 16, 2019 at 10:08:46PM +0800, Kewen.Lin wrote:
> > 	* gcc.target/powerpc/altivec_vld_vst_addr.c: New test.
> 
> This test fails on powerpc64-linux, both with -m32 and -m64:

I missed that.  Thanks Jakub.

Kewen, please split the "vector long long" tests to a separate testcase,
and use -mvsx and powerpc_vsx_ok there (instead of -maltivec and
powerpc_altivec_ok).


Segher
diff mbox series

Patch

Index: gcc/config/rs6000/rs6000-c.c
===================================================================
--- gcc/config/rs6000/rs6000-c.c        (revision 267912)
+++ gcc/config/rs6000/rs6000-c.c        (working copy)
@@ -1531,12 +1531,19 @@  const struct altivec_builtin_types altivec_overloa

   { ALTIVEC_BUILTIN_VEC_LD, ALTIVEC_BUILTIN_LVX_V2DF,
     RS6000_BTI_V2DF, RS6000_BTI_INTSI, ~RS6000_BTI_V2DF, 0 },
+  { ALTIVEC_BUILTIN_VEC_LD, ALTIVEC_BUILTIN_LVX_V2DF,
+    RS6000_BTI_V2DF, RS6000_BTI_INTSI, ~RS6000_BTI_double, 0 },
   { ALTIVEC_BUILTIN_VEC_LD, ALTIVEC_BUILTIN_LVX_V2DI,
     RS6000_BTI_V2DI, RS6000_BTI_INTSI, ~RS6000_BTI_V2DI, 0 },
   { ALTIVEC_BUILTIN_VEC_LD, ALTIVEC_BUILTIN_LVX_V2DI,
+    RS6000_BTI_V2DI, RS6000_BTI_INTSI, ~RS6000_BTI_long_long, 0 },
+  { ALTIVEC_BUILTIN_VEC_LD, ALTIVEC_BUILTIN_LVX_V2DI,
     RS6000_BTI_unsigned_V2DI, RS6000_BTI_INTSI,
     ~RS6000_BTI_unsigned_V2DI, 0 },
   { ALTIVEC_BUILTIN_VEC_LD, ALTIVEC_BUILTIN_LVX_V2DI,
+    RS6000_BTI_unsigned_V2DI, RS6000_BTI_INTSI,
+    ~RS6000_BTI_unsigned_long_long, 0 },
+  { ALTIVEC_BUILTIN_VEC_LD, ALTIVEC_BUILTIN_LVX_V2DI,
     RS6000_BTI_bool_V2DI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V2DI, 0 },
   { ALTIVEC_BUILTIN_VEC_LD, ALTIVEC_BUILTIN_LVX_V4SF,
     RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_V4SF, 0 },
@@ -3737,14 +3744,27 @@  const struct altivec_builtin_types altivec_overloa

   { ALTIVEC_BUILTIN_VEC_ST, ALTIVEC_BUILTIN_STVX_V2DF,
     RS6000_BTI_void, RS6000_BTI_V2DF, RS6000_BTI_INTSI, ~RS6000_BTI_V2DF },
+  { ALTIVEC_BUILTIN_VEC_ST, ALTIVEC_BUILTIN_STVX_V2DF,
+    RS6000_BTI_void, RS6000_BTI_V2DF, RS6000_BTI_INTSI, ~RS6000_BTI_double },
   { ALTIVEC_BUILTIN_VEC_ST, ALTIVEC_BUILTIN_STVX_V2DI,
     RS6000_BTI_void, RS6000_BTI_V2DI, RS6000_BTI_INTSI, ~RS6000_BTI_V2DI },
   { ALTIVEC_BUILTIN_VEC_ST, ALTIVEC_BUILTIN_STVX_V2DI,
+    RS6000_BTI_void, RS6000_BTI_V2DI, RS6000_BTI_INTSI, ~RS6000_BTI_long_long },
+  { ALTIVEC_BUILTIN_VEC_ST, ALTIVEC_BUILTIN_STVX_V2DI,
     RS6000_BTI_void, RS6000_BTI_unsigned_V2DI, RS6000_BTI_INTSI,
     ~RS6000_BTI_unsigned_V2DI },
   { ALTIVEC_BUILTIN_VEC_ST, ALTIVEC_BUILTIN_STVX_V2DI,
+    RS6000_BTI_void, RS6000_BTI_unsigned_V2DI, RS6000_BTI_INTSI,
+    ~RS6000_BTI_unsigned_long_long },
+  { ALTIVEC_BUILTIN_VEC_ST, ALTIVEC_BUILTIN_STVX_V2DI,
     RS6000_BTI_void, RS6000_BTI_bool_V2DI, RS6000_BTI_INTSI,
     ~RS6000_BTI_bool_V2DI },
+  { ALTIVEC_BUILTIN_VEC_ST, ALTIVEC_BUILTIN_STVX_V2DI,
+    RS6000_BTI_void, RS6000_BTI_bool_V2DI, RS6000_BTI_INTSI,
+    ~RS6000_BTI_long_long },
+  { ALTIVEC_BUILTIN_VEC_ST, ALTIVEC_BUILTIN_STVX_V2DI,
+    RS6000_BTI_void, RS6000_BTI_bool_V2DI, RS6000_BTI_INTSI,
+    ~RS6000_BTI_unsigned_long_long },
   { ALTIVEC_BUILTIN_VEC_ST, ALTIVEC_BUILTIN_STVX_V4SF,
     RS6000_BTI_void, RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_V4SF },
   { ALTIVEC_BUILTIN_VEC_ST, ALTIVEC_BUILTIN_STVX_V4SF,
Index: gcc/doc/extend.texi
===================================================================
--- gcc/doc/extend.texi (revision 267912)
+++ gcc/doc/extend.texi (working copy)
@@ -18451,6 +18451,10 @@  vector double vec_div (vector double, vector doubl
 vector long vec_div (vector long, vector long);
 vector unsigned long vec_div (vector unsigned long, vector unsigned long);
 vector double vec_floor (vector double);
+vector signed long long vec_ld (int, const vector signed long long *);
+vector signed long long vec_ld (int, const signed long long *);
+vector unsigned long long vec_ld (int, const vector unsigned long long *);
+vector unsigned long long vec_ld (int, const unsigned long long *);
 vector __int128 vec_ld (int, const vector __int128 *);
 vector unsigned __int128 vec_ld (int, const vector unsigned __int128 *);
 vector __int128 vec_ld (int, const __int128 *);
@@ -18529,6 +18533,13 @@  vector signed long vec_splats (signed long);
 vector unsigned long vec_splats (unsigned long);
 vector float vec_sqrt (vector float);
 vector double vec_sqrt (vector double);
+void vec_st (vector signed long long, int, vector signed long long *);
+void vec_st (vector signed long long, int, signed long long *);
+void vec_st (vector unsigned long long, int, vector unsigned long long *);
+void vec_st (vector unsigned long long, int, unsigned long long *);
+void vec_st (vector bool long long, int, vector bool long long *);
+void vec_st (vector bool long long, int, signed long long *);
+void vec_st (vector bool long long, int, unsigned long long *);
 void vec_st (vector double, int, vector double *);
 void vec_st (vector double, int, double *);
 vector double vec_sub (vector double, vector double);
Index: gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr.c     (nonexistent)
+++ gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr.c     (working copy)
@@ -0,0 +1,257 @@ 
+/* { dg-require-effective-target powerpc_altivec_ok } */
+/* { dg-options "-maltivec" } */
+
+/* Test vec_ld and vec_st can support both scalar and vector
+   type address points, the list is:
+     - address of vector unsigned char/short/int/long long
+     - address of vector signed char/short/int/long long
+     - address of vector double/float
+     - address of unsigned char/short/int/long long
+     - address of signed char/short/int/long long
+     - address of double/float */
+#include <altivec.h>
+
+/* Test vec_ld can allow scalar and vector type address. */
+vector unsigned char
+test_vld_scalar_uc (const unsigned char *address)
+{
+  return __builtin_vec_ld (0, address);
+}
+
+vector unsigned short
+test_vld_scalar_us (const unsigned short *address)
+{
+  return __builtin_vec_ld (0, address);
+}
+
+vector unsigned int
+test_vld_scalar_ui (const unsigned int *address)
+{
+  return __builtin_vec_ld (0, address);
+}
+
+vector unsigned long long
+test_vld_scalar_ul (const unsigned long long *address)
+{
+  return __builtin_vec_ld (0, address);
+}
+
+vector signed char
+test_vld_scalar_sc (const signed char *address)
+{
+  return __builtin_vec_ld (0, address);
+}
+
+vector signed short
+test_vld_scalar_ss (const signed short *address)
+{
+  return __builtin_vec_ld (0, address);
+}
+
+vector signed int
+test_vld_scalar_si (const signed int *address)
+{
+  return __builtin_vec_ld (0, address);
+}
+
+vector signed long long
+test_vld_scalar_sl (const signed long long *address)
+{
+  return __builtin_vec_ld (0, address);
+}
+
+vector unsigned char
+test_vld_vector_uc (const vector unsigned char *address)
+{
+  return __builtin_vec_ld (0, address);
+}
+
+vector unsigned short
+test_vld_vector_us (const vector unsigned short *address)
+{
+  return __builtin_vec_ld (0, address);
+}
+
+vector unsigned int
+test_vld_vector_ui (const vector unsigned int *address)
+{
+  return __builtin_vec_ld (0, address);
+}
+
+vector unsigned long long
+test_vld_vector_ul (const vector unsigned long long *address)
+{
+  return __builtin_vec_ld (0, address);
+}
+
+vector signed char
+test_vld_vector_sc (const vector signed char *address)
+{
+  return __builtin_vec_ld (0, address);
+}
+
+vector signed short
+test_vld_vector_ss (const vector signed short *address)
+{
+  return __builtin_vec_ld (0, address);
+}
+
+vector signed int
+test_vld_vector_si (const vector signed int *address)
+{
+  return __builtin_vec_ld (0, address);
+}
+
+vector signed long long
+test_vld_vector_sl (const vector signed long long *address)
+{
+  return __builtin_vec_ld (0, address);
+}
+
+vector float
+test_vld_scalar_f (const float *address)
+{
+  return __builtin_vec_ld (0, address);
+}
+
+vector double
+test_vld_scalar_d (const double *address)
+{
+  return __builtin_vec_ld (0, address);
+}
+
+vector float
+test_vld_vector_f (const vector float *address)
+{
+  return __builtin_vec_ld (0, address);
+}
+
+vector double
+test_vld_vector_d (const vector double *address)
+{
+  return __builtin_vec_ld (0, address);
+}
+
+/* Test vec_st can allow scalar and vector type address. */
+
+void
+test_vst_scalar_uc (vector unsigned char v, unsigned char *address)
+{
+  __builtin_vec_st (v, 0, address);
+}
+
+void
+test_vst_scalar_us (vector unsigned short v, unsigned short *address)
+{
+  __builtin_vec_st (v, 0, address);
+}
+
+void
+test_vst_scalar_ui (vector unsigned int v, unsigned int *address)
+{
+  __builtin_vec_st (v, 0, address);
+}
+
+void
+test_vst_scalar_ul (vector unsigned long long v, unsigned long long *address)
+{
+  __builtin_vec_st (v, 0, address);
+}
+
+void
+test_vst_scalar_sc (vector signed char v, signed char *address)
+{
+  __builtin_vec_st (v, 0, address);
+}
+
+void
+test_vst_scalar_ss (vector signed short v, signed short *address)
+{
+  __builtin_vec_st (v, 0, address);
+}
+
+void
+test_vst_scalar_si (vector signed int v, signed int *address)
+{
+  __builtin_vec_st (v, 0, address);
+}
+
+void
+test_vst_scalar_sl (vector signed long long v, signed long long *address)
+{
+  __builtin_vec_st (v, 0, address);
+}
+
+void
+test_vst_vector_uc (vector unsigned char v, vector unsigned char *address)
+{
+  __builtin_vec_st (v, 0, address);
+}
+
+void
+test_vst_vector_us (vector unsigned short v, vector unsigned short *address)
+{
+  __builtin_vec_st (v, 0, address);
+}
+
+void
+test_vst_vector_ui (vector unsigned int v, vector unsigned int *address)
+{
+  __builtin_vec_st (v, 0, address);
+}
+
+void
+test_vst_vector_ul (vector unsigned long long v,
+                   vector unsigned long long *address)
+{
+  __builtin_vec_st (v, 0, address);
+}
+
+void
+test_vst_vector_sc (vector signed char v, vector signed char *address)
+{
+  __builtin_vec_st (v, 0, address);
+}
+
+void
+test_vst_vector_ss (vector signed short v, vector signed short *address)
+{
+  __builtin_vec_st (v, 0, address);
+}
+
+void
+test_vst_vector_si (vector signed int v, vector signed int *address)
+{
+  __builtin_vec_st (v, 0, address);
+}
+
+void
+test_vst_vector_sl (vector signed long long v, vector signed long long *address)
+{
+  __builtin_vec_st (v, 0, address);
+}
+
+void
+test_vst_scalar_f (vector float v, float *address)
+{
+  __builtin_vec_st (v, 0, address);
+}
+
+void
+test_vst_vector_f (vector float v, vector float *address)
+{
+  __builtin_vec_st (v, 0, address);
+}
+
+void
+test_vst_scalar_d (vector double v, double *address)
+{
+  __builtin_vec_st (v, 0, address);
+}
+
+void
+test_vst_vector_d (vector double v, vector double *address)
+{
+  __builtin_vec_st (v, 0, address);
+}
+