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

perf stat: Remove evsel metric_name/expr 



Metrics are their own unit and these variables held broken metrics
previously and now just hold the value NULL. Remove code that used
these variables.

Reviewed-by: default avatarJohn Garry <john.g.garry@oracle.com>
Reviewed-by: default avatarKajol Jain <kjain@linux.ibm.com>
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: Caleb Biggers <caleb.biggers@intel.com>
Cc: Florian Fischer <florian.fischer@muhq.space>
Cc: Ian Rogers <irogers@google.com>
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: Kan Liang <kan.liang@linux.intel.com>
Cc: Kang Minchul <tegongkang@gmail.com>
Cc: Kim Phillips <kim.phillips@amd.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mike Leach <mike.leach@linaro.org>
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: Rob Herring <robh@kernel.org>
Cc: Sandipan Das <sandipan.das@amd.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Will Deacon <will@kernel.org>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linuxppc-dev@lists.ozlabs.org
Link: https://lore.kernel.org/r/20230126233645.200509-8-irogers@google.com


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

tools/perf/builtin-stat.c

+0 −1
Original line number Diff line number Diff line
@@ -2524,7 +2524,6 @@ int cmd_stat(int argc, const char **argv) 
					&stat_config.metric_events);

		zfree(&metrics);

	}

	perf_stat__collect_metric_expr(evsel_list);

	perf_stat__init_shadow_stats();



	if (add_default_attributes())

tools/perf/util/cgroup.c

+0 −1
Original line number Diff line number Diff line
@@ -481,7 +481,6 @@ int evlist__expand_cgroup(struct evlist *evlist, const char *str, 
		nr_cgroups++;



		if (metric_events) {

			perf_stat__collect_metric_expr(tmp_list);

			if (metricgroup__copy_metric_events(tmp_list, cgrp,

							    metric_events,

							    &orig_metric_events) < 0)

tools/perf/util/evsel.c

+0 −2
Original line number Diff line number Diff line
@@ -285,8 +285,6 @@ void evsel__init(struct evsel *evsel, 
	evsel->sample_size = __evsel__sample_size(attr->sample_type);

	evsel__calc_id_pos(evsel);

	evsel->cmdline_group_boundary = false;

	evsel->metric_expr   = NULL;

	evsel->metric_name   = NULL;

	evsel->metric_events = NULL;

	evsel->per_pkg_mask  = NULL;

	evsel->collect_stat  = false;

tools/perf/util/evsel.h

+0 −2
Original line number Diff line number Diff line
@@ -105,8 +105,6 @@ struct evsel { 
	 * metric fields are similar, but needs more care as they can have

	 * references to other metric (evsel).

	 */

	const char *		metric_expr;

	const char *		metric_name;

	struct evsel		**metric_events;

	struct evsel		*metric_leader;

tools/perf/util/python.c

+0 −7
Original line number Diff line number Diff line
@@ -76,13 +76,6 @@ const char *perf_env__arch(struct perf_env *env __maybe_unused) 
	return NULL;

}



/*

 * Add this one here not to drag util/stat-shadow.c

 */

void perf_stat__collect_metric_expr(struct evlist *evsel_list)

{

}



/*

 * These ones are needed not to drag the PMU bandwagon, jevents generated

 * pmu_sys_event_tables, etc and evsel__find_pmu() is used so far just for