From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from progateway7-pub.mail.pro1.eigbox.com (gproxy5-pub.mail.unifiedlayer.com [67.222.38.55]) by sourceware.org (Postfix) with ESMTPS id EF2BA3858434 for ; Mon, 4 Apr 2022 19:53:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EF2BA3858434 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw15.mail.unifiedlayer.com (unknown [10.0.90.130]) by progateway7.mail.pro1.eigbox.com (Postfix) with ESMTP id 6746C10047C3D for ; Mon, 4 Apr 2022 19:53:43 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id bSlin5fEWkku4bSljnNOmu; Mon, 04 Apr 2022 19:53:43 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=R6XGpfdX c=1 sm=1 tr=0 ts=624b4cc7 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=z0gMJWrwH1QA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=mDV3o1hIAAAA:8 a=2O_svEyqy5OToRjQPBUA:9 a=_FVE-zBwftR9WsbkzFJk:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=qiM5v4TVXIQKMUlYt/rEqyIdy8jVPy+BeuF3s4qy2FM=; b=nRnntVsvO/l3Qzdxayy4qlBjXi 947vLIzaxu4OZhbouGeCXlD/ePPMHl6uPO47moSKESR6wnxamWU4XwbdUSyqawcncANbmC/E6VEul 4A9AUgBIEvfXCGC/5jAFLiG5g; Received: from 71-211-176-135.hlrn.qwest.net ([71.211.176.135]:34800 helo=prentzel.Home) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nbSli-003uD2-Nj; Mon, 04 Apr 2022 13:53:42 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v4 15/34] Introduce DWARF abbrev cache Date: Mon, 4 Apr 2022 13:53:16 -0600 Message-Id: <20220404195335.2111906-16-tom@tromey.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220404195335.2111906-1-tom@tromey.com> References: <20220404195335.2111906-1-tom@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 71.211.176.135 X-Source-L: No X-Exim-ID: 1nbSli-003uD2-Nj X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 71-211-176-135.hlrn.qwest.net (prentzel.Home) [71.211.176.135]:34800 X-Source-Auth: tom+tromey.com X-Email-Count: 23 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3030.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Apr 2022 19:53:46 -0000 The replacement for the DWARF psymbol reader works in a somewhat different way. The current reader reads and stores all the DIEs that might be interesting. Then, if it is missing a DIE, it re-scans the CU and reads them all. This approach is used for both intra- and inter-CU references. I instrumented the partial DIE hash to see how frequently it was used: [ 0] -> 1538165 [ 1] -> 4912 [ 2] -> 96102 [ 3] -> 175 [ 4] -> 244 That is, most DIEs are never used, and some are looked up twice -- but this is just an artifact of the implementation of partial_die_info::fixup, which may do two lookups. Based on this, the new implementation doesn't try to store any DIEs, but instead just re-scans them on demand. In order to do this, though, it is convenient to have a cache of DWARF abbrevs. This way, if a second CU is needed to resolve an inter-CU reference, the abbrevs for that CU need only be computed a single time. --- gdb/Makefile.in | 1 + gdb/dwarf2/abbrev-cache.c | 65 +++++++++++++++++++++++++++++++++++++++ gdb/dwarf2/abbrev-cache.h | 58 ++++++++++++++++++++++++++++++++++ gdb/dwarf2/abbrev.c | 5 +-- gdb/dwarf2/abbrev.h | 4 ++- 5 files changed, 130 insertions(+), 3 deletions(-) create mode 100644 gdb/dwarf2/abbrev-cache.c create mode 100644 gdb/dwarf2/abbrev-cache.h diff --git a/gdb/Makefile.in b/gdb/Makefile.in index ba6ab8f6412..ab1bdd1d28a 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1044,6 +1044,7 @@ COMMON_SFILES = \ displaced-stepping.c \ dummy-frame.c \ dwarf2/abbrev.c \ + dwarf2/abbrev-cache.c \ dwarf2/attribute.c \ dwarf2/comp-unit-head.c \ dwarf2/cu.c \ diff --git a/gdb/dwarf2/abbrev-cache.c b/gdb/dwarf2/abbrev-cache.c new file mode 100644 index 00000000000..f0705065a3c --- /dev/null +++ b/gdb/dwarf2/abbrev-cache.c @@ -0,0 +1,65 @@ +/* DWARF 2 abbrev table cache + + Copyright (C) 2021 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include "defs.h" +#include "dwarf2/read.h" +#include "dwarf2/abbrev-cache.h" + +/* Hash function for an abbrev table. */ + +hashval_t +abbrev_cache::hash_table (const void *item) +{ + const struct abbrev_table *table = (const struct abbrev_table *) item; + return to_underlying (table->sect_off); +} + +/* Comparison function for abbrev table. */ + +int +abbrev_cache::eq_table (const void *lhs, const void *rhs) +{ + const struct abbrev_table *l_table = (const struct abbrev_table *) lhs; + const search_key *key = (const search_key *) rhs; + return (l_table->section == key->section + && l_table->sect_off == key->offset); +} + +abbrev_cache::abbrev_cache () + : m_tables (htab_create_alloc (20, hash_table, eq_table, + htab_delete_entry, + xcalloc, xfree)) +{ +} + +void +abbrev_cache::add (abbrev_table_up table) +{ + /* We allow this as a convenience to the caller. */ + if (table == nullptr) + return; + + search_key key = { table->section, table->sect_off }; + void **slot = htab_find_slot_with_hash (m_tables.get (), &key, + to_underlying (table->sect_off), + INSERT); + /* If this one already existed, then it should have been reused. */ + gdb_assert (*slot == nullptr); + *slot = (void *) table.release (); +} diff --git a/gdb/dwarf2/abbrev-cache.h b/gdb/dwarf2/abbrev-cache.h new file mode 100644 index 00000000000..a651fcc0ec0 --- /dev/null +++ b/gdb/dwarf2/abbrev-cache.h @@ -0,0 +1,58 @@ +/* DWARF abbrev table cache + + Copyright (C) 2020 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#ifndef GDB_DWARF2_ABBREV_CACHE_H +#define GDB_DWARF2_ABBREV_CACHE_H + +#include "dwarf2/abbrev.h" +#include +#include "gdbtypes.h" + +class abbrev_cache +{ +public: + abbrev_cache (); + DISABLE_COPY_AND_ASSIGN (abbrev_cache); + + abbrev_table *find (struct dwarf2_section_info *section, sect_offset offset) + { + search_key key = { section, offset }; + + return (abbrev_table *) htab_find_with_hash (m_tables.get (), &key, + to_underlying (offset)); + } + + void add (abbrev_table_up table); + +private: + + static hashval_t hash_table (const void *item); + static int eq_table (const void *lhs, const void *rhs); + + struct search_key + { + struct dwarf2_section_info *section; + sect_offset offset; + }; + + /* Hash table of abbrev tables. */ + htab_up m_tables; +}; + +#endif /* GDB_DWARF2_ABBREV_CACHE_H */ diff --git a/gdb/dwarf2/abbrev.c b/gdb/dwarf2/abbrev.c index 1dd0818c382..4b65e6b5309 100644 --- a/gdb/dwarf2/abbrev.c +++ b/gdb/dwarf2/abbrev.c @@ -58,8 +58,9 @@ eq_abbrev (const void *lhs, const void *rhs) dies from a section we read in all abbreviations and install them in a hash table. */ -abbrev_table::abbrev_table (sect_offset off) +abbrev_table::abbrev_table (sect_offset off, struct dwarf2_section_info *sect) : sect_off (off), + section (sect), m_abbrevs (htab_create_alloc (20, hash_abbrev, eq_abbrev, nullptr, xcalloc, xfree)) { @@ -85,7 +86,7 @@ abbrev_table::read (struct dwarf2_section_info *section, const gdb_byte *abbrev_ptr; struct abbrev_info *cur_abbrev; - abbrev_table_up abbrev_table (new struct abbrev_table (sect_off)); + abbrev_table_up abbrev_table (new struct abbrev_table (sect_off, section)); struct obstack *obstack = &abbrev_table->m_abbrev_obstack; /* Caller must ensure this. */ diff --git a/gdb/dwarf2/abbrev.h b/gdb/dwarf2/abbrev.h index 414296796e3..b5fa76ad514 100644 --- a/gdb/dwarf2/abbrev.h +++ b/gdb/dwarf2/abbrev.h @@ -85,9 +85,11 @@ struct abbrev_table This is used as a sanity check when the table is used. */ const sect_offset sect_off; + struct dwarf2_section_info *section; + private: - explicit abbrev_table (sect_offset off); + abbrev_table (sect_offset off, struct dwarf2_section_info *sect); DISABLE_COPY_AND_ASSIGN (abbrev_table); -- 2.34.1