From patchwork Sun Jul 24 15:04:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aldy Hernandez X-Patchwork-Id: 56290 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 913FB385E02C for ; Sun, 24 Jul 2022 15:06:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 913FB385E02C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1658675167; bh=j1QoNdy3fMUqbWg5kucO7BIrCfff7QDHQ1gntwHBjn8=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=KQeVamciMVcIz+hHsTV5hlHQx+/HiS3bAIWjrhbByNBJWAFhtMTXdIm99nj9qSNGF RWsBqc/DqDYqHbMjw2Ynde4P1PXqbG+IS53CAnvDMXoVSD7w7QKheg/6sPMWWnsQx4 CdodFSBz2oYG1Jxt8xewripRJNX+HRO8pxxkOT0Y= 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 38C073858428 for ; Sun, 24 Jul 2022 15:04:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 38C073858428 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-269-s_Feud-kNDyxz4KW3vk8pA-1; Sun, 24 Jul 2022 11:04:38 -0400 X-MC-Unique: s_Feud-kNDyxz4KW3vk8pA-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 90CC3802D2C for ; Sun, 24 Jul 2022 15:04:38 +0000 (UTC) Received: from abulafia.quesejoda.com (unknown [10.39.192.85]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 30A3C492CA2; Sun, 24 Jul 2022 15:04:38 +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 26OF4Z4D2010501 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Sun, 24 Jul 2022 17:04:36 +0200 Received: (from aldyh@localhost) by abulafia.quesejoda.com (8.17.1/8.17.1/Submit) id 26OF4Zb62010500; Sun, 24 Jul 2022 17:04:35 +0200 To: GCC patches Subject: [COMMITTED] Convert some uses in ranger_cache and DOM to vrange. Date: Sun, 24 Jul 2022 17:04:28 +0200 Message-Id: <20220724150431.2010479-1-aldyh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.0 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_LOW, SPF_HELO_NONE, SPF_NONE, 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: 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" Here are a few conversions to type agnostic vrange I found while working on frange. Tested on x86-64 Linux. gcc/ChangeLog: * gimple-range-cache.cc (ranger_cache::edge_range): Convert to vrange. (ranger_cache::range_from_dom): Same. * tree-ssa-dom.cc (dom_opt_dom_walker::set_global_ranges_from_unreachable_edges): Same. --- gcc/gimple-range-cache.cc | 7 ++++--- gcc/tree-ssa-dom.cc | 18 ++++++++++-------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/gcc/gimple-range-cache.cc b/gcc/gimple-range-cache.cc index f3292fccaee..d9e160c9a2a 100644 --- a/gcc/gimple-range-cache.cc +++ b/gcc/gimple-range-cache.cc @@ -960,7 +960,7 @@ ranger_cache::edge_range (vrange &r, edge e, tree name, enum rfd_mode mode) // If this is not an abnormal edge, check for inferred ranges on exit. if ((e->flags & (EDGE_EH | EDGE_ABNORMAL)) == 0) m_exit.maybe_adjust_range (r, name, e->src); - int_range_max er; + Value_Range er (TREE_TYPE (name)); if (m_gori.outgoing_edge_range_p (er, e, name, *this)) r.intersect (er); return true; @@ -1364,7 +1364,8 @@ ranger_cache::range_from_dom (vrange &r, tree name, basic_block start_bb, basic_block prev_bb = start_bb; // Track any inferred ranges seen. - int_range_max infer (TREE_TYPE (name)); + Value_Range infer (TREE_TYPE (name)); + infer.set_varying (TREE_TYPE (name)); // Range on entry to the DEF block should not be queried. gcc_checking_assert (start_bb != def_bb); @@ -1431,7 +1432,7 @@ ranger_cache::range_from_dom (vrange &r, tree name, basic_block start_bb, // Now process any blocks wit incoming edges that nay have adjustemnts. while (m_workback.length () > start_limit) { - int_range_max er; + Value_Range er (TREE_TYPE (name)); prev_bb = m_workback.pop (); if (!single_pred_p (prev_bb)) { diff --git a/gcc/tree-ssa-dom.cc b/gcc/tree-ssa-dom.cc index f5e8f574997..44dc27b464c 100644 --- a/gcc/tree-ssa-dom.cc +++ b/gcc/tree-ssa-dom.cc @@ -1233,20 +1233,22 @@ dom_opt_dom_walker::set_global_ranges_from_unreachable_edges (basic_block bb) gimple *stmt = last_stmt (pred_e->src); tree name; - int_range_max r; if (stmt && gimple_code (stmt) == GIMPLE_COND && (name = gimple_cond_lhs (stmt)) && TREE_CODE (name) == SSA_NAME - && r.supports_type_p (TREE_TYPE (name)) && assert_unreachable_fallthru_edge_p (pred_e) - && all_uses_feed_or_dominated_by_stmt (name, stmt) - && m_ranger->range_on_edge (r, pred_e, name) - && !r.varying_p () - && !r.undefined_p ()) + && all_uses_feed_or_dominated_by_stmt (name, stmt)) { - set_range_info (name, r); - maybe_set_nonzero_bits (pred_e, name); + Value_Range r (TREE_TYPE (name)); + + if (m_ranger->range_on_edge (r, pred_e, name) + && !r.varying_p () + && !r.undefined_p ()) + { + set_range_info (name, r); + maybe_set_nonzero_bits (pred_e, name); + } } }