From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by sourceware.org (Postfix) with ESMTPS id C901C3858D38 for ; Mon, 11 Sep 2023 20:39:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C901C3858D38 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=marvell.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=marvell.com Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 38B9A89j007272 for ; Mon, 11 Sep 2023 13:39:54 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=/wTtlL0RuaJXHpWZQ6j1YxKxd2vBbQenzS8YYJUH3Ec=; b=i0V9/7hS/k6OBg7wi94m/Fy8nxenjsE11Fh5iepSAXd/GM/AFbcWfKYiW+G8kZYC3uAE iQ5b2YkZV+UER0062DRdXaq6thsTfKrG/Ll5oEtzF2Aws8cl4fhgRBR5iWu0xpk8s8Ar 0C8eR6IFzUatC0nIfLnBPiJGP+dqaT85QaqJXpyf//IB0VWMyGmFSyHxMQoHxYJhhSH+ OM/vCDFMGBmBlAEw1WZ8CnSRQV6TQW8w+hbGyAy9yHQcUx13aDuWWOPYi02l03Fx0UyB FPX5eCsuqCvTHHicykaU3R5QubfbczlGOP9xV7FLDzRFqRLjcVBlFm2ZZGepIuHta0xS VA== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3t200qj5kc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Mon, 11 Sep 2023 13:39:54 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Mon, 11 Sep 2023 13:39:53 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.48 via Frontend Transport; Mon, 11 Sep 2023 13:39:53 -0700 Received: from vpnclient.wrightpinski.org.com (unknown [10.69.242.187]) by maili.marvell.com (Postfix) with ESMTP id D330E6737C; Mon, 11 Sep 2023 13:39:52 -0700 (PDT) From: Andrew Pinski To: CC: Andrew Pinski Subject: [PATCH] MATCH: [PR111348] add missing :c to cmp in the `(a CMP b) ? minmax : minmax` pattern Date: Mon, 11 Sep 2023 13:39:39 -0700 Message-ID: <20230911203939.1394059-1-apinski@marvell.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-ORIG-GUID: Kz58lRYWWsyiOWKg-l_fOAnvsmGlIACy X-Proofpoint-GUID: Kz58lRYWWsyiOWKg-l_fOAnvsmGlIACy X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.601,FMLib:17.11.176.26 definitions=2023-09-11_16,2023-09-05_01,2023-05-22_02 X-Spam-Status: No, score=-14.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: When I added this pattern in r14-337-gc43819a9b4cd, I had missed the :c on the cmp part of the pattern meaning there might be some missing optimizations happening. The testcase shows an example of the missed optmization. Committed as obvious after a bootstrap/test on x86_64-linux-gnu. PR tree-optimization/111348 gcc/ChangeLog: * match.pd (`(a CMP b) ? minmax : minmax`): Add :c on the cmp part of the pattern. gcc/testsuite/ChangeLog: * gcc.dg/tree-ssa/minmax-26.c: New test. --- gcc/match.pd | 2 +- gcc/testsuite/gcc.dg/tree-ssa/minmax-26.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/minmax-26.c diff --git a/gcc/match.pd b/gcc/match.pd index 209b0599382..e96e385c6fa 100644 --- a/gcc/match.pd +++ b/gcc/match.pd @@ -5417,7 +5417,7 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT) (for minmax (min max) (for cmp (lt le gt ge ne) (simplify - (cond (cmp @1 @3) (minmax:c @1 @4) (minmax:c @2 @4)) + (cond (cmp:c @1 @3) (minmax:c @1 @4) (minmax:c @2 @4)) (with { tree_code code = minmax_from_comparison (cmp, @1, @2, @1, @3); diff --git a/gcc/testsuite/gcc.dg/tree-ssa/minmax-26.c b/gcc/testsuite/gcc.dg/tree-ssa/minmax-26.c new file mode 100644 index 00000000000..e4b7412e766 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/minmax-26.c @@ -0,0 +1,22 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-optimized -fdump-tree-original" } */ +/* PR tree-optimization/111348 */ + +int test1(int a, int b, int c) +{ + return (a > b) ? ((a > c) ? a : c) : ((b > c) ? b : c); +} + + +int test1_(int a, int b, int c) +{ + return (b < a) ? ((a > c) ? a : c) : ((b > c) ? b : c); +} + +/* test1 and test1_ should be able to optimize to `MAX_EXPR , c>;` during fold. */ +/* { dg-final { scan-tree-dump-times "MAX_EXPR , c>" 2 "original" } } */ +/* { dg-final { scan-tree-dump-not "b > a" "original" } } */ +/* { dg-final { scan-tree-dump-not "a > b" "original" } } */ +/* { dg-final { scan-tree-dump-times "MAX_EXPR " 4 "optimized" } } */ +/* { dg-final { scan-tree-dump-not "if " "optimized" } } */ + -- 2.31.1