Commit 578f6428 authored by Leo Yan's avatar Leo Yan Committed by Zheng Zengkai
Browse files

perf c2c: Rename for shared cache line stats 

mainline inclusion
from mainline-v5.12-rc1
commit 1834436e
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I4NGPV


CVE: NA

-------------------------------------------------

For shared cache line statistics, 'perf c2c' relies on HITM.  We can use
more general naming rather than only binding to HITM, so replace
"hitm_stats" with "shared_clines_stats" in structure perf_c2c, and
rename function resort_hitm_cb() to resort_shared_cl_cb().

Signed-off-by: default avatarLeo Yan <leo.yan@linaro.org>
Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Joe Mario <jmario@redhat.com>
Cc: Joe Perches <joe@perches.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Link: https://lore.kernel.org/r/20210114154646.209024-2-leo.yan@linaro.org


Signed-off-by: default avatarWei Li <liwei391@huawei.com>
Reviewed-by: default avatarYang Jihong <yangjihong1@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent dee07037

tools/perf/builtin-c2c.c

+7 −7
Original line number Diff line number Diff line
@@ -97,8 +97,8 @@ struct perf_c2c { 
	bool			 symbol_full;

	bool			 stitch_lbr;



	/* HITM shared clines stats */

	struct c2c_stats	hitm_stats;

	/* Shared cache line stats */

	struct c2c_stats	shared_clines_stats;

	int			shared_clines;



	int			 display;
@@ -1961,7 +1961,7 @@ static int resort_cl_cb(struct hist_entry *he, void *arg __maybe_unused) 
{

	struct c2c_hist_entry *c2c_he;

	struct c2c_hists *c2c_hists;

	bool display = he__display(he, &c2c.hitm_stats);

	bool display = he__display(he, &c2c.shared_clines_stats);



	c2c_he = container_of(he, struct c2c_hist_entry, he);

	c2c_hists = c2c_he->hists;
@@ -2048,14 +2048,14 @@ static int setup_nodes(struct perf_session *session) 


#define HAS_HITMS(__h) ((__h)->stats.lcl_hitm || (__h)->stats.rmt_hitm)



static int resort_hitm_cb(struct hist_entry *he, void *arg __maybe_unused)

static int resort_shared_cl_cb(struct hist_entry *he, void *arg __maybe_unused)

{

	struct c2c_hist_entry *c2c_he;

	c2c_he = container_of(he, struct c2c_hist_entry, he);



	if (HAS_HITMS(c2c_he)) {

		c2c.shared_clines++;

		c2c_add_stats(&c2c.hitm_stats, &c2c_he->stats);

		c2c_add_stats(&c2c.shared_clines_stats, &c2c_he->stats);

	}



	return 0;
@@ -2126,7 +2126,7 @@ static void print_c2c__display_stats(FILE *out) 


static void print_shared_cacheline_info(FILE *out)

{

	struct c2c_stats *stats = &c2c.hitm_stats;

	struct c2c_stats *stats = &c2c.shared_clines_stats;

	int hitm_cnt = stats->lcl_hitm + stats->rmt_hitm;



	fprintf(out, "=================================================\n");
@@ -2827,7 +2827,7 @@ static int perf_c2c__report(int argc, const char **argv) 
	ui_progress__init(&prog, c2c.hists.hists.nr_entries, "Sorting...");



	hists__collapse_resort(&c2c.hists.hists, NULL);

	hists__output_resort_cb(&c2c.hists.hists, &prog, resort_hitm_cb);

	hists__output_resort_cb(&c2c.hists.hists, &prog, resort_shared_cl_cb);

	hists__iterate_cb(&c2c.hists.hists, resort_cl_cb);



	ui_progress__finish();