Commit 0a2ae963 authored by Leo Yan's avatar Leo Yan Committed by Zheng Zengkai
Browse files

perf c2c: Refactor display filter 

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


CVE: NA

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

When sorting on the respective metrics (lcl_hitm, rmt_hitm, tot_hitm),
the FILTER_HITM macro is used to filter out the cache line entries if
its overhead is less than 1%.

This patch introduces a static function filter_display() to replace that
macro and refines its parameters with a more flexible way, rather than
passing field name, it changes to pass the cache line's statistic and
sum value.

Signed-off-by: default avatarLeo Yan <leo.yan@linaro.org>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
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>
Link: https://lore.kernel.org/r/20210114154646.209024-4-leo.yan@linaro.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
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 7f6e133e

tools/perf/builtin-c2c.c

+15 −15
Original line number Original line Diff line number Diff line
@@ -1851,40 +1851,40 @@ static int c2c_hists__reinit(struct c2c_hists *c2c_hists, 




#define DISPLAY_LINE_LIMIT  0.001

#define DISPLAY_LINE_LIMIT  0.001





static u8 filter_display(u32 val, u32 sum)

{

	if (sum == 0 || ((double)val / sum) < DISPLAY_LINE_LIMIT)

		return HIST_FILTER__C2C;



	return 0;

}



static bool he__display(struct hist_entry *he, struct c2c_stats *stats)

static bool he__display(struct hist_entry *he, struct c2c_stats *stats)

{

{

	struct c2c_hist_entry *c2c_he;

	struct c2c_hist_entry *c2c_he;

	double ld_dist;





	if (c2c.show_all)

	if (c2c.show_all)

		return true;

		return true;





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

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





#define FILTER_HITM(__h)						\

	if (stats->__h) {						\

		ld_dist = ((double)c2c_he->stats.__h / stats->__h);	\

		if (ld_dist < DISPLAY_LINE_LIMIT)			\

			he->filtered = HIST_FILTER__C2C;		\

	} else {							\

		he->filtered = HIST_FILTER__C2C;			\

	}



	switch (c2c.display) {

	switch (c2c.display) {

	case DISPLAY_LCL:

	case DISPLAY_LCL:

		FILTER_HITM(lcl_hitm);

		he->filtered = filter_display(c2c_he->stats.lcl_hitm,

					      stats->lcl_hitm);

		break;

		break;

	case DISPLAY_RMT:

	case DISPLAY_RMT:

		FILTER_HITM(rmt_hitm);

		he->filtered = filter_display(c2c_he->stats.rmt_hitm,

					      stats->rmt_hitm);

		break;

		break;

	case DISPLAY_TOT:

	case DISPLAY_TOT:

		FILTER_HITM(tot_hitm);

		he->filtered = filter_display(c2c_he->stats.tot_hitm,

					      stats->tot_hitm);

		break;

	default:

	default:

		break;

		break;

	}

	}





#undef FILTER_HITM



	return he->filtered == 0;

	return he->filtered == 0;

}

}