Commit 660e533e authored by Jin Yao's avatar Jin Yao Committed by Arnaldo Carvalho de Melo
Browse files

perf stat: Warn group events from different hybrid PMU 



If a group has events which are from different hybrid PMUs,
shows a warning:

"WARNING: events in group from different hybrid PMUs!"

This is to remind the user not to put the core event and atom
event into one group.

Next, just disable grouping.

  # perf stat -e "{cpu_core/cycles/,cpu_atom/cycles/}" -a -- sleep 1
  WARNING: events in group from different hybrid PMUs!
  WARNING: grouped events cpus do not match, disabling group:
    anon group { cpu_core/cycles/, cpu_atom/cycles/ }

   Performance counter stats for 'system wide':

           5,438,125      cpu_core/cycles/
           3,914,586      cpu_atom/cycles/

         1.004250966 seconds time elapsed

Signed-off-by: default avatarJin Yao <yao.jin@linux.intel.com>
Reviewed-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20210427070139.25256-17-yao.jin@linux.intel.com


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

tools/perf/builtin-stat.c

+4 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#include "util/pmu.h"

#include "util/event.h"

#include "util/evlist.h"

#include "util/evlist-hybrid.h"

#include "util/evsel.h"

#include "util/debug.h"

#include "util/color.h"
@@ -243,6 +244,9 @@ static void evlist__check_cpu_maps(struct evlist *evlist) 
	struct evsel *evsel, *pos, *leader;

	char buf[1024];



	if (evlist__has_hybrid(evlist))

		evlist__warn_hybrid_group(evlist);



	evlist__for_each_entry(evlist, evsel) {

		leader = evsel->leader;

tools/perf/util/evlist-hybrid.c

+47 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include "../perf.h"

#include "util/pmu-hybrid.h"

#include "util/evlist-hybrid.h"

#include "debug.h"

#include <unistd.h>

#include <stdlib.h>

#include <linux/err.h>
@@ -39,3 +40,49 @@ int evlist__add_default_hybrid(struct evlist *evlist, bool precise) 


	return 0;

}



static bool group_hybrid_conflict(struct evsel *leader)

{

	struct evsel *pos, *prev = NULL;



	for_each_group_evsel(pos, leader) {

		if (!evsel__is_hybrid(pos))

			continue;



		if (prev && strcmp(prev->pmu_name, pos->pmu_name))

			return true;



		prev = pos;

	}



	return false;

}



void evlist__warn_hybrid_group(struct evlist *evlist)

{

	struct evsel *evsel;



	evlist__for_each_entry(evlist, evsel) {

		if (evsel__is_group_leader(evsel) &&

		    evsel->core.nr_members > 1 &&

		    group_hybrid_conflict(evsel)) {

			pr_warning("WARNING: events in group from "

				   "different hybrid PMUs!\n");

			return;

		}

	}

}



bool evlist__has_hybrid(struct evlist *evlist)

{

	struct evsel *evsel;



	evlist__for_each_entry(evlist, evsel) {

		if (evsel->pmu_name &&

		    perf_pmu__is_hybrid(evsel->pmu_name)) {

			return true;

		}

	}



	return false;

}

tools/perf/util/evlist-hybrid.h

+2 −0
Original line number Diff line number Diff line
@@ -8,5 +8,7 @@ 
#include <unistd.h>



int evlist__add_default_hybrid(struct evlist *evlist, bool precise);

void evlist__warn_hybrid_group(struct evlist *evlist);

bool evlist__has_hybrid(struct evlist *evlist);



#endif /* __PERF_EVLIST_HYBRID_H */

tools/perf/util/evsel.c

+6 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#include "memswap.h"

#include "util.h"

#include "hashmap.h"

#include "pmu-hybrid.h"

#include "../perf-sys.h"

#include "util/parse-branch-options.h"

#include <internal/xyarray.h>
@@ -2819,3 +2820,8 @@ void evsel__zero_per_pkg(struct evsel *evsel) 
		hashmap__clear(evsel->per_pkg_mask);

	}

}



bool evsel__is_hybrid(struct evsel *evsel)

{

	return evsel->pmu_name && perf_pmu__is_hybrid(evsel->pmu_name);

}

tools/perf/util/evsel.h

+1 −0
Original line number Diff line number Diff line
@@ -462,4 +462,5 @@ struct perf_env *evsel__env(struct evsel *evsel); 
int evsel__store_ids(struct evsel *evsel, struct evlist *evlist);



void evsel__zero_per_pkg(struct evsel *evsel);

bool evsel__is_hybrid(struct evsel *evsel);

#endif /* __PERF_EVSEL_H */