perf, tools: Move weight back to common sort keys
PATCH 1/1 perf, tools: Move weight back to common sort keys
From: Andi Kleen <[email protected]>
This is a partial revert of Namhyung's patch
afab87b91f3f331d55664172dad8e476e6ffca9d perf sort: Separate out memory-specific sort keys
He wrote
For global/local weights, I'm not entirely sure to place them into the memory dimension. But it's the only user at this time.
Well TSX is another (in fact the original) user of the flags, and it needs them to be common. So move local/global weight back to the common sort keys.
--- tools/perf/util/sort.c | 4 ++-- tools/perf/util/sort.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
tools/perf/util/sort.c +2 -2
@@ -872,6 +872,8 @@ static struct sort_dimension common_sort_dimensions[] = {DIM (SORT_PARENT ,"parent" , sort_parent),DIM (SORT_CPU ,"cpu" , sort_cpu),DIM (SORT_SRCLINE ,"srcline" , sort_srcline), +DIM (SORT_LOCAL_WEIGHT ,"local_weight" , sort_local_weight), + DIM(SORT_GLOBAL_WEIGHT, "weight", sort_global_weight), };#undef DIM
@@ -891,8 +893,6 @@ static struct sort_dimension bstack_sort_dimensions[] = {#define DIM (d, n, func) [d - __SORT_MEMORY_MODE] = { .name = n, .entry = &(func) }static struct sort_dimension memory_sort_dimensions[] = { -DIM (SORT_LOCAL_WEIGHT ,"local_weight" , sort_local_weight), -DIM (SORT_GLOBAL_WEIGHT ,"weight" , sort_global_weight),DIM (SORT_MEM_DADDR_SYMBOL ,"symbol_daddr" , sort_mem_daddr_sym),DIM (SORT_MEM_DADDR_DSO ,"dso_daddr" , sort_mem_daddr_dso),DIM (SORT_MEM_LOCKED ,"locked" , sort_mem_locked),
tools/perf/util/sort.h +3 -3
@@ -138,6 +138,8 @@ enum sort_type {SORT_PARENT ,SORT_CPU ,SORT_SRCLINE , +SORT_LOCAL_WEIGHT , +SORT_GLOBAL_WEIGHT ,/* branch stack specific sort keys */ __SORT_BRANCH_STACK,
@@ -149,9 +151,7 @@ enum sort_type {/* memory mode specific sort keys */ __SORT_MEMORY_MODE, -SORT_LOCAL_WEIGHT = __SORT_MEMORY_MODE, -SORT_GLOBAL_WEIGHT , -SORT_MEM_DADDR_SYMBOL , +SORT_MEM_DADDR_SYMBOL = __SORT_MEMORY_MODE,SORT_MEM_DADDR_DSO ,SORT_MEM_LOCKED , SORT_MEM_TLB,
Signature · 1 line
1.8.1.4
tip-bot for Andi Kleen
merge bot[tip:perf/core] perf tools: Move weight back to common sort keys
perf tools: Move weight back to common sort keys
Commit-ID: f9ea55d0ddf66ed030b2a478625cd5792d30df16 Gitweb: http://git.kernel.org/tip/f9ea55d0ddf66ed030b2a478625cd5792d30df16 Author: Andi Kleen <[email protected]> AuthorDate: Thu, 18 Jul 2013 15:58:53 -0700 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 22 Jul 2013 16:58:28 -0300
perf tools: Move weight back to common sort keys
This is a partial revert of Namhyung's patch
afab87b91f3f331d55664172dad8e476e6ffca9d perf sort: Separate out memory-specific sort keys
He wrote
For global/local weights, I'm not entirely sure to place them into the memory dimension. But it's the only user at this time.
Well TSX is another (in fact the original) user of the flags, and it needs them to be common. So move local/global weight back to the common sort keys.
--- tools/perf/util/sort.c | 4 ++-- tools/perf/util/sort.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
tools/perf/util/sort.c +2 -2
@@ -874,6 +874,8 @@ static struct sort_dimension common_sort_dimensions[] = {DIM (SORT_PARENT ,"parent" , sort_parent),DIM (SORT_CPU ,"cpu" , sort_cpu),DIM (SORT_SRCLINE ,"srcline" , sort_srcline), +DIM (SORT_LOCAL_WEIGHT ,"local_weight" , sort_local_weight), + DIM(SORT_GLOBAL_WEIGHT, "weight", sort_global_weight), };#undef DIM
@@ -893,8 +895,6 @@ static struct sort_dimension bstack_sort_dimensions[] = {#define DIM (d, n, func) [d - __SORT_MEMORY_MODE] = { .name = n, .entry = &(func) }static struct sort_dimension memory_sort_dimensions[] = { -DIM (SORT_LOCAL_WEIGHT ,"local_weight" , sort_local_weight), -DIM (SORT_GLOBAL_WEIGHT ,"weight" , sort_global_weight),DIM (SORT_MEM_DADDR_SYMBOL ,"symbol_daddr" , sort_mem_daddr_sym),DIM (SORT_MEM_DADDR_DSO ,"dso_daddr" , sort_mem_daddr_dso),DIM (SORT_MEM_LOCKED ,"locked" , sort_mem_locked),
tools/perf/util/sort.h +3 -3
@@ -143,6 +143,8 @@ enum sort_type {SORT_PARENT ,SORT_CPU ,SORT_SRCLINE , +SORT_LOCAL_WEIGHT , +SORT_GLOBAL_WEIGHT ,/* branch stack specific sort keys */ __SORT_BRANCH_STACK,
@@ -154,9 +156,7 @@ enum sort_type {/* memory mode specific sort keys */ __SORT_MEMORY_MODE, -SORT_LOCAL_WEIGHT = __SORT_MEMORY_MODE, -SORT_GLOBAL_WEIGHT , -SORT_MEM_DADDR_SYMBOL , +SORT_MEM_DADDR_SYMBOL = __SORT_MEMORY_MODE,SORT_MEM_DADDR_DSO ,SORT_MEM_LOCKED , SORT_MEM_TLB,