Commit d74192c7 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf stat: Remove perf_stat_evsel_id 



perf_stat_evsel_id was used for hard coded metrics. These have now
migrated to json metrics and so the id values are no longer necessary.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>
Cc: Andrii Nakryiko <andrii@kernel.org>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Caleb Biggers <caleb.biggers@intel.com>
Cc: Eduard Zingerman <eddyz87@gmail.com>
Cc: Florian Fischer <florian.fischer@muhq.space>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jing Zhang <renyu.zj@linux.alibaba.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Perry Taylor <perry.taylor@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Sandipan Das <sandipan.das@amd.com>
Cc: Sean Christopherson <seanjc@google.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-stm32@st-md-mailman.stormreply.com
Link: https://lore.kernel.org/r/20230219092848.639226-46-irogers@google.com


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

tools/perf/util/stat.c

+0 −31
Original line number Diff line number Diff line
@@ -77,36 +77,6 @@ double rel_stddev_stats(double stddev, double avg) 
	return pct;

}



bool __perf_stat_evsel__is(struct evsel *evsel, enum perf_stat_evsel_id id)

{

	struct perf_stat_evsel *ps = evsel->stats;



	return ps->id == id;

}



#define ID(id, name) [PERF_STAT_EVSEL_ID__##id] = #name

static const char *id_str[PERF_STAT_EVSEL_ID__MAX] = {

	ID(NONE,		x),

};

#undef ID



static void perf_stat_evsel_id_init(struct evsel *evsel)

{

	struct perf_stat_evsel *ps = evsel->stats;

	int i;



	/* ps->id is 0 hence PERF_STAT_EVSEL_ID__NONE by default */



	for (i = 0; i < PERF_STAT_EVSEL_ID__MAX; i++) {

		if (!strcmp(evsel__name(evsel), id_str[i]) ||

		    (strstr(evsel__name(evsel), id_str[i]) && evsel->pmu_name

		     && strstr(evsel__name(evsel), evsel->pmu_name))) {

			ps->id = i;

			break;

		}

	}

}



static void evsel__reset_aggr_stats(struct evsel *evsel)

{

	struct perf_stat_evsel *ps = evsel->stats;
@@ -166,7 +136,6 @@ static int evsel__alloc_stat_priv(struct evsel *evsel, int nr_aggr) 
		return -ENOMEM;

	}



	perf_stat_evsel_id_init(evsel);

	evsel__reset_stat_priv(evsel);

	return 0;

}

tools/perf/util/stat.h

+0 −12
Original line number Diff line number Diff line
@@ -19,11 +19,6 @@ struct stats { 
	u64 max, min;

};



enum perf_stat_evsel_id {

	PERF_STAT_EVSEL_ID__NONE = 0,

	PERF_STAT_EVSEL_ID__MAX,

};



/* hold aggregated event info */

struct perf_stat_aggr {

	/* aggregated values */
@@ -40,8 +35,6 @@ struct perf_stat_aggr { 
struct perf_stat_evsel {

	/* used for repeated runs */

	struct stats		 res_stats;

	/* evsel id for quick check */

	enum perf_stat_evsel_id	 id;

	/* number of allocated 'aggr' */

	int			 nr_aggr;

	/* aggregated event values */
@@ -187,11 +180,6 @@ static inline void update_rusage_stats(struct rusage_stats *ru_stats, struct rus 
struct evsel;

struct evlist;



bool __perf_stat_evsel__is(struct evsel *evsel, enum perf_stat_evsel_id id);



#define perf_stat_evsel__is(evsel, id) \

	__perf_stat_evsel__is(evsel, PERF_STAT_EVSEL_ID__ ## id)



extern struct runtime_stat rt_stat;

extern struct stats walltime_nsecs_stats;

extern struct rusage_stats ru_stats;