Commit a9c1ecda authored by Kan Liang's avatar Kan Liang Committed by Arnaldo Carvalho de Melo
Browse files

perf evlist: Always use arch_evlist__add_default_attrs() 



Current perf stat uses the evlist__add_default_attrs() to add the
generic default attrs, and uses arch_evlist__add_default_attrs() to add
the Arch specific default attrs, e.g., Topdown for x86.

It works well for the non-hybrid platforms. However, for a hybrid
platform, the hard code generic default attrs don't work.

Uses arch_evlist__add_default_attrs() to replace the
evlist__add_default_attrs(). The arch_evlist__add_default_attrs() is
modified to invoke the same __evlist__add_default_attrs() for the
generic default attrs. No functional change.

Add default_null_attrs[] to indicate the arch specific attrs.
No functional change for the arch specific default attrs either.

Signed-off-by: default avatarKan Liang <kan.liang@linux.intel.com>
Acked-by: default avatarIan Rogers <irogers@google.com>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20220721065706.2886112-4-zhengjun.xing@linux.intel.com


Signed-off-by: default avatarXing Zhengjun <zhengjun.xing@linux.intel.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent ff4207f7

tools/perf/arch/x86/util/evlist.c

+6 −1
Original line number Diff line number Diff line
@@ -8,8 +8,13 @@ 
#define TOPDOWN_L1_EVENTS	"{slots,topdown-retiring,topdown-bad-spec,topdown-fe-bound,topdown-be-bound}"

#define TOPDOWN_L2_EVENTS	"{slots,topdown-retiring,topdown-bad-spec,topdown-fe-bound,topdown-be-bound,topdown-heavy-ops,topdown-br-mispredict,topdown-fetch-lat,topdown-mem-bound}"



int arch_evlist__add_default_attrs(struct evlist *evlist)

int arch_evlist__add_default_attrs(struct evlist *evlist,

				   struct perf_event_attr *attrs,

				   size_t nr_attrs)

{

	if (nr_attrs)

		return __evlist__add_default_attrs(evlist, attrs, nr_attrs);



	if (!pmu_have_event("cpu", "slots"))

		return 0;

tools/perf/builtin-stat.c

+5 −1
Original line number Diff line number Diff line
@@ -1777,6 +1777,9 @@ static int add_default_attributes(void) 
	(PERF_COUNT_HW_CACHE_OP_PREFETCH	<<  8) |

	(PERF_COUNT_HW_CACHE_RESULT_MISS	<< 16)				},

};



	struct perf_event_attr default_null_attrs[] = {};



	/* Set attrs if no event is selected and !null_run: */

	if (stat_config.null_run)

		return 0;
@@ -1958,7 +1961,8 @@ static int add_default_attributes(void) 
			return -1;



		stat_config.topdown_level = TOPDOWN_MAX_LEVEL;

		if (arch_evlist__add_default_attrs(evsel_list) < 0)

		/* Platform specific attrs */

		if (evlist__add_default_attrs(evsel_list, default_null_attrs) < 0)

			return -1;

	}

tools/perf/util/evlist.c

+7 −2
Original line number Diff line number Diff line
@@ -342,9 +342,14 @@ int __evlist__add_default_attrs(struct evlist *evlist, struct perf_event_attr *a 
	return evlist__add_attrs(evlist, attrs, nr_attrs);

}



__weak int arch_evlist__add_default_attrs(struct evlist *evlist __maybe_unused)

__weak int arch_evlist__add_default_attrs(struct evlist *evlist,

					  struct perf_event_attr *attrs,

					  size_t nr_attrs)

{

	if (!nr_attrs)

		return 0;



	return __evlist__add_default_attrs(evlist, attrs, nr_attrs);

}



struct evsel *evlist__find_tracepoint_by_id(struct evlist *evlist, int id)

tools/perf/util/evlist.h

+5 −2
Original line number Diff line number Diff line
@@ -107,10 +107,13 @@ static inline int evlist__add_default(struct evlist *evlist) 
int __evlist__add_default_attrs(struct evlist *evlist,

				     struct perf_event_attr *attrs, size_t nr_attrs);



int arch_evlist__add_default_attrs(struct evlist *evlist,

				   struct perf_event_attr *attrs,

				   size_t nr_attrs);



#define evlist__add_default_attrs(evlist, array) \

	__evlist__add_default_attrs(evlist, array, ARRAY_SIZE(array))

	arch_evlist__add_default_attrs(evlist, array, ARRAY_SIZE(array))



int arch_evlist__add_default_attrs(struct evlist *evlist);

struct evsel *arch_evlist__leader(struct list_head *list);



int evlist__add_dummy(struct evlist *evlist);