Merge remote-tracking branch 'torvalds/master' into perf/core

[linux-2.6-microblaze.git] / tools / perf / util / evlist.c

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 6ea3e67..6ba9664 100644 (file)
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -2161,3 +2161,28 @@ int evlist__scnprintf_evsels(struct evlist *evlist, size_t size, char *bf)
 
        return printed;
 }
+
+void evlist__check_mem_load_aux(struct evlist *evlist)
+{
+       struct evsel *leader, *evsel, *pos;
+
+       /*
+        * For some platforms, the 'mem-loads' event is required to use
+        * together with 'mem-loads-aux' within a group and 'mem-loads-aux'
+        * must be the group leader. Now we disable this group before reporting
+        * because 'mem-loads-aux' is just an auxiliary event. It doesn't carry
+        * any valid memory load information.
+        */
+       evlist__for_each_entry(evlist, evsel) {
+               leader = evsel->leader;
+               if (leader == evsel)
+                       continue;
+
+               if (leader->name && strstr(leader->name, "mem-loads-aux")) {
+                       for_each_group_evsel(pos, leader) {
+                               pos->leader = pos;
+                               pos->core.nr_members = 0;
+                       }
+               }
+       }
+}