From patchwork Tue Feb 23 14:33:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Krebbel X-Patchwork-Id: 586882 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 58175140778 for ; Wed, 24 Feb 2016 01:34:50 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=W4CJd9Mz; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:date:message-id:in-reply-to:references; q=dns; s= default; b=jYoO1ghUaFvFqwnTIlx5Xnjf9KfCn7r5IRAnoJ8M+1Y2nO/OAgl8M ywNVwhnEbF/FMIjx9vKEfBVlC4k9R1LbWUOVzZK3kW63qcL7hYFcJEjGCD0exR8H kVqA4b7G9QhEAVK+fXqyjvou3nsMg8eD8WuzWOJNd2S5TAkZFkyt0Q= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:date:message-id:in-reply-to:references; s=default; bh=IiF6kfbVK2TjPSxGrbs3QZYJlcE=; b=W4CJd9Mz0RJL/HqgbSuyTVR2mZuw oa+sJVCZ0LOwZW0LKpjRkptMwd91NbmqMhHZKLdSc3LRN15XnBAHkuhZfR2H5eNC fFAvF8AbFDibdOqXWkIw+WqMEKBR3UB/ZBD7WbKsIyEn36C4NO5XGaeoAPj4xM/b y207tJO6mDeoTY0= Received: (qmail 20196 invoked by alias); 23 Feb 2016 14:33:40 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 20113 invoked by uid 89); 23 Feb 2016 14:33:40 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=1.1 required=5.0 tests=AWL, BAYES_50, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD autolearn=no version=3.3.2 spammy=nn, an, substitution, dd X-HELO: e06smtp11.uk.ibm.com Received: from e06smtp11.uk.ibm.com (HELO e06smtp11.uk.ibm.com) (195.75.94.107) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (CAMELLIA256-SHA encrypted) ESMTPS; Tue, 23 Feb 2016 14:33:31 +0000 Received: from localhost by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 23 Feb 2016 14:33:28 -0000 Received: from d06dlp03.portsmouth.uk.ibm.com (9.149.20.15) by e06smtp11.uk.ibm.com (192.168.101.141) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 23 Feb 2016 14:33:25 -0000 X-IBM-Helo: d06dlp03.portsmouth.uk.ibm.com X-IBM-MailFrom: krebbel@linux.vnet.ibm.com X-IBM-RcptTo: gcc-patches@gcc.gnu.org Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id D05541B08070 for ; Tue, 23 Feb 2016 14:33:44 +0000 (GMT) Received: from d06av09.portsmouth.uk.ibm.com (d06av09.portsmouth.uk.ibm.com [9.149.37.250]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u1NEXPfs2818514 for ; Tue, 23 Feb 2016 14:33:25 GMT Received: from d06av09.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u1NEXPjU023544 for ; Tue, 23 Feb 2016 07:33:25 -0700 Received: from maggie.boeblingen.de.ibm.com (dyn-9-152-212-123.boeblingen.de.ibm.com [9.152.212.123]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u1NEXOE8023504 (version=TLSv1/SSLv3 cipher=AES256-SHA256 bits=256 verify=NO) for ; Tue, 23 Feb 2016 07:33:25 -0700 From: Andreas Krebbel To: gcc-patches@gcc.gnu.org Subject: [PATCH 4/9] S/390: Get rid of Y constraint in left and logical right shift patterns. Date: Tue, 23 Feb 2016 15:33:19 +0100 Message-Id: <1456238004-21150-5-git-send-email-krebbel@linux.vnet.ibm.com> In-Reply-To: <1456238004-21150-1-git-send-email-krebbel@linux.vnet.ibm.com> References: <1456238004-21150-1-git-send-email-krebbel@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16022314-0041-0000-0000-0000079DB9D3 X-IsSubscribed: yes With this patch the substitution patterns added earlier are used for the logical right shift and all the left shift patterns. * config/s390/s390.md ("3"): Change predicate of op2 to nonmemory_operand. ("*di3_31", "*di3_31_and"): Merge into single pattern definition ... ("*di3_31"): New pattern. ("*3", "*3_and"): Merge into single pattern definition ... ("*3"): New pattern. --- gcc/config/s390/s390.md | 63 ++++++++++++++++++------------------------------- 1 file changed, 23 insertions(+), 40 deletions(-) diff --git a/gcc/config/s390/s390.md b/gcc/config/s390/s390.md index 9703a30..b4983cd 100644 --- a/gcc/config/s390/s390.md +++ b/gcc/config/s390/s390.md @@ -8395,60 +8395,43 @@ (define_expand "3" [(set (match_operand:DSI 0 "register_operand" "") (SHIFT:DSI (match_operand:DSI 1 "register_operand" "") - (match_operand:SI 2 "shift_count_or_setmem_operand" "")))] + (match_operand:SI 2 "nonmemory_operand" "")))] "" "") +; ESA 64 bit register pair shift with reg or imm shift count ; sldl, srdl -(define_insn "*di3_31" - [(set (match_operand:DI 0 "register_operand" "=d") - (SHIFT:DI (match_operand:DI 1 "register_operand" "0") - (match_operand:SI 2 "shift_count_or_setmem_operand" "Y")))] +(define_insn "*di3_31" + [(set (match_operand:DI 0 "register_operand" "=d,d") + (SHIFT:DI (match_operand:DI 1 "register_operand" "0,0") + (match_operand:SI 2 "nonmemory_operand" "a,n")))] "!TARGET_ZARCH" - "sdl\t%0,%Y2" + "@ + sdl\t%0,(%2) + sdl\t%0,%Y2" [(set_attr "op_type" "RS") (set_attr "atype" "reg") + (set_attr "enabled" "*,") (set_attr "z196prop" "z196_cracked")]) -; sll, srl, sllg, srlg, sllk, srlk -(define_insn "*3" - [(set (match_operand:GPR 0 "register_operand" "=d,d") - (SHIFT:GPR (match_operand:GPR 1 "register_operand" ",d") - (match_operand:SI 2 "shift_count_or_setmem_operand" "Y,Y")))] - "" - "@ - sl\t%0,<1>%Y2 - sl\t%0,%1,%Y2" - [(set_attr "op_type" "RS,RSY") - (set_attr "atype" "reg,reg") - (set_attr "cpu_facility" "*,z196") - (set_attr "z10prop" "z10_super_E1,*")]) - -; sldl, srdl -(define_insn "*di3_31_and" - [(set (match_operand:DI 0 "register_operand" "=d") - (SHIFT:DI (match_operand:DI 1 "register_operand" "0") - (and:SI (match_operand:SI 2 "shift_count_or_setmem_operand" "Y") - (match_operand:SI 3 "const_int_operand" "n"))))] - "!TARGET_ZARCH && (INTVAL (operands[3]) & 63) == 63" - "sdl\t%0,%Y2" - [(set_attr "op_type" "RS") - (set_attr "atype" "reg")]) +; 64 bit register shift with reg or imm shift count ; sll, srl, sllg, srlg, sllk, srlk -(define_insn "*3_and" - [(set (match_operand:GPR 0 "register_operand" "=d,d") - (SHIFT:GPR (match_operand:GPR 1 "register_operand" ",d") - (and:SI (match_operand:SI 2 "shift_count_or_setmem_operand" "Y,Y") - (match_operand:SI 3 "const_int_operand" "n,n"))))] - "(INTVAL (operands[3]) & 63) == 63" +(define_insn "*3" + [(set (match_operand:GPR 0 "register_operand" "=d, d,d,d") + (SHIFT:GPR (match_operand:GPR 1 "register_operand" ",,d,d") + (match_operand:SI 2 "nonmemory_operand" "a, n,a,n")))] + "" "@ + sl\t%0,<1>(%2) sl\t%0,<1>%Y2 + sl\t%0,%1,(%2) sl\t%0,%1,%Y2" - [(set_attr "op_type" "RS,RSY") - (set_attr "atype" "reg,reg") - (set_attr "cpu_facility" "*,z196") - (set_attr "z10prop" "z10_super_E1,*")]) + [(set_attr "op_type" "RS,RS,RSY,RSY") + (set_attr "atype" "reg,reg,reg,reg") + (set_attr "cpu_facility" "*,*,z196,z196") + (set_attr "enabled" "*,,*,") + (set_attr "z10prop" "z10_super_E1,z10_super_E1,*,*")]) ; ; ashr(di|si)3 instruction pattern(s).