S/390: PR79895: Fix TImode constant handling

The P constraint letter is supposed to match every constant which is
acceptable during reload.  However, constraints do not appear to be
able to handle const_wide_int yet.  It works with predicates so the
alternative is modelled with a new predicate now.

gcc/ChangeLog:

2017-04-25  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>

	PR target/79895
	* config/s390/predicates.md (reload_const_wide_int_operand): New
	predicate.
	* config/s390/s390.md ("movti"): Remove d/P alternative.
	("movti_bigconst"): New pattern definition.

gcc/testsuite/ChangeLog:

2017-04-25  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>

	PR target/79895
	* gcc.target/s390/pr79895.c: New test.

From-SVN: r247133

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c70d790dc5e48cfa2e628093ab8a98a58d0a0348..e9cefd918e43c0291efa5d50ab5e54b9273b88a6 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2017-04-25  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>
+
+       PR target/79895
+       * config/s390/predicates.md (reload_const_wide_int_operand): New
+       predicate.
+       * config/s390/s390.md ("movti"): Remove d/P alternative.
+       ("movti_bigconst"): New pattern definition.
+
 2017-04-25  Dominik Vogt  <vogt@linux.vnet.ibm.com>
 
        PR target/80080

diff --git a/gcc/config/s390/predicates.md b/gcc/config/s390/predicates.md
index 0c82efc01cd28c32c8d5b0c96da68103476424c2..34a7ea284556618093501a8f9613ee0feb4215e3 100644 (file)
--- a/gcc/config/s390/predicates.md
+++ b/gcc/config/s390/predicates.md
@@ -199,6 +199,11 @@
       (and (match_code "const_int")
           (match_test "INTVAL (op) <= 32767 && INTVAL (op) >= -32768"))))
 
+(define_predicate "reload_const_wide_int_operand"
+  (and (match_code "const_wide_int")
+       (match_test "legitimate_reload_constant_p (op)")))
+
+
 ;; operators --------------------------------------------------------------
 
 ;; Return nonzero if OP is a valid comparison operator

diff --git a/gcc/config/s390/s390.md b/gcc/config/s390/s390.md
index 8a700edab94a030b0f27405a7d0ff11839d0a279..c9fd19aeb330b9cdc77116f44d16be33236c8e64 100644 (file)
--- a/gcc/config/s390/s390.md
+++ b/gcc/config/s390/s390.md
@@ -1494,11 +1494,20 @@
 ; movti instruction pattern(s).
 ;
 
+
+; Separate out the register pair alternative since constraints (P) are
+; not able to deal with const_wide_int's.  But predicates do.
+(define_insn "*movti_bigconst"
+  [(set (match_operand:TI 0 "register_operand"              "=d")
+        (match_operand:TI 1 "reload_const_wide_int_operand" ""))]
+  "TARGET_ZARCH"
+  "#")
+
 ; FIXME: More constants are possible by enabling jxx, jyy constraints
 ; for TImode (use double-int for the calculations)
 (define_insn "movti"
-  [(set (match_operand:TI 0 "nonimmediate_operand" "=d,S,v,  v,  v,v,d,v,R,  d,o")
-        (match_operand:TI 1 "general_operand"      " S,d,v,j00,jm1,d,v,R,v,dPT,d"))]
+  [(set (match_operand:TI 0 "nonimmediate_operand" "=d,S,v,  v,  v,v,d,v,R, d,o")
+        (match_operand:TI 1 "general_operand"      " S,d,v,j00,jm1,d,v,R,v,dT,d"))]
   "TARGET_ZARCH"
   "@
    lmg\t%0,%N0,%S1

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e4a9f0ed7240cd6703a4de64f0f5e6766ff0c0cd..ffa5b4a604d63481176bf7c960c3b7b500343ebb 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-04-25  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>
+
+       PR target/79895
+       * gcc.target/s390/pr79895.c: New test.
+
 2017-04-25  Dominik Vogt  <vogt@linux.vnet.ibm.com>
 
        PR target/80080

diff --git a/gcc/testsuite/gcc.target/s390/pr79895.c b/gcc/testsuite/gcc.target/s390/pr79895.c
new file mode 100644 (file)
index 0000000..02374e4
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/pr79895.c
@@ -0,0 +1,9 @@
+/* { dg-do compile { target int128 } } */
+/* { dg-options "-O1 -mno-lra" } */
+
+unsigned __int128 g;
+void
+foo ()
+{
+  g = (unsigned __int128)1 << 127;
+}