From patchwork Thu Nov 2 22:26:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Namhyung Kim X-Patchwork-Id: 161138 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp679708vqu; Thu, 2 Nov 2023 15:28:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHskp1oIsvUBxtgrx+U7BbwR28R1fSVn2ncUFwfPHGmc/CvYHaz+YnlsmGSJZ8aVc1NTL/b X-Received: by 2002:a05:6a21:4841:b0:181:8e2:ba3c with SMTP id au1-20020a056a21484100b0018108e2ba3cmr9628231pzc.19.1698964112082; Thu, 02 Nov 2023 15:28:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698964112; cv=none; d=google.com; s=arc-20160816; b=NwSKmO6yvYnKqZFUxDvDu+v1tqvttb/p2NAiUZ2mPBu81JWb0iYT/57vj733R8YsvX i3OgvxCSQG2J4MGtbmwlSTaDZVKAQzC/yytzCVeNH4sPzQwj0cyyfrIbqz5fBj7ognD1 4X4Hn0HGvxXOamfCidTE6nXTeVncibqcavcnc1LxUMSszE9JokrvYIpZS8turbIVM9go v6nCtyH3gCT7d5k80YS05z74Tnz1bdmqGXaGlKNJqaHlggV1o1i0el3QHxhK78nXBNCy qBdHPfXDLNnJ5J/1cFPnUeO7aojZfBi1hNKAVTG+oi/hgOfcg8piv60qc0UNkEpXdprv Q+pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=UfeDJJAakAHGSmerBO7TwpTzcsIOcntyODz+PgBSHd0=; fh=/TViaxNXj9Ubl1KVZseJCqJutBKG0dvzf3DPkf/1G64=; b=U5K5RHWYzNd1SPKepLzXLccPAQpBlsX8R2OxYu1NVvVUU+XHoN+hV/2z60QHnTqnnZ KmnrgV7ld7CDJD0wi55fMnAjyliVc5bHZQqWWmUMmmO39HVeyBjIMRnFDcwxDi7R8wZo 54waXlYIo+m5CKTmq02uHgWf+/FQ4TAKElqDzGyQq8iObrbGSEJvqbp6h8q0mKr6VjK3 Wln4n32+KPsHCyCDC62wXtUriTFitLDdC0EzD7TEYBggcXjJMHMKlnCwLt733kKDfHHm DPOrpspYCMgRCi8e+Dda4nM4BFpA0IjgOqaHzr8jGNL++PmIILQSRu+16uA+xHh5bomm csSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=bY7wOe5y; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id na9-20020a17090b4c0900b002802d12083fsi429811pjb.54.2023.11.02.15.28.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Nov 2023 15:28:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=bY7wOe5y; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 0166D8065007; Thu, 2 Nov 2023 15:27:27 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377518AbjKBW1J (ORCPT + 37 others); Thu, 2 Nov 2023 18:27:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35932 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377503AbjKBW1D (ORCPT ); Thu, 2 Nov 2023 18:27:03 -0400 Received: from mail-pg1-x536.google.com (mail-pg1-x536.google.com [IPv6:2607:f8b0:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91BDDDC; Thu, 2 Nov 2023 15:27:00 -0700 (PDT) Received: by mail-pg1-x536.google.com with SMTP id 41be03b00d2f7-5b9a7357553so1177946a12.0; Thu, 02 Nov 2023 15:27:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698964020; x=1699568820; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=UfeDJJAakAHGSmerBO7TwpTzcsIOcntyODz+PgBSHd0=; b=bY7wOe5yL0wwM16bJryT8fNXF/IGkTKfYUhpNQTfjwlwR9KwyheRZ3A06Up2/OTzou XDb4Q6FpXVeMFe0TP30JX9DLPXvunqqT0gz3vsJoBlfi29Heg31EdMM1+4EWHy0yRBwt EkataOAPqWPyEXZxyE3dboCzxk4RnZBU7EQD5XLZZeON7mK2cdQZd0yRsaPZwTzVR4o2 Pm0cBtb/hcpr80JsG0u3MH692jS6pjwGPyfMpcXsRoECzALy89nN3kx+Ij4+QjrFPx0+ 9DdrQkrOFcgZTdniYUIbuQ5b4KDFrbqy37adK7BPBkshpETJwMYxx/iahiBe1z+B4Cll tbEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698964020; x=1699568820; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=UfeDJJAakAHGSmerBO7TwpTzcsIOcntyODz+PgBSHd0=; b=ldR3m3dPwn5cPP3rWhF/yiTOftU4qaSkfNW4t3XaS37vO4lASxvFlaTYWprc5FRaoP 0HjLqirDzvG5EyzPLuxXJgHNvWirDxz42YQivPybVBYQaon0wmcZkbwzzGnAuW5aJWOd GEFrXD8EmW5GgojmCZrWL/bTB3unJx4FJKniA0emtQgLTXnck5weRbTeLg8vhwaeOSFp 9h2HAIRhR8DY6D64r7BTidwrOi7hWGfFhDRusvXU2krY6ko4SEhf3lEPt7pbExpeCg5N HDAAj0raAH5h7y/8TvJLnpAEptshAQT3oStTPQB2NaQknQ6kdMeKegwh0WYtTpHZHCjn qDaQ== X-Gm-Message-State: AOJu0Yw6dqBoBc6FD3rBnBnIgi48s4+6Jg/cyQb6o8YR6Ju0CC3j4dKb KCPQlhao3dg2UFW9gsI5LV4= X-Received: by 2002:a17:90a:3c86:b0:27c:fb84:101a with SMTP id g6-20020a17090a3c8600b0027cfb84101amr18099517pjc.29.1698964019924; Thu, 02 Nov 2023 15:26:59 -0700 (PDT) Received: from bangji.corp.google.com ([2620:15c:2c0:5:ea22:bed1:d67b:af04]) by smtp.gmail.com with ESMTPSA id cn18-20020a17090af09200b0027d015c365csm309894pjb.31.2023.11.02.15.26.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Nov 2023 15:26:59 -0700 (PDT) Sender: Namhyung Kim From: Namhyung Kim To: Arnaldo Carvalho de Melo , Jiri Olsa Cc: Ian Rogers , Adrian Hunter , Peter Zijlstra , Ingo Molnar , LKML , linux-perf-users@vger.kernel.org Subject: [PATCH 4/5] perf annotate: Move some fields to annotated_source Date: Thu, 2 Nov 2023 15:26:52 -0700 Message-ID: <20231102222653.4165959-5-namhyung@kernel.org> X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog In-Reply-To: <20231102222653.4165959-1-namhyung@kernel.org> References: <20231102222653.4165959-1-namhyung@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 02 Nov 2023 15:27:27 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781492992981063286 X-GMAIL-MSGID: 1781492992981063286 Some fields in the struct annotation are only used with annotated_source so better to be moved there in order to reduce memory consumption for other symbols. Signed-off-by: Namhyung Kim Reviewed-by: Ian Rogers --- tools/perf/ui/browsers/annotate.c | 12 ++++++------ tools/perf/util/annotate.c | 17 +++++++++-------- tools/perf/util/annotate.h | 14 +++++++------- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c index d2470f87344d..1b42db70c998 100644 --- a/tools/perf/ui/browsers/annotate.c +++ b/tools/perf/ui/browsers/annotate.c @@ -384,7 +384,7 @@ static bool annotate_browser__toggle_source(struct annotate_browser *browser) if (al->idx_asm < offset) offset = al->idx; - browser->b.nr_entries = notes->nr_entries; + browser->b.nr_entries = notes->src->nr_entries; notes->options->hide_src_code = false; browser->b.seek(&browser->b, -offset, SEEK_CUR); browser->b.top_idx = al->idx - offset; @@ -402,7 +402,7 @@ static bool annotate_browser__toggle_source(struct annotate_browser *browser) if (al->idx_asm < offset) offset = al->idx_asm; - browser->b.nr_entries = notes->nr_asm_entries; + browser->b.nr_entries = notes->src->nr_asm_entries; notes->options->hide_src_code = true; browser->b.seek(&browser->b, -offset, SEEK_CUR); browser->b.top_idx = al->idx_asm - offset; @@ -435,7 +435,7 @@ static void ui_browser__init_asm_mode(struct ui_browser *browser) { struct annotation *notes = browser__annotation(browser); ui_browser__reset_index(browser); - browser->nr_entries = notes->nr_asm_entries; + browser->nr_entries = notes->src->nr_asm_entries; } static int sym_title(struct symbol *sym, struct map *map, char *title, @@ -860,7 +860,7 @@ static int annotate_browser__run(struct annotate_browser *browser, browser->b.height, browser->b.index, browser->b.top_idx, - notes->nr_asm_entries); + notes->src->nr_asm_entries); } continue; case K_ENTER: @@ -991,8 +991,8 @@ int symbol__tui_annotate(struct map_symbol *ms, struct evsel *evsel, ui_helpline__push("Press ESC to exit"); - browser.b.width = notes->max_line_len; - browser.b.nr_entries = notes->nr_entries; + browser.b.width = notes->src->max_line_len; + browser.b.nr_entries = notes->src->nr_entries; browser.b.entries = ¬es->src->source, browser.b.width += 18; /* Percentage */ diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 92a9adf9d5eb..ee7b8e1848a8 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -2808,19 +2808,20 @@ void annotation__mark_jump_targets(struct annotation *notes, struct symbol *sym) void annotation__set_offsets(struct annotation *notes, s64 size) { struct annotation_line *al; + struct annotated_source *src = notes->src; - notes->max_line_len = 0; - notes->nr_entries = 0; - notes->nr_asm_entries = 0; + src->max_line_len = 0; + src->nr_entries = 0; + src->nr_asm_entries = 0; - list_for_each_entry(al, ¬es->src->source, node) { + list_for_each_entry(al, &src->source, node) { size_t line_len = strlen(al->line); - if (notes->max_line_len < line_len) - notes->max_line_len = line_len; - al->idx = notes->nr_entries++; + if (src->max_line_len < line_len) + src->max_line_len = line_len; + al->idx = src->nr_entries++; if (al->offset != -1) { - al->idx_asm = notes->nr_asm_entries++; + al->idx_asm = src->nr_asm_entries++; /* * FIXME: short term bandaid to cope with assembly * routines that comes with labels in the same column diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h index d8a221591926..c51ceb857bd6 100644 --- a/tools/perf/util/annotate.h +++ b/tools/perf/util/annotate.h @@ -268,10 +268,13 @@ struct cyc_hist { * returns. */ struct annotated_source { - struct list_head source; - int nr_histograms; - size_t sizeof_sym_hist; - struct sym_hist *histograms; + struct list_head source; + int nr_histograms; + size_t sizeof_sym_hist; + struct sym_hist *histograms; + int nr_entries; + int nr_asm_entries; + u16 max_line_len; }; struct annotated_branch { @@ -289,9 +292,6 @@ struct LOCKABLE annotation { struct annotation_line **offsets; int nr_events; int max_jump_sources; - int nr_entries; - int nr_asm_entries; - u16 max_line_len; struct { u8 addr; u8 jumps;