From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by sourceware.org (Postfix) with ESMTPS id AE2FD3858D28 for ; Sat, 16 Sep 2023 15:59:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AE2FD3858D28 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 (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 38GBrT6b026934 for ; Sat, 16 Sep 2023 08:59:40 -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=otgIUNfuJQQXkCTGIQgDosrFWLR2QrIeNiUR65duseM=; b=U7N/rFe5hp5O+GnZQlHTPI6ujF+QBoqn/UJXQgl99ZOJ5eCRXDkPGL1rNC2jTzn2Cj2U Eb6PJ75Wz8JSQTMFPJWe23pw/rnlFn5YujYGYJaMn/PBeRDxBuSbpglQIARlmykAjLtk M5ZhR2Nd7ast+kDgAjuE/+YiFEB2M1yuD4UahXt8VafjmYOER08WnGiUiJDp5Mq5WjTW hCjpOS+PpBcF2E2GnTSXjWyhw+lLTyfJ7/iUo/PnmAwyxyUBRDCz1GRNCqxXXCz3Lwxa qOtigCv2agbFhKFOzLmi4tRps+zjFirT2xPnKUUpTTnuafcl73gUAKD6N4gNOyGrNbK5 UQ== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3t5bvkga4c-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Sat, 16 Sep 2023 08:59:39 -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; Sat, 16 Sep 2023 08:59:35 -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; Sat, 16 Sep 2023 08:59:35 -0700 Received: from vpnclient.wrightpinski.org.com (unknown [10.69.242.187]) by maili.marvell.com (Postfix) with ESMTP id 818073F7040; Sat, 16 Sep 2023 08:59:35 -0700 (PDT) From: Andrew Pinski To: CC: Andrew Pinski Subject: [PATCH] MATCH: Add simplifications of `(a == CST) & a` Date: Sat, 16 Sep 2023 08:59:24 -0700 Message-ID: <20230916155924.1679335-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-GUID: HMDj5S3gzOkblPed0MzieHKmd7qhNjye X-Proofpoint-ORIG-GUID: HMDj5S3gzOkblPed0MzieHKmd7qhNjye X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.980,Hydra:6.0.601,FMLib:17.11.176.26 definitions=2023-09-15_20,2023-09-15_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: `(a == CST) & a` can be either simplified to simplying `a == CST` or 0 depending on the first bit of the CST. This is an extension of the already pattern of `X & !X` and allows us to remove the 2 xfails on gcc.dg/binop-notand1a.c and gcc.dg/binop-notand4a.c. OK? Bootstrapped and tested on x86_64-linux-gnu with no regressions. PR tree-optimization/111431 gcc/ChangeLog: * match.pd (`(a == CST) & a`): New pattern. gcc/testsuite/ChangeLog: * gcc.dg/binop-notand1a.c: Remove xfail. * gcc.dg/binop-notand4a.c: Likewise. * gcc.c-torture/execute/pr111431-1.c: New test. * gcc.dg/binop-andeq1.c: New test. * gcc.dg/binop-andeq2.c: New test. * gcc.dg/binop-notand7.c: New test. * gcc.dg/binop-notand7a.c: New test. --- gcc/match.pd | 8 ++++ .../gcc.c-torture/execute/pr111431-1.c | 39 +++++++++++++++++++ gcc/testsuite/gcc.dg/binop-andeq1.c | 12 ++++++ gcc/testsuite/gcc.dg/binop-andeq2.c | 14 +++++++ gcc/testsuite/gcc.dg/binop-notand1a.c | 4 +- gcc/testsuite/gcc.dg/binop-notand4a.c | 4 +- gcc/testsuite/gcc.dg/binop-notand7.c | 12 ++++++ gcc/testsuite/gcc.dg/binop-notand7a.c | 12 ++++++ 8 files changed, 99 insertions(+), 6 deletions(-) create mode 100644 gcc/testsuite/gcc.c-torture/execute/pr111431-1.c create mode 100644 gcc/testsuite/gcc.dg/binop-andeq1.c create mode 100644 gcc/testsuite/gcc.dg/binop-andeq2.c create mode 100644 gcc/testsuite/gcc.dg/binop-notand7.c create mode 100644 gcc/testsuite/gcc.dg/binop-notand7a.c diff --git a/gcc/match.pd b/gcc/match.pd index ebb50ee0581..65960a1701e 100644 --- a/gcc/match.pd +++ b/gcc/match.pd @@ -5172,6 +5172,14 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT) ) ) +/* `(a == CST) & a` can be simplified to `0` or `(a == CST)` depending + on the first bit of the CST. */ +(simplify + (bit_and:c (convert@2 (eq @0 INTEGER_CST@1)) (convert? @0)) + (if ((wi::to_wide (@1) & 1) != 0) + @2 + { build_zero_cst (type); })) + /* Optimize # x_5 in range [cst1, cst2] where cst2 = cst1 + 1 x_5 ? cstN ? cst4 : cst3 diff --git a/gcc/testsuite/gcc.c-torture/execute/pr111431-1.c b/gcc/testsuite/gcc.c-torture/execute/pr111431-1.c new file mode 100644 index 00000000000..a96dbadf2b5 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/execute/pr111431-1.c @@ -0,0 +1,39 @@ +int +foo (int a) +{ + int b = a == 0; + return (a & b); +} + +#define function(vol,cst) \ +__attribute__((noipa)) \ +_Bool func_##cst##_##vol(vol int a) \ +{ \ + vol int b = a == cst; \ + return (a & b); \ +} + +#define funcdefs(cst) \ +function(,cst) \ +function(volatile,cst) + +#define funcs(f) \ +f(0) \ +f(1) \ +f(5) + +funcs(funcdefs) + +#define test(cst) \ +do { \ + if(func_##cst##_(a) != func_##cst##_volatile(a))\ + __builtin_abort(); \ +} while(0); +int main(void) +{ + for(int a = -10; a <= 10; a++) + { + funcs(test) + } +} + diff --git a/gcc/testsuite/gcc.dg/binop-andeq1.c b/gcc/testsuite/gcc.dg/binop-andeq1.c new file mode 100644 index 00000000000..2a92b8f95df --- /dev/null +++ b/gcc/testsuite/gcc.dg/binop-andeq1.c @@ -0,0 +1,12 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-optimized" } */ +/* PR tree-optimization/111431 */ + +int +foo (int a) +{ + int b = a == 2; + return (a & b); +} + +/* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/binop-andeq2.c b/gcc/testsuite/gcc.dg/binop-andeq2.c new file mode 100644 index 00000000000..895262fc17e --- /dev/null +++ b/gcc/testsuite/gcc.dg/binop-andeq2.c @@ -0,0 +1,14 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-optimized" } */ +/* PR tree-optimization/111431 */ + +int +foo (int a) +{ + int b = a == 1025; + return (a & b); +} + +/* { dg-final { scan-tree-dump-not "return 0" "optimized" } } */ +/* { dg-final { scan-tree-dump-not " & " "optimized" } } */ +/* { dg-final { scan-tree-dump-times " == 1025;" 1 "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/binop-notand1a.c b/gcc/testsuite/gcc.dg/binop-notand1a.c index c7e932b2638..d94685eb4ce 100644 --- a/gcc/testsuite/gcc.dg/binop-notand1a.c +++ b/gcc/testsuite/gcc.dg/binop-notand1a.c @@ -7,6 +7,4 @@ foo (char a, unsigned short b) return (a & !a) | (b & !b); } -/* As long as comparisons aren't boolified and casts from boolean-types - aren't preserved, the folding of X & !X to zero fails. */ -/* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" { xfail *-*-* } } } */ +/* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/binop-notand4a.c b/gcc/testsuite/gcc.dg/binop-notand4a.c index dce6a5c7eb5..bd9c7cce638 100644 --- a/gcc/testsuite/gcc.dg/binop-notand4a.c +++ b/gcc/testsuite/gcc.dg/binop-notand4a.c @@ -7,6 +7,4 @@ foo (unsigned char a, _Bool b) return (!a & a) | (b & !b); } -/* As long as comparisons aren't boolified and casts from boolean-types - aren't preserved, the folding of X & !X to zero fails. */ -/* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" { xfail *-*-* } } } */ +/* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/binop-notand7.c b/gcc/testsuite/gcc.dg/binop-notand7.c new file mode 100644 index 00000000000..c2bb6a0449d --- /dev/null +++ b/gcc/testsuite/gcc.dg/binop-notand7.c @@ -0,0 +1,12 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-optimized" } */ +/* PR tree-optimization/111431 */ + +int +foo (int a) +{ + int b = !a; + return (a & b); +} + +/* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/binop-notand7a.c b/gcc/testsuite/gcc.dg/binop-notand7a.c new file mode 100644 index 00000000000..dd50916da61 --- /dev/null +++ b/gcc/testsuite/gcc.dg/binop-notand7a.c @@ -0,0 +1,12 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-optimized" } */ +/* PR tree-optimization/111431 */ + +unsigned +foo (int a) +{ + int b = !a; + return (a & b); +} + +/* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" } } */ -- 2.31.1