From patchwork Tue Dec 12 17:32:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 81985 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 6A753385C418 for ; Tue, 12 Dec 2023 17:33:25 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id 6CA5138582A0 for ; Tue, 12 Dec 2023 17:32:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6CA5138582A0 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 6CA5138582A0 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702402346; cv=none; b=CJFBoTT8PDPuL0sUyaPB1rCpJOyIRy2k45NW0xAQwCBvLlI2pkKKAkqAUVX+jOC0MpFAj9jf+t4zRx7TZ5jHfvcHW8YaAM8vrYXyaorJFzn3c4lw2ZnMl0nz/S6Ztu+CiT7cwukXDzG7XnLvhmixM9wVim4j6tnlMQu1OIXIThc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702402346; c=relaxed/simple; bh=9DR74faL1AYUKcy5OIzybqTb0fmL1VTZY7UCcgddUDU=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=i94giVE91yIG6+EoaQpTUZtUGGh+MLEAdfW7+S1ZGQDpZb9RxGOOdyRqhPxKTyBDhOLLUs7ct30CtW5wjDIIotcLyiywluz8VbySLf5GkROnh3dRSIF6s26EbzC3R19aN3LS7p34BGnkEo1f69JN3kPbNvGWpfUW5i435NtRRjA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id A50131FD00 for ; Tue, 12 Dec 2023 17:32:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1702402342; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZdgzZFTdA8kZA617qqLtUwVgSYqWMViCpEGfh2rjHSI=; b=NvKwnToH5F6XsegLB8eLDPA9zHtEUeBDUGbvHSuRxCAMX8llbphtXHeFz4SzXvlMuWCELa Z4jtYBnxpfJmvbLjS2nno3/AT1gZe5Yu+3wTucHMd7BgU1QtOZt2OtJZlPPl3xUiFKoqf+ yTb3Ty3dS6VOfJ3cArD1/GSCgmWpO14= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1702402342; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZdgzZFTdA8kZA617qqLtUwVgSYqWMViCpEGfh2rjHSI=; b=pYklfZQ0aJLbrVYKETWCCiBur/c36okw3tbwEeAQW0bI6GVHw9suyYw4dvn/YRHwCktUus 7csKoE/ya0HYl7AQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1702402342; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZdgzZFTdA8kZA617qqLtUwVgSYqWMViCpEGfh2rjHSI=; b=NvKwnToH5F6XsegLB8eLDPA9zHtEUeBDUGbvHSuRxCAMX8llbphtXHeFz4SzXvlMuWCELa Z4jtYBnxpfJmvbLjS2nno3/AT1gZe5Yu+3wTucHMd7BgU1QtOZt2OtJZlPPl3xUiFKoqf+ yTb3Ty3dS6VOfJ3cArD1/GSCgmWpO14= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1702402342; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZdgzZFTdA8kZA617qqLtUwVgSYqWMViCpEGfh2rjHSI=; b=pYklfZQ0aJLbrVYKETWCCiBur/c36okw3tbwEeAQW0bI6GVHw9suyYw4dvn/YRHwCktUus 7csKoE/ya0HYl7AQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 9020513A9B for ; Tue, 12 Dec 2023 17:32:22 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id CJz4ISaZeGVaPQAAD6G6ig (envelope-from ) for ; Tue, 12 Dec 2023 17:32:22 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v2 08/13] [gdb/symtab] Keep track of processed DIEs in shard Date: Tue, 12 Dec 2023 18:32:34 +0100 Message-Id: <20231212173239.16793-9-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20231212173239.16793-1-tdevries@suse.de> References: <20231212173239.16793-1-tdevries@suse.de> MIME-Version: 1.0 X-Spam-Level: *** X-Spam-Score: 3.99 X-Spam-Level: Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=NvKwnToH; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=pYklfZQ0; dmarc=pass (policy=none) header.from=suse.de; spf=softfail (smtp-out2.suse.de: 2a07:de40:b281:104:10:150:64:97 is neither permitted nor denied by domain of tdevries@suse.de) smtp.mailfrom=tdevries@suse.de X-Rspamd-Server: rspamd2 X-Spamd-Result: default: False [-7.51 / 50.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; R_MISSING_CHARSET(2.50)[]; TO_DN_NONE(0.00)[]; BROKEN_CONTENT_TYPE(1.50)[]; R_SPF_SOFTFAIL(0.00)[~all:c]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[suse.de:+]; DMARC_POLICY_ALLOW(0.00)[suse.de,none]; MX_GOOD(-0.01)[]; DMARC_POLICY_ALLOW_WITH_FAILURES(-0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; DWL_DNSWL_HI(-3.50)[suse.de:dkim]; RCPT_COUNT_ONE(0.00)[1]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; WHITELIST_DMARC(-7.00)[suse.de:D:+]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: -7.51 X-Rspamd-Queue-Id: A50131FD00 X-Spam-Flag: NO X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, 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: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org For optimizations in two following patches, we keep track in each shard which DIEs have been processed. Tested on x86_64-linux. --- gdb/dwarf2/cooked-index.c | 1 + gdb/dwarf2/cooked-index.h | 15 +++++++++++++++ gdb/dwarf2/read.c | 24 ++++++++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/gdb/dwarf2/cooked-index.c b/gdb/dwarf2/cooked-index.c index ba37d4a820c..1368636d4b3 100644 --- a/gdb/dwarf2/cooked-index.c +++ b/gdb/dwarf2/cooked-index.c @@ -722,6 +722,7 @@ cooked_index::handle_deferred_entries () { shard->m_die_range_map.reset (nullptr); shard->m_deferred_entries.reset (nullptr); + shard->m_die_range_map_valid.reset (nullptr); } } diff --git a/gdb/dwarf2/cooked-index.h b/gdb/dwarf2/cooked-index.h index de54a788c42..9b233e0f344 100644 --- a/gdb/dwarf2/cooked-index.h +++ b/gdb/dwarf2/cooked-index.h @@ -316,6 +316,7 @@ class cooked_index_shard { m_die_range_map.reset (new parent_map); m_deferred_entries.reset (new std::vector); + m_die_range_map_valid.reset (new addrmap_mutable); } DISABLE_COPY_AND_ASSIGN (cooked_index_shard); @@ -407,6 +408,18 @@ class cooked_index_shard const cooked_index_entry *resolve_deferred_entry (const deferred_entry &entry, const cooked_index_entry *parent_entry); + /* Mark parents in range [START, END] as valid . */ + void set_parent_valid (CORE_ADDR start, CORE_ADDR end) + { + m_die_range_map_valid->set_empty (start, end, (void *) 1); + } + + /* Return true if find_parents can be relied upon. */ + bool parent_valid (CORE_ADDR addr) + { + return m_die_range_map_valid->find (addr) != nullptr; + } + private: /* Return the entry that is believed to represent the program's @@ -470,6 +483,8 @@ class cooked_index_shard understand this. */ std::unique_ptr m_die_range_map; + std::unique_ptr m_die_range_map_valid; + /* The generated DWARF can sometimes have the declaration for a method in a class (or perhaps namespace) scope, with the definition appearing outside this scope... just one of the many diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index ec58125499c..e8d5f0a1a9c 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -4516,6 +4516,12 @@ class cooked_index_storage m_index->defer_entry (de); } + /* Mark parents in range [START, END] as valid . */ + void set_parent_valid (CORE_ADDR start, CORE_ADDR end) + { + m_index->set_parent_valid (start, end); + } + private: /* Hash function for a cutu_reader. */ @@ -4659,6 +4665,11 @@ class cooked_indexer { m_index_storage->defer_entry (de); } + + void set_parent_valid (CORE_ADDR start, CORE_ADDR end) + { + m_index_storage->set_parent_valid (start, end); + } }; /* Subroutine of dwarf2_build_psymtabs_hard to simplify it. @@ -16364,6 +16375,11 @@ cooked_indexer::index_dies (cutu_reader *reader, + to_underlying (reader->cu->header.sect_off) + reader->cu->header.get_length_with_initial ()); + const CORE_ADDR start_cu + = parent_map::form_addr (sect_offset (info_ptr - reader->buffer), + reader->cu->per_cu->is_dwz, + reader->cu->per_cu->is_debug_types); + while (info_ptr < end_ptr) { sect_offset this_die = (sect_offset) (info_ptr - reader->buffer); @@ -16514,6 +16530,14 @@ cooked_indexer::index_dies (cutu_reader *reader, } } + { + CORE_ADDR end_prev_die + = parent_map::form_addr (sect_offset (info_ptr - reader->buffer - 1), + reader->cu->per_cu->is_dwz, + reader->cu->per_cu->is_debug_types); + set_parent_valid (start_cu, end_prev_die); + } + return info_ptr; }