From d8f3474ff81b07fd2e758337957711db17eb801e Mon Sep 17 00:00:00 2001 From: Will Schmidt Date: Mon, 20 Jul 2020 10:51:37 -0500 Subject: [PATCH] [PATCH, rs6000] Fix vector long long subtype (PR96139) Hi, This corrects an issue with the powerpc vector long long subtypes. As reported by SjMunroe, when building some code with -Wall, and attempting to print an element of a "long long vector" with a long long printf format string, we will report an error because the vector sub-type was improperly defined as int. When defining a V2DI_type_node we use a TARGET_POWERPC64 ternary to define the V2DI_type_node with "vector long" or "vector long long". We also need to specify the proper sub-type when we define the type. PR target/96139 2020-09-03 Will Schmidt gcc/ChangeLog: * config/rs6000/rs6000-call.c (rs6000_init_builtin): Update V2DI_type_node and unsigned_V2DI_type_node definitions. gcc/testsuite/ChangeLog: * gcc.target/powerpc/pr96139-a.c: New test. * gcc.target/powerpc/pr96139-b.c: New test. * gcc.target/powerpc/pr96139-c.c: New test. --- gcc/config/rs6000/rs6000-call.c | 4 ++-- gcc/testsuite/gcc.target/powerpc/pr96139-a.c | 32 ++++++++++++++++++++++++++++ gcc/testsuite/gcc.target/powerpc/pr96139-b.c | 32 ++++++++++++++++++++++++++++ gcc/testsuite/gcc.target/powerpc/pr96139-c.c | 26 ++++++++++++++++++++++ 4 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.target/powerpc/pr96139-a.c create mode 100644 gcc/testsuite/gcc.target/powerpc/pr96139-b.c create mode 100644 gcc/testsuite/gcc.target/powerpc/pr96139-c.c diff --git a/gcc/config/rs6000/rs6000-call.c b/gcc/config/rs6000/rs6000-call.c index b6b4568..77c7a11 100644 --- a/gcc/config/rs6000/rs6000-call.c +++ b/gcc/config/rs6000/rs6000-call.c @@ -12801,7 +12801,7 @@ rs6000_init_builtins (void) V2DI_type_node = rs6000_vector_type (TARGET_POWERPC64 ? "__vector long" : "__vector long long", - intDI_type_node, 2); + long_long_integer_type_node, 2); V2DF_type_node = rs6000_vector_type ("__vector double", double_type_node, 2); V4SI_type_node = rs6000_vector_type ("__vector signed int", intSI_type_node, 4); @@ -12820,7 +12820,7 @@ rs6000_init_builtins (void) unsigned_V2DI_type_node = rs6000_vector_type (TARGET_POWERPC64 ? "__vector unsigned long" : "__vector unsigned long long", - unsigned_intDI_type_node, 2); + long_long_unsigned_type_node, 2); opaque_V4SI_type_node = build_opaque_vector_type (intSI_type_node, 4); diff --git a/gcc/testsuite/gcc.target/powerpc/pr96139-a.c b/gcc/testsuite/gcc.target/powerpc/pr96139-a.c new file mode 100644 index 0000000..b3daee4 --- /dev/null +++ b/gcc/testsuite/gcc.target/powerpc/pr96139-a.c @@ -0,0 +1,32 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -Wall -m32" } */ +/* { dg-require-effective-target ilp32 } */ +/* { dg-require-effective-target powerpc_altivec_ok } */ + +#include +#include + +void +try_printing_longlong_a ( + __vector signed char cval, + __vector signed int ival, + __vector signed long long int llval, + int x, int y, int z) +{ + printf (" %016llx \n", llval[x]); + printf (" %016x \n", ival[z]); + printf (" %c \n", cval[y]); +} + +void +try_printing_unsigned_longlong_a ( + __vector unsigned char cval, + __vector unsigned int ival, + __vector unsigned long long int llval, + int x, int y, int z) +{ + printf (" %016llx \n", llval[x]); + printf (" %016x \n", ival[z]); + printf (" %c \n", cval[y]); +} + diff --git a/gcc/testsuite/gcc.target/powerpc/pr96139-b.c b/gcc/testsuite/gcc.target/powerpc/pr96139-b.c new file mode 100644 index 0000000..19c1110 --- /dev/null +++ b/gcc/testsuite/gcc.target/powerpc/pr96139-b.c @@ -0,0 +1,32 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -Wall -m64" } */ +/* { dg-require-effective-target lp64 } */ +/* { dg-require-effective-target powerpc_altivec_ok } */ + +#include +#include + +void +try_printing_longlong_a ( + __vector signed char cval, + __vector signed int ival, + __vector signed long long int llval, + int x, int y, int z) +{ + printf (" %016llx \n", llval[x]); + printf (" %016x \n", ival[z]); + printf (" %c \n", cval[y]); +} + + +void +try_printing_unsigned_longlong_a ( + __vector unsigned char cval, + __vector unsigned int ival, + __vector unsigned long long int llval, + int x, int y, int z) +{ + printf (" %016llx \n", llval[x]); + printf (" %016x \n", ival[z]); + printf (" %c \n", cval[y]); +} diff --git a/gcc/testsuite/gcc.target/powerpc/pr96139-c.c b/gcc/testsuite/gcc.target/powerpc/pr96139-c.c new file mode 100644 index 0000000..2464b8d --- /dev/null +++ b/gcc/testsuite/gcc.target/powerpc/pr96139-c.c @@ -0,0 +1,26 @@ +/* { dg-do run } */ +/* { dg-options "-O2 -Wall" } */ +/* { dg-require-effective-target powerpc_altivec_ok } */ + +/* + * Based on test created by sjmunroe for pr96139 + */ + +#include +#include + +volatile vector long long llfoo; + +void +print_v2xint64_b () { + printf (" %016llx \n", llfoo[0]); + printf (" %016llx \n", llfoo[1]); +} + +int +main() { +llfoo[0]=12345678; +llfoo[1]=34567890; +print_v2xint64_b(); +return 0; +} -- 2.7.4