From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by sourceware.org (Postfix) with ESMTPS id 0F7A63858C31 for ; Mon, 1 Jan 2024 04:03:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0F7A63858C31 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=quicinc.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0F7A63858C31 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704081826; cv=none; b=in6Bx1a6De7aUnBbUshg0PUS9bAp9a4DrczNo0bCE2lzGY7M1RBNrSoNr64uYU4E/j5huKaNvhNiqQSnj4+c9g7Y7fz8d6p7XWue/W6+JOLM158ikmO8jWN7CgmgE8rBnWk+tKssExT2QAO7Q9wKGGDCB+dqpRJj4tBs9qCFJD0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704081826; c=relaxed/simple; bh=9teQJZTvGabQVt3VszlaRJ5ZOf3R0uYmqnL9zOpzk2Y=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=spqaPzN0k++GbrXsP7nIQa0aLiL80/pBdzPdduBim6xIeDcutJeAWeemefCljr5uxFAGtWOwtesRF8R8Ik5vVahE9qlWSIPj6yg1h82m/m5kddvYQ6DNen9Yc9WdbabYnpvipLobFaINC/YDZOPrfCF033OvUQvzq5F1X2alDeo= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 4013nc5k027516 for ; Mon, 1 Jan 2024 04:03:42 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding:content-type; s=qcppdkim1; bh=9bAhTOJ jsYUH3fO2UPz6Ug5ZN/443YBIoxB9nN4IMzk=; b=GeKUUfAAH813FpomG8OhjnQ NTfsgLjWCbVo/5Bs8DhhIos2un3BQxWrVKQpusvCGoY4Jpxb6im95tqRgO0bVlfe 4EqJ6dhjgnv/SZUDMDXcXaTvpkeasqiAXkV5TAm2rUTSdHRh9QFz7zFRl45Bp4oT qka6xs1VBvD7uWfP27ZRl4mWyy8bExbo9irYZaG2KZSN6AQSq6YiL8OX/Y+DE18y 5jhUbvWSVwSMyitCq+Wuxq0T7+tgSRdacvqSjITvopsEVhRPRGaCNMGH2or2H1Tp WjFvZuQjYxzwB2K1grQsHhrAoYqaXmbgqN6RDKqosjOe64wOR3bikJILHUeMBAQ= = Received: from nasanppmta04.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3va8js2u0t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 01 Jan 2024 04:03:42 +0000 (GMT) Received: from nasanex01c.na.qualcomm.com (nasanex01c.na.qualcomm.com [10.45.79.139]) by NASANPPMTA04.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 40143fUX023865 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 1 Jan 2024 04:03:41 GMT Received: from hu-apinski-lv.qualcomm.com (10.49.16.6) by nasanex01c.na.qualcomm.com (10.45.79.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Sun, 31 Dec 2023 20:03:40 -0800 From: Andrew Pinski To: CC: Andrew Pinski Subject: [PATCH] Match: Improve inverted_equal_p for bool and `^` and `==` [PR113186] Date: Sun, 31 Dec 2023 20:03:29 -0800 Message-ID: <20240101040329.3895909-1-quic_apinski@quicinc.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.49.16.6] X-ClientProxiedBy: nalasex01c.na.qualcomm.com (10.47.97.35) To nasanex01c.na.qualcomm.com (10.45.79.139) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: FtqjSzliBwIwe_l_V0zIs6RINQQ2fweK X-Proofpoint-ORIG-GUID: FtqjSzliBwIwe_l_V0zIs6RINQQ2fweK X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-12-09_02,2023-12-07_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 lowpriorityscore=0 spamscore=0 phishscore=0 adultscore=0 suspectscore=0 priorityscore=1501 bulkscore=0 clxscore=1015 mlxlogscore=706 impostorscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2311290000 definitions=main-2401010032 X-Spam-Status: No, score=-13.0 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 List-Id: For boolean types, `a ^ b` is a valid form for `a != b`. This means for gimple_bitwise_inverted_equal_p, we catch some inverted value forms. This patch extends inverted_equal_p to allow matching of `^` with the corresponding `==`. Note in the testcase provided we used to optimize in GCC 12 to just `return 0` where `a == b` was used, this allows us to do that again. Bootstrapped and tested on x86_64-linux-gnu with no regressions. PR tree-optimized/113186 gcc/ChangeLog: * gimple-match-head.cc (gimple_bitwise_inverted_equal_p): Match `^` with the `==` for 1bit integral types. * match.pd (maybe_cmp): Allow for bit_xor for 1bit integral types. gcc/testsuite/ChangeLog: * gcc.dg/tree-ssa/bitops-bool-1.c: New test. Signed-off-by: Andrew Pinski --- gcc/gimple-match-head.cc | 20 ++++++++++++++++--- gcc/match.pd | 6 ++++++ gcc/testsuite/gcc.dg/tree-ssa/bitops-bool-1.c | 14 +++++++++++++ 3 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/bitops-bool-1.c diff --git a/gcc/gimple-match-head.cc b/gcc/gimple-match-head.cc index 322072332f9..56719154f59 100644 --- a/gcc/gimple-match-head.cc +++ b/gcc/gimple-match-head.cc @@ -333,9 +333,23 @@ gimple_bitwise_inverted_equal_p (tree expr1, tree expr2, bool &wascmp, tree (*va if (!operand_equal_p (op11, op21)) return false; wascmp = true; - if (invert_tree_comparison (gimple_assign_rhs_code (a1), - HONOR_NANS (op10)) - == gimple_assign_rhs_code (a2)) + tree_code ac1 = gimple_assign_rhs_code (a1); + tree_code ac2 = gimple_assign_rhs_code (a2); + /* Match `^` against `==` but this should only + happen when the type is a 1bit precision integer. */ + if (ac1 == BIT_XOR_EXPR) + { + tree type = TREE_TYPE (newexpr1); + gcc_assert (INTEGRAL_TYPE_P (type) && TYPE_PRECISION (type) == 1); + return ac2 == EQ_EXPR; + } + if (ac2 == BIT_XOR_EXPR) + { + tree type = TREE_TYPE (newexpr1); + gcc_assert (INTEGRAL_TYPE_P (type) && TYPE_PRECISION (type) == 1); + return ac1 == EQ_EXPR; + } + if (invert_tree_comparison (ac1, HONOR_NANS (op10)) == ac2) return true; return false; } diff --git a/gcc/match.pd b/gcc/match.pd index a980c4d7e94..2392ffe5f30 100644 --- a/gcc/match.pd +++ b/gcc/match.pd @@ -182,6 +182,12 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT) (convert (cmp@0 @1 @2)) (if (tree_nop_conversion_p (type, TREE_TYPE (@0))))) ) +/* `a ^ b` is another form of `a != b` when the type + is a 1bit precission integer. */ +(match (maybe_cmp @0) + (bit_xor@0 @1 @2) + (if (INTEGRAL_TYPE_P (type) + && TYPE_PRECISION (type) == 1))) #endif /* Transform likes of (char) ABS_EXPR <(int) x> into (char) ABSU_EXPR diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bitops-bool-1.c b/gcc/testsuite/gcc.dg/tree-ssa/bitops-bool-1.c new file mode 100644 index 00000000000..8b43afb5d66 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/bitops-bool-1.c @@ -0,0 +1,14 @@ +/* { dg-do compile } */ +/* { dg-options "-O1 -fdump-tree-optimized -fdump-tree-forwprop1" } */ +/* PR tree-optimized/113186 */ + +_Bool f(_Bool a, _Bool c) +{ + _Bool b = (a^c); + _Bool d = (a^!c); + return b & d; +} + +/* This function should be optimized to return 0; */ +/* { dg-final { scan-tree-dump "return 0" "optimized" } } */ +/* { dg-final { scan-tree-dump "return 0" "forwprop1" } } */ -- 2.39.3