From patchwork Tue Apr 18 16:24:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aldy Hernandez X-Patchwork-Id: 1770357 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=LlNxWLHQ; dkim-atps=neutral Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q18RP3l5Zz1yZy for ; Wed, 19 Apr 2023 02:25:36 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D1BD73858438 for ; Tue, 18 Apr 2023 16:25:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D1BD73858438 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1681835133; bh=NFvpvgLC/PNRQon4sgJEBZTINSKWhVLQmmSXB9YPOrA=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=LlNxWLHQzGF6PY6mxE2iMqsWGOPWotKIznTbFQJ2NTS6KeDmE9H299sMifMUzujts eGb5RnpZZdj5r1e4U/t1gZ6slrifCRkg6onixy780vcCVWDsQccTAQbUfFWI/wAHqn Imaq4uKcQ9vwHf9FnhI1utBOgfxUpvoDcrDGwFkM= 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.133.124]) by sourceware.org (Postfix) with ESMTPS id 146933858D1E for ; Tue, 18 Apr 2023 16:25:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 146933858D1E 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-96-SeSZhelOPfOT0ewszIa_iQ-1; Tue, 18 Apr 2023 12:25:03 -0400 X-MC-Unique: SeSZhelOPfOT0ewszIa_iQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AAC6888B7A6 for ; Tue, 18 Apr 2023 16:25:02 +0000 (UTC) Received: from abulafia.quesejoda.com (unknown [10.39.194.164]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5DA661410F1E; Tue, 18 Apr 2023 16:25:01 +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 33IGOxm3338641 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 18 Apr 2023 18:24:59 +0200 Received: (from aldyh@localhost) by abulafia.quesejoda.com (8.17.1/8.17.1/Submit) id 33IGOxkw338640; Tue, 18 Apr 2023 18:24:59 +0200 To: GCC patches Cc: Andrew MacLeod , Aldy Hernandez Subject: [COMMITTED] Add GTY support for vrange. Date: Tue, 18 Apr 2023 18:24:57 +0200 Message-Id: <20230418162457.338626-1-aldyh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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, 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" IPA currently puts *some* irange's in GC memory. When I contribute support for generic ranges in IPA, we'll need to change this to vrange. This patch adds GTY support for both vrange and frange. gcc/ChangeLog: * value-range.cc (gt_ggc_mx): New. (gt_pch_nx): New. * value-range.h (class vrange): Add GTY marker. (class frange): Same. (gt_ggc_mx): Remove. (gt_pch_nx): Remove. --- gcc/value-range.cc | 85 ++++++++++++++++++++++++++++++++++++++++++++++ gcc/value-range.h | 51 ++++++++-------------------- 2 files changed, 99 insertions(+), 37 deletions(-) diff --git a/gcc/value-range.cc b/gcc/value-range.cc index 3b3102bc6d0..17f4e1b9f59 100644 --- a/gcc/value-range.cc +++ b/gcc/value-range.cc @@ -3252,6 +3252,91 @@ vrp_operand_equal_p (const_tree val1, const_tree val2) return true; } +void +gt_ggc_mx (irange *x) +{ + for (unsigned i = 0; i < x->m_num_ranges; ++i) + { + gt_ggc_mx (x->m_base[i * 2]); + gt_ggc_mx (x->m_base[i * 2 + 1]); + } + if (x->m_nonzero_mask) + gt_ggc_mx (x->m_nonzero_mask); +} + +void +gt_pch_nx (irange *x) +{ + for (unsigned i = 0; i < x->m_num_ranges; ++i) + { + gt_pch_nx (x->m_base[i * 2]); + gt_pch_nx (x->m_base[i * 2 + 1]); + } + if (x->m_nonzero_mask) + gt_pch_nx (x->m_nonzero_mask); +} + +void +gt_pch_nx (irange *x, gt_pointer_operator op, void *cookie) +{ + for (unsigned i = 0; i < x->m_num_ranges; ++i) + { + op (&x->m_base[i * 2], NULL, cookie); + op (&x->m_base[i * 2 + 1], NULL, cookie); + } + if (x->m_nonzero_mask) + op (&x->m_nonzero_mask, NULL, cookie); +} + +void +gt_ggc_mx (frange *x) +{ + gt_ggc_mx (x->m_type); +} + +void +gt_pch_nx (frange *x) +{ + gt_pch_nx (x->m_type); +} + +void +gt_pch_nx (frange *x, gt_pointer_operator op, void *cookie) +{ + op (&x->m_type, NULL, cookie); +} + +void +gt_ggc_mx (vrange *x) +{ + if (is_a (*x)) + return gt_ggc_mx ((irange *) x); + if (is_a (*x)) + return gt_ggc_mx ((frange *) x); + gcc_unreachable (); +} + +void +gt_pch_nx (vrange *x) +{ + if (is_a (*x)) + return gt_pch_nx ((irange *) x); + if (is_a (*x)) + return gt_pch_nx ((frange *) x); + gcc_unreachable (); +} + +void +gt_pch_nx (vrange *x, gt_pointer_operator op, void *cookie) +{ + if (is_a (*x)) + gt_pch_nx ((irange *) x, op, cookie); + else if (is_a (*x)) + gt_pch_nx ((frange *) x, op, cookie); + else + gcc_unreachable (); +} + // ?? These stubs are for ipa-prop.cc which use a value_range in a // hash_traits. hash-traits.h defines an extern of gt_ggc_mx (T &) // instead of picking up the gt_ggc_mx (T *) version. diff --git a/gcc/value-range.h b/gcc/value-range.h index 5545cce5024..0eeea79b322 100644 --- a/gcc/value-range.h +++ b/gcc/value-range.h @@ -72,7 +72,7 @@ enum value_range_discriminator // if (f.supports_type_p (type)) ... // } -class vrange +class GTY((user)) vrange { template friend bool is_a (vrange &); friend class Value_Range; @@ -329,10 +329,13 @@ nan_state::neg_p () const // The representation is a type with a couple of endpoints, unioned // with the set of { -NAN, +Nan }. -class frange : public vrange +class GTY((user)) frange : public vrange { friend class frange_storage_slot; friend class vrange_printer; + friend void gt_ggc_mx (frange *); + friend void gt_pch_nx (frange *); + friend void gt_pch_nx (frange *, gt_pointer_operator, void *); public: frange (); frange (const frange &); @@ -827,41 +830,15 @@ range_includes_zero_p (const irange *vr) return vr->may_contain_p (build_zero_cst (vr->type ())); } -inline void -gt_ggc_mx (irange *x) -{ - for (unsigned i = 0; i < x->m_num_ranges; ++i) - { - gt_ggc_mx (x->m_base[i * 2]); - gt_ggc_mx (x->m_base[i * 2 + 1]); - } - if (x->m_nonzero_mask) - gt_ggc_mx (x->m_nonzero_mask); -} - -inline void -gt_pch_nx (irange *x) -{ - for (unsigned i = 0; i < x->m_num_ranges; ++i) - { - gt_pch_nx (x->m_base[i * 2]); - gt_pch_nx (x->m_base[i * 2 + 1]); - } - if (x->m_nonzero_mask) - gt_pch_nx (x->m_nonzero_mask); -} - -inline void -gt_pch_nx (irange *x, gt_pointer_operator op, void *cookie) -{ - for (unsigned i = 0; i < x->m_num_ranges; ++i) - { - op (&x->m_base[i * 2], NULL, cookie); - op (&x->m_base[i * 2 + 1], NULL, cookie); - } - if (x->m_nonzero_mask) - op (&x->m_nonzero_mask, NULL, cookie); -} +extern void gt_ggc_mx (vrange *); +extern void gt_pch_nx (vrange *); +extern void gt_pch_nx (vrange *, gt_pointer_operator, void *); +extern void gt_ggc_mx (irange *); +extern void gt_pch_nx (irange *); +extern void gt_pch_nx (irange *, gt_pointer_operator, void *); +extern void gt_ggc_mx (frange *); +extern void gt_pch_nx (frange *); +extern void gt_pch_nx (frange *, gt_pointer_operator, void *); template inline void