From patchwork Wed Oct 11 00:45:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Pinski X-Patchwork-Id: 1846191 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=UO6q+Mdh; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S4vG30kVxz1ypX for ; Wed, 11 Oct 2023 11:46:01 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 85AA83858426 for ; Wed, 11 Oct 2023 00:45:58 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by sourceware.org (Postfix) with ESMTPS id A7A583858C41 for ; Wed, 11 Oct 2023 00:45:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A7A583858C41 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-692b2bdfce9so5615715b3a.3 for ; Tue, 10 Oct 2023 17:45:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696985143; x=1697589943; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=EDjAzvzemjCwxxvcu2DbWDPjkKlJo//XxARGJts7f7w=; b=UO6q+MdhZhquxA2kSu+s1e0jreSA6WhTLbuY7bkUIvAyo8Sj4vPFPm55oW42YvNXmT dZSFRTHg1ekTOCNz8YSA/U3Tf8epeTrTqQ30gLUe/1IJrQxE9BT/IAKkAtdSOzt3CfkN ocxP6hj9K+MZIZLMEjPFhxdJMN+Pyo7q1bdIMiGbbUUIfoxfrCndnSk71f3cYP9mHNop YChrFPFC8MNTmXUJOQZvrTrevEwl0svwhO21Y+mojalbwV5iwv+2bQbrIfA+IAauvJaU wUgOIFu3SRDVKWPAL/1fQQJLykZrIhFVIhltC8kutbCq8Qmy4pd/8J25VELm+tG50ME0 7dRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696985143; x=1697589943; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=EDjAzvzemjCwxxvcu2DbWDPjkKlJo//XxARGJts7f7w=; b=dRfaVP3NFQRDJAgrruayHyiX9DUN5EKJVJOsBfMwGdowJJ2MXhLHFN/gmm5ADwUlwq LTEQ0RWnmbOp242qZCZhqQK+SkFP4TU3M61bb+SMGWNAMgECR+o1+Jjll5hS3lkSlB1J 3IhXNWBn92diP38xFGVRijY365oiD/cmlc1dBb7OGBBXRo/6T3JipacgPi85UUBq1WKk SY003jusAJSbiFlE6gFVWWndUbzwOXTRYXwyjeCBYzFbvjuA19jW4sIfd+FnFuwuJTS9 CBK1N9KpUwxR9c0nZ94iDeIXNCJk/1Q6WNde3J+8fh/qz1p883gVrWtWT9LVZ0xYHjOw fdyw== X-Gm-Message-State: AOJu0Yz06ZA+oMtL4kS+qwqEbu38TZvfySoNmGEai/ct6XTSlbUl39+c jAdcmCunNND+9wrs46Y/RqOie/peVfUeHA== X-Google-Smtp-Source: AGHT+IHzfLgd+fLh/i1xTUtsWX9v7GKeHusvUegtd4ye7s3jEKj36FuTK3p9FM5L5clZ953/XOIMtQ== X-Received: by 2002:aa7:88c2:0:b0:68e:36bc:194a with SMTP id k2-20020aa788c2000000b0068e36bc194amr26188667pff.15.1696985143228; Tue, 10 Oct 2023 17:45:43 -0700 (PDT) Received: from xeond2.wrightpinski.org ([98.97.114.173]) by smtp.gmail.com with ESMTPSA id w2-20020aa78582000000b0068be7119e55sm8716962pfn.122.2023.10.10.17.45.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 17:45:42 -0700 (PDT) From: Andrew Pinski To: gcc-patches@gcc.gnu.org Cc: Andrew Pinski Subject: [PATCH] MATCH: [PR111282] Simplify `a & (b ^ ~a)` to `a & b` Date: Tue, 10 Oct 2023 17:45:37 -0700 Message-Id: <20231011004537.3582095-1-pinskia@gmail.com> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 X-Spam-Status: No, score=-10.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org While `a & (b ^ ~a)` is optimized to `a & b` on the rtl level, it is always good to optimize this at the gimple level and allows us to match a few extra things including where a is a comparison. Note I had to update/change the testcase and-1.c to avoid matching this case as we can match -2 and 1 as bitwise inversions. PR tree-optimization/111282 gcc/ChangeLog: * match.pd (`a & ~(a ^ b)`, `a & (a == b)`, `a & ((~a) ^ b)`): New patterns. gcc/testsuite/ChangeLog: * gcc.dg/tree-ssa/and-1.c: Update testcase to avoid matching `~1 & (a ^ 1)` simplification. * gcc.dg/tree-ssa/bitops-6.c: New test. --- gcc/match.pd | 20 ++++++++++++++ gcc/testsuite/gcc.dg/tree-ssa/and-1.c | 6 ++--- gcc/testsuite/gcc.dg/tree-ssa/bitops-6.c | 33 ++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/bitops-6.c diff --git a/gcc/match.pd b/gcc/match.pd index 49740d189a7..26b05c157c1 100644 --- a/gcc/match.pd +++ b/gcc/match.pd @@ -1358,6 +1358,26 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT) && (!wascmp || element_precision (type) == 1)) (bit_ior @0 (bit_not @2))))) +/* a & ~(a ^ b) --> a & b */ +(simplify + (bit_and:c @0 (bit_not (bit_xor:c @0 @1))) + (bit_and @0 @1)) + +/* a & (a == b) --> a & b (boolean version of the above). */ +(simplify + (bit_and:c @0 (nop_convert? (eq:c @0 @1))) + (if (INTEGRAL_TYPE_P (TREE_TYPE (@0)) + && TYPE_PRECISION (TREE_TYPE (@0)) == 1) + (bit_and @0 @1))) + +/* a & ((~a) ^ b) --> a & b (alt version of the above 2) */ +(simplify + (bit_and:c @0 (bit_xor:c @1 @2)) + (with { bool wascmp; } + (if (bitwise_inverted_equal_p (@0, @1, wascmp) + && (!wascmp || element_precision (type) == 1)) + (bit_and @0 @2)))) + /* (a | b) | (a &^ b) --> a | b */ (for op (bit_and bit_xor) (simplify diff --git a/gcc/testsuite/gcc.dg/tree-ssa/and-1.c b/gcc/testsuite/gcc.dg/tree-ssa/and-1.c index 276c2b9bd8a..27d38907eea 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/and-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/and-1.c @@ -2,10 +2,10 @@ /* { dg-options "-O -fdump-tree-optimized-raw" } */ int f(int in) { - in = in | 3; - in = in ^ 1; + in = in | 7; + in = in ^ 3; in = (in & ~(unsigned long)1); return in; } -/* { dg-final { scan-tree-dump-not "bit_and_expr" "optimized" } } */ +/* { dg-final { scan-tree-dump-not "bit_and_expr, " "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bitops-6.c b/gcc/testsuite/gcc.dg/tree-ssa/bitops-6.c new file mode 100644 index 00000000000..e6ab2fd6c71 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/bitops-6.c @@ -0,0 +1,33 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-optimized-raw" } */ +/* PR tree-optimization/111282 */ + + +int f(int a, int b) +{ + return a & (b ^ ~a); // a & b +} + +_Bool fb(_Bool x, _Bool y) +{ + return x & (y ^ !x); // x & y +} + +int fa(int w, int z) +{ + return (~w) & (w ^ z); // ~w & z +} + +int fcmp(int x, int y) +{ + _Bool a = x == 2; + _Bool b = y == 1; + return a & (b ^ !a); // (x == 2) & (y == 1) +} + +/* { dg-final { scan-tree-dump-not "bit_xor_expr, " "optimized" } } */ +/* { dg-final { scan-tree-dump-times "bit_and_expr, " 4 "optimized" } } */ +/* { dg-final { scan-tree-dump-times "bit_not_expr, " 1 "optimized" } } */ +/* { dg-final { scan-tree-dump-not "ne_expr, " "optimized" } } */ +/* { dg-final { scan-tree-dump-times "eq_expr, " 2 "optimized" } } */ +