Messages in this thread Patch in this message | | | From | kan.liang@linux ... | Subject | [PATCH RFC 4/7] perf sort: Add sort option for page size | Date | Fri, 10 Aug 2018 06:36:24 -0700 |
| |
From: Kan Liang <kan.liang@linux.intel.com>
Add a new sort option "page_size" for --mem-mode sort. With this option applied, perf can sort and report by sample's page size.
Here is an example. perf report --stdio --mem-mode --sort=comm,symbol,phys_daddr,page_size
# To display the perf.data header info, please use # --header/--header-only options. # # # Total Lost Samples: 0 # # Samples: 9K of event 'mem-loads:uP' # Total weight : 9028 # Sort order : comm,symbol,phys_daddr,page_size # # Overhead Command Symbol Data Physical Address # Page Size # ........ ....... ............................ # ...................... ...................... # 11.19% dtlb [.] touch_buffer [.] 0x00000003fec82ea8 4K 8.61% dtlb [.] GetTickCount [.] 0x00000003c4f2c8a8 4K 4.52% dtlb [.] GetTickCount [.] 0x00000003fec82f58 4K 4.33% dtlb [.] __gettimeofday [.] 0x00000003fec82f48 4K 4.32% dtlb [.] GetTickCount [.] 0x00000003fec82f78 4K 4.28% dtlb [.] GetTickCount [.] 0x00000003fec82f50 4K 4.23% dtlb [.] GetTickCount [.] 0x00000003fec82f70 4K 4.11% dtlb [.] GetTickCount [.] 0x00000003fec82f68 4K 4.00% dtlb [.] Calibrate [.] 0x00000003fec82f98 4K 3.91% dtlb [.] Calibrate [.] 0x00000003fec82f90 4K 3.43% dtlb [.] touch_buffer [.] 0x00000003fec82e98 4K 3.42% dtlb [.] touch_buffer [.] 0x00000003fec82e90 4K 0.09% dtlb [.] DoDependentLoads [.] 0x000000036ea084c0 2M 0.08% dtlb [.] DoDependentLoads [.] 0x000000032b010b80 2M
Signed-off-by: Kan Liang <kan.liang@linux.intel.com> --- tools/perf/Documentation/perf-report.txt | 1 + tools/perf/util/hist.c | 3 +++ tools/perf/util/hist.h | 1 + tools/perf/util/machine.c | 7 +++++-- tools/perf/util/sort.c | 28 ++++++++++++++++++++++++++++ tools/perf/util/sort.h | 1 + tools/perf/util/symbol.h | 1 + 7 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/tools/perf/Documentation/perf-report.txt b/tools/perf/Documentation/perf-report.txt index 917e36f..53fadad 100644 --- a/tools/perf/Documentation/perf-report.txt +++ b/tools/perf/Documentation/perf-report.txt @@ -139,6 +139,7 @@ OPTIONS - snoop: type of snoop (if any) for the data at the time of the sample - dcacheline: the cacheline the data address is on at the time of the sample - phys_daddr: physical address of data being executed on at the time of sample + - page_size: the page size of data being executed on at the time of sample And the default sort keys are changed to local_weight, mem, sym, dso, symbol_daddr, dso_daddr, snoop, tlb, locked, see '--mem-mode'. diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c index 828cb97..96d2b40 100644 --- a/tools/perf/util/hist.c +++ b/tools/perf/util/hist.c @@ -174,6 +174,9 @@ void hists__calc_col_len(struct hists *hists, struct hist_entry *h) hists__new_col_len(hists, HISTC_MEM_PHYS_DADDR, unresolved_col_width + 4 + 2); + hists__new_col_len(hists, HISTC_MEM_PAGE_SIZE, + unresolved_col_width + 4 + 2); + } else { symlen = unresolved_col_width + 4 + 2; hists__new_col_len(hists, HISTC_MEM_DADDR_SYMBOL, symlen); diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h index 3badd7f..1c42c8e 100644 --- a/tools/perf/util/hist.h +++ b/tools/perf/util/hist.h @@ -49,6 +49,7 @@ enum hist_column { HISTC_MEM_DADDR_SYMBOL, HISTC_MEM_DADDR_DSO, HISTC_MEM_PHYS_DADDR, + HISTC_MEM_PAGE_SIZE, HISTC_MEM_LOCKED, HISTC_MEM_TLB, HISTC_MEM_LVL, diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index b300a39..e79bbc8 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -1829,11 +1829,12 @@ static void ip__resolve_ams(struct thread *thread, ams->sym = al.sym; ams->map = al.map; ams->phys_addr = 0; + ams->page_size = PERF_MEM_PAGE_SIZE_NONE; } static void ip__resolve_data(struct thread *thread, u8 m, struct addr_map_symbol *ams, - u64 addr, u64 phys_addr) + u64 addr, u64 phys_addr, u64 daddr_page_size) { struct addr_location al; @@ -1846,6 +1847,7 @@ static void ip__resolve_data(struct thread *thread, ams->sym = al.sym; ams->map = al.map; ams->phys_addr = phys_addr; + ams->page_size = daddr_page_size; } struct mem_info *sample__resolve_mem(struct perf_sample *sample, @@ -1858,7 +1860,8 @@ struct mem_info *sample__resolve_mem(struct perf_sample *sample, ip__resolve_ams(al->thread, &mi->iaddr, sample->ip); ip__resolve_data(al->thread, al->cpumode, &mi->daddr, - sample->addr, sample->phys_addr); + sample->addr, sample->phys_addr, + sample->page_size); mi->data_src.val = sample->data_src; return mi; diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c index fed2952..68b0f9e 100644 --- a/tools/perf/util/sort.c +++ b/tools/perf/util/sort.c @@ -1334,6 +1334,33 @@ struct sort_entry sort_mem_phys_daddr = { }; static int64_t +sort__page_size_cmp(struct hist_entry *left, struct hist_entry *right) +{ + uint64_t l = 0, r = 0; + + if (left->mem_info) + l = left->mem_info->daddr.page_size; + if (right->mem_info) + r = right->mem_info->daddr.page_size; + + return (int64_t)(r - l); +} + +static int hist_entry__page_size_snprintf(struct hist_entry *he, char *bf, + size_t size, unsigned int width) +{ + return repsep_snprintf(bf, size, "%-*s", width, + get_page_size_name(he->mem_info->daddr.page_size)); +} + +struct sort_entry sort_mem_page_size = { + .se_header = "Page Size", + .se_cmp = sort__page_size_cmp, + .se_snprintf = hist_entry__page_size_snprintf, + .se_width_idx = HISTC_MEM_PAGE_SIZE, +}; + +static int64_t sort__abort_cmp(struct hist_entry *left, struct hist_entry *right) { if (!left->branch_info || !right->branch_info) @@ -1607,6 +1634,7 @@ static struct sort_dimension memory_sort_dimensions[] = { DIM(SORT_MEM_SNOOP, "snoop", sort_mem_snoop), DIM(SORT_MEM_DCACHELINE, "dcacheline", sort_mem_dcacheline), DIM(SORT_MEM_PHYS_DADDR, "phys_daddr", sort_mem_phys_daddr), + DIM(SORT_MEM_PAGE_SIZE, "page_size", sort_mem_page_size), }; #undef DIM diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h index 8bf302c..c6b2f30 100644 --- a/tools/perf/util/sort.h +++ b/tools/perf/util/sort.h @@ -254,6 +254,7 @@ enum sort_type { SORT_MEM_DCACHELINE, SORT_MEM_IADDR_SYMBOL, SORT_MEM_PHYS_DADDR, + SORT_MEM_PAGE_SIZE, }; /* diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h index f25fae4..567a1e1 100644 --- a/tools/perf/util/symbol.h +++ b/tools/perf/util/symbol.h @@ -187,6 +187,7 @@ struct addr_map_symbol { u64 addr; u64 al_addr; u64 phys_addr; + u64 page_size; }; struct branch_info { -- 2.7.4
| |