aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorAndreas Krebbel <krebbel@linux.vnet.ibm.com>2016-03-01 09:26:20 +0000
committerAndreas Krebbel <krebbel@gcc.gnu.org>2016-03-01 09:26:20 +0000
commit708c0910a8f5bf48ec9ad54456dca3fc73360631 (patch)
tree283552d6e89f7c36ca91a7a959821bd47df1b32e /gcc
parent674a959cd5eac469b63f9e64ab5d11890750451f (diff)
downloadgcc-708c0910a8f5bf48ec9ad54456dca3fc73360631.zip
gcc-708c0910a8f5bf48ec9ad54456dca3fc73360631.tar.gz
gcc-708c0910a8f5bf48ec9ad54456dca3fc73360631.tar.bz2
S/390: Use define_subst for the setmem patterns.
While trying to get rid of the Y constraint in the setmem patterns I noticed that for these patterns it isn't even a problem since these always only use the constraint with a Pmode match_operand. But while being at it I've tried to fold some of the patterns a bit. gcc/ChangeLog: 2016-03-01 Andreas Krebbel <krebbel@linux.vnet.ibm.com> * config/s390/constraints.md ("jm8"): New constraint. * config/s390/predicates.md ("const_int_8bitset_operand"): New predicate. * config/s390/s390.md ("*setmem_long", "*setmem_long_and"): Merge into ... ("*setmem_long<setmem_and>"): New pattern. ("*setmem_long_31z", "*setmem_long_and_31z"): Merge into ... ("*setmem_long_31z<setmem_and>"): New pattern. * config/s390/subst.md ("setmem_31z_subst", "setmem_and_subst"): New substitution rules with the required attributes. From-SVN: r233848
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog13
-rw-r--r--gcc/config/s390/constraints.md5
-rw-r--r--gcc/config/s390/predicates.md6
-rw-r--r--gcc/config/s390/s390.md35
-rw-r--r--gcc/config/s390/subst.md25
5 files changed, 51 insertions, 33 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 79756c8..6c35f0e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,18 @@
2016-03-01 Andreas Krebbel <krebbel@linux.vnet.ibm.com>
+ * config/s390/constraints.md ("jm8"): New constraint.
+ * config/s390/predicates.md ("const_int_8bitset_operand"): New predicate.
+ * config/s390/s390.md ("*setmem_long", "*setmem_long_and"): Merge
+ into ...
+ ("*setmem_long<setmem_and>"): New pattern.
+ ("*setmem_long_31z", "*setmem_long_and_31z"): Merge
+ into ...
+ ("*setmem_long_31z<setmem_and>"): New pattern.
+ * config/s390/subst.md ("setmem_31z_subst", "setmem_and_subst"):
+ New substitution rules with the required attributes.
+
+2016-03-01 Andreas Krebbel <krebbel@linux.vnet.ibm.com>
+
* config/s390/subst.md (DSI_VI): New mode iterator.
("addr_style_op_subst"): Use DSI_VI instead of DSI.
* config/s390/vector.md ("vec_set<mode>"): Move expander before
diff --git a/gcc/config/s390/constraints.md b/gcc/config/s390/constraints.md
index 60a7edf..6eeaa98 100644
--- a/gcc/config/s390/constraints.md
+++ b/gcc/config/s390/constraints.md
@@ -37,6 +37,7 @@
;; jKK: constant vector with all elements having the same value and
;; matching K constraint
;; jm6: An integer operand with the lowest order 6 bits all ones.
+;; jm8: An integer operand with the lowest order 8 bits all ones.
;; t -- Access registers 36 and 37.
;; v -- Vector registers v0-v31.
;; C -- A signed 8-bit constant (-128..127)
@@ -420,6 +421,10 @@
"@internal An integer operand with the lowest order 6 bits all ones."
(match_operand 0 "const_int_6bitset_operand"))
+(define_constraint "jm8"
+ "@internal An integer operand with the lowest order 8 bits all ones."
+ (match_operand 0 "const_int_8bitset_operand"))
+
;;
;; Memory constraints follow.
;;
diff --git a/gcc/config/s390/predicates.md b/gcc/config/s390/predicates.md
index fefefb3..fbff24d 100644
--- a/gcc/config/s390/predicates.md
+++ b/gcc/config/s390/predicates.md
@@ -119,6 +119,12 @@
(define_predicate "const_int_6bitset_operand"
(and (match_code "const_int")
(match_test "(INTVAL (op) & 63) == 63")))
+
+; An integer operand with the lowest order 8 bits all ones.
+(define_predicate "const_int_8bitset_operand"
+ (and (match_code "const_int")
+ (match_test "(INTVAL (op) & 255) == 255")))
+
(define_predicate "nonzero_shift_count_operand"
(and (match_code "const_int")
(match_test "IN_RANGE (INTVAL (op), 1, GET_MODE_BITSIZE (mode) - 1)")))
diff --git a/gcc/config/s390/s390.md b/gcc/config/s390/s390.md
index ca58c42..d085fa1 100644
--- a/gcc/config/s390/s390.md
+++ b/gcc/config/s390/s390.md
@@ -3323,7 +3323,7 @@
; Patterns for 31 bit + Esa and 64 bit + Zarch.
-(define_insn "*setmem_long"
+(define_insn "*setmem_long<setmem_and>"
[(clobber (match_operand:<DBL> 0 "register_operand" "=d"))
(set (mem:BLK (subreg:P (match_operand:<DBL> 3 "register_operand" "0") 0))
(unspec:BLK [(match_operand:P 2 "shift_count_or_setmem_operand" "Y")
@@ -3336,26 +3336,10 @@
[(set_attr "length" "8")
(set_attr "type" "vs")])
-(define_insn "*setmem_long_and"
- [(clobber (match_operand:<DBL> 0 "register_operand" "=d"))
- (set (mem:BLK (subreg:P (match_operand:<DBL> 3 "register_operand" "0") 0))
- (unspec:BLK [(and:P
- (match_operand:P 2 "shift_count_or_setmem_operand" "Y")
- (match_operand:P 4 "const_int_operand" "n"))
- (subreg:P (match_dup 3) <modesize>)]
- UNSPEC_REPLICATE_BYTE))
- (use (match_operand:<DBL> 1 "register_operand" "d"))
- (clobber (reg:CC CC_REGNUM))]
- "(TARGET_64BIT || !TARGET_ZARCH) &&
- (INTVAL (operands[4]) & 255) == 255"
- "mvcle\t%0,%1,%Y2\;jo\t.-4"
- [(set_attr "length" "8")
- (set_attr "type" "vs")])
-
; Variants for 31 bit + Zarch, necessary because of the odd in-register offsets
; of the SImode subregs.
-(define_insn "*setmem_long_31z"
+(define_insn "*setmem_long_31z<setmem_and>"
[(clobber (match_operand:TI 0 "register_operand" "=d"))
(set (mem:BLK (subreg:SI (match_operand:TI 3 "register_operand" "0") 4))
(unspec:BLK [(match_operand:SI 2 "shift_count_or_setmem_operand" "Y")
@@ -3367,21 +3351,6 @@
[(set_attr "length" "8")
(set_attr "type" "vs")])
-(define_insn "*setmem_long_and_31z"
- [(clobber (match_operand:TI 0 "register_operand" "=d"))
- (set (mem:BLK (subreg:SI (match_operand:TI 3 "register_operand" "0") 4))
- (unspec:BLK [(and:SI
- (match_operand:SI 2 "shift_count_or_setmem_operand" "Y")
- (match_operand:SI 4 "const_int_operand" "n"))
- (subreg:SI (match_dup 3) 12)] UNSPEC_REPLICATE_BYTE))
- (use (match_operand:TI 1 "register_operand" "d"))
- (clobber (reg:CC CC_REGNUM))]
- "(!TARGET_64BIT && TARGET_ZARCH) &&
- (INTVAL (operands[4]) & 255) == 255"
- "mvcle\t%0,%1,%Y2\;jo\t.-4"
- [(set_attr "length" "8")
- (set_attr "type" "vs")])
-
;
; cmpmemM instruction pattern(s).
;
diff --git a/gcc/config/s390/subst.md b/gcc/config/s390/subst.md
index 8a1b814..886d420 100644
--- a/gcc/config/s390/subst.md
+++ b/gcc/config/s390/subst.md
@@ -120,3 +120,28 @@
(clobber (match_scratch:DSI 0 "=d,d"))])
(define_subst_attr "cconly" "cconly_subst" "" "_cconly")
+
+
+;; setmem substitution patterns
+
+; Add an AND operation on the padding byte operand. Only the lowest 8
+; bit are used and the rest is ignored.
+(define_subst "setmem_and_subst"
+ [(clobber (match_operand:TDI 0 "register_operand" ""))
+ (set (mem:BLK (subreg:DSI (match_operand:TDI 1 "register_operand" "") 0))
+ (unspec:BLK [(match_operand:DSI 2 "shift_count_or_setmem_operand" "")
+ (match_operand:DSI 3 "register_operand" "")]
+ UNSPEC_REPLICATE_BYTE))
+ (use (match_operand:TDI 4 "register_operand" ""))
+ (clobber (reg:CC CC_REGNUM))]
+""
+ [(clobber (match_dup 0))
+ (set (mem:BLK (subreg:DSI (match_dup 1) 0))
+ (unspec:BLK [(and:DSI (match_dup 2)
+ (match_operand:DSI 5 "const_int_8bitset_operand" "jm8"))
+ (match_dup 3)]
+ UNSPEC_REPLICATE_BYTE))
+ (use (match_dup 4))
+ (clobber (reg:CC CC_REGNUM))])
+
+(define_subst_attr "setmem_and" "setmem_and_subst" "" "_and")