From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by sourceware.org (Postfix) with ESMTPS id 6C3BD388B829 for ; Thu, 2 Apr 2020 18:54:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 6C3BD388B829 Received: by mail-pj1-x102d.google.com with SMTP id np9so1897609pjb.4 for ; Thu, 02 Apr 2020 11:54:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hbK6EKlTDW0hiccjJQ+EKUKiiRrLsbFezTIufxcSPoQ=; b=Fs9eY+wllRBslh3TZhJF1WbGUdNnKJGRlwcg/au+KXMQSzx8MZO3puxJYlc85dYNrd rsm1VeNd41u7ytsboc6DhT99rx5rpdO2sZC9zhtlv+DiVg/c9xmxSj+A03CWYOENLIL+ 0vlOCbw5l7Bka81KEnMLPSsvGzxbsuXOCjp/Rgs033xjEY3vLE6/o8kxAjkfLffF+6sk De5B/sq/LiAKk+w8ILxhgRDzbblaHbucMwy0ITqwlWgu+PtSe+mly+YNlHg3GS1K9QHj dbkiMkod1UrpFB6i/DvcbjG8cU1XVu5/AGMgEF8dlH4Cl1CeJUL/8ekhkFGnM3igTsvu Br6A== X-Gm-Message-State: AGi0Pub+J2/4LwPLRiB+f0XT7aGZz95OBv3rmv0DNhvijUgFO4a3jpH6 DhR9oYpnogBiJG9hrnREhWS3hwBRuzI= X-Google-Smtp-Source: APiQypJN5ibuxXQLtjTU82NeD72YByU8aN1zVjEg9d/Fu5Ii+yHOqL2W3F/Hs2hDJRZiecxXQIGEfQ== X-Received: by 2002:a17:902:6b86:: with SMTP id p6mr4173442plk.315.1585853645980; Thu, 02 Apr 2020 11:54:05 -0700 (PDT) Received: from localhost.localdomain (174-21-149-226.tukw.qwest.net. [174.21.149.226]) by smtp.gmail.com with ESMTPSA id r64sm4216973pjb.15.2020.04.02.11.54.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2020 11:54:05 -0700 (PDT) From: Richard Henderson To: gcc-patches@gcc.gnu.org Cc: richard.sandiford@arm.com, segher@kernel.crashing.org, richard.earnshaw@arm.com, Wilco.Dijkstra@arm.com, marcus.shawcroft@arm.com, kyrylo.tkachov@arm.com Subject: [PATCH v2 08/11] aarch64: Accept -1 as second argument to add3_carryin Date: Thu, 2 Apr 2020 11:53:50 -0700 Message-Id: <20200402185353.11047-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200402185353.11047-1-richard.henderson@linaro.org> References: <20200402185353.11047-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-23.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Apr 2020 18:54:08 -0000 * config/aarch64/predicates.md (aarch64_reg_or_minus1): New. * config/aarch64/aarch64.md (add3_carryin): Use it. (*add3_carryin): Likewise. (*addsi3_carryin_uxtw): Likewise. --- gcc/config/aarch64/aarch64.md | 26 +++++++++++++++----------- gcc/config/aarch64/predicates.md | 6 +++++- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md index 8d405b40173..c11c4366bf9 100644 --- a/gcc/config/aarch64/aarch64.md +++ b/gcc/config/aarch64/aarch64.md @@ -2545,7 +2545,7 @@ (plus:GPI (ltu:GPI (reg:CC_C CC_REGNUM) (const_int 0)) (match_operand:GPI 1 "aarch64_reg_or_zero")) - (match_operand:GPI 2 "aarch64_reg_or_zero")))] + (match_operand:GPI 2 "aarch64_reg_zero_minus1")))] "" "" ) @@ -2555,28 +2555,32 @@ ;; accept the zeros during initial expansion. (define_insn "*add3_carryin" - [(set (match_operand:GPI 0 "register_operand" "=r") + [(set (match_operand:GPI 0 "register_operand" "=r,r") (plus:GPI (plus:GPI (match_operand:GPI 3 "aarch64_carry_operation" "") - (match_operand:GPI 1 "aarch64_reg_or_zero" "rZ")) - (match_operand:GPI 2 "aarch64_reg_or_zero" "rZ")))] - "" - "adc\\t%0, %1, %2" + (match_operand:GPI 1 "aarch64_reg_or_zero" "rZ,rZ")) + (match_operand:GPI 2 "aarch64_reg_zero_minus1" "rZ,UsM")))] + "" + "@ + adc\\t%0, %1, %2 + sbc\\t%0, %1, zr" [(set_attr "type" "adc_reg")] ) ;; zero_extend version of above (define_insn "*addsi3_carryin_uxtw" - [(set (match_operand:DI 0 "register_operand" "=r") + [(set (match_operand:DI 0 "register_operand" "=r,r") (zero_extend:DI (plus:SI (plus:SI (match_operand:SI 3 "aarch64_carry_operation" "") - (match_operand:SI 1 "register_operand" "r")) - (match_operand:SI 2 "register_operand" "r"))))] - "" - "adc\\t%w0, %w1, %w2" + (match_operand:SI 1 "register_operand" "r,r")) + (match_operand:SI 2 "aarch64_reg_or_minus1" "r,UsM"))))] + "" + "@ + adc\\t%w0, %w1, %w2 + sbc\\t%w0, %w1, wzr" [(set_attr "type" "adc_reg")] ) diff --git a/gcc/config/aarch64/predicates.md b/gcc/config/aarch64/predicates.md index 42864cbf4dd..2e7aa6389eb 100644 --- a/gcc/config/aarch64/predicates.md +++ b/gcc/config/aarch64/predicates.md @@ -68,13 +68,17 @@ (ior (match_operand 0 "register_operand") (match_test "op == CONST0_RTX (GET_MODE (op))")))) +(define_predicate "aarch64_reg_or_minus1" + (and (match_code "reg,subreg,const_int") + (ior (match_operand 0 "register_operand") + (match_test "op == CONSTM1_RTX (GET_MODE (op))")))) + (define_predicate "aarch64_reg_zero_minus1" (and (match_code "reg,subreg,const_int") (ior (match_operand 0 "register_operand") (ior (match_test "op == CONST0_RTX (GET_MODE (op))") (match_test "op == CONSTM1_RTX (GET_MODE (op))"))))) - (define_predicate "aarch64_reg_or_fp_zero" (ior (match_operand 0 "register_operand") (and (match_code "const_double") -- 2.20.1