From patchwork Tue Jun 6 15:56:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Segher Boessenkool X-Patchwork-Id: 771936 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 3whxM16kDjz9s74 for ; Wed, 7 Jun 2017 02:03:57 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="IxbypYj8"; 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:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; q=dns; s=default; b=OnTKpYra4u6bNHA1J/H l6b9X0IXUEOEOeZxPSYzak4m+M/I5YpR7hTBFDTZpixe1nZOw45zIy7PdFlR6JtV Rca3ZpGbGZXgfkjyFzry6byMza1qDYJErRnE6XEd2aaqtDT0h1a/3jIkwhgZuGjJ gGDFnSP1G+tUXGBPpJ1zzUdE= 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:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; s=default; bh=et3phTkvfy7DtEmlRZ9U0fg1b IA=; b=IxbypYj85DSbux5lHSbopywbro1hDX7G/LYBRGr4w6Pka4IGgPaQ70EXR W+Q9FxUcMJBV5H8orQR/8wQYKsdXvOYLSUcy0CnxdIKldv9qf0sjesAL4VMPXGym fAnSGJQF7vEARda5044/5kH7H3nEQbkSw+H7Zp4BqdIOFbG+V4= Received: (qmail 58121 invoked by alias); 6 Jun 2017 15:59:04 -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 58074 invoked by uid 89); 6 Jun 2017 15:59:03 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-23.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=wv X-HELO: gcc1-power7.osuosl.org Received: from gcc1-power7.osuosl.org (HELO gcc1-power7.osuosl.org) (140.211.15.137) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 06 Jun 2017 15:59:00 +0000 Received: by gcc1-power7.osuosl.org (Postfix, from userid 10019) id 7B2F91C06A4; Tue, 6 Jun 2017 15:59:03 +0000 (UTC) From: Segher Boessenkool To: gcc-patches@gcc.gnu.org Cc: dje.gcc@gmail.com, Segher Boessenkool Subject: [PATCH 14/14] rs6000: Remove rs6000_nonimmediate_operand Date: Tue, 6 Jun 2017 15:56:30 +0000 Message-Id: In-Reply-To: References: In-Reply-To: References: X-IsSubscribed: yes Now rs6000_nonimmediate_operand is just nonimmediate_operand. 2017-06-06 Segher Boessenkool * config/rs6000/predicates.md (rs6000_nonimmediate_operand): Delete. * config/rs6000/rs6000.md (*movsi_internal1, movsi_from_sf, *mov_softfloat, and an anonymous splitter): Use nonimmediate_operand instead of rs6000_nonimmediate_operand. --- gcc/config/rs6000/predicates.md | 7 ------- gcc/config/rs6000/rs6000.md | 14 +++++++------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/gcc/config/rs6000/predicates.md b/gcc/config/rs6000/predicates.md index 1bf9194..aa1c01b 100644 --- a/gcc/config/rs6000/predicates.md +++ b/gcc/config/rs6000/predicates.md @@ -1150,13 +1150,6 @@ (define_predicate "splat_input_operand" return gpc_reg_operand (op, mode); }) -;; Return true if OP is a non-immediate operand. -(define_predicate "rs6000_nonimmediate_operand" - (match_code "reg,subreg,mem") -{ - return nonimmediate_operand (op, mode); -}) - ;; Return true if operand is an operator used in rotate-and-mask instructions. (define_predicate "rotate_mask_operator" (match_code "rotate,ashift,lshiftrt")) diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md index d0120d1..1bb565a 100644 --- a/gcc/config/rs6000/rs6000.md +++ b/gcc/config/rs6000/rs6000.md @@ -6693,7 +6693,7 @@ (define_insn "movsi_low" ;; XXLXOR 0 XXLORC -1 P9 const MTVSRWZ MFVSRWZ ;; MF%1 MT%0 MT%0 NOP (define_insn "*movsi_internal1" - [(set (match_operand:SI 0 "rs6000_nonimmediate_operand" + [(set (match_operand:SI 0 "nonimmediate_operand" "=r, r, r, ?*wI, ?*wH, m, ?Z, ?Z, r, r, r, ?*wIwH, ?*wJwK, ?*wJwK, ?*wu, @@ -6749,7 +6749,7 @@ (define_insn "*movsi_internal1" 4, 4, 4, 4")]) (define_insn "*movsi_internal1_single" - [(set (match_operand:SI 0 "rs6000_nonimmediate_operand" "=r,r,r,m,r,r,r,r,*c*l,*h,*h,m,*f") + [(set (match_operand:SI 0 "nonimmediate_operand" "=r,r,r,m,r,r,r,r,*c*l,*h,*h,m,*f") (match_operand:SI 1 "input_operand" "r,U,m,r,I,L,n,*h,r,r,0,f,m"))] "TARGET_SINGLE_FPU && (gpc_reg_operand (operands[0], SImode) || gpc_reg_operand (operands[1], SImode))" @@ -6790,7 +6790,7 @@ (define_insn "*movsi_internal1_single" ;; VSX->VSX (define_insn_and_split "movsi_from_sf" - [(set (match_operand:SI 0 "rs6000_nonimmediate_operand" + [(set (match_operand:SI 0 "nonimmediate_operand" "=r, r, ?*wI, ?*wH, m, m, wY, Z, r, wIwH, ?wK") @@ -7236,7 +7236,7 @@ (define_insn "*mov_softfloat" ;; LWZ LFS LXSSP LXSSPX STW STFIWX ;; STXSIWX GPR->VSX VSX->GPR GPR->GPR (define_insn_and_split "movsf_from_si" - [(set (match_operand:SF 0 "rs6000_nonimmediate_operand" + [(set (match_operand:SF 0 "nonimmediate_operand" "=!r, f, wb, wu, m, Z, Z, wy, ?r, !r") @@ -7521,7 +7521,7 @@ (define_insn_and_split "*mov_32bit" [(set_attr "length" "8,8,8,8,20,20,16")]) (define_insn_and_split "*mov_softfloat" - [(set (match_operand:FMOVE128 0 "rs6000_nonimmediate_operand" "=Y,r,r") + [(set (match_operand:FMOVE128 0 "nonimmediate_operand" "=Y,r,r") (match_operand:FMOVE128 1 "input_operand" "r,YGHF,r"))] "TARGET_SOFT_FLOAT && (gpc_reg_operand (operands[0], mode) @@ -8463,7 +8463,7 @@ (define_insn "p8_mfvsrd_4_disf" ;; AVX const (define_insn "*movdi_internal32" - [(set (match_operand:DI 0 "rs6000_nonimmediate_operand" + [(set (match_operand:DI 0 "nonimmediate_operand" "=Y, r, r, ^m, ^d, ^d, r, ^wY, $Z, ^wb, $wv, ^wi, *wo, *wo, *wv, *wi, *wi, *wv, @@ -8525,7 +8525,7 @@ (define_split }") (define_split - [(set (match_operand:DIFD 0 "rs6000_nonimmediate_operand" "") + [(set (match_operand:DIFD 0 "nonimmediate_operand" "") (match_operand:DIFD 1 "input_operand" ""))] "reload_completed && !TARGET_POWERPC64 && gpr_or_gpr_p (operands[0], operands[1])