Hi,
This corrects an issue with the powerpc vector long long subtypes.
As reported by SjMunroe in PR96139. 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 a 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.
This has been successfully regtested on assorted power7,power8,
power8 targets. Another sniff test in the queue to verify a last
minute testcase tweak.
OK for trunk?
Thanks
-Will
PR target/96139
2020-09-01 Will Schmidt <will_schm...@vnet.ibm.com>
gcc/Changelog:
* config/rs6000/rs6000-call.c (rs6000_init_builtin): Update V2DI_type_node
and unsigned_V2DI_type_node definitions.
gcc/testsuite/Changelog:
* testsuite/gcc.target/powerpc/pr96139-a.c: New test.
* testsuite/gcc.target/powerpc/pr96139-b.c: New test.
* testsuite/gcc.target/powerpc/pr96139-c.c: New test.
diff --git a/gcc/config/rs6000/rs6000-call.c b/gcc/config/rs6000/rs6000-call.c
index ff4c2537fada..354cac575cc6 100644
--- a/gcc/config/rs6000/rs6000-call.c
+++ b/gcc/config/rs6000/rs6000-call.c
@@ -12511,13 +12511,16 @@ rs6000_init_builtins (void)
if (TARGET_DEBUG_BUILTIN)
fprintf (stderr, "rs6000_init_builtins%s%s\n",
(TARGET_ALTIVEC) ? ", altivec" : "",
(TARGET_VSX) ? ", vsx" : "");
- V2DI_type_node = rs6000_vector_type (TARGET_POWERPC64 ? "__vector long"
- : "__vector long long",
- intDI_type_node, 2);
+ V2DI_type_node
+ = rs6000_vector_type (TARGET_POWERPC64
+ ? "__vector long" : "__vector long long",
+ TARGET_POWERPC64
+ ? long_long_integer_type_node : intDI_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);
V4SF_type_node = rs6000_vector_type ("__vector float", float_type_node, 4);
V8HI_type_node = rs6000_vector_type ("__vector signed short",
@@ -12529,14 +12532,18 @@ rs6000_init_builtins (void)
unsigned_intQI_type_node, 16);
unsigned_V8HI_type_node = rs6000_vector_type ("__vector unsigned short",
unsigned_intHI_type_node, 8);
unsigned_V4SI_type_node = rs6000_vector_type ("__vector unsigned int",
unsigned_intSI_type_node, 4);
- unsigned_V2DI_type_node = rs6000_vector_type (TARGET_POWERPC64
- ? "__vector unsigned long"
- : "__vector unsigned long long",
- unsigned_intDI_type_node, 2);
+ unsigned_V2DI_type_node
+ = rs6000_vector_type (TARGET_POWERPC64
+ ? "__vector unsigned long"
+ : "__vector unsigned long long",
+ TARGET_POWERPC64
+ ? long_long_unsigned_type_node
+ : unsigned_intDI_type_node,
+ 2);
opaque_V4SI_type_node = build_opaque_vector_type (intSI_type_node, 4);
const_str_type_node
= build_pointer_type (build_qualified_type (char_type_node,
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 000000000000..37820b1809ba
--- /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 <stdio.h>
+#include <altivec.h>
+
+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 000000000000..7fac6901790e
--- /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 <stdio.h>
+#include <altivec.h>
+
+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 000000000000..2464b8da4f71
--- /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 <stdio.h>
+#include <altivec.h>
+
+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;
+}
