perf mem/c2c: Fix perf_mem_events to support powerpc
PATCH 1/1 perf mem/c2c: Fix perf_mem_events to support powerpc
Powerpc hw does not have inbuilt latency filter (--ldlat) for mem-load event and, perf_mem_events by default includes ldlat=30 which is causing failure on powerpc. Refactor code to support perf mem/c2c on powerpc.
This patch depends on kernel side changes done my Madhavan:
https://lists.ozlabs.org/pipermail/linuxppc-dev/2018-December/182596.html
--- tools/perf/Documentation/perf-c2c.txt | 16 ++++++++++++---- tools/perf/Documentation/perf-mem.txt | 2 +- tools/perf/arch/x86/util/Build | 1 + tools/perf/arch/x86/util/mem-events.c | 25 +++++++++++++++++++++++++ tools/perf/util/mem-events.c | 26 ++++---------------------- tools/perf/util/mem-events.h | 2 ++ 6 files changed, 45 insertions(+), 27 deletions(-) create mode 100644 tools/perf/arch/x86/util/mem-events.c
tools/perf/Documentation/perf-c2c.txt +12 -4
@@ -19,8 +19,11 @@ C2C stands for Cache To Cache. The perf c2c tool provides means for Shared Data C2C/HITM analysis. It allows you to track down the cacheline contentions. -The tool is based on x86's load latency and precise store facility events -provided by Intel CPUs. These events provide: +On x86, the tool is based on load latency and precise store facility events +provided by Intel CPUs. On PowerPC, the tool uses random instruction sampling +with thresholding feature. + +These events provide: - memory address of the access - type of the access (load and store details) - latency (in cycles) of the load access
@@ -46,7 +49,7 @@ RECORD OPTIONS -l:: --ldlat:: - Configure mem-loads latency. + Configure mem-loads latency. (x86 only) -k:: --all-kernel::
@@ -119,11 +122,16 @@ Following perf record options are configured by default: -W,-d,--phys-data,--sample-cpu Unless specified otherwise with '-e' option, following events are monitored by -default: +default on x86: cpu/mem-loads,ldlat=30/P cpu/mem-stores/P +and following on PowerPC: + + cpu/mem-loads/P + cpu/mem-stores/P + User can pass any 'perf record' option behind '--' mark, like (to enable callchains and system wide monitoring):
tools/perf/Documentation/perf-mem.txt +1 -1
@@ -82,7 +82,7 @@ RECORD OPTIONS Be more verbose (show counter open errors, etc) --ldlat <n>:: - Specify desired latency for loads event. + Specify desired latency for loads event. (x86 only) In addition, for report all perf report options are valid, and for record all perf record options.
tools/perf/arch/x86/util/Build +1 -0
@@ -6,6 +6,7 @@ libperf-y += perf_regs.o libperf-y += group.o libperf-y += machine.o libperf-y += event.o +libperf-y += mem-events.o libperf-$(CONFIG_DWARF) += dwarf-regs.o libperf-$(CONFIG_BPF_PROLOGUE) += dwarf-regs.o
tools/perf/arch/x86/util/mem-events.c new file +25 -0
@@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "mem-events.h" + +struct perf_mem_event perf_mem_events[PERF_MEM_EVENTS__MAX ] = { +PERF_MEM_EVENT ("ldlat-loads" ,"cpu/mem-loads,ldlat=%u/P" ,"mem-loads" ), +PERF_MEM_EVENT ("ldlat-stores" ,"cpu/mem-stores/P" ,"mem-stores" ), +}; + +static char mem_loads_name[100 ]; +static bool mem_loads_name__init; + +char *perf_mem_events__name (int i) +{ +if (i ==PERF_MEM_EVENTS__LOAD ) { +if (!mem_loads_name__init) { + mem_loads_name__init = true; +scnprintf (mem_loads_name,sizeof (mem_loads_name), + perf_mem_events[i].name, + perf_mem_events__loads_ldlat); + } +return mem_loads_name; + } + +return (char *)perf_mem_events[i].name; +}
tools/perf/util/mem-events.c +4 -22
@@ -15,31 +15,13 @@unsigned int perf_mem_events__loads_ldlat =30 ; -#define E (t, n, s) { .tag = t, .name = n, .sysfs_name = s } - -struct perf_mem_event perf_mem_events[PERF_MEM_EVENTS__MAX ] = { -E ("ldlat-loads" ,"cpu/mem-loads,ldlat=%u/P" ,"mem-loads" ), -E ("ldlat-stores" ,"cpu/mem-stores/P" ,"mem-stores" ), +struct perf_mem_event __weak perf_mem_events[PERF_MEM_EVENTS__MAX ] = { +PERF_MEM_EVENT ("ldlat-loads" ,"cpu/mem-loads/P" ,"mem-loads" ), +PERF_MEM_EVENT ("ldlat-stores" ,"cpu/mem-stores/P" ,"mem-stores" ), }; -#undef E - -#undef E - -static char mem_loads_name[100 ]; -static bool mem_loads_name__init; -char *perf_mem_events__name (int i) +char *__weak perf_mem_events__name (int i) { -if (i ==PERF_MEM_EVENTS__LOAD ) { -if (!mem_loads_name__init) { - mem_loads_name__init = true; -scnprintf (mem_loads_name,sizeof (mem_loads_name), - perf_mem_events[i].name, - perf_mem_events__loads_ldlat); - } -return mem_loads_name; - } -return (char *)perf_mem_events[i].name; }
tools/perf/util/mem-events.h +2 -0
@@ -16,6 +16,8 @@ struct perf_mem_event {const char *sysfs_name; }; +#define PERF_MEM_EVENT (t, n, s) { .tag = t, .name = n, .sysfs_name = s } +enum {PERF_MEM_EVENTS__LOAD ,PERF_MEM_EVENTS__STORE ,
Signature · 1 line
1.8.3.1
Quoted 9 lines · Ravi Bangoria
Powerpc hw does not have inbuilt latency filter (--ldlat) for mem-load event and,
perf_mem_eventsby default includes ldlat=30 which is causing failure on powerpc. Refactor code to support perf mem/c2c on powerpc.This patch depends on kernel side changes done my Madhavan:
https://lists.ozlabs.org/pipermail/linuxppc-dev/2018-December/182596.htmlSigned-off-by Ravi Bangoria <[email protected]>
Arnaldo / Michael, Any thoughts?
Thanks.
Quoted 6 lines · Ravi Bangoria
Quoted 5 lines · Ravi Bangoria
Powerpc hw does not have inbuilt latency filter (--ldlat) for mem-load event and,
perf_mem_eventsby default includes ldlat=30 which is causing failure on powerpc. Refactor code to support perf mem/c2c on powerpc.
Quoted 7 lines
Quoted 4 lines
This patch depends on kernel side changes done my Madhavan:
https://lists.ozlabs.org/pipermail/linuxppc-dev/2018-December/182596.htmlSigned-off-by Ravi Bangoria <[email protected]>Arnaldo / Michael, Any thoughts?
I haven't merged the kernel patch, I think because Maddy told me not to because it would break the userspace tooling :)
What is the actual dependency between them? ie. should we merge the kernel fix first or second or what?
cheers
Arnaldo Carvalho de Melo
maintainerEm Tue, Jan 29, 2019 at 08:45:44PM +1100, Michael Ellerman escreveu:
Quoted 14 lines
Quoted 12 lines · Ravi Bangoria
Quoted 9 lines · Ravi Bangoria
Powerpc hw does not have inbuilt latency filter (--ldlat) for mem-load event and,
perf_mem_eventsby default includes ldlat=30 which is causing failure on powerpc. Refactor code to support perf mem/c2c on powerpc.This patch depends on kernel side changes done my Madhavan:
https://lists.ozlabs.org/pipermail/linuxppc-dev/2018-December/182596.htmlSigned-off-by Ravi Bangoria <[email protected]>
Quoted 7 lines
Quoted 1 line
Arnaldo / Michael, Any thoughts?
I haven't merged the kernel patch, I think because Maddy told me not to because it would break the userspace tooling :)
What is the actual dependency between them? ie. should we merge the kernel fix first or second or what?
I think its just a tooling side, I haven't processed it because I'm waiting for Ravi to address Jiri's comment, after that I'm happy to put it in my perf/urgent branch that I'm brewing to push to Ingo today or tomorrow.
- Arnaldo
Quoted 4 lines · Arnaldo Carvalho de Melo
I think its just a tooling side, I haven't processed it because I'm waiting for Ravi to address Jiri's comment, after that I'm happy to put it in my perf/urgent branch that I'm brewing to push to Ingo today or tomorrow.
Ah.. Will try to send v2 today.
Thanks.
PATCH v2 1/1 perf mem/c2c: Fix perf_mem_events to support powerpc
Powerpc hw does not have inbuilt latency filter (--ldlat) for mem-load event and, perf_mem_events by default includes ldlat=30 which is causing failure on powerpc. Refactor code to support perf mem/c2c on powerpc.
This patch depends on kernel side changes done my Madhavan:
https://lists.ozlabs.org/pipermail/linuxppc-dev/2018-December/182596.html
--- tools/perf/Documentation/perf-c2c.txt | 16 ++++++++++++---- tools/perf/Documentation/perf-mem.txt | 2 +- tools/perf/arch/powerpc/util/Build | 1 + tools/perf/arch/powerpc/util/mem-events.c | 11 +++++++++++ tools/perf/util/mem-events.c | 2 +- 5 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 tools/perf/arch/powerpc/util/mem-events.c
tools/perf/Documentation/perf-c2c.txt +12 -4
@@ -19,8 +19,11 @@ C2C stands for Cache To Cache. The perf c2c tool provides means for Shared Data C2C/HITM analysis. It allows you to track down the cacheline contentions. -The tool is based on x86's load latency and precise store facility events -provided by Intel CPUs. These events provide: +On x86, the tool is based on load latency and precise store facility events +provided by Intel CPUs. On PowerPC, the tool uses random instruction sampling +with thresholding feature. + +These events provide: - memory address of the access - type of the access (load and store details) - latency (in cycles) of the load access
@@ -46,7 +49,7 @@ RECORD OPTIONS -l:: --ldlat:: - Configure mem-loads latency. + Configure mem-loads latency. (x86 only) -k:: --all-kernel::
@@ -119,11 +122,16 @@ Following perf record options are configured by default: -W,-d,--phys-data,--sample-cpu Unless specified otherwise with '-e' option, following events are monitored by -default: +default on x86: cpu/mem-loads,ldlat=30/P cpu/mem-stores/P +and following on PowerPC: + + cpu/mem-loads/ + cpu/mem-stores/ + User can pass any 'perf record' option behind '--' mark, like (to enable callchains and system wide monitoring):
tools/perf/Documentation/perf-mem.txt +1 -1
@@ -82,7 +82,7 @@ RECORD OPTIONS Be more verbose (show counter open errors, etc) --ldlat <n>:: - Specify desired latency for loads event. + Specify desired latency for loads event. (x86 only) In addition, for report all perf report options are valid, and for record all perf record options.
tools/perf/arch/powerpc/util/Build +1 -0
@@ -2,6 +2,7 @@ libperf-y += header.o libperf-y += sym-handling.o libperf-y += kvm-stat.o libperf-y += perf_regs.o +libperf-y += mem-events.o libperf-$(CONFIG_DWARF) += dwarf-regs.o libperf-$(CONFIG_DWARF) += skip-callchain-idx.o
tools/perf/arch/powerpc/util/mem-events.c new file +11 -0
@@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "mem-events.h" + +/* PowerPC does not support 'ldlat' parameter. */ +char *perf_mem_events__name (int i) +{ +if (i ==PERF_MEM_EVENTS__LOAD ) +return (char *)"cpu/mem-loads/" ; + +return (char *)"cpu/mem-stores/" ; +}
tools/perf/util/mem-events.c +1 -1
@@ -28,7 +28,7 @@ struct perf_mem_event perf_mem_events[PERF_MEM_EVENTS__MAX] = {static char mem_loads_name[100 ];static bool mem_loads_name__init; -char *perf_mem_events__name (int i) +char *__weak perf_mem_events__name (int i) {if (i ==PERF_MEM_EVENTS__LOAD ) {if (!mem_loads_name__init) {
Signature · 1 line
1.8.3.1
Quoted 10 lines · Ravi Bangoria
Powerpc hw does not have inbuilt latency filter (--ldlat) for mem-load event and,
perf_mem_eventsby default includes ldlat=30 which is causing failure on powerpc. Refactor code to support perf mem/c2c on powerpc.This patch depends on kernel side changes done my Madhavan:
https://lists.ozlabs.org/pipermail/linuxppc-dev/2018-December/182596.htmlSigned-off-by Ravi Bangoria <[email protected]>---
thanks,
jirka
Quoted 111 lines
tools/perf/Documentation/perf-c2c.txt | 16 ++++++++++++---- tools/perf/Documentation/perf-mem.txt | 2 +- tools/perf/arch/powerpc/util/Build | 1 + tools/perf/arch/powerpc/util/mem-events.c | 11 +++++++++++ tools/perf/util/mem-events.c | 2 +- 5 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 tools/perf/arch/powerpc/util/mem-events.ctools/perf/Documentation/perf-c2c.txt +12
-4@@ -19,8 +19,11 @@ C2C stands for Cache To Cache. The perf c2c tool provides means for Shared Data C2C/HITM analysis. It allows you to track down the cacheline contentions. -The tool is based on x86's load latency and precise store facility events -provided by Intel CPUs. These events provide: +On x86, the tool is based on load latency and precise store facility events +provided by Intel CPUs. On PowerPC, the tool uses random instruction sampling +with thresholding feature. + +These events provide: - memory address of the access - type of the access (load and store details) - latency (in cycles) of the load access@@ -46,7 +49,7 @@ RECORD OPTIONS -l:: --ldlat:: - Configure mem-loads latency. + Configure mem-loads latency. (x86 only) -k:: --all-kernel::@@ -119,11 +122,16 @@ Following perf record options are configured by default: -W,-d,--phys-data,--sample-cpu Unless specified otherwise with '-e' option, following events are monitored by -default: +default on x86: cpu/mem-loads,ldlat=30/P cpu/mem-stores/P +and following on PowerPC: + + cpu/mem-loads/ + cpu/mem-stores/ + User can pass any 'perf record' option behind '--' mark, like (to enable callchains and system wide monitoring):tools/perf/Documentation/perf-mem.txt +1
-1@@ -82,7 +82,7 @@ RECORD OPTIONS Be more verbose (show counter open errors, etc) --ldlat <n>:: - Specify desired latency for loads event. + Specify desired latency for loads event. (x86 only) In addition, for report all perf report options are valid, and for record all perf record options.tools/perf/arch/powerpc/util/Build +1
-0@@ -2,6 +2,7 @@ libperf-y += header.o libperf-y += sym-handling.o libperf-y += kvm-stat.o libperf-y += perf_regs.o +libperf-y += mem-events.o libperf-$(CONFIG_DWARF) += dwarf-regs.o libperf-$(CONFIG_DWARF) += skip-callchain-idx.otools/perf/arch/powerpc/util/mem-events.c new file +11
-0@@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "mem-events.h" + +/* PowerPC does not support 'ldlat' parameter. */ +char *perf_mem_events__name (int i) +{ +if (i ==PERF_MEM_EVENTS__LOAD ) +return (char *)"cpu/mem-loads/" ; + +return (char *)"cpu/mem-stores/" ; +}tools/perf/util/mem-events.c +1
-1@@ -28,7 +28,7 @@ struct perf_mem_event perf_mem_events[PERF_MEM_EVENTS__MAX] = {static char mem_loads_name[100 ];static bool mem_loads_name__init; -char *perf_mem_events__name (int i) +char *__weak perf_mem_events__name (int i) {if (i ==PERF_MEM_EVENTS__LOAD ) {if (!mem_loads_name__init) {Signature · 1 line
1.8.3.1
Em Tue, Jan 29, 2019 at 02:42:36PM +0100, Jiri Olsa escreveu:
Quoted 6 lines · Ravi Bangoria
Quoted 5 lines
Powerpc hw does not have inbuilt latency filter (--ldlat) for mem-load event and,
perf_mem_eventsby default includes ldlat=30 which is causing failure on powerpc. Refactor code to support perf mem/c2c on powerpc.
Quoted 7 lines
Quoted 5 lines
This patch depends on kernel side changes done my Madhavan:
https://lists.ozlabs.org/pipermail/linuxppc-dev/2018-December/182596.htmlSigned-off-by Ravi Bangoria <[email protected]>---
Acked-by Jiri Olsa <[email protected]>
Applied to perf/urgent, as soon as the kernel bits are there tooling will be ready.
- Arnaldo
Quoted 114 lines
thanks,
jirkaQuoted 111 lines
tools/perf/Documentation/perf-c2c.txt | 16 ++++++++++++---- tools/perf/Documentation/perf-mem.txt | 2 +- tools/perf/arch/powerpc/util/Build | 1 + tools/perf/arch/powerpc/util/mem-events.c | 11 +++++++++++ tools/perf/util/mem-events.c | 2 +- 5 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 tools/perf/arch/powerpc/util/mem-events.ctools/perf/Documentation/perf-c2c.txt +12
-4@@ -19,8 +19,11 @@ C2C stands for Cache To Cache. The perf c2c tool provides means for Shared Data C2C/HITM analysis. It allows you to track down the cacheline contentions. -The tool is based on x86's load latency and precise store facility events -provided by Intel CPUs. These events provide: +On x86, the tool is based on load latency and precise store facility events +provided by Intel CPUs. On PowerPC, the tool uses random instruction sampling +with thresholding feature. + +These events provide: - memory address of the access - type of the access (load and store details) - latency (in cycles) of the load access@@ -46,7 +49,7 @@ RECORD OPTIONS -l:: --ldlat:: - Configure mem-loads latency. + Configure mem-loads latency. (x86 only) -k:: --all-kernel::@@ -119,11 +122,16 @@ Following perf record options are configured by default: -W,-d,--phys-data,--sample-cpu Unless specified otherwise with '-e' option, following events are monitored by -default: +default on x86: cpu/mem-loads,ldlat=30/P cpu/mem-stores/P +and following on PowerPC: + + cpu/mem-loads/ + cpu/mem-stores/ + User can pass any 'perf record' option behind '--' mark, like (to enable callchains and system wide monitoring):tools/perf/Documentation/perf-mem.txt +1
-1@@ -82,7 +82,7 @@ RECORD OPTIONS Be more verbose (show counter open errors, etc) --ldlat <n>:: - Specify desired latency for loads event. + Specify desired latency for loads event. (x86 only) In addition, for report all perf report options are valid, and for record all perf record options.tools/perf/arch/powerpc/util/Build +1
-0@@ -2,6 +2,7 @@ libperf-y += header.o libperf-y += sym-handling.o libperf-y += kvm-stat.o libperf-y += perf_regs.o +libperf-y += mem-events.o libperf-$(CONFIG_DWARF) += dwarf-regs.o libperf-$(CONFIG_DWARF) += skip-callchain-idx.otools/perf/arch/powerpc/util/mem-events.c new file +11
-0@@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "mem-events.h" + +/* PowerPC does not support 'ldlat' parameter. */ +char *perf_mem_events__name (int i) +{ +if (i ==PERF_MEM_EVENTS__LOAD ) +return (char *)"cpu/mem-loads/" ; + +return (char *)"cpu/mem-stores/" ; +}tools/perf/util/mem-events.c +1
-1@@ -28,7 +28,7 @@ struct perf_mem_event perf_mem_events[PERF_MEM_EVENTS__MAX] = {static char mem_loads_name[100 ];static bool mem_loads_name__init; -char *perf_mem_events__name (int i) +char *__weak perf_mem_events__name (int i) {if (i ==PERF_MEM_EVENTS__LOAD ) {if (!mem_loads_name__init) {Signature · 1 line
1.8.3.1
Signature · 1 line
- Arnaldo
tip-bot for Ravi Bangoria
merge botperf mem/c2c: Fix perf_mem_events to support powerpc
Commit-ID: f0fabf9c897327abd39018aefb5029aff8c7e133 Gitweb: https://git.kernel.org/tip/f0fabf9c897327abd39018aefb5029aff8c7e133 Author: Ravi Bangoria <[email protected]> AuthorDate: Tue, 29 Jan 2019 18:54:12 +0530 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 4 Feb 2019 11:32:14 -0300
perf mem/c2c: Fix perf_mem_events to support powerpc
PowerPC hardware does not have a builtin latency filter (--ldlat) for the "mem-load" event and perf_mem_events by default includes "/ldlat=30/" which is causing a failure on PowerPC. Refactor the code to support "perf mem/c2c" on PowerPC.
This patch depends on kernel side changes done my Madhavan:
https://lists.ozlabs.org/pipermail/linuxppc-dev/2018-December/182596.html
--- tools/perf/Documentation/perf-c2c.txt | 16 ++++++++++++---- tools/perf/Documentation/perf-mem.txt | 2 +- tools/perf/arch/powerpc/util/Build | 1 + tools/perf/arch/powerpc/util/mem-events.c | 11 +++++++++++ tools/perf/util/mem-events.c | 2 +- 5 files changed, 26 insertions(+), 6 deletions(-)
tools/perf/Documentation/perf-c2c.txt +12 -4
@@ -19,8 +19,11 @@ C2C stands for Cache To Cache. The perf c2c tool provides means for Shared Data C2C/HITM analysis. It allows you to track down the cacheline contentions. -The tool is based on x86's load latency and precise store facility events -provided by Intel CPUs. These events provide: +On x86, the tool is based on load latency and precise store facility events +provided by Intel CPUs. On PowerPC, the tool uses random instruction sampling +with thresholding feature. + +These events provide: - memory address of the access - type of the access (load and store details) - latency (in cycles) of the load access
@@ -46,7 +49,7 @@ RECORD OPTIONS -l:: --ldlat:: - Configure mem-loads latency. + Configure mem-loads latency. (x86 only) -k:: --all-kernel::
@@ -119,11 +122,16 @@ Following perf record options are configured by default: -W,-d,--phys-data,--sample-cpu Unless specified otherwise with '-e' option, following events are monitored by -default: +default on x86: cpu/mem-loads,ldlat=30/P cpu/mem-stores/P +and following on PowerPC: + + cpu/mem-loads/ + cpu/mem-stores/ + User can pass any 'perf record' option behind '--' mark, like (to enable callchains and system wide monitoring):
tools/perf/Documentation/perf-mem.txt +1 -1
@@ -82,7 +82,7 @@ RECORD OPTIONS Be more verbose (show counter open errors, etc) --ldlat <n>:: - Specify desired latency for loads event. + Specify desired latency for loads event. (x86 only) In addition, for report all perf report options are valid, and for record all perf record options.
tools/perf/arch/powerpc/util/Build +1 -0
@@ -2,6 +2,7 @@ libperf-y += header.o libperf-y += sym-handling.o libperf-y += kvm-stat.o libperf-y += perf_regs.o +libperf-y += mem-events.o libperf-$(CONFIG_DWARF) += dwarf-regs.o libperf-$(CONFIG_DWARF) += skip-callchain-idx.o
tools/perf/arch/powerpc/util/mem-events.c new file +11 -0
@@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "mem-events.h" + +/* PowerPC does not support 'ldlat' parameter. */ +char *perf_mem_events__name (int i) +{ +if (i ==PERF_MEM_EVENTS__LOAD ) +return (char *)"cpu/mem-loads/" ; + +return (char *)"cpu/mem-stores/" ; +}
tools/perf/util/mem-events.c +1 -1
@@ -28,7 +28,7 @@ struct perf_mem_event perf_mem_events[PERF_MEM_EVENTS__MAX] = {static char mem_loads_name[100 ];static bool mem_loads_name__init; -char *perf_mem_events__name (int i) +char *__weak perf_mem_events__name (int i) {if (i ==PERF_MEM_EVENTS__LOAD ) {if (!mem_loads_name__init) {
On Mon, Jan 14, 2019 at 09:44:02AM +0530, Ravi Bangoria wrote:
SNIP
Quoted 38 lines
tools/perf/arch/x86/util/mem-events.c new file +25
-0@@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "mem-events.h" + +struct perf_mem_event perf_mem_events[PERF_MEM_EVENTS__MAX ] = { +PERF_MEM_EVENT ("ldlat-loads" ,"cpu/mem-loads,ldlat=%u/P" ,"mem-loads" ), +PERF_MEM_EVENT ("ldlat-stores" ,"cpu/mem-stores/P" ,"mem-stores" ), +}; + +static char mem_loads_name[100 ]; +static bool mem_loads_name__init; + +char *perf_mem_events__name (int i) +{ +if (i ==PERF_MEM_EVENTS__LOAD ) { +if (!mem_loads_name__init) { + mem_loads_name__init = true; +scnprintf (mem_loads_name,sizeof (mem_loads_name), + perf_mem_events[i].name, + perf_mem_events__loads_ldlat); + } +return mem_loads_name; + } + +return (char *)perf_mem_events[i].name; +}tools/perf/util/mem-events.c +0
-0@@ -15,31 +15,13 @@unsigned int perf_mem_events__loads_ldlat =30 ;
tools/perf/util/mem-events.c line 21
Quoted 10 lines
tools/perf/util/mem-events.c +3
-5-#define E (t, n, s) { .tag = t, .name = n, .sysfs_name = s } - -struct perf_mem_event perf_mem_events[PERF_MEM_EVENTS__MAX ] = { -E ("ldlat-loads" ,"cpu/mem-loads,ldlat=%u/P" ,"mem-loads" ), -E ("ldlat-stores" ,"cpu/mem-stores/P" ,"mem-stores" ), +struct perf_mem_event __weak perf_mem_events[PERF_MEM_EVENTS__MAX ] = { +PERF_MEM_EVENT ("ldlat-loads" ,"cpu/mem-loads/P" ,"mem-loads" ), +PERF_MEM_EVENT ("ldlat-stores" ,"cpu/mem-stores/P" ,"mem-stores" ), };
I dont think perf_mem_events array needs to be overloaded as well, the perf_mem_events__name function should be enough no?
thanks,
jirka