Skip to content

Commit b4388df

Browse files
captain5050acmel
authored andcommitted
perf evlist: Remove evlist__warn_hybrid_group
Parse events now corrects PMU groups in parse_events__sort_events_and_fix_groups and so this warning is no longer possible. Reviewed-by: Kan Liang <[email protected]> Signed-off-by: Ian Rogers <[email protected]> Cc: Adrian Hunter <[email protected]> Cc: Alexander Shishkin <[email protected]> Cc: Ali Saidi <[email protected]> Cc: Athira Rajeev <[email protected]> Cc: Dmitrii Dolgov <[email protected]> Cc: Huacai Chen <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: James Clark <[email protected]> Cc: Jing Zhang <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: John Garry <[email protected]> Cc: Kajol Jain <[email protected]> Cc: Kang Minchul <[email protected]> Cc: Leo Yan <[email protected]> Cc: Madhavan Srinivasan <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Mike Leach <[email protected]> Cc: Ming Wang <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Ravi Bangoria <[email protected]> Cc: Rob Herring <[email protected]> Cc: Sandipan Das <[email protected]> Cc: Sean Christopherson <[email protected]> Cc: Suzuki Poulouse <[email protected]> Cc: Thomas Richter <[email protected]> Cc: Will Deacon <[email protected]> Cc: Xing Zhengjun <[email protected]> Cc: [email protected] Cc: [email protected] Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 5ac7263 commit b4388df

File tree

3 files changed

+0
-36
lines changed

3 files changed

+0
-36
lines changed

tools/perf/builtin-stat.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,6 @@ static void evlist__check_cpu_maps(struct evlist *evlist)
189189
{
190190
struct evsel *evsel, *warned_leader = NULL;
191191

192-
if (evlist__has_hybrid(evlist))
193-
evlist__warn_hybrid_group(evlist);
194-
195192
evlist__for_each_entry(evlist, evsel) {
196193
struct evsel *leader = evsel__leader(evsel);
197194

tools/perf/util/evlist-hybrid.c

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -41,38 +41,6 @@ int evlist__add_default_hybrid(struct evlist *evlist, bool precise)
4141
return 0;
4242
}
4343

44-
static bool group_hybrid_conflict(struct evsel *leader)
45-
{
46-
struct evsel *pos, *prev = NULL;
47-
48-
for_each_group_evsel(pos, leader) {
49-
if (!evsel__is_hybrid(pos))
50-
continue;
51-
52-
if (prev && strcmp(prev->pmu_name, pos->pmu_name))
53-
return true;
54-
55-
prev = pos;
56-
}
57-
58-
return false;
59-
}
60-
61-
void evlist__warn_hybrid_group(struct evlist *evlist)
62-
{
63-
struct evsel *evsel;
64-
65-
evlist__for_each_entry(evlist, evsel) {
66-
if (evsel__is_group_leader(evsel) &&
67-
evsel->core.nr_members > 1 &&
68-
group_hybrid_conflict(evsel)) {
69-
pr_warning("WARNING: events in group from "
70-
"different hybrid PMUs!\n");
71-
return;
72-
}
73-
}
74-
}
75-
7644
bool evlist__has_hybrid(struct evlist *evlist)
7745
{
7846
struct evsel *evsel;

tools/perf/util/evlist-hybrid.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#include <unistd.h>
99

1010
int evlist__add_default_hybrid(struct evlist *evlist, bool precise);
11-
void evlist__warn_hybrid_group(struct evlist *evlist);
1211
bool evlist__has_hybrid(struct evlist *evlist);
1312

1413
#endif /* __PERF_EVLIST_HYBRID_H */

0 commit comments

Comments
 (0)