From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gproxy4-pub.mail.unifiedlayer.com (gproxy4-pub.mail.unifiedlayer.com [69.89.23.142]) by sourceware.org (Postfix) with ESMTPS id 31399385801E for ; Mon, 4 Apr 2022 19:53:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 31399385801E 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 cmgw13.mail.unifiedlayer.com (unknown [10.0.90.128]) by progateway6.mail.pro1.eigbox.com (Postfix) with ESMTP id 9938110044F5B for ; Mon, 4 Apr 2022 19:53:48 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id bSlnnVknQY8ycbSlon7Zn9; Mon, 04 Apr 2022 19:53:48 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=e+XD9Yl/ c=1 sm=1 tr=0 ts=624b4ccc 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=T1PaN6NXMAtfr4LbOhIA:9 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=PaFSVhrgkjSC4sbyqhnq9yjrujZpXeZW73aZpiKL8hI=; b=Kw7lDvmUtbDSmax0NGBA+GNZcP gD9OVbeXdtHC+GrnN9/v8dqAP6AeGQdS0W5x52lukb/Jwi5EJ/n/8t8TJkK16jVA4azqvLG0AmAlj Mok+6zj74Mf2edvItzrqJbEFT; Received: from 71-211-176-135.hlrn.qwest.net ([71.211.176.135]:34804 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 1nbSln-003uM1-Kc; Mon, 04 Apr 2022 13:53:47 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v4 32/34] Enable the new DWARF indexer Date: Mon, 4 Apr 2022 13:53:33 -0600 Message-Id: <20220404195335.2111906-33-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: 1nbSln-003uM1-Kc X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 71-211-176-135.hlrn.qwest.net (prentzel.Home) [71.211.176.135]:34804 X-Source-Auth: tom+tromey.com X-Email-Count: 40 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3030.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, 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:50 -0000 This patch finally enables the new indexer. It is left until this point in the series to avoid any regressions; in particular, it has to come after the changes to the DWARF index writer to avoid this problem. However, if you experiment with the series, this patch can be moved anywhere from the patch to wire in the new reader to this point. Moving this patch around is how I got separate numbers for the parallelization and background finalization patches. In the ongoing performance example, this reduces the time from the baseline of 1.598869 to 0.903534. --- gdb/dwarf2/read.c | 3 ++- gdb/testsuite/gdb.base/maint.exp | 14 +++++++++++--- gdb/testsuite/gdb.dwarf2/dw2-missing-cu-tag.exp | 3 +-- gdb/testsuite/lib/gdb.exp | 2 +- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 87512449680..02c4e640a06 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -5706,7 +5706,8 @@ dwarf2_initialize_objfile (struct objfile *objfile) } global_index_cache.miss (); - objfile->qf.push_front (make_lazy_dwarf_reader ()); + per_bfd->using_index = true; + objfile->qf.push_front (make_cooked_index_funcs ()); } diff --git a/gdb/testsuite/gdb.base/maint.exp b/gdb/testsuite/gdb.base/maint.exp index 6f7bd2d24a7..45ccdc6584e 100644 --- a/gdb/testsuite/gdb.base/maint.exp +++ b/gdb/testsuite/gdb.base/maint.exp @@ -200,11 +200,11 @@ set re \ " Number of symbol tables: $decimal" \ " Number of symbol tables with line tables: $decimal" \ " Number of symbol tables with blockvectors: $decimal" \ - "( Number of read CUs: $decimal" \ - " Number of unread CUs: $decimal" \ - ")?( Number of \"partial\" symbols read: $decimal" \ + "( Number of \"partial\" symbols read: $decimal" \ ")?( Number of psym tables \\(not yet expanded\\): $decimal" \ ")?( Total memory used for psymbol cache: $decimal" \ + ")?( Number of read CUs: $decimal" \ + " Number of unread CUs: $decimal" \ ")? Total memory used for objfile obstack: $decimal" \ " Total memory used for BFD obstack: $decimal" \ " Total memory used for string cache: $decimal" \ @@ -224,12 +224,17 @@ gdb_test_no_output "maint print dummy-frames" set header 0 set psymtabs 0 +set cooked_index 0 set symtabs 0 gdb_test_multiple "maint print objfiles" "" -lbl { -re "\r\nObject file.*maint($EXEEXT)?: Objfile at ${hex}" { set header 1 exp_continue } + -re "\r\nCooked index" { + set cooked_index 1 + exp_continue + } -re "\r\nPsymtabs:\[\r\t \]+" { set psymtabs 1 exp_continue @@ -248,6 +253,9 @@ proc maint_pass_if {val name} { } maint_pass_if $header "maint print objfiles: header" +if {$cooked_index} { + set have_psyms 0 +} if { $have_psyms } { maint_pass_if $psymtabs "maint print objfiles: psymtabs" } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-missing-cu-tag.exp b/gdb/testsuite/gdb.dwarf2/dw2-missing-cu-tag.exp index 1afcaa3b502..3ac94c31689 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-missing-cu-tag.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-missing-cu-tag.exp @@ -54,8 +54,7 @@ clean_restart set pattern1 \ [multi_line \ "Reading symbols from \[^\r\n\]+" \ - "Dwarf Error: unexpected tag 'DW_TAG_subprogram' at offset $hex \\\[\[^\r\n\]+\\\]" \ - "\\(No debugging symbols \[^\r\n\]+\\)"] + "Dwarf Error: unexpected tag 'DW_TAG_subprogram' at offset $hex \\\[\[^\r\n\]+\\\]"] # This pattern is hit when GDB does use -readnow (e.g. running with # --target_board=readnow). diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 0b242b64992..84a9eb8a118 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -8070,7 +8070,7 @@ proc ensure_gdb_index { binfile {style ""} } { set has_index 1 gdb_test_lines "" $gdb_test_name ".*" } - -re "\r\nPsymtabs:(?=\r\n)" { + -re "\r\n(Cooked index in use|Psymtabs)(?=\r\n)" { gdb_test_lines "" $gdb_test_name ".*" } -re ".gdb_index: faked for \"readnow\"" { -- 2.34.1