From patchwork Fri May 13 09:50:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 53920 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E7906383D834 for ; Fri, 13 May 2022 09:51:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E7906383D834 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1652435507; bh=kRJXx9STRRhgQzqeFvWIsdj/WKhOXEU82r5/QI9TnKs=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=uN6gWxaT8YsCB1RFQ9RW0nZBYx9kYjOWqRdl0Wj/VSzmJ1JAWnw/9AcKWfPbWAv3y Bl1MLw8q2OgDg2mtYktUv35RuEN48KTub5g7l0PoKRS2z3zeySXrn14lnH2jknMZyk xSsqyF+iDr8gLgLiyaZ6gHZFFzYdcKxMM3q9h3g4= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 906BC38425BC for ; Fri, 13 May 2022 09:50:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 906BC38425BC Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id F106521A9C for ; Fri, 13 May 2022 09:50:41 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id DDECB13A84 for ; Fri, 13 May 2022 09:50:41 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id uL71NPEpfmKlCAAAMHmgww (envelope-from ) for ; Fri, 13 May 2022 09:50:41 +0000 Date: Fri, 13 May 2022 11:50:41 +0200 (CEST) To: gcc-patches@gcc.gnu.org Subject: [PATCH] Add MIN/MAX folding from fold_cond_expr_with_comparison to match.pd MIME-Version: 1.0 Message-Id: <20220513095041.DDECB13A84@imap2.suse-dmz.suse.de> X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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-Patchwork-Original-From: Richard Biener via Gcc-patches From: Richard Biener Reply-To: Richard Biener Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" The following adds MIN/MAX folding from fold_cond_expr_with_comparison to the part GIMPLE of match.pd, leaving the GENERIC part in fold-const.cc since that's constrainted on frontend specific things I did not want to carry to match.pd. The effect becomes appearant when we no longer can rely on GENERIC folding of COND_EXPRs in gcc.dg/tree-ssa/pr92834.c and gcc.dg/tree-ssa/pr94786.c. Bootstrapped and tested on x86_64-unknown-linux-gnu. Richard. 2022-05-13 Richard Biener * match.pd (A cmp B ? A : B -> min/max): New patterns carried over from fold_cond_expr_with_comparison. --- gcc/match.pd | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gcc/match.pd b/gcc/match.pd index f5efa77560c..0995055fcb5 100644 --- a/gcc/match.pd +++ b/gcc/match.pd @@ -4450,6 +4450,52 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT) (op (min @X { wide_int_to_tree (from_type, real_c1); }) { wide_int_to_tree (from_type, c2); }))))))))) +#if GIMPLE +/* A >= B ? A : B -> max (A, B) and friends. The code is still + in fold_cond_expr_with_comparison for GENERIC folding with + some extra constraints. */ +(for cmp (eq ne le lt unle unlt ge gt unge ungt uneq ltgt) + (simplify + (cond (cmp:c (nop_convert1?@c0 @0) (nop_convert2?@c1 @1)) + (convert3? @0) (convert4? @1)) + (if (!HONOR_SIGNED_ZEROS (type) + && ((INTEGRAL_TYPE_P (type) + /* Allow widening conversions of the data. */ + && TYPE_PRECISION (TREE_TYPE (@0)) <= TYPE_PRECISION (type) + && TYPE_PRECISION (TREE_TYPE (@1)) <= TYPE_PRECISION (type)) + || (tree_nop_conversion_p (type, TREE_TYPE (@0)) + && tree_nop_conversion_p (type, TREE_TYPE (@1))))) + (switch + (if (cmp == EQ_EXPR) + (if (VECTOR_TYPE_P (type)) + (view_convert @c1) + (convert @c1))) + (if (cmp == NE_EXPR) + (if (VECTOR_TYPE_P (type)) + (view_convert @c0) + (convert @c0))) + (if (cmp == LE_EXPR || cmp == UNLE_EXPR || cmp == LT_EXPR || cmp == UNLT_EXPR) + (if (!HONOR_NANS (type)) + (if (VECTOR_TYPE_P (type)) + (view_convert (min @c0 @c1)) + (convert (min @c0 @c1))))) + (if (cmp == GE_EXPR || cmp == UNGE_EXPR || cmp == GT_EXPR || cmp == UNGT_EXPR) + (if (!HONOR_NANS (type)) + (if (VECTOR_TYPE_P (type)) + (view_convert (max @c0 @c1)) + (convert (max @c0 @c1))))) + (if (cmp == UNEQ_EXPR) + (if (!HONOR_NANS (type)) + (if (VECTOR_TYPE_P (type)) + (view_convert @c1) + (convert @c1)))) + (if (cmp == LTGT_EXPR) + (if (!HONOR_NANS (type)) + (if (VECTOR_TYPE_P (type)) + (view_convert @c0) + (convert @c0)))))))) +#endif + /* X != C1 ? -X : C2 simplifies to -X when -C1 == C2. */ (simplify (cond (ne @0 INTEGER_CST@1) (negate@3 @0) INTEGER_CST@2)