perf mem: Fix missed p-core mem events on ADL and RPL
The p-core mem events are missed when launching 'perf mem record' on ADL
and RPL.
root@number:~# perf mem record sleep 1
Memory events are enabled on a subset of CPUs: 16-27
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.032 MB perf.data ]
root@number:~# perf evlist
cpu_atom/mem-loads,ldlat=30/P
cpu_atom/mem-stores/P
dummy:u
A variable 'record' in the 'struct perf_mem_event' is to indicate
whether a mem event in a mem_events[] should be recorded. The current
code only configure the variable for the first eligible PMU.
It's good enough for a non-hybrid machine or a hybrid machine which has
the same mem_events[].
However, if a different mem_events[] is used for different PMUs on a
hybrid machine, e.g., ADL or RPL, the 'record' for the second PMU never
get a chance to be set.
The mem_events[] of the second PMU are always ignored.
'perf mem' doesn't support the per-PMU configuration now. A per-PMU
mem_events[] 'record' variable doesn't make sense. Make it global.
That could also avoid searching for the per-PMU mem_events[] via
perf_pmu__mem_events_ptr every time.
Committer testing:
root@number:~# perf evlist -g
cpu_atom/mem-loads,ldlat=30/P
cpu_atom/mem-stores/P
{cpu_core/mem-loads-aux/,cpu_core/mem-loads,ldlat=30/}
cpu_core/mem-stores/P
dummy:u
root@number:~#
The :S for '{cpu_core/mem-loads-aux/,cpu_core/mem-loads,ldlat=30/}' is
not being added by 'perf evlist -g', to be checked.
Fixes: abbdd79b78
("perf mem: Clean up perf_mem_events__name()")
Reported-by: Arnaldo Carvalho de Melo <acme@kernel.org>
Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Closes: https://lore.kernel.org/lkml/Zthu81fA3kLC2CS2@x1/
Link: https://lore.kernel.org/r/20240905170737.4070743-2-kan.liang@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
6e05d28ff2
commit
5ad7db2c3f
@ -3285,19 +3285,15 @@ static int perf_c2c__record(int argc, const char **argv)
|
|||||||
* PERF_MEM_EVENTS__LOAD_STORE if it is supported.
|
* PERF_MEM_EVENTS__LOAD_STORE if it is supported.
|
||||||
*/
|
*/
|
||||||
if (e->tag) {
|
if (e->tag) {
|
||||||
e->record = true;
|
perf_mem_record[PERF_MEM_EVENTS__LOAD_STORE] = true;
|
||||||
rec_argv[i++] = "-W";
|
rec_argv[i++] = "-W";
|
||||||
} else {
|
} else {
|
||||||
e = perf_pmu__mem_events_ptr(pmu, PERF_MEM_EVENTS__LOAD);
|
perf_mem_record[PERF_MEM_EVENTS__LOAD] = true;
|
||||||
e->record = true;
|
perf_mem_record[PERF_MEM_EVENTS__STORE] = true;
|
||||||
|
|
||||||
e = perf_pmu__mem_events_ptr(pmu, PERF_MEM_EVENTS__STORE);
|
|
||||||
e->record = true;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
e = perf_pmu__mem_events_ptr(pmu, PERF_MEM_EVENTS__LOAD);
|
if (perf_mem_record[PERF_MEM_EVENTS__LOAD])
|
||||||
if (e->record)
|
|
||||||
rec_argv[i++] = "-W";
|
rec_argv[i++] = "-W";
|
||||||
|
|
||||||
rec_argv[i++] = "-d";
|
rec_argv[i++] = "-d";
|
||||||
|
@ -117,22 +117,17 @@ static int __cmd_record(int argc, const char **argv, struct perf_mem *mem,
|
|||||||
if (e->tag &&
|
if (e->tag &&
|
||||||
(mem->operation & MEM_OPERATION_LOAD) &&
|
(mem->operation & MEM_OPERATION_LOAD) &&
|
||||||
(mem->operation & MEM_OPERATION_STORE)) {
|
(mem->operation & MEM_OPERATION_STORE)) {
|
||||||
e->record = true;
|
perf_mem_record[PERF_MEM_EVENTS__LOAD_STORE] = true;
|
||||||
rec_argv[i++] = "-W";
|
rec_argv[i++] = "-W";
|
||||||
} else {
|
} else {
|
||||||
if (mem->operation & MEM_OPERATION_LOAD) {
|
if (mem->operation & MEM_OPERATION_LOAD)
|
||||||
e = perf_pmu__mem_events_ptr(pmu, PERF_MEM_EVENTS__LOAD);
|
perf_mem_record[PERF_MEM_EVENTS__LOAD] = true;
|
||||||
e->record = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (mem->operation & MEM_OPERATION_STORE) {
|
if (mem->operation & MEM_OPERATION_STORE)
|
||||||
e = perf_pmu__mem_events_ptr(pmu, PERF_MEM_EVENTS__STORE);
|
perf_mem_record[PERF_MEM_EVENTS__STORE] = true;
|
||||||
e->record = true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
e = perf_pmu__mem_events_ptr(pmu, PERF_MEM_EVENTS__LOAD);
|
if (perf_mem_record[PERF_MEM_EVENTS__LOAD])
|
||||||
if (e->record)
|
|
||||||
rec_argv[i++] = "-W";
|
rec_argv[i++] = "-W";
|
||||||
|
|
||||||
rec_argv[i++] = "-d";
|
rec_argv[i++] = "-d";
|
||||||
|
@ -29,6 +29,8 @@ struct perf_mem_event perf_mem_events[PERF_MEM_EVENTS__MAX] = {
|
|||||||
};
|
};
|
||||||
#undef E
|
#undef E
|
||||||
|
|
||||||
|
bool perf_mem_record[PERF_MEM_EVENTS__MAX] = { 0 };
|
||||||
|
|
||||||
static char mem_loads_name[100];
|
static char mem_loads_name[100];
|
||||||
static char mem_stores_name[100];
|
static char mem_stores_name[100];
|
||||||
|
|
||||||
@ -163,7 +165,7 @@ int perf_pmu__mem_events_parse(struct perf_pmu *pmu, const char *str)
|
|||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (strstr(e->tag, tok))
|
if (strstr(e->tag, tok))
|
||||||
e->record = found = true;
|
perf_mem_record[j] = found = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
tok = strtok_r(NULL, ",", &saveptr);
|
tok = strtok_r(NULL, ",", &saveptr);
|
||||||
@ -261,7 +263,7 @@ int perf_mem_events__record_args(const char **rec_argv, int *argv_nr)
|
|||||||
for (int j = 0; j < PERF_MEM_EVENTS__MAX; j++) {
|
for (int j = 0; j < PERF_MEM_EVENTS__MAX; j++) {
|
||||||
e = perf_pmu__mem_events_ptr(pmu, j);
|
e = perf_pmu__mem_events_ptr(pmu, j);
|
||||||
|
|
||||||
if (!e->record)
|
if (!perf_mem_record[j])
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (!e->supported) {
|
if (!e->supported) {
|
||||||
|
@ -6,7 +6,6 @@
|
|||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
|
|
||||||
struct perf_mem_event {
|
struct perf_mem_event {
|
||||||
bool record;
|
|
||||||
bool supported;
|
bool supported;
|
||||||
bool ldlat;
|
bool ldlat;
|
||||||
u32 aux_event;
|
u32 aux_event;
|
||||||
@ -28,6 +27,7 @@ struct perf_pmu;
|
|||||||
|
|
||||||
extern unsigned int perf_mem_events__loads_ldlat;
|
extern unsigned int perf_mem_events__loads_ldlat;
|
||||||
extern struct perf_mem_event perf_mem_events[PERF_MEM_EVENTS__MAX];
|
extern struct perf_mem_event perf_mem_events[PERF_MEM_EVENTS__MAX];
|
||||||
|
extern bool perf_mem_record[PERF_MEM_EVENTS__MAX];
|
||||||
|
|
||||||
int perf_pmu__mem_events_parse(struct perf_pmu *pmu, const char *str);
|
int perf_pmu__mem_events_parse(struct perf_pmu *pmu, const char *str);
|
||||||
int perf_pmu__mem_events_init(void);
|
int perf_pmu__mem_events_init(void);
|
||||||
|
Loading…
Reference in New Issue
Block a user