From patchwork Thu Mar 21 18:09:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyrylo Tkachov X-Patchwork-Id: 229793 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 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 987782C00A3 for ; Fri, 22 Mar 2013 05:09:58 +1100 (EST) 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:mime-version:content-type; q=dns; s=default; b=LNCdzuUFLXMUtzPdsexGPkUCVuNiGFgYf5TXkvMf0KyjCqm/hv dlemmY/DKY1Q19/S+VZvANl53M1b4G9SOZ8dNewQz29byxsnPDgCxblLbtudJ/st D4eoez81bmAqpkd4uX+A5LD3cxtw5cnPK3SAeArG0eUIi3mekounEPSDs= 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:mime-version:content-type; s= default; bh=QHkJY+r++lNuP0qJUlwbPP4AWSA=; b=VMLb9+fwWJvscD/4hHmV 6vsMfNdxKZQ+fXmF+Vn3+m7QvwSPXhnkPRtTPvrcZBDGMFlOWe0iKT69ETOAY4Q1 z0Zi7z9kr3KkORaxLq0UfAkH35ctUSf/SQgH3bY/Rq741HuS7+XNckp8WNHJou9k P1DeI0CYYRQqIrltKQIpm4w= Received: (qmail 8321 invoked by alias); 21 Mar 2013 18:09:53 -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 8280 invoked by uid 89); 21 Mar 2013 18:09:44 -0000 X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL, BAYES_00, MSGID_MULTIPLE_AT, RCVD_IN_DNSWL_LOW autolearn=no version=3.3.1 Received: from service87.mimecast.com (HELO service87.mimecast.com) (91.220.42.44) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Thu, 21 Mar 2013 18:09:41 +0000 Received: from cam-owa1.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Thu, 21 Mar 2013 18:09:37 +0000 Received: from e106372vm ([10.1.255.212]) by cam-owa1.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.0); Thu, 21 Mar 2013 18:09:37 +0000 From: "Kyrylo Tkachov" To: Cc: "Richard Earnshaw" , "Ramana Radhakrishnan" Subject: [PATCH][ARM] minmax_arithsi for non-canonical operand order with MINUS operator Date: Thu, 21 Mar 2013 18:09:25 -0000 Message-ID: <016201ce265f$394cdbd0$abe69370$@tkachov@arm.com> MIME-Version: 1.0 X-MC-Unique: 113032118093720801 Hi all, This patch adds a splitter variant of the minmax_arithsi pattern for when the operator is non-commutative (MINUS) and the ordering of the operands is not canonical. That is, it will trigger for: #define MAX(a, b) (a > b ? a : b) int foo (int a, int b, int c) { return c - MAX (a,b); } and will generate: cmp r1, r0 rsbge r0, r1, r2 rsblt r0, r0, r2 instead of the current: cmp r0, r1 movlt r0, r1 rsb r0, r0, r2 No regressions on arm-none-eabi. Ok for trunk? Thanks, Kyrill gcc/ 2013-03-21 Kyrylo Tkachov * config/arm/arm.md (minmax_arithsi_non_canon): New pattern. gcc/testsuite 2013-03-21 Kyrylo Tkachov * gcc.target/arm/minmax_minus.c: New test. diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md index f3c59f3..c2875f9 100644 --- a/gcc/config/arm/arm.md +++ b/gcc/config/arm/arm.md @@ -3423,6 +3423,49 @@ (const_int 12)))] ) +; Reject the frame pointer in operand[1], since reloading this after +; it has been eliminated can cause carnage. +(define_insn_and_split "*minmax_arithsi_non_canon" + [(set (match_operand:SI 0 "s_register_operand" "=r,r") + (minus:SI + (match_operand:SI 1 "s_register_operand" "0,?r") + (match_operator:SI 4 "minmax_operator" + [(match_operand:SI 2 "s_register_operand" "r,r") + (match_operand:SI 3 "arm_rhs_operand" "rI,rI")]))) + (clobber (reg:CC CC_REGNUM))] + "TARGET_32BIT && !arm_eliminable_register (operands[1])" + "#" + "TARGET_32BIT && !arm_eliminable_register (operands[1])" + [(set (reg:CC CC_REGNUM) + (compare:CC (match_dup 2) (match_dup 3))) + (cond_exec (match_op_dup 4 [(reg:CC CC_REGNUM) (const_int 0)]) + (set (match_dup 0) + (minus:SI (match_dup 1) + (match_dup 2)))) + (cond_exec (match_op_dup 5 [(reg:CC CC_REGNUM) (const_int 0)]) + (set (match_dup 0) + (minus:SI (match_dup 1) + (match_dup 3))))] + { + enum machine_mode mode = SELECT_CC_MODE (GET_CODE (operands[1]), + operands[2], operands[3]); + enum rtx_code rc = minmax_code (operands[4]); + operands[4] = gen_rtx_fmt_ee (rc, SImode, + operands[2], operands[3]); + + if (mode == CCFPmode || mode == CCFPEmode) + rc = reverse_condition_maybe_unordered (rc); + else + rc = reverse_condition (rc); + operands[5] = gen_rtx_fmt_ee (rc, SImode, operands[2], operands[3]); + } + [(set_attr "conds" "clob") + (set (attr "length") + (if_then_else (eq_attr "is_thumb" "yes") + (const_int 14) + (const_int 12)))] +) + (define_code_iterator SAT [smin smax]) (define_code_iterator SATrev [smin smax]) (define_code_attr SATlo [(smin "1") (smax "2")]) diff --git a/gcc/testsuite/gcc.target/arm/minmax_minus.c b/gcc/testsuite/gcc.target/arm/minmax_minus.c new file mode 100644 index 0000000..050c847 --- /dev/null +++ b/gcc/testsuite/gcc.target/arm/minmax_minus.c @@ -0,0 +1,12 @@ +/* { dg-do compile } */ +/* { dg-options "-O2" } */ + +#define MAX(a, b) (a > b ? a : b) +int +foo (int a, int b, int c) +{ + return c - MAX (a, b); +} + +/* { dg-final { scan-assembler "rsbge" } } */ +/* { dg-final { scan-assembler "rsblt" } } */