Commit 0709a82c authored by Ian Rogers's avatar Ian Rogers Committed by Namhyung Kim
Browse files

perf tool_pmu: Rename enum perf_tool_event to tool_pmu_event 



To better reflect the events listed are from the tool PMU. Rename the
enum values from PERF_TOOL_* to TOOL_PMU__EVENT_*.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20241002032016.333748-6-irogers@google.com


Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
parent 240505b2

tools/perf/builtin-stat.c

+3 −3
Original line number Diff line number Diff line
@@ -295,14 +295,14 @@ static int read_single_counter(struct evsel *counter, int cpu_map_idx, int threa 
	 * terminates. Use the wait4 values in that case.

	 */

	if (err && cpu_map_idx == 0 &&

	    (evsel__tool_event(counter) == PERF_TOOL_USER_TIME ||

	     evsel__tool_event(counter) == PERF_TOOL_SYSTEM_TIME)) {

	    (evsel__tool_event(counter) == TOOL_PMU__EVENT_USER_TIME ||

	     evsel__tool_event(counter) == TOOL_PMU__EVENT_SYSTEM_TIME)) {

		u64 val, *start_time;

		struct perf_counts_values *count =

			perf_counts(counter->counts, cpu_map_idx, thread);



		start_time = xyarray__entry(counter->start_times, cpu_map_idx, thread);

		if (evsel__tool_event(counter) == PERF_TOOL_USER_TIME)

		if (evsel__tool_event(counter) == TOOL_PMU__EVENT_USER_TIME)

			val = ru_stats.ru_utime_usec_stat.mean;

		else

			val = ru_stats.ru_stime_usec_stat.mean;

tools/perf/util/evsel.c

+2 −2
Original line number Diff line number Diff line
@@ -1476,8 +1476,8 @@ void evsel__exit(struct evsel *evsel) 
	evsel->per_pkg_mask = NULL;

	zfree(&evsel->metric_events);

	perf_evsel__object.fini(evsel);

	if (evsel__tool_event(evsel) == PERF_TOOL_SYSTEM_TIME ||

	    evsel__tool_event(evsel) == PERF_TOOL_USER_TIME)

	if (evsel__tool_event(evsel) == TOOL_PMU__EVENT_SYSTEM_TIME ||

	    evsel__tool_event(evsel) == TOOL_PMU__EVENT_USER_TIME)

		xyarray__delete(evsel->start_times);

}

tools/perf/util/metricgroup.c

+6 −6
Original line number Diff line number Diff line
@@ -674,20 +674,20 @@ static int metricgroup__build_event_string(struct strbuf *events, 
	struct hashmap_entry *cur;

	size_t bkt;

	bool no_group = true, has_tool_events = false;

	bool tool_events[PERF_TOOL_MAX] = {false};

	bool tool_events[TOOL_PMU__EVENT_MAX] = {false};

	int ret = 0;



#define RETURN_IF_NON_ZERO(x) do { if (x) return x; } while (0)



	hashmap__for_each_entry(ctx->ids, cur, bkt) {

		const char *sep, *rsep, *id = cur->pkey;

		enum perf_tool_event ev;

		enum tool_pmu_event ev;



		pr_debug("found event %s\n", id);



		/* Always move tool events outside of the group. */

		ev = perf_tool_event__from_str(id);

		if (ev != PERF_TOOL_NONE) {

		if (ev != TOOL_PMU__EVENT_NONE) {

			has_tool_events = true;

			tool_events[ev] = true;

			continue;
@@ -1375,7 +1375,7 @@ static void metricgroup__free_metrics(struct list_head *metric_list) 
 *               to true if tool event is found.

 */

static void find_tool_events(const struct list_head *metric_list,

			     bool tool_events[PERF_TOOL_MAX])

			     bool tool_events[TOOL_PMU__EVENT_MAX])

{

	struct metric *m;
@@ -1447,7 +1447,7 @@ static int build_combined_expr_ctx(const struct list_head *metric_list, 
 */

static int parse_ids(bool metric_no_merge, bool fake_pmu,

		     struct expr_parse_ctx *ids, const char *modifier,

		     bool group_events, const bool tool_events[PERF_TOOL_MAX],

		     bool group_events, const bool tool_events[TOOL_PMU__EVENT_MAX],

		     struct evlist **out_evlist)

{

	struct parse_events_error parse_error;
@@ -1536,7 +1536,7 @@ static int parse_groups(struct evlist *perf_evlist, 
	struct evlist *combined_evlist = NULL;

	LIST_HEAD(metric_list);

	struct metric *m;

	bool tool_events[PERF_TOOL_MAX] = {false};

	bool tool_events[TOOL_PMU__EVENT_MAX] = {false};

	bool is_default = !strcmp(str, "Default");

	int ret;

tools/perf/util/pmu.c

+1 −1
Original line number Diff line number Diff line
@@ -1836,7 +1836,7 @@ bool perf_pmu__have_event(struct perf_pmu *pmu, const char *name) 
	if (!name)

		return false;

	if (perf_pmu__is_tool(pmu))

		return perf_tool_event__from_str(name) != PERF_TOOL_NONE;

		return perf_tool_event__from_str(name) != TOOL_PMU__EVENT_NONE;

	if (perf_pmu__find_alias(pmu, name, /*load=*/ true) != NULL)

		return true;

	if (pmu->cpu_aliases_added || !pmu->events_table)

tools/perf/util/stat-shadow.c

+5 −5
Original line number Diff line number Diff line
@@ -382,22 +382,22 @@ static int prepare_metric(const struct metric_expr *mexp, 
			double scale;



			switch (evsel__tool_event(metric_events[i])) {

			case PERF_TOOL_DURATION_TIME:

			case TOOL_PMU__EVENT_DURATION_TIME:

				stats = &walltime_nsecs_stats;

				scale = 1e-9;

				break;

			case PERF_TOOL_USER_TIME:

			case TOOL_PMU__EVENT_USER_TIME:

				stats = &ru_stats.ru_utime_usec_stat;

				scale = 1e-6;

				break;

			case PERF_TOOL_SYSTEM_TIME:

			case TOOL_PMU__EVENT_SYSTEM_TIME:

				stats = &ru_stats.ru_stime_usec_stat;

				scale = 1e-6;

				break;

			case PERF_TOOL_NONE:

			case TOOL_PMU__EVENT_NONE:

				pr_err("Invalid tool event 'none'");

				abort();

			case PERF_TOOL_MAX:

			case TOOL_PMU__EVENT_MAX:

				pr_err("Invalid tool event 'max'");

				abort();

			default: