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 D068C3858D33 for ; Sun, 3 Sep 2023 16:26:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D068C3858D33 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 3836bAXI003849 for ; Sun, 3 Sep 2023 09:26:08 -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=2N3HNMnYicUfz4/ldUniuhMBeCkbyTo3bo7IjXC8oRg=; b=Z4hcu3Es9eWEZwFSO9xnETL7xSII3zrA/+7R+yz3xVH1k8MkQc8zK+qEWOMkSSn1nEq2 Q1rBlGwaXORLTM9xd9ac2Q/UCElrDfxUdrXaTbwB1dEPUDBk7FeE0kIOXdalADPsYIfp E2M5t1gRzXnseF6Cra+03sAzS4HMSiTqfaKOGdeZ5Hg5Kt5uuO7XBHjEgPGMlk6cHJX0 WbVvu/En37p6ia1Axx5zYh696zsBu05dXMNsKTxgHdrAChxIrw0Bad/UcKa2reEMOxVp pSeg2tPd3cNs5VsbCFUfBHDhvMzpXFOFCwne8DYqIXFvZzlQhNxGvCFCOU2X/MvDO16q 4Q== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3sv2dp3335-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Sun, 03 Sep 2023 09:26:07 -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; Sun, 3 Sep 2023 09:26:06 -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; Sun, 3 Sep 2023 09:26:06 -0700 Received: from vpnclient.wrightpinski.org.com (unknown [10.69.242.187]) by maili.marvell.com (Postfix) with ESMTP id D8E9E3F7070; Sun, 3 Sep 2023 09:26:05 -0700 (PDT) From: Andrew Pinski To: CC: Andrew Pinski Subject: [PATCH] MATCH: Transform `(1 >> X) !=/== 0` into `X ==/!= 0` Date: Sun, 3 Sep 2023 09:25:54 -0700 Message-ID: <20230903162554.908044-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: 05hDWtMVfHFngh7JioGtX6J_-gKvIWnL X-Proofpoint-GUID: 05hDWtMVfHFngh7JioGtX6J_-gKvIWnL 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-03_14,2023-08-31_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: We currently have a pattern for handling `(C >> X) & D == 0` but if C is 1 and D is 1, the `& 1` might have been removed. gcc/ChangeLog: PR tree-optimization/105832 * match.pd (`(1 >> X) != 0`): New pattern gcc/testsuite/ChangeLog: PR tree-optimization/105832 * gcc.dg/tree-ssa/pr105832-1.c: New test. * gcc.dg/tree-ssa/pr105832-2.c: New test. * gcc.dg/tree-ssa/pr105832-3.c: New test. --- gcc/match.pd | 10 ++++- gcc/testsuite/gcc.dg/tree-ssa/pr105832-1.c | 25 ++++++++++++ gcc/testsuite/gcc.dg/tree-ssa/pr105832-2.c | 30 ++++++++++++++ gcc/testsuite/gcc.dg/tree-ssa/pr105832-3.c | 46 ++++++++++++++++++++++ 4 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/pr105832-1.c create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/pr105832-2.c create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/pr105832-3.c diff --git a/gcc/match.pd b/gcc/match.pd index 5270e4104ac..e9ce48ea7fa 100644 --- a/gcc/match.pd +++ b/gcc/match.pd @@ -4026,7 +4026,8 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT) /* Simplify ((C << x) & D) != 0 where C and D are power of two constants, either to false if D is smaller (unsigned comparison) than C, or to - x == log2 (D) - log2 (C). Similarly for right shifts. */ + x == log2 (D) - log2 (C). Similarly for right shifts. + Note for `(1 >> x)`, the & 1 has been removed so matching that seperately. */ (for cmp (ne eq) icmp (eq ne) (simplify @@ -4043,7 +4044,12 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT) int c2 = wi::clz (wi::to_wide (@2)); } (if (c1 > c2) { constant_boolean_node (cmp == NE_EXPR ? false : true, type); } - (icmp @0 { build_int_cst (TREE_TYPE (@0), c2 - c1); })))))) + (icmp @0 { build_int_cst (TREE_TYPE (@0), c2 - c1); }))))) + /* `(1 >> X) != 0` -> `X == 0` */ + /* `(1 >> X) == 0` -> `X != 0` */ + (simplify + (cmp (rshift integer_onep @0) integer_zerop) + (icmp @0 { build_zero_cst (TREE_TYPE (@0)); }))) /* (CST1 << A) == CST2 -> A == ctz (CST2) - ctz (CST1) (CST1 << A) != CST2 -> A != ctz (CST2) - ctz (CST1) diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr105832-1.c b/gcc/testsuite/gcc.dg/tree-ssa/pr105832-1.c new file mode 100644 index 00000000000..d7029d39c85 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr105832-1.c @@ -0,0 +1,25 @@ +/* { dg-do compile } */ +/* { dg-options "-O3 -fdump-tree-optimized" } */ +/* PR tree-optimization/105832 */ + +void foo(void); + +static struct { + short a; + signed char b; +} c; + +static signed char d; + +int main() { + signed char g = c.b > 4U ? c.b : c.b << 2; + for (int h = 0; h < 5; h++) { + d = (g >= 2 || 1 >> g) ? g : g << 1; + if (d && 1 == g) + foo(); + c.a = 0; + } +} + +/* The call of foo should have been removed. */ +/* { dg-final { scan-tree-dump-not "foo " "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr105832-2.c b/gcc/testsuite/gcc.dg/tree-ssa/pr105832-2.c new file mode 100644 index 00000000000..2d2a33e2755 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr105832-2.c @@ -0,0 +1,30 @@ +/* PR tree-optimization/105832 */ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-original" } */ +/* { dg-final { scan-tree-dump "return a == 0;" "original" } } */ +/* { dg-final { scan-tree-dump "return b == 0;" "original" } } */ +/* { dg-final { scan-tree-dump "return c != 0;" "original" } } */ +/* { dg-final { scan-tree-dump "return d != 0;" "original" } } */ + +int +f1 (int a) +{ + return (1 >> a) != 0; +} + +int +f2 (int b) +{ + return ((1 >> b) & 1) != 0; +} +int +f3 (int c) +{ + return (1 >> c) == 0; +} + +int +f4 (int d) +{ + return ((1 >> d) & 1) == 0; +} diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr105832-3.c b/gcc/testsuite/gcc.dg/tree-ssa/pr105832-3.c new file mode 100644 index 00000000000..2bdd9afcbc7 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr105832-3.c @@ -0,0 +1,46 @@ +/* PR tree-optimization/105832 */ +/* { dg-do compile } */ +/* Disable the first forwprop1 as that will catch f2/f4 even though `&1` + will be removed during evrp. */ +/* { dg-options "-O2 -fdisable-tree-forwprop1 -fdump-tree-optimized" } */ +/* { dg-final { scan-tree-dump "a_\[0-9]+\\(D\\) == 0" "optimized" } } */ +/* { dg-final { scan-tree-dump "b_\[0-9]+\\(D\\) == 0" "optimized" } } */ +/* { dg-final { scan-tree-dump "c_\[0-9]+\\(D\\) != 0" "optimized" } } */ +/* { dg-final { scan-tree-dump "d_\[0-9]+\\(D\\) != 0" "optimized" } } */ + +int g(void); +int h(void); + +int +f1 (int a) +{ + int t = 1 >> a; + if (t != 0) return g(); + return h(); +} + +int +f2 (int b) +{ + int t = 1 >> b; + t &= 1; + if (t != 0) return g(); + return h(); +} + +int +f3 (int c) +{ + int t = 1 >> c; + if (t == 0) return g(); + return h(); +} + +int +f4 (int d) +{ + int t = 1 >> d; + t &= 1; + if (t == 0) return g(); + return h(); +} -- 2.31.1