From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752770AbcAFSXu (ORCPT ); Wed, 6 Jan 2016 13:23:50 -0500 Received: from mga03.intel.com ([134.134.136.65]:27081 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752309AbcAFSXT (ORCPT ); Wed, 6 Jan 2016 13:23:19 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,530,1444719600"; d="scan'208";a="629031480" From: kan.liang@intel.com To: peterz@infradead.org, acme@kernel.org Cc: eranian@google.com, ak@linux.intel.com, jolsa@kernel.org, namhyung@kernel.org, linux-kernel@vger.kernel.org, Kan Liang Subject: [PATCH 5/8] perf mem: report physical addresses Date: Wed, 6 Jan 2016 06:04:34 -0500 Message-Id: <1452078277-15520-5-git-send-email-kan.liang@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1452078277-15520-1-git-send-email-kan.liang@intel.com> References: <1452078277-15520-1-git-send-email-kan.liang@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kan Liang perf mem report should support physical addresses by applying -p or --phys-data. The default mem sort order for physical addresses is added accordingly. Signed-off-by: Kan Liang --- tools/perf/builtin-mem.c | 15 +++++++++++---- tools/perf/util/sort.c | 1 + tools/perf/util/sort.h | 1 + 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c index 7d5ff3a..a81bdc2 100644 --- a/tools/perf/builtin-mem.c +++ b/tools/perf/builtin-mem.c @@ -6,6 +6,7 @@ #include "util/tool.h" #include "util/session.h" #include "util/data.h" +#include "util/sort.h" #define MEM_OPERATION_LOAD 0x1 #define MEM_OPERATION_STORE 0x2 @@ -176,9 +177,15 @@ static int report_events(int argc, const char **argv, struct perf_mem *mem) * there is no weight (cost) associated with stores, so don't print * the column */ - if (!(mem->operation & MEM_OPERATION_LOAD)) - rep_argv[i++] = "--sort=mem,sym,dso,symbol_daddr," - "dso_daddr,tlb,locked"; + if (!(mem->operation & MEM_OPERATION_LOAD)) { + if (mem->phys_addr) + rep_argv[i++] = "--sort=mem,sym,dso,symbol_daddr," + "dso_daddr,tlb,locked,phys_daddr"; + else + rep_argv[i++] = "--sort=mem,sym,dso,symbol_daddr," + "dso_daddr,tlb,locked"; + } else if (mem->phys_addr) + rep_argv[i++] = default_phys_mem_sort_order; for (j = 1; j < argc; j++, i++) rep_argv[i] = argv[j]; @@ -294,7 +301,7 @@ int cmd_mem(int argc, const char **argv, const char *prefix __maybe_unused) "separator for columns, no spaces will be added" " between columns '.' is reserved."), OPT_BOOLEAN('f', "force", &mem.force, "don't complain, do it"), - OPT_BOOLEAN('p', "phys-data", &mem.phys_addr, "Record sample physical addresses"), + OPT_BOOLEAN('p', "phys-data", &mem.phys_addr, "Record/Report sample physical addresses"), OPT_END() }; const char *const mem_subcommands[] = { "record", "report", NULL }; diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c index 4ce6827..c9e7088 100644 --- a/tools/perf/util/sort.c +++ b/tools/perf/util/sort.c @@ -13,6 +13,7 @@ const char *parent_pattern = default_parent_pattern; const char default_sort_order[] = "comm,dso,symbol"; const char default_branch_sort_order[] = "comm,dso_from,symbol_from,symbol_to,cycles"; const char default_mem_sort_order[] = "local_weight,mem,sym,dso,symbol_daddr,dso_daddr,snoop,tlb,locked"; +const char default_phys_mem_sort_order[] = "local_weight,mem,sym,dso,symbol_daddr,dso_daddr,snoop,tlb,locked,phys_daddr"; const char default_top_sort_order[] = "dso,symbol"; const char default_diff_sort_order[] = "dso,symbol"; const char default_tracepoint_sort_order[] = "trace"; diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h index f6e1781..4421f76 100644 --- a/tools/perf/util/sort.h +++ b/tools/perf/util/sort.h @@ -46,6 +46,7 @@ extern struct sort_entry sort_sym_from; extern struct sort_entry sort_sym_to; extern enum sort_type sort__first_dimension; extern const char default_mem_sort_order[]; +extern const char default_phys_mem_sort_order[]; struct he_stat { u64 period; -- 1.8.3.1