From patchwork Fri Aug 11 09:15:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Pinski X-Patchwork-Id: 134378 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp957741vqi; Fri, 11 Aug 2023 02:17:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGSyTnqidwSY10FI2iRWbYdflTsKGbXc1x9GBHb8iIuBdURGhg6DeW2U7OmTvLdxqbMWXNv X-Received: by 2002:a17:906:8a7c:b0:992:a85d:278b with SMTP id hy28-20020a1709068a7c00b00992a85d278bmr1221714ejc.59.1691745433668; Fri, 11 Aug 2023 02:17:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691745433; cv=none; d=google.com; s=arc-20160816; b=QQ5UAqvoS9C9dzY6VSQ9vNkoStMK6O+l0sXdxlG2UIpT8JV2//05XQje2/lufGNavD zJRA3N58merWZLKzsSTSG/Jo/S7F6uMvxSRevIX5CckO4cIj1Gejb/f9BTM2vdAL6p02 vlWdrvXlo4dIoDyTSNdliwttNivtluo08MioH1tDjX9EFLEru2B2dhDTtiwn10dv7pRY 1rD81PwcSaYS3JgVDe3c7ws3+JvhjFpI6OVGApZvF63/LNltWlFOU3v6NJbg2s/SLAS5 z13F2HKywewZybemOEk8YbE6HE20zH3sib1ZWgb9icISok4uWh7xkHu0XxQRvo3dj4Ry t/lQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=oKyVP68ezK5sLwtR+Ou9QxBCMAC0SLINA6Ex8FacSm4=; fh=09okz+w4tVyhQmqNBttR063P0zKcIsLE1JRBioNPGC4=; b=trUMJzX9nd3Jt4elf5JYMg+cxeRZNc0JOkn2z4umKb4dokVg91jhg4loAgeOJxaRl/ aEhFMtMTUYcsCUwiYsxjVRfhryrI6Q8bs+5c5WNqUasS5/QlvfzQH+V7EeQxsBlzI6XK sVuGnQ0/3R9PefgxH3u+QIG+T0WDEi2uJsiLJo6wv0l0w/AvvJ7UWVZXsqot+WVj7+vd tUqa7+gQFofYsmfF6+WpQl1zx92YlIwt3dt6rSdQHut6UM2DgdvIkwPuDseHE/TZKcLV avuK4evKxT0wHGtegFZ7ReWvtxN7C5es7JDlJeXT39XM0hQ1YaG2NONXizmtC9CZYdue Xlmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=uPHUBMab; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id dc22-20020a170906c7d600b00997e71d037dsi2950162ejb.624.2023.08.11.02.17.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Aug 2023 02:17:13 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=uPHUBMab; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9BBF5385694E for ; Fri, 11 Aug 2023 09:16:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9BBF5385694E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1691745417; bh=oKyVP68ezK5sLwtR+Ou9QxBCMAC0SLINA6Ex8FacSm4=; h=To:CC:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=uPHUBMabkyYpMqPRlv5FiiIkhZ448WX/JZw9qNDU9KU/Nqk7txj9mfsSoUuxzAil6 xq21d7TRbO6tS8e9UbLHS8yahkyVDGAD73uk943V0D6y2zru0fDCSkNhgCZbICP9Gt kgSeKKMXO+1CpBoZHcbkhP0uBl6YjIQotl3KOxUE= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by sourceware.org (Postfix) with ESMTPS id 00B4B3858D28 for ; Fri, 11 Aug 2023 09:16:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 00B4B3858D28 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 37AN2YaF011353 for ; Fri, 11 Aug 2023 02:16:02 -0700 Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3sd8ya1j8y-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Fri, 11 Aug 2023 02:16:02 -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; Fri, 11 Aug 2023 02:16:00 -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; Fri, 11 Aug 2023 02:16:00 -0700 Received: from vpnclient.wrightpinski.org.com (unknown [10.69.242.187]) by maili.marvell.com (Postfix) with ESMTP id D361A3F706A; Fri, 11 Aug 2023 02:15:59 -0700 (PDT) To: CC: Andrew Pinski Subject: [PATCH 2/2] VR-VALUES: Rewrite test_for_singularity using range_op_handler Date: Fri, 11 Aug 2023 02:15:51 -0700 Message-ID: <20230811091551.2758227-2-apinski@marvell.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230811091551.2758227-1-apinski@marvell.com> References: <20230811091551.2758227-1-apinski@marvell.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: ZjuOf1qoiLvBEnqeLjIt-29CCFZ-VelQ X-Proofpoint-GUID: ZjuOf1qoiLvBEnqeLjIt-29CCFZ-VelQ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-08-10_20,2023-08-10_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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Andrew Pinski via Gcc-patches From: Andrew Pinski Reply-To: Andrew Pinski Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773923660171329577 X-GMAIL-MSGID: 1773923660171329577 So it turns out there was a simplier way of starting to improve VRP to start to fix PR 110131, PR 108360, and PR 108397. That was rewrite test_for_singularity to use range_op_handler and Value_Range. This patch implements that and OK? Bootstrapped and tested on x86_64-linux-gnu with no regressions. gcc/ChangeLog: * vr-values.cc (test_for_singularity): Add edge argument and rewrite using range_op_handler. (simplify_compare_using_range_pairs): Use Value_Range instead of value_range and update test_for_singularity call. gcc/testsuite/ChangeLog: * gcc.dg/tree-ssa/vrp124.c: New test. * gcc.dg/tree-ssa/vrp125.c: New test. --- gcc/testsuite/gcc.dg/tree-ssa/vrp124.c | 44 +++++++++++++ gcc/testsuite/gcc.dg/tree-ssa/vrp125.c | 44 +++++++++++++ gcc/vr-values.cc | 91 ++++++++------------------ 3 files changed, 114 insertions(+), 65 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/vrp124.c create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/vrp125.c diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp124.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp124.c new file mode 100644 index 00000000000..6ccbda35d1b --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp124.c @@ -0,0 +1,44 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-optimized" } */ + +/* Should be optimized to a == -100 */ +int g(int a) +{ + if (a == -100 || a >= 0) + ; + else + return 0; + return a < 0; +} + +/* Should optimize to a == 0 */ +int f(int a) +{ + if (a == 0 || a > 100) + ; + else + return 0; + return a < 50; +} + +/* Should be optimized to a == 0. */ +int f2(int a) +{ + if (a == 0 || a > 100) + ; + else + return 0; + return a < 100; +} + +/* Should optimize to a == 100 */ +int f1(int a) +{ + if (a < 0 || a == 100) + ; + else + return 0; + return a > 50; +} + +/* { dg-final { scan-tree-dump-not "goto " "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp125.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp125.c new file mode 100644 index 00000000000..f6c2f8e35f1 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp125.c @@ -0,0 +1,44 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-optimized" } */ + +/* Should be optimized to a == -100 */ +int g(int a) +{ + if (a == -100 || a == -50 || a >= 0) + ; + else + return 0; + return a < -50; +} + +/* Should optimize to a == 0 */ +int f(int a) +{ + if (a == 0 || a == 50 || a > 100) + ; + else + return 0; + return a < 50; +} + +/* Should be optimized to a == 0. */ +int f2(int a) +{ + if (a == 0 || a == 50 || a > 100) + ; + else + return 0; + return a < 25; +} + +/* Should optimize to a == 100 */ +int f1(int a) +{ + if (a < 0 || a == 50 || a == 100) + ; + else + return 0; + return a > 50; +} + +/* { dg-final { scan-tree-dump-not "goto " "optimized" } } */ diff --git a/gcc/vr-values.cc b/gcc/vr-values.cc index a4fddd62841..7004b0224bd 100644 --- a/gcc/vr-values.cc +++ b/gcc/vr-values.cc @@ -907,66 +907,30 @@ simplify_using_ranges::simplify_bit_ops_using_ranges a known value range VR. If there is one and only one value which will satisfy the - conditional, then return that value. Else return NULL. - - If signed overflow must be undefined for the value to satisfy - the conditional, then set *STRICT_OVERFLOW_P to true. */ + conditional on the EDGE, then return that value. + Else return NULL. */ static tree test_for_singularity (enum tree_code cond_code, tree op0, - tree op1, const value_range *vr) + tree op1, Value_Range vr, bool edge) { - tree min = NULL; - tree max = NULL; - - /* Extract minimum/maximum values which satisfy the conditional as it was - written. */ - if (cond_code == LE_EXPR || cond_code == LT_EXPR) + /* This is already a singularity. */ + if (cond_code == NE_EXPR || cond_code == EQ_EXPR) + return NULL; + auto range_op = range_op_handler (cond_code); + int_range<2> op1_range (TREE_TYPE (op0)); + wide_int w = wi::to_wide (op1); + op1_range.set (TREE_TYPE (op1), w, w); + Value_Range vr1(TREE_TYPE (op0)); + if (range_op.op1_range (vr1, TREE_TYPE (op0), + edge ? range_true () : range_false (), + op1_range)) { - min = TYPE_MIN_VALUE (TREE_TYPE (op0)); - - max = op1; - if (cond_code == LT_EXPR) - { - tree one = build_int_cst (TREE_TYPE (op0), 1); - max = fold_build2 (MINUS_EXPR, TREE_TYPE (op0), max, one); - /* Signal to compare_values_warnv this expr doesn't overflow. */ - if (EXPR_P (max)) - suppress_warning (max, OPT_Woverflow); - } - } - else if (cond_code == GE_EXPR || cond_code == GT_EXPR) - { - max = TYPE_MAX_VALUE (TREE_TYPE (op0)); - - min = op1; - if (cond_code == GT_EXPR) - { - tree one = build_int_cst (TREE_TYPE (op0), 1); - min = fold_build2 (PLUS_EXPR, TREE_TYPE (op0), min, one); - /* Signal to compare_values_warnv this expr doesn't overflow. */ - if (EXPR_P (min)) - suppress_warning (min, OPT_Woverflow); - } - } - - /* Now refine the minimum and maximum values using any - value range information we have for op0. */ - if (min && max) - { - tree type = TREE_TYPE (op0); - tree tmin = wide_int_to_tree (type, vr->lower_bound ()); - tree tmax = wide_int_to_tree (type, vr->upper_bound ()); - if (compare_values (tmin, min) == 1) - min = tmin; - if (compare_values (tmax, max) == -1) - max = tmax; - - /* If the new min/max values have converged to a single value, - then there is only one value which can satisfy the condition, - return that value. */ - if (operand_equal_p (min, max, 0) && is_gimple_min_invariant (min)) - return min; + vr.intersect (vr1); + tree newop1; + /* If the updated range is just a singleton, then we can just do a comparison */ + if (vr.singleton_p (&newop1)) + return newop1; } return NULL; } @@ -1224,9 +1188,9 @@ simplify_using_ranges::simplify_compare_using_ranges_1 (tree_code &cond_code, tr && cond_code != EQ_EXPR && TREE_CODE (op0) == SSA_NAME && INTEGRAL_TYPE_P (TREE_TYPE (op0)) - && is_gimple_min_invariant (op1)) + && TREE_CODE (op1) == INTEGER_CST) { - value_range vr; + Value_Range vr (TREE_TYPE (op0)); if (!query->range_of_expr (vr, op0, stmt)) vr.set_undefined (); @@ -1235,20 +1199,17 @@ simplify_using_ranges::simplify_compare_using_ranges_1 (tree_code &cond_code, tr able to simplify this conditional. */ if (!vr.undefined_p () && !vr.varying_p ()) { - tree new_tree = test_for_singularity (cond_code, op0, op1, &vr); + tree new_tree = test_for_singularity (cond_code, op0, op1, vr, + true); if (new_tree) { cond_code = EQ_EXPR; op1 = new_tree; happened = true; } - - /* Try again after inverting the condition. We only deal - with integral types here, so no need to worry about - issues with inverting FP comparisons. */ - new_tree = test_for_singularity - (invert_tree_comparison (cond_code, false), - op0, op1, &vr); + /* Try again after inverting the condition. */ + new_tree = test_for_singularity (cond_code, op0, op1, vr, + false); if (new_tree) { cond_code = NE_EXPR;