From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 364073858D35 for ; Thu, 22 Jun 2023 05:49:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 364073858D35 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687412956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=zarppmc53KTcRHja2YvBGf9PlYSpgV8VZJHpAFSEm1A=; b=ZixFbT/K2qIyoH+NhxwswIVCG4eQkuqVA+ywijkyZSg1F5SHxg063OhU2rI/22mGQtaxNB s9YhsZXxibaAurQLAS0ir/UzQeOEfNxvrJeuSeNFL52j9UnxGrXcpsR+vof0+RvkVPephv hUW1mxNjlnmNCGj/dkk/rOkws22YtBw= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-613-9ApNp97nMNyWAsR2KOqrCQ-1; Thu, 22 Jun 2023 01:49:13 -0400 X-MC-Unique: 9ApNp97nMNyWAsR2KOqrCQ-1 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-3f9d7ff4b6aso3817765e9.1 for ; Wed, 21 Jun 2023 22:49:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687412952; x=1690004952; h=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=zarppmc53KTcRHja2YvBGf9PlYSpgV8VZJHpAFSEm1A=; b=kqi1MO5LGNkzzndpzaya4Nz6xigU6SPiGRCwE/So9jXticnSRui1eORiSsDBpTFf5Z VZhP1TXkZeL/KgQl4MEZT2UGzuRmS6RoN2j+LPRvnZ1ew8hekXi3sn+C42coqeIgnZBA l7GetnZ6mgsE4DkZWrTLRFFPlN0ZNlpcUDBQADTgjDj/WwPN0WZGZ18qGENtIWAgn2g5 9rCfmVqtcp9CVAXMM+AOPufT/sgEP+pqnoQdEVuRzLfD51Y3coJl6DxBA8w1PfiTkRVl PieINjp73H+PKPzG18sG69vbDArqxLQd9FLmBvFWJqhbYb33ntcwtawrQrlttQIFMRjL f2bQ== X-Gm-Message-State: AC+VfDyZqdPU23bYXkgB4R1D9NXWVyOJon4q2XL/6I77wmm9+dSJ8Ito FogfCycRCY7n8/vA0/2EofXIMTQgD4lRgdvsU8IXJoHHDbCM3pGxWYdgE8TrYY8c9sb1XrTn1UM tOcdKsOaJ0YjoPVZcerxTLYWRhPRo/H0UDetCmZp7Aw== X-Received: by 2002:a7b:c44e:0:b0:3f9:ca:ecf1 with SMTP id l14-20020a7bc44e000000b003f900caecf1mr11188589wmi.11.1687412952024; Wed, 21 Jun 2023 22:49:12 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7+xr5bW+70jZB89N6Za8Pai0JofJ53Zt/FVtifvaFDZ8CAitmgtyxlAoUZdeP1pNjkQ7yvShZTYW5G/7ZqHwM= X-Received: by 2002:a7b:c44e:0:b0:3f9:ca:ecf1 with SMTP id l14-20020a7bc44e000000b003f900caecf1mr11188580wmi.11.1687412951761; Wed, 21 Jun 2023 22:49:11 -0700 (PDT) MIME-Version: 1.0 References: <20230522185622.537454-1-aldyh@redhat.com> <20230522185622.537454-3-aldyh@redhat.com> In-Reply-To: From: Aldy Hernandez Date: Thu, 22 Jun 2023 07:49:01 +0200 Message-ID: Subject: Re: [PATCH] Convert remaining uses of value_range in ipa-*.cc to Value_Range. To: GCC patches , Martin Jambor Cc: Andrew MacLeod X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/alternative; boundary="000000000000945a3705feb171e2" X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,HTML_MESSAGE,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,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: --000000000000945a3705feb171e2 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Ping*2 On Wed, Jun 14, 2023, 14:10 Aldy Hernandez wrote: > PING > > On Mon, May 22, 2023 at 8:56=E2=80=AFPM Aldy Hernandez = wrote: > > > > Minor cleanups to get rid of value_range in IPA. There's only one left, > > but it's in the switch code which is integer specific. > > > > OK? > > > > gcc/ChangeLog: > > > > * ipa-cp.cc (decide_whether_version_node): Adjust comment. > > * ipa-fnsummary.cc (evaluate_conditions_for_known_args): Adjust > > for Value_Range. > > (set_switch_stmt_execution_predicate): Same. > > * ipa-prop.cc (ipa_compute_jump_functions_for_edge): Same. > > --- > > gcc/ipa-cp.cc | 3 +-- > > gcc/ipa-fnsummary.cc | 22 ++++++++++++++-------- > > gcc/ipa-prop.cc | 9 +++------ > > 3 files changed, 18 insertions(+), 16 deletions(-) > > > > diff --git a/gcc/ipa-cp.cc b/gcc/ipa-cp.cc > > index 03273666ea2..2e64415096e 100644 > > --- a/gcc/ipa-cp.cc > > +++ b/gcc/ipa-cp.cc > > @@ -6287,8 +6287,7 @@ decide_whether_version_node (struct cgraph_node > *node) > > { > > /* If some values generated for self-recursive calls with > > arithmetic jump functions fall outside of the known > > - value_range for the parameter, we can skip them. VR > interface > > - supports this only for integers now. */ > > + range for the parameter, we can skip them. */ > > if (TREE_CODE (val->value) =3D=3D INTEGER_CST > > && !plats->m_value_range.bottom_p () > > && !ipa_range_contains_p (plats->m_value_range.m_vr, > > diff --git a/gcc/ipa-fnsummary.cc b/gcc/ipa-fnsummary.cc > > index 0474af8991e..1ce8501fe85 100644 > > --- a/gcc/ipa-fnsummary.cc > > +++ b/gcc/ipa-fnsummary.cc > > @@ -488,19 +488,20 @@ evaluate_conditions_for_known_args (struct > cgraph_node *node, > > if (vr.varying_p () || vr.undefined_p ()) > > break; > > > > - value_range res; > > + Value_Range res (op->type); > > if (!op->val[0]) > > { > > + Value_Range varying (op->type); > > + varying.set_varying (op->type); > > range_op_handler handler (op->code, op->type); > > if (!handler > > || !res.supports_type_p (op->type) > > - || !handler.fold_range (res, op->type, vr, > > - value_range > (op->type))) > > + || !handler.fold_range (res, op->type, vr, > varying)) > > res.set_varying (op->type); > > } > > else if (!op->val[1]) > > { > > - value_range op0; > > + Value_Range op0 (op->type); > > range_op_handler handler (op->code, op->type); > > > > ipa_range_set_and_normalize (op0, op->val[0]); > > @@ -518,14 +519,14 @@ evaluate_conditions_for_known_args (struct > cgraph_node *node, > > } > > if (!vr.varying_p () && !vr.undefined_p ()) > > { > > - value_range res; > > - value_range val_vr; > > + int_range<2> res; > > + Value_Range val_vr (TREE_TYPE (c->val)); > > range_op_handler handler (c->code, boolean_type_node); > > > > ipa_range_set_and_normalize (val_vr, c->val); > > > > if (!handler > > - || !res.supports_type_p (boolean_type_node) > > + || !val_vr.supports_type_p (TREE_TYPE (c->val)) > > || !handler.fold_range (res, boolean_type_node, > vr, val_vr)) > > res.set_varying (boolean_type_node); > > > > @@ -1687,12 +1688,17 @@ set_switch_stmt_execution_predicate (struct > ipa_func_body_info *fbi, > > int bound_limit =3D opt_for_fn (fbi->node->decl, > > param_ipa_max_switch_predicate_bounds); > > int bound_count =3D 0; > > - value_range vr; > > + // This can safely be an integer range, as switches can only hold > > + // integers. > > + int_range<2> vr; > > > > get_range_query (cfun)->range_of_expr (vr, op); > > if (vr.undefined_p ()) > > vr.set_varying (TREE_TYPE (op)); > > tree vr_min, vr_max; > > + // ?? This entire function could use a rewrite to use the irange > > + // API, instead of trying to recreate its intersection/union logic. > > + // Any use of get_legacy_range() is a serious code smell. > > value_range_kind vr_type =3D get_legacy_range (vr, vr_min, vr_max); > > wide_int vr_wmin =3D wi::to_wide (vr_min); > > wide_int vr_wmax =3D wi::to_wide (vr_max); > > diff --git a/gcc/ipa-prop.cc b/gcc/ipa-prop.cc > > index 6383bc11e0a..5f9e6dbbff2 100644 > > --- a/gcc/ipa-prop.cc > > +++ b/gcc/ipa-prop.cc > > @@ -2348,7 +2348,6 @@ ipa_compute_jump_functions_for_edge (struct > ipa_func_body_info *fbi, > > gcall *call =3D cs->call_stmt; > > int n, arg_num =3D gimple_call_num_args (call); > > bool useful_context =3D false; > > - value_range vr; > > > > if (arg_num =3D=3D 0 || args->jump_functions) > > return; > > @@ -2379,6 +2378,7 @@ ipa_compute_jump_functions_for_edge (struct > ipa_func_body_info *fbi, > > useful_context =3D true; > > } > > > > + Value_Range vr (TREE_TYPE (arg)); > > if (POINTER_TYPE_P (TREE_TYPE (arg))) > > { > > bool addr_nonzero =3D false; > > @@ -2404,14 +2404,11 @@ ipa_compute_jump_functions_for_edge (struct > ipa_func_body_info *fbi, > > { > > if (TREE_CODE (arg) =3D=3D SSA_NAME > > && param_type > > - /* Limit the ranger query to integral types as the rest > > - of this file uses value_range's, which only hold > > - integers and pointers. */ > > - && irange::supports_p (TREE_TYPE (arg)) > > + && Value_Range::supports_type_p (TREE_TYPE (arg)) > > && get_range_query (cfun)->range_of_expr (vr, arg) > > && !vr.undefined_p ()) > > { > > - value_range resvr =3D vr; > > + Value_Range resvr (vr); > > range_cast (resvr, param_type); > > if (!resvr.undefined_p () && !resvr.varying_p ()) > > ipa_set_jfunc_vr (jfunc, resvr); > > -- > > 2.40.1 > > > --000000000000945a3705feb171e2--