S/390: Fix immediate vector operands for some builtins.

This fixes a problem with vec_add/sub_u128 builtins.  The
s390_expand_builtin backend function is supposed to convert the
operand to TImode *AND* load it into a vector register.  The current
implementation did only the conversion and gave up then.

gcc/ChangeLog:

2019-03-13  Andreas Krebbel  <krebbel@linux.ibm.com>

	Backport from mainline
	2019-03-11  Andreas Krebbel  <krebbel@linux.ibm.com>

	* config/s390/s390.c (s390_expand_builtin): Do the copy_to_reg not
	only on the else branch.

gcc/testsuite/ChangeLog:

2019-03-13  Andreas Krebbel  <krebbel@linux.ibm.com>

	Backport from mainline
	2019-03-11  Andreas Krebbel  <krebbel@linux.ibm.com>

	* gcc.target/s390/zvector/vec-addc-u128.c: New test.

From-SVN: r269643

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fefba6f134513a0d70e9b29ebf361f7fc934e734..e97bd4a2327854e93e4ed8a844ccf03b0cdb59e5 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2019-03-13  Andreas Krebbel  <krebbel@linux.ibm.com>
+
+       Backport from mainline
+       2019-03-11  Andreas Krebbel  <krebbel@linux.ibm.com>
+
+       * config/s390/s390.c (s390_expand_builtin): Do the copy_to_reg not
+       only on the else branch.
+
 2019-03-13  Andreas Krebbel  <krebbel@linux.ibm.com>
 
        Backport from mainline

diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index 8921f6d82f5d7bc55e0bd70c33e2f0dedeaf8d57..f2b6676cd0f8c9ca358407edbf7d8de6fc6822e8 100644 (file)
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -937,6 +937,8 @@ s390_expand_builtin (tree exp, rtx target, rtx subtarget ATTRIBUTE_UNUSED,
          continue;
        }
 
+      /* A memory operand is rejected by the memory_operand predicate.
+        Try making the address legal by copying it into a register.  */
       if (MEM_P (op[arity])
          && insn_op->predicate == memory_operand
          && (GET_MODE (XEXP (op[arity], 0)) == Pmode
@@ -960,10 +962,14 @@ s390_expand_builtin (tree exp, rtx target, rtx subtarget ATTRIBUTE_UNUSED,
        {
          op[arity] = tmp_rtx;
        }
-      else if (GET_MODE (op[arity]) == insn_op->mode
-              || GET_MODE (op[arity]) == VOIDmode
-              || (insn_op->predicate == address_operand
-                  && GET_MODE (op[arity]) == Pmode))
+
+      /* The predicate rejects the operand although the mode is fine.
+        Copy the operand to register.  */
+      if (!insn_op->predicate (op[arity], insn_op->mode)
+         && (GET_MODE (op[arity]) == insn_op->mode
+             || GET_MODE (op[arity]) == VOIDmode
+             || (insn_op->predicate == address_operand
+                 && GET_MODE (op[arity]) == Pmode)))
        {
          /* An address_operand usually has VOIDmode in the expander
             so we cannot use this.  */

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a0cacfa72898bb00e104fc54359255d9bc121d0b..51a1713741f0f551816bfbef0396b87372c4baf8 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2019-03-13  Andreas Krebbel  <krebbel@linux.ibm.com>
+
+       Backport from mainline
+       2019-03-11  Andreas Krebbel  <krebbel@linux.ibm.com>
+
+       * gcc.target/s390/zvector/vec-addc-u128.c: New test.
+
 2019-03-13  Andreas Krebbel  <krebbel@linux.ibm.com>
 
        Backport from mainline

diff --git a/gcc/testsuite/gcc.target/s390/zvector/vec-addc-u128.c b/gcc/testsuite/gcc.target/s390/zvector/vec-addc-u128.c
new file mode 100644 (file)
index 0000000..3ab0c71
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/zvector/vec-addc-u128.c
@@ -0,0 +1,10 @@
+/* { dg-do compile { target { s390*-*-* } } } */
+/* { dg-options "-O3 -mzarch -march=z13 -mzvector -fno-asynchronous-unwind-tables" } */
+
+#include <vecintrin.h>
+
+vector unsigned char test(void)
+{
+   vector unsigned char a = { 0 };
+   return __builtin_s390_vec_addc_u128 (a, a);
+}