Commit 01b8957b authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf stat: Don't compare runtime stat for shadow stats 



Now it always uses the global rt_stat.  Let's get rid of the field from
the saved_value.  When the both evsels are NULL, it'd return 0 so remove
the block in the saved_value_cmp.

Reviewed-by: default avatarJames Clark <james.clark@arm.com>
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Link: https://lore.kernel.org/r/20220930202110.845199-7-namhyung@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent f407aac4

tools/perf/util/stat-shadow.c

+0 −12
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ struct saved_value { 
	int ctx;

	int map_idx;  /* cpu or thread map index */

	struct cgroup *cgrp;

	struct runtime_stat *stat;

	struct stats stats;

	u64 metric_total;

	int metric_other;
@@ -67,16 +66,6 @@ static int saved_value_cmp(struct rb_node *rb_node, const void *entry) 
	if (a->cgrp != b->cgrp)

		return (char *)a->cgrp < (char *)b->cgrp ? -1 : +1;



	if (a->evsel == NULL && b->evsel == NULL) {

		if (a->stat == b->stat)

			return 0;



		if ((char *)a->stat < (char *)b->stat)

			return -1;



		return 1;

	}



	if (a->evsel == b->evsel)

		return 0;

	if ((char *)a->evsel < (char *)b->evsel)
@@ -120,7 +109,6 @@ static struct saved_value *saved_value_lookup(struct evsel *evsel, 
		.evsel = evsel,

		.type = type,

		.ctx = ctx,

		.stat = st,

		.cgrp = cgrp,

	};