From patchwork Mon May 22 18:56:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aldy Hernandez X-Patchwork-Id: 69820 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DD9E63857348 for ; Mon, 22 May 2023 18:57:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DD9E63857348 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1684781841; bh=XUUfuSpQvc6bhSt0ntG00x6ECPwbqUXmN74nvkT9zCs=; 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=cRqlSb5byCTS5IUaj8/FnqQzOSyIIdbX21ijxqBkZCfczxgPxfe6MO+KpfrvLkvZE UfrGWlRHTBgB3+o4S+ioSeweMbKV0mszcwZl22QkQhntjTjdWl1r0tenTj5j07OkeC KR0FZ87rY29HFLWT0Ah/PUoxVgLZQoQ9jkkLjOq0= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 E78A53857437 for ; Mon, 22 May 2023 18:56:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E78A53857437 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-297-GXAIkxR6N62viw0zHIMcyQ-1; Mon, 22 May 2023 14:56:51 -0400 X-MC-Unique: GXAIkxR6N62viw0zHIMcyQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 374641C03D88 for ; Mon, 22 May 2023 18:56:50 +0000 (UTC) Received: from abulafia.quesejoda.com (unknown [10.39.192.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C35811121314; Mon, 22 May 2023 18:56:49 +0000 (UTC) Received: from abulafia.quesejoda.com (localhost [127.0.0.1]) by abulafia.quesejoda.com (8.17.1/8.17.1) with ESMTPS id 34MIul7I537491 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 22 May 2023 20:56:47 +0200 Received: (from aldyh@localhost) by abulafia.quesejoda.com (8.17.1/8.17.1/Submit) id 34MIuljg537490; Mon, 22 May 2023 20:56:47 +0200 To: GCC patches Cc: Andrew MacLeod , Aldy Hernandez Subject: [PATCH] Convert remaining uses of value_range in ipa-*.cc to Value_Range. Date: Mon, 22 May 2023 20:56:22 +0200 Message-Id: <20230522185622.537454-3-aldyh@redhat.com> In-Reply-To: <20230522185622.537454-1-aldyh@redhat.com> References: <20230522185622.537454-1-aldyh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, 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 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: Aldy Hernandez via Gcc-patches From: Aldy Hernandez Reply-To: Aldy Hernandez Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" 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) == 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 = opt_for_fn (fbi->node->decl, param_ipa_max_switch_predicate_bounds); int bound_count = 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 = get_legacy_range (vr, vr_min, vr_max); wide_int vr_wmin = wi::to_wide (vr_min); wide_int vr_wmax = 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 = cs->call_stmt; int n, arg_num = gimple_call_num_args (call); bool useful_context = false; - value_range vr; if (arg_num == 0 || args->jump_functions) return; @@ -2379,6 +2378,7 @@ ipa_compute_jump_functions_for_edge (struct ipa_func_body_info *fbi, useful_context = true; } + Value_Range vr (TREE_TYPE (arg)); if (POINTER_TYPE_P (TREE_TYPE (arg))) { bool addr_nonzero = false; @@ -2404,14 +2404,11 @@ ipa_compute_jump_functions_for_edge (struct ipa_func_body_info *fbi, { if (TREE_CODE (arg) == 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 = vr; + Value_Range resvr (vr); range_cast (resvr, param_type); if (!resvr.undefined_p () && !resvr.varying_p ()) ipa_set_jfunc_vr (jfunc, resvr);