From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oi1-x236.google.com (mail-oi1-x236.google.com [IPv6:2607:f8b0:4864:20::236]) by sourceware.org (Postfix) with ESMTPS id 4F14C3858D32; Tue, 10 Oct 2023 07:23:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4F14C3858D32 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-oi1-x236.google.com with SMTP id 5614622812f47-3aec067556dso3581289b6e.2; Tue, 10 Oct 2023 00:23:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696922605; x=1697527405; darn=gcc.gnu.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=8Z4v0LhXhtBuz59O4737ksFHCT83VcDVOvxvlB5R2XY=; b=h17+zhBOYghjxbI+3U16g2msld4gNnsQ7SGO9AQOlsDw1+PsBuHf07Pdrn3bTJ/H7c SirzyX7okmMZnE8Q0NzG2s6HaF2swrRfnl1SOzv1e7J3XCLAgMJiarTSbEP+9WtHi2x+ F92cg76PAPDKNNLAElQvv6ejNaLu78p9UPXMW/Sqedopvh4EhHMnXW6FL4KA8gSq9L8v 6ZG4KZKwx8FjoBGTirSLXvhpnBbz8pPB3HMzc2yqrPn6EYW3YY8/xD7fDn2YCD5NgMpY u66+USaBWMQAK7IOUGPoQlE/78ck7xfrfvgBW2DrL7pt4w6J5pyf2YznD+QL56wUag8I X9QQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696922605; x=1697527405; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8Z4v0LhXhtBuz59O4737ksFHCT83VcDVOvxvlB5R2XY=; b=koT5RksmABREkDwRomHEAcQ+C4juppifMr2H1VCoJjA3QrJeCYkyK+Cgoke/xJcO+g 8GJH9/Tr3526JuyEMvfnBSh8TTZ6XdPrWeh68JD6MnjwMHs3jhH8aHhdDoEdGDfQwK14 7e18+T+Z+FGI+yLGgi9yB43wdc3fmuuSaN79WoYottAuMR20qnJYfqfGEkQuBDqwjiM+ F0k1FdaljnJP+yV0p/nBP6o9Ber1sFyg4mhrc7c7Q5XLmN9R3O9ka6dynAA/T0t59OCr CRz8Z5IZTHbUzzGGBCY5oRVB2O0Wn1MUwMKthWYFz7dMWCuT3HRcP2Whbxn+cWDkxTp7 EjSw== X-Gm-Message-State: AOJu0YwY5tejaOFMsVRCP/IgI93RqnBnOA7ho9rd/x2QMnjOeuO2xnHW bjCRt9WjqBfIDUFtIRl2tz7Vi5jErq4PdnoZ5hk= X-Google-Smtp-Source: AGHT+IGvG3J3iIqjRjMw6SaUnDYkcop7VRqeXoTjeHWzhFad3oTCI5fz4kmqCBnqAcuCsYIVt1Er1ktraQXBEbT4xrU= X-Received: by 2002:a05:6358:24aa:b0:13f:2833:bf41 with SMTP id m42-20020a05635824aa00b0013f2833bf41mr17348518rwc.23.1696922605235; Tue, 10 Oct 2023 00:23:25 -0700 (PDT) MIME-Version: 1.0 References: <20231010025311.3642757-1-guojiufu@linux.ibm.com> In-Reply-To: From: Andrew Pinski Date: Tue, 10 Oct 2023 00:23:12 -0700 Message-ID: Subject: Re: [PATCH] use get_range_query to replace get_global_range_query To: Richard Biener Cc: Jiufu Guo , gcc-patches@gcc.gnu.org, jeffreyalaw@gmail.com, richard.sandiford@arm.com, segher@kernel.crashing.org, dje.gcc@gmail.com, linkw@gcc.gnu.org, bergner@linux.ibm.com, amacleod@redhat.com, aldyh@redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,KAM_SHORT,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 List-Id: On Tue, Oct 10, 2023 at 12:02=E2=80=AFAM Richard Biener = wrote: > > On Tue, 10 Oct 2023, Jiufu Guo wrote: > > > Hi, > > > > For "get_global_range_query" SSA_NAME_RANGE_INFO can be queried. > > For "get_range_query", it could get more context-aware range info. > > And look at the implementation of "get_range_query", it returns > > global range if no local fun info. > > > > So, if not quering for SSA_NAME, it would be ok to use get_range_query > > to replace get_global_range_query. > > > > Patch https://gcc.gnu.org/pipermail/gcc-patches/2023-September/630389.h= tml, > > Uses get_range_query could handle more cases. > > > > This patch replaces get_global_range_query by get_range_query for > > most possible code pieces (but deoes not draft new test cases). > > > > Pass bootstrap & regtest on ppc64{,le} and x86_64. > > Is this ok for trunk. > > See below > > > > > BR, > > Jeff (Jiufu Guo) > > > > gcc/ChangeLog: > > > > * builtins.cc (expand_builtin_strnlen): Replace get_global_range_= query > > by get_range_query. > > * fold-const.cc (expr_not_equal_to): Likewise. > > * gimple-fold.cc (size_must_be_zero_p): Likewise. > > * gimple-range-fold.cc (fur_source::fur_source): Likewise. > > * gimple-ssa-warn-access.cc (check_nul_terminated_array): Likewis= e. > > * tree-dfa.cc (get_ref_base_and_extent): Likewise. > > * tree-ssa-loop-split.cc (split_at_bb_p): Likewise. > > * tree-ssa-loop-unswitch.cc (evaluate_control_stmt_using_entry_ch= ecks): > > Likewise. > > > > --- > > gcc/builtins.cc | 2 +- > > gcc/fold-const.cc | 6 +----- > > gcc/gimple-fold.cc | 6 ++---- > > gcc/gimple-range-fold.cc | 4 +--- > > gcc/gimple-ssa-warn-access.cc | 2 +- > > gcc/tree-dfa.cc | 5 +---- > > gcc/tree-ssa-loop-split.cc | 2 +- > > gcc/tree-ssa-loop-unswitch.cc | 2 +- > > 8 files changed, 9 insertions(+), 20 deletions(-) > > > > diff --git a/gcc/builtins.cc b/gcc/builtins.cc > > index cb90bd03b3e..4e0a77ff8e0 100644 > > --- a/gcc/builtins.cc > > +++ b/gcc/builtins.cc > > @@ -3477,7 +3477,7 @@ expand_builtin_strnlen (tree exp, rtx target, mac= hine_mode target_mode) > > > > wide_int min, max; > > value_range r; > > - get_global_range_query ()->range_of_expr (r, bound); > > + get_range_query (cfun)->range_of_expr (r, bound); > > expand doesn't have a ranger instance so this is a no-op. I'm unsure > if it would be safe given we're half GIMPLE, half RTL. Please leave it > out. It definitely does not work and can't as I tried to enable a ranger instance and it didn't work. I wrote up my experience here: https://gcc.gnu.org/pipermail/gcc/2023-September/242407.html Thanks, Andrew Pinski > > > if (r.varying_p () || r.undefined_p ()) > > return NULL_RTX; > > min =3D r.lower_bound (); > > diff --git a/gcc/fold-const.cc b/gcc/fold-const.cc > > index 4f8561509ff..15134b21b9f 100644 > > --- a/gcc/fold-const.cc > > +++ b/gcc/fold-const.cc > > @@ -11056,11 +11056,7 @@ expr_not_equal_to (tree t, const wide_int &w) > > if (!INTEGRAL_TYPE_P (TREE_TYPE (t))) > > return false; > > > > - if (cfun) > > - get_range_query (cfun)->range_of_expr (vr, t); > > - else > > - get_global_range_query ()->range_of_expr (vr, t); > > - > > + get_range_query (cfun)->range_of_expr (vr, t); > > These kind of changes look obvious. > > > if (!vr.undefined_p () && !vr.contains_p (w)) > > return true; > > /* If T has some known zero bits and W has any of those bits set= , > > diff --git a/gcc/gimple-fold.cc b/gcc/gimple-fold.cc > > index dc89975270c..853edd9e5d4 100644 > > --- a/gcc/gimple-fold.cc > > +++ b/gcc/gimple-fold.cc > > @@ -876,10 +876,8 @@ size_must_be_zero_p (tree size) > > wide_int zero =3D wi::zero (TYPE_PRECISION (type)); > > value_range valid_range (type, zero, ssize_max); > > value_range vr; > > - if (cfun) > > - get_range_query (cfun)->range_of_expr (vr, size); > > - else > > - get_global_range_query ()->range_of_expr (vr, size); > > + get_range_query (cfun)->range_of_expr (vr, size); > > + > > if (vr.undefined_p ()) > > vr.set_varying (TREE_TYPE (size)); > > vr.intersect (valid_range); > > diff --git a/gcc/gimple-range-fold.cc b/gcc/gimple-range-fold.cc > > index d1945ccb554..6e9530c3d7f 100644 > > --- a/gcc/gimple-range-fold.cc > > +++ b/gcc/gimple-range-fold.cc > > @@ -50,10 +50,8 @@ fur_source::fur_source (range_query *q) > > { > > if (q) > > m_query =3D q; > > - else if (cfun) > > - m_query =3D get_range_query (cfun); > > else > > - m_query =3D get_global_range_query (); > > + m_query =3D get_range_query (cfun); > > m_gori =3D NULL; > > } > > > > diff --git a/gcc/gimple-ssa-warn-access.cc b/gcc/gimple-ssa-warn-access= .cc > > index fcaff128d60..e439d1b9b68 100644 > > --- a/gcc/gimple-ssa-warn-access.cc > > +++ b/gcc/gimple-ssa-warn-access.cc > > @@ -332,7 +332,7 @@ check_nul_terminated_array (GimpleOrTree expr, tree= src, tree bound) > > { > > Value_Range r (TREE_TYPE (bound)); > > > > - get_global_range_query ()->range_of_expr (r, bound); > > + get_range_query (cfun)->range_of_expr (r, bound); > > > > if (r.undefined_p () || r.varying_p ()) > > return true; > > The pass has a ranger instance, so yes, this should improve things. > Since the pass doesn't do any IL modification it should also be safe. > > > diff --git a/gcc/tree-dfa.cc b/gcc/tree-dfa.cc > > index af8e9243947..5355af2c869 100644 > > --- a/gcc/tree-dfa.cc > > +++ b/gcc/tree-dfa.cc > > @@ -531,10 +531,7 @@ get_ref_base_and_extent (tree exp, poly_int64 *pof= fset, > > > > value_range vr; > > range_query *query; > > - if (cfun) > > - query =3D get_range_query (cfun); > > - else > > - query =3D get_global_range_query (); > > + query =3D get_range_query (cfun); > > > > if (TREE_CODE (index) =3D=3D SSA_NAME > > && (low_bound =3D array_ref_low_bound (exp), > > diff --git a/gcc/tree-ssa-loop-split.cc b/gcc/tree-ssa-loop-split.cc > > index 64464802c1e..e85a1881526 100644 > > --- a/gcc/tree-ssa-loop-split.cc > > +++ b/gcc/tree-ssa-loop-split.cc > > @@ -145,7 +145,7 @@ split_at_bb_p (class loop *loop, basic_block bb, tr= ee *border, affine_iv *iv, > > else > > { > > int_range<2> r; > > - get_global_range_query ()->range_of_expr (r, op0, stmt); > > + get_range_query (cfun)->range_of_expr (r, op0, stmt); > > loop splitting doesn't have a ranger instance so this is a no-op change > but I'm also not sure it would be safe to use a dynamic ranger instance > here since we are doing even CFG manipulations between. Please leave > this change out. > > > if (!r.varying_p () && !r.undefined_p () > > && TREE_CODE (op1) =3D=3D INTEGER_CST) > > { > > diff --git a/gcc/tree-ssa-loop-unswitch.cc b/gcc/tree-ssa-loop-unswitch= .cc > > index 619b50fb4bb..b3dc2ded931 100644 > > --- a/gcc/tree-ssa-loop-unswitch.cc > > +++ b/gcc/tree-ssa-loop-unswitch.cc > > @@ -764,7 +764,7 @@ evaluate_control_stmt_using_entry_checks (gimple *s= tmt, > > > > int_range_max r; > > if (!ranger->gori ().outgoing_edge_range_p (r, e, idx, > > - *get_global_range_q= uery ())) > > + *get_range_query (c= fun))) > > continue; > > unswitching has a ranger instance but it does perform IL modification. > Did you check whether the use of the global ranger was intentional here? > Specifically we do have the 'ranger' object here and IIRC using global > ranges was intentional. So please leave this change out. > > Thanks, > Richard. > > > r.intersect (path_range); > > if (r.undefined_p ()) > > > > -- > Richard Biener > SUSE Software Solutions Germany GmbH, > Frankenstrasse 146, 90461 Nuernberg, Germany; > GF: Ivo Totev, Andrew McDonald, Werner Knoblich; (HRB 36809, AG Nuernberg= )