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 [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 20006393BC3C for ; Tue, 25 May 2021 23:31:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 20006393BC3C Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-285-kvl54Sw-MgmdzWou46GWHw-1; Tue, 25 May 2021 19:31:31 -0400 X-MC-Unique: kvl54Sw-MgmdzWou46GWHw-1 Received: by mail-qk1-f198.google.com with SMTP id d201-20020ae9efd20000b02902e9e9d8d9dcso31139059qkg.10 for ; Tue, 25 May 2021 16:31:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-language; bh=YEsTIUFBLmYNa3RHb80C+ojuwsIjNQf6JJsVO8I8U9k=; b=QaPiuK4xRK9cBl1/kua/M1Sfu8+R3d54MKxZnoaVQm2aW9ZE07AHWQUzjQNYSmFR3b WXqPh2CtAX/G7Hvm3jnBRQofDday/C32v/n7ZdpsDFT+Nez9vu4EyO9YNxuCZZeZMegB /SlQcWtmLBnKnd9uApS1FLXLTd/moj1ANxB9Fkizq2Pjco15YqezA1K4xAYBhpCUu+bk CxFntmU07PpYJ4/FDx8tyoYEtKoyq4w7l4YSGVgXHW8DjtKv/REe+Hd17tAY1w6EIvur Q1CVxbtXSWHtSKo9fvw+lnp0hZ6WkQi40WzIAQr1x9MmO5bkaR1T2MGctalnm2AqndvV JbJw== X-Gm-Message-State: AOAM530iGUG5J9CTTScykD5uwUF34PdhWTPbR7w03LnDkO9J2bQqiTxj VmgkY/98FkKjsqBiMqtaspUy4z8RRVWByg81b76TYtgYM7+yrhM9BKNep1RQFL6YNo8X6UroLbC o3OgWkMT8v06B0w2sWA== X-Received: by 2002:a05:620a:118a:: with SMTP id b10mr37576748qkk.263.1621985490955; Tue, 25 May 2021 16:31:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwnzjLxkncNGVYIThcCa7roT0lLOVaPAjUuRVFMa3DMrANxVbio9eQzMP+8fgiN/mweDp8ndA== X-Received: by 2002:a05:620a:118a:: with SMTP id b10mr37576740qkk.263.1621985490813; Tue, 25 May 2021 16:31:30 -0700 (PDT) Received: from ?IPv6:2607:fea8:a25d:e700::2b5? ([2607:fea8:a25d:e700::2b5]) by smtp.gmail.com with ESMTPSA id e20sm405430qto.93.2021.05.25.16.31.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 25 May 2021 16:31:30 -0700 (PDT) To: gcc-patches From: Andrew MacLeod Subject: [PATCH 7/8] Adjust fur_source internal api to use gori_compute not, ranger_cache. Message-ID: <96532e40-6aa1-4816-f4a6-661de2e31403@redhat.com> Date: Tue, 25 May 2021 19:31:29 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.9.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="------------64806338D2DB50B825E8A93E" Content-Language: en-CA X-Spam-Status: No, score=-12.1 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, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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-List-Received-Date: Tue, 25 May 2021 23:31:35 -0000 This is a multi-part message in MIME format. --------------64806338D2DB50B825E8A93E Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit I introduced fur_source  a week ago or so to act as the source for operands of fold_stmt.. ie, it encapsulated a range_query source to get operands for the arguments of a stmt when fold_stmt was invoked. One of the API points was an internal ranger version which contains a reference to a ranger_cache for various dependency set-upo/query reasons.   That has been relocated to gori_compute now, so change that class to use a gori_compute class reference instead of a ranger_cache object. Again, no functional change.  Bootstraps on x86_64-pc-linux-gnu with no regressions.  Pushed. Andrew --------------64806338D2DB50B825E8A93E Content-Type: text/x-patch; charset=UTF-8; name="0007-Adjust-fur_source-internal-api-to-use-gori_compute-n.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0007-Adjust-fur_source-internal-api-to-use-gori_compute-n.pa"; filename*1="tch" >From f630797a1ed2f82faf965a47b43b5f995bc6623a Mon Sep 17 00:00:00 2001 From: Andrew MacLeod Date: Tue, 25 May 2021 14:55:04 -0400 Subject: [PATCH 7/8] Adjust fur_source internal api to use gori_compute not ranger_cache. In order to access the dependencies, the FoldUsingRange source API class stored a range_cache.. THis is now contained in the base gori_compute class, so use that now. * gimple-range.cc (fold_using_range::range_of_range_op): Use m_gori intead of m_cache. (fold_using_range::range_of_address): Adjust. (fold_using_range::range_of_phi): Adjust. * gimple-range.h (class fur_source): Adjust. (fur_source::fur_source): Adjust. --- gcc/gimple-range.cc | 18 +++++++++--------- gcc/gimple-range.h | 12 ++++++------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/gcc/gimple-range.cc b/gcc/gimple-range.cc index 593ddb1c3f8..e2d24d6e451 100644 --- a/gcc/gimple-range.cc +++ b/gcc/gimple-range.cc @@ -435,17 +435,17 @@ fold_using_range::range_of_range_op (irange &r, gimple *s, fur_source &src) // Fold range, and register any dependency if available. int_range<2> r2 (type); handler->fold_range (r, type, range1, r2); - if (lhs && src.m_cache) - src.m_cache->register_dependency (lhs, op1); + if (lhs && src.m_gori) + src.m_gori->register_dependency (lhs, op1); } else if (src.get_operand (range2, op2)) { // Fold range, and register any dependency if available. handler->fold_range (r, type, range1, range2); - if (lhs && src.m_cache) + if (lhs && src.m_gori) { - src.m_cache->register_dependency (lhs, op1); - src.m_cache->register_dependency (lhs, op2); + src.m_gori->register_dependency (lhs, op1); + src.m_gori->register_dependency (lhs, op2); } } else @@ -485,8 +485,8 @@ fold_using_range::range_of_address (irange &r, gimple *stmt, fur_source &src) { tree ssa = TREE_OPERAND (base, 0); tree lhs = gimple_get_lhs (stmt); - if (src.m_cache && lhs && gimple_range_ssa_p (ssa)) - src.m_cache->register_dependency (lhs, ssa); + if (src.m_gori && lhs && gimple_range_ssa_p (ssa)) + src.m_gori->register_dependency (lhs, ssa); gcc_checking_assert (irange::supports_type_p (TREE_TYPE (ssa))); src.get_operand (r, ssa); range_cast (r, TREE_TYPE (gimple_assign_rhs1 (stmt))); @@ -563,8 +563,8 @@ fold_using_range::range_of_phi (irange &r, gphi *phi, fur_source &src) edge e = gimple_phi_arg_edge (phi, x); // Register potential dependencies for stale value tracking. - if (src.m_cache && gimple_range_ssa_p (arg)) - src.m_cache->register_dependency (phi_def, arg); + if (src.m_gori && gimple_range_ssa_p (arg)) + src.m_gori->register_dependency (phi_def, arg); // Get the range of the argument on its edge. fur_source e_src (src.m_query, e); diff --git a/gcc/gimple-range.h b/gcc/gimple-range.h index 08035a53238..707dcfe027b 100644 --- a/gcc/gimple-range.h +++ b/gcc/gimple-range.h @@ -84,10 +84,10 @@ class fur_source public: inline fur_source (range_query *q, edge e); inline fur_source (range_query *q, gimple *s); - inline fur_source (range_query *q, class ranger_cache *g, edge e, gimple *s); + inline fur_source (range_query *q, gori_compute *g, edge e, gimple *s); bool get_operand (irange &r, tree expr); protected: - ranger_cache *m_cache; + gori_compute *m_gori; range_query *m_query; edge m_edge; gimple *m_stmt; @@ -124,7 +124,7 @@ inline fur_source::fur_source (range_query *q, edge e) { m_query = q; - m_cache = NULL; + m_gori = NULL; m_edge = e; m_stmt = NULL; } @@ -135,7 +135,7 @@ inline fur_source::fur_source (range_query *q, gimple *s) { m_query = q; - m_cache = NULL; + m_gori = NULL; m_edge = NULL; m_stmt = s; } @@ -144,10 +144,10 @@ fur_source::fur_source (range_query *q, gimple *s) // and can also set the dependency information as appropriate when invoked. inline -fur_source::fur_source (range_query *q, ranger_cache *g, edge e, gimple *s) +fur_source::fur_source (range_query *q, gori_compute *g, edge e, gimple *s) { m_query = q; - m_cache = g; + m_gori = g; m_edge = e; m_stmt = s; } -- 2.17.2 --------------64806338D2DB50B825E8A93E--