From 045e28d43300c630e57f81a7ff21d2f5103fa3d7 Mon Sep 17 00:00:00 2001 From: Kewen Lin Date: Wed, 30 Jan 2019 08:18:05 +0000 Subject: [PATCH] backport: [multiple changes] 2019-01-30 Kewen Lin Backport from mainline. gcc/ 2019-01-17 Kewen Lin * 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/ 2019-01-20 Kewen Lin * gcc.target/powerpc/altivec_vld_vst_addr.c: Remove, split into altivec_vld_vst_addr-1.c and altivec_vld_vst_addr-2.c. * gcc.target/powerpc/altivec_vld_vst_addr-1.c: New test. * gcc.target/powerpc/altivec_vld_vst_addr-2.c: Ditto. 2019-01-17 Kewen Lin * gcc.target/powerpc/altivec_vld_vst_addr.c: New test. From-SVN: r268383 --- gcc/ChangeLog | 11 ++ gcc/config/rs6000/rs6000-c.c | 20 ++ gcc/doc/extend.texi | 11 ++ gcc/testsuite/ChangeLog | 14 ++ .../powerpc/altivec_vld_vst_addr-1.c | 184 ++++++++++++++++++ .../powerpc/altivec_vld_vst_addr-2.c | 92 +++++++++ 6 files changed, 332 insertions(+) create mode 100644 gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr-1.c create mode 100644 gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr-2.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 07bebd6c7a2a..99f9805eb8e6 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,14 @@ +2019-01-30 Kewen Lin + + Backport from mainline. + 2019-01-17 Kewen Lin + + * 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. + 2019-01-27 Uroš Bizjak PR target/88948 diff --git a/gcc/config/rs6000/rs6000-c.c b/gcc/config/rs6000/rs6000-c.c index 516db05da8f4..2996ca19b6f5 100644 --- a/gcc/config/rs6000/rs6000-c.c +++ b/gcc/config/rs6000/rs6000-c.c @@ -1518,11 +1518,18 @@ const struct altivec_builtin_types altivec_overloaded_builtins[] = { RS6000_BTI_V2DF, RS6000_BTI_unsigned_V2DI, 0, 0 }, { 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, @@ -3440,14 +3447,27 @@ const struct altivec_builtin_types altivec_overloaded_builtins[] = { RS6000_BTI_V2DF, RS6000_BTI_V2DF, RS6000_BTI_V2DF, RS6000_BTI_NOT_OPAQUE }, { 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, diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi index dbcf13f862bc..94e4849004bb 100644 --- a/gcc/doc/extend.texi +++ b/gcc/doc/extend.texi @@ -17523,6 +17523,10 @@ vector double vec_div (vector double, vector double); 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 double vec_ld (int, const vector double *); vector double vec_ld (int, const double *); vector double vec_ldl (int, const vector double *); @@ -17595,6 +17599,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); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 108a9dd1a398..8af5f61673ca 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,17 @@ +2019-01-30 Kewen Lin + + Backport from mainline + 2019-01-20 Kewen Lin + + * gcc.target/powerpc/altivec_vld_vst_addr.c: Remove, split into + altivec_vld_vst_addr-1.c and altivec_vld_vst_addr-2.c. + * gcc.target/powerpc/altivec_vld_vst_addr-1.c: New test. + * gcc.target/powerpc/altivec_vld_vst_addr-2.c: Ditto. + + 2019-01-17 Kewen Lin + + * gcc.target/powerpc/altivec_vld_vst_addr.c: New test. + 2019-01-27 Uroš Bizjak PR fortran/70696 diff --git a/gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr-1.c b/gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr-1.c new file mode 100644 index 000000000000..eb6d1ebd40f3 --- /dev/null +++ b/gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr-1.c @@ -0,0 +1,184 @@ +/* { 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 unsigned char/short/int + - address of signed char/short/int + - address of float + - address of vector unsigned char/short/int + - address of vector signed char/short/int + - address of vector float */ +#include + +/* 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 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 float +test_vld_scalar_f (const float *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 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 float +test_vld_vector_f (const vector float *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_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_f (vector float v, float *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_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_f (vector float v, vector float *address) +{ + __builtin_vec_st (v, 0, address); +} + diff --git a/gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr-2.c b/gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr-2.c new file mode 100644 index 000000000000..aecccd0c7d27 --- /dev/null +++ b/gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr-2.c @@ -0,0 +1,92 @@ +/* { dg-require-effective-target powerpc_vsx_ok } */ +/* { dg-options "-mvsx" } */ + +/* Note that vector long long and vector double type require vsx support. */ + +/* Test vec_ld and vec_st can support both scalar and vector + type address points, the list is: + - address of unsigned long long + - address of signed long long + - address of double + - address of vector unsigned long long + - address of vector signed long long + - address of vector double */ +#include + +/* Test vec_ld can allow scalar and vector type address. */ + +vector unsigned long long +test_vld_scalar_ul (const unsigned long long *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 double +test_vld_scalar_d (const double *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 long long +test_vld_vector_sl (const vector signed long long *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_ul (vector unsigned long long v, unsigned long long *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_scalar_d (vector double v, double *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_sl (vector signed long long v, vector signed long long *address) +{ + __builtin_vec_st (v, 0, address); +} + +void +test_vst_vector_d (vector double v, vector double *address) +{ + __builtin_vec_st (v, 0, address); +} + -- 2.47.2