From patchwork Fri Oct 23 15:03:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Sandiford X-Patchwork-Id: 535029 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 AD012141302 for ; Sat, 24 Oct 2015 02:04:37 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=O29Qf5o5; 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:mime-version:content-type :content-transfer-encoding; q=dns; s=default; b=fgQM+URrre5RXx3q vpgvB0Olaj7DcA5wMKdsl1N1mIAUDk4d/rKHv22jphpSAzf4/2RI2XwXdSpqSZUX YPvkqC0Scxvq/CVbR+EBlPWJJNh9eefldF849PAln3vw0b1vcfdYYUkTFALnIa0h rvmlQdyax9jBbpmaDp5qY83jSs8= 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:mime-version:content-type :content-transfer-encoding; s=default; bh=/N94v0dEkgBsVsWJc7lPzm Bp3Ao=; b=O29Qf5o5iUVsODt0BHzLZ+pSB8A9cSWJhdU1oWIziKCwF7jfp8erJ6 ZY0uUF3sGk9b/3QcX9IESk7wQ0UxrqdQ9hvFFt4VVVj714QFNPoWfyUGKKGm6lPu NTpR/ZqglRmtw52VAQ92H0AVAqExURzgWGYDvX5+MM2nomEdwi1Kg= Received: (qmail 9940 invoked by alias); 23 Oct 2015 15:04:18 -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 9863 invoked by uid 89); 23 Oct 2015 15:04:18 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.1 required=5.0 tests=AWL, BAYES_50, SPF_PASS autolearn=ham version=3.3.2 X-HELO: eu-smtp-delivery-143.mimecast.com Received: from eu-smtp-delivery-143.mimecast.com (HELO eu-smtp-delivery-143.mimecast.com) (146.101.78.143) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 23 Oct 2015 15:04:08 +0000 Received: from cam-owa1.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.140]) by eu-smtp-1.mimecast.com with ESMTP id uk-mta-27-q28hLdOsQ7GOr0CFmEinOQ-1; Fri, 23 Oct 2015 16:03:58 +0100 Received: from localhost ([10.1.2.79]) by cam-owa1.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 23 Oct 2015 16:03:58 +0100 From: Richard Sandiford To: gcc-patches@gcc.gnu.org Mail-Followup-To: gcc-patches@gcc.gnu.org, richard.sandiford@arm.com Subject: Move cexp simplifications to match.pd Date: Fri, 23 Oct 2015 16:03:58 +0100 Message-ID: <87611xy6ch.fsf@e105548-lin.cambridge.arm.com> User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 X-MC-Unique: q28hLdOsQ7GOr0CFmEinOQ-1 This required reinstating support for captures in the result of a simplification. That part (genmatch.c) is by Richard B. Tested on x86_64-linux-gnu, aarch64-linux-gnu and arm-linux-gnueabi. OK to install? Thanks, Richard gcc/ 2015-10-20 Richard Sandiford Richard Biener * genmatch.c (dt_simplify::gen): Skip captures that are part of the result. (parser::parse_expr): Allow captures in results too. * builtins.c (fold_builtin_cexp): Delete. (fold_builtin_1): Handle constant cexp arguments here. * match.pd: Fold cexp(x+yi) to exp(x) * cexpi(y). diff --git a/gcc/builtins.c b/gcc/builtins.c index 02bf9f6..e5e65ba 100644 --- a/gcc/builtins.c +++ b/gcc/builtins.c @@ -7577,74 +7577,6 @@ fold_builtin_sincos (location_t loc, build1 (REALPART_EXPR, type, call))); } -/* Fold function call to builtin cexp, cexpf, or cexpl. Return - NULL_TREE if no simplification can be made. */ - -static tree -fold_builtin_cexp (location_t loc, tree arg0, tree type) -{ - tree rtype; - tree realp, imagp, ifn; - tree res; - - if (!validate_arg (arg0, COMPLEX_TYPE) - || TREE_CODE (TREE_TYPE (TREE_TYPE (arg0))) != REAL_TYPE) - return NULL_TREE; - - /* Calculate the result when the argument is a constant. */ - if ((res = do_mpc_arg1 (arg0, type, mpc_exp))) - return res; - - rtype = TREE_TYPE (TREE_TYPE (arg0)); - - /* In case we can figure out the real part of arg0 and it is constant zero - fold to cexpi. */ - if (!targetm.libc_has_function (function_c99_math_complex)) - return NULL_TREE; - ifn = mathfn_built_in (rtype, BUILT_IN_CEXPI); - if (!ifn) - return NULL_TREE; - - if ((realp = fold_unary_loc (loc, REALPART_EXPR, rtype, arg0)) - && real_zerop (realp)) - { - tree narg = fold_build1_loc (loc, IMAGPART_EXPR, rtype, arg0); - return build_call_expr_loc (loc, ifn, 1, narg); - } - - /* In case we can easily decompose real and imaginary parts split cexp - to exp (r) * cexpi (i). */ - if (flag_unsafe_math_optimizations - && realp) - { - tree rfn, rcall, icall; - - rfn = mathfn_built_in (rtype, BUILT_IN_EXP); - if (!rfn) - return NULL_TREE; - - imagp = fold_unary_loc (loc, IMAGPART_EXPR, rtype, arg0); - if (!imagp) - return NULL_TREE; - - icall = build_call_expr_loc (loc, ifn, 1, imagp); - icall = builtin_save_expr (icall); - rcall = build_call_expr_loc (loc, rfn, 1, realp); - rcall = builtin_save_expr (rcall); - return fold_build2_loc (loc, COMPLEX_EXPR, type, - fold_build2_loc (loc, MULT_EXPR, rtype, - rcall, - fold_build1_loc (loc, REALPART_EXPR, - rtype, icall)), - fold_build2_loc (loc, MULT_EXPR, rtype, - rcall, - fold_build1_loc (loc, IMAGPART_EXPR, - rtype, icall))); - } - - return NULL_TREE; -} - /* Fold function call to builtin trunc, truncf or truncl with argument ARG. Return NULL_TREE if no simplification can be made. */ @@ -9589,7 +9521,10 @@ fold_builtin_1 (location_t loc, tree fndecl, tree arg0) break; CASE_FLT_FN (BUILT_IN_CEXP): - return fold_builtin_cexp (loc, arg0, type); + if (validate_arg (arg0, COMPLEX_TYPE) + && TREE_CODE (TREE_TYPE (TREE_TYPE (arg0))) == REAL_TYPE) + return do_mpc_arg1 (arg0, type, mpc_exp); + break; CASE_FLT_FN (BUILT_IN_CEXPI): if (validate_arg (arg0, REAL_TYPE)) diff --git a/gcc/genmatch.c b/gcc/genmatch.c index b05760e..b5a0fff 100644 --- a/gcc/genmatch.c +++ b/gcc/genmatch.c @@ -3163,7 +3163,11 @@ dt_simplify::gen (FILE *f, int indent, bool gimple) s->capture_max + 1, indexes[0]->get_name (opname)); for (int i = 1; i <= s->capture_max; ++i) - fprintf (f, ", %s", indexes[i]->get_name (opname)); + { + if (!indexes[i]) + break; + fprintf (f, ", %s", indexes[i]->get_name (opname)); + } fprintf (f, " };\n"); } @@ -3831,7 +3835,7 @@ parser::parse_expr () if (token->type == CPP_ATSIGN && !(token->flags & PREV_WHITE)) - op = parse_capture (e, !parsing_match_operand); + op = parse_capture (e, false); else if (force_capture) { unsigned num = capture_ids->elements (); diff --git a/gcc/match.pd b/gcc/match.pd index b399786..98bb903 100644 --- a/gcc/match.pd +++ b/gcc/match.pd @@ -61,6 +61,7 @@ along with GCC; see the file COPYING3. If not see (define_operator_list TAN BUILT_IN_TANF BUILT_IN_TAN BUILT_IN_TANL) (define_operator_list ATAN BUILT_IN_ATANF BUILT_IN_ATAN BUILT_IN_ATANL) (define_operator_list COSH BUILT_IN_COSHF BUILT_IN_COSH BUILT_IN_COSHL) +(define_operator_list CEXP BUILT_IN_CEXPF BUILT_IN_CEXP BUILT_IN_CEXPL) (define_operator_list CEXPI BUILT_IN_CEXPIF BUILT_IN_CEXPI BUILT_IN_CEXPIL) (define_operator_list CPROJ BUILT_IN_CPROJF BUILT_IN_CPROJ BUILT_IN_CPROJL) (define_operator_list CCOS BUILT_IN_CCOSF BUILT_IN_CCOS BUILT_IN_CCOSL) @@ -1530,6 +1531,11 @@ along with GCC; see the file COPYING3. If not see (mult @0 integer_minus_onep) (negate @0)) +/* True if we can easily extract the real and imaginary parts of a complex + number. */ +(match (compositional_complex) + (convert?:s (complex @0 @1))) + /* COMPLEX_EXPR and REALPART/IMAGPART_EXPR cancellations. */ (simplify (complex (realpart @0) (imagpart @0)) @@ -2535,7 +2541,18 @@ along with GCC; see the file COPYING3. If not see /* cabs(x+xi) -> fabs(x)*sqrt(2). */ (simplify (CABS (complex @0 @0)) - (mult (abs @0) { build_real_truncate (type, dconst_sqrt2 ()); }))) + (mult (abs @0) { build_real_truncate (type, dconst_sqrt2 ()); })) + + /* cexp(x+yi) -> exp(x)*cexpi(y). */ + (for cexps (CEXP) + exps (EXP) + cexpis (CEXPI) + (simplify + (cexps compositional_complex@0) + (if (targetm.libc_has_function (function_c99_math_complex)) + (complex + (mult (exps@1 (realpart @0)) (realpart (cexpis:type@2 (imagpart @0)))) + (mult @1 (imagpart @2))))))) /* cproj(x) -> x if we're ignoring infinities. */ (simplify