Ian Rogers
175c852325
perf tool_pmu: Allow num_cpus(_online) to be specific to a cpumask
...
For hybrid metrics it is useful to know the number of p-core or e-core
CPUs. If a cpumask is specified for the num_cpus or num_cpus_online
tool events, compute the value relative to the given mask rather than
for the full system.
```
$ sudo /tmp/perf/perf stat -e 'tool/num_cpus/,tool/num_cpus,cpu=cpu_core/,
tool/num_cpus,cpu=cpu_atom/,tool/num_cpus_online/,tool/num_cpus_online,
cpu=cpu_core/,tool/num_cpus_online,cpu=cpu_atom/' true
Performance counter stats for 'true':
28 tool/num_cpus/
16 tool/num_cpus,cpu=cpu_core/
12 tool/num_cpus,cpu=cpu_atom/
28 tool/num_cpus_online/
16 tool/num_cpus_online,cpu=cpu_core/
12 tool/num_cpus_online,cpu=cpu_atom/
0.000767205 seconds time elapsed
0.000938000 seconds user
0.000000000 seconds sys
```
Reviewed-by: Thomas Falcon <[email protected] >
Signed-off-by: Ian Rogers <[email protected] >
Tested-by: James Clark <[email protected] >
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Namhyung Kim <[email protected] >
2025-07-24 13:41:35 -07:00
Ian Rogers
3787cdaf38
perf expr: Accumulate rather than replace in the context counts
...
Metrics will fill in the context to have mappings from an event to a
count. When counts are added they replace existing mappings which
generally shouldn't exist with aggregation. Switch to accumulating to
better support cases where perf stat's aggregation isn't used and we
may see a counter more than once.
Signed-off-by: Ian Rogers <[email protected] >
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Namhyung Kim <[email protected] >
2025-07-11 12:36:40 -07:00
Kan Liang
ee8aef2d23
perf tools: Add skip check in tool_pmu__event_to_str()
...
Some topdown related metrics may fail on hybrid machines.
$ perf stat -M tma_frontend_bound
Cannot resolve IDs for tma_frontend_bound:
cpu_atom@TOPDOWN_FE_BOUND.ALL@ / (8 * cpu_atom@CPU_CLK_UNHALTED.CORE@)
In the find_tool_events(), the tool_pmu__event_to_str() is used to
compare the tool_events. It only checks the event name, no PMU or arch.
So the tool_events[TOOL_PMU__EVENT_SLOTS] is set to true, because the
p-core Topdown metrics has "slots" event.
The tool_events is shared. So when parsing the e-core metrics, the
"slots" is automatically added.
The "slots" event as a tool event should only be available on arm64. It
has a different meaning on X86. The tool_pmu__skip_event() intends
handle the case. Apply it for tool_pmu__event_to_str() as well.
There is a lack of sanity check in the expr__get_id(). Add the check.
Closes: https://lore.kernel.org/lkml/[email protected] /
Fixes: 069057239a ("perf tool_pmu: Move expr literals to tool_pmu")
Signed-off-by: Kan Liang <[email protected] >
Reviewed-by: Ian Rogers <[email protected] >
Cc: [email protected]
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Namhyung Kim <[email protected] >
2025-02-10 11:46:30 -08:00
Levi Yun
1d18ebcfd3
perf expr: Initialize is_test value in expr__ctx_new()
...
When expr_parse_ctx is allocated by expr_ctx_new(),
expr_scanner_ctx->is_test isn't initialize, so it has garbage value.
this can affects the result of expr__parse() return when it parses
non-exist event literal according to garbage value.
Use calloc instead of malloc in expr_ctx_new() to fix this.
Fixes: 3340a08354 ("perf pmu-events: Fix testing with JEVENTS_ARCH=all")
Reviewed-by: Ian Rogers <[email protected] >
Reviewed-by: James Clark <[email protected] >
Signed-off-by: Levi Yun <[email protected] >
Cc: Mark Rutland <[email protected] >
Cc: Namhyung Kim <[email protected] >
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2024-12-12 16:12:37 -03:00
Ian Rogers
494c403ff1
perf header: Pass a perf_cpu rather than a PMU to get_cpuid_str
...
On ARM the cpuid is dependent on the core type of the CPU in
question. The PMU was passed for the sake of the CPU map but this
means in places a temporary PMU is created just to pass a CPU
value. Just pass the CPU and fix up the callers.
As there are no longer PMU users in header.h, shuffle forward
declarations earlier to work around build failures.
Reviewed-by: James Clark <[email protected] >
Signed-off-by: Ian Rogers <[email protected] >
Tested-by: Xu Yang <[email protected] >
Cc: Adrian Hunter <[email protected] >
Cc: Albert Ou <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Alexandre Ghiti <[email protected] >
Cc: Athira Rajeev <[email protected] >
Cc: Ben Zong-You Xie <[email protected] >
Cc: Benjamin Gray <[email protected] >
Cc: Bibo Mao <[email protected] >
Cc: Clément Le Goffic <[email protected] >
Cc: Dima Kogan <[email protected] >
Cc: Dr. David Alan Gilbert <[email protected] >
Cc: Huacai Chen <[email protected] >
Cc: Ingo Molnar <[email protected] >
Cc: Jiri Olsa <[email protected] >
Cc: John Garry <[email protected] >
Cc: Kan Liang <[email protected] >
Cc: Leo Yan <[email protected] >
Cc: Mark Rutland <[email protected] >
Cc: Masami Hiramatsu <[email protected] >
Cc: Mike Leach <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Palmer Dabbelt <[email protected] >
Cc: Paul Walmsley <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Ravi Bangoria <[email protected] >
Cc: Sandipan Das <[email protected] >
Cc: Will Deacon <[email protected] >
Cc: Yicong Yang <[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] >
2024-11-16 16:40:30 -03:00
Ian Rogers
069057239a
perf tool_pmu: Move expr literals to tool_pmu
...
Add the expr literals like "#smt_on" as tool events, this allows stat
events to give the values. On my laptop with hyperthreading enabled:
```
$ perf stat -e "has_pmem,num_cores,num_cpus,num_cpus_online,num_dies,num_packages,smt_on,system_tsc_freq" true
Performance counter stats for 'true':
0 has_pmem
8 num_cores
16 num_cpus
16 num_cpus_online
1 num_dies
1 num_packages
1 smt_on
2,496,000,000 system_tsc_freq
0.001113637 seconds time elapsed
0.001218000 seconds user
0.000000000 seconds sys
```
And with hyperthreading disabled:
```
$ perf stat -e "has_pmem,num_cores,num_cpus,num_cpus_online,num_dies,num_packages,smt_on,system_tsc_freq" true
Performance counter stats for 'true':
0 has_pmem
8 num_cores
16 num_cpus
8 num_cpus_online
1 num_dies
1 num_packages
0 smt_on
2,496,000,000 system_tsc_freq
0.000802115 seconds time elapsed
0.000000000 seconds user
0.000806000 seconds sys
```
As zero matters for these values, in stat-display
should_skip_zero_counter only skip the zero value if it is not the
first aggregation index.
The tool event implementations are used in expr but not evaluated as
events for simplicity. Also core_wide isn't made a tool event as it
requires command line parameters.
Signed-off-by: Ian Rogers <[email protected] >
Acked-by: Namhyung Kim <[email protected] >
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Namhyung Kim <[email protected] >
2024-10-10 23:40:32 -07:00
Clément Le Goffic
9aa61d8ecb
perf: parse-events: Fix compilation error while defining DEBUG_PARSER
...
Compiling perf tool with 'DEBUG_PARSER=1' leads to errors:
$> make -C tools/perf PARSER_DEBUG=1 NO_LIBTRACEEVENT=1
...
CC util/expr-flex.o
CC util/expr.o
util/parse-events.c:33:12: error: redundant redeclaration of ‘parse_events_debug’ [-Werror=redundant-decls]
33 | extern int parse_events_debug;
| ^~~~~~~~~~~~~~~~~~
In file included from util/parse-events.c:18:
util/parse-events-bison.h:43:12: note: previous declaration of ‘parse_events_debug’ with type ‘int’
43 | extern int parse_events_debug;
| ^~~~~~~~~~~~~~~~~~
util/expr.c:27:12: error: redundant redeclaration of ‘expr_debug’ [-Werror=redundant-decls]
27 | extern int expr_debug;
| ^~~~~~~~~~
In file included from util/expr.c:11:
util/expr-bison.h:43:12: note: previous declaration of ‘expr_debug’ with type ‘int’
43 | extern int expr_debug;
| ^~~~~~~~~~
cc-1: all warnings being treated as errors
Remove extern declaration from the parse-envents.c file as there is a
conflict with the ones generated using bison and yacc tools from the file
parse-events.[ly].
Signed-off-by: Clément Le Goffic <[email protected] >
Reviewed-by: Ian Rogers <[email protected] >
Cc: James Clark <[email protected] >
Cc: John Garry <[email protected] >
Signed-off-by: Namhyung Kim <[email protected] >
Link: https://lore.kernel.org/r/[email protected]
2024-06-06 00:19:36 -07:00
Ian Rogers
6dd76680b9
perf expr: Fix "has_event" function for metric style events
...
Events in metrics cannot use '/' as a separator, it would be
recognized as a divide, so they use '@'. The '@' is recognized in the
metricgroups code and changed to '/', do the same in the has_event
function so that the parsing is only tried without the @s.
Fixes: 4a4a9bf907 ("perf expr: Add has_event function")
Signed-off-by: Ian Rogers <[email protected] >
Reviewed-by: Kan Liang <[email protected] >
Cc: K Prateek Nayak <[email protected] >
Cc: James Clark <[email protected] >
Cc: Kaige Ye <[email protected] >
Cc: John Garry <[email protected] >
Signed-off-by: Namhyung Kim <[email protected] >
Link: https://lore.kernel.org/r/[email protected]
2024-02-13 13:48:06 -08:00
James Clark
3d0f5f456a
perf pmu: Move pmu__find_core_pmu() to pmus.c
...
pmu__find_core_pmu() more logically belongs in pmus.c because it
iterates over all PMUs, so move it to pmus.c
At the same time rename it to perf_pmus__find_core_pmu() to match the
naming convention in this file.
list_prepare_entry() can't be used in perf_pmus__scan_core() anymore now
that it's called from the same compilation unit. This is with -O2
(specifically -O1 -ftree-vrp -finline-functions
-finline-small-functions) which allow the bounds of the array
access to be determined at compile time. list_prepare_entry() subtracts
the offset of the 'list' member in struct perf_pmu from &core_pmus,
which isn't a struct perf_pmu. The compiler sees that pmu results in
&core_pmus - 8 and refuses to compile. At runtime this works because
list_for_each_entry_continue() always adds the offset back again before
dereferencing ->next, but it's technically undefined behavior. With
-fsanitize=undefined an additional warning is generated.
Using list_first_entry_or_null() to get the first entry here avoids
doing &core_pmus - 8 but has the same result and fixes both the compile
warning and the undefined behavior warning. There are other uses of
list_prepare_entry() in pmus.c, but the compiler doesn't seem to be
able to see that they can also be called with &core_pmus, so I won't
change any at this time.
Signed-off-by: James Clark <[email protected] >
Reviewed-by: Ian Rogers <[email protected] >
Reviewed-by: John Garry <[email protected] >
Cc: Ravi Bangoria <[email protected] >
Cc: Eduard Zingerman <[email protected] >
Cc: Will Deacon <[email protected] >
Cc: Leo Yan <[email protected] >
Cc: Mike Leach <[email protected] >
Cc: Jing Zhang <[email protected] >
Cc: Haixin Yu <[email protected] >
Cc: Kan Liang <[email protected] >
Cc: [email protected]
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Namhyung Kim <[email protected] >
2023-09-15 16:46:40 -07:00
Ian Rogers
f0005f1732
perf metric: Add #num_cpus_online literal
...
Returns the number of CPUs online, unlike #num_cpus that returns the
number present.
Add a test of the property.
This will be used in future Intel metrics.
Reviewed-by: Kan Liang <[email protected] >
Signed-off-by: Ian Rogers <[email protected] >
Cc: Adrian Hunter <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Eduard Zingerman <[email protected] >
Cc: James Clark <[email protected] >
Cc: Jing Zhang <[email protected] >
Cc: Jiri Olsa <[email protected] >
Cc: John Garry <[email protected] >
Cc: Mark Rutland <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Perry Taylor <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Link: http://lore.kernel.org/lkml/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2023-08-30 23:03:03 -03:00
James Clark
9d5da30e4a
perf jevents: Add a new expression builtin strcmp_cpuid_str()
...
This will allow writing formulas that are conditional on a specific
CPU type or CPU version. It calls through to the existing
strcmp_cpuid_str() function in Perf which has a default weak version,
and an arch specific version for x86 and arm64.
The function takes an 'ID' type value, which is a string. But in this
case Arm CPU IDs are hex numbers prefixed with '0x'. metric.py
assumes strings are only used by event names, and that they can't start
with a number ('0'), so an additional change has to be made to the
regex to convert hex numbers back to 'ID' types.
Signed-off-by: James Clark <[email protected] >
Reviewed-by: John Garry <[email protected] >
Cc: Adrian Hunter <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Eduard Zingerman <[email protected] >
Cc: Haixin Yu <[email protected] >
Cc: Ian Rogers <[email protected] >
Cc: Ingo Molnar <[email protected] >
Cc: Jing Zhang <[email protected] >
Cc: Jiri Olsa <[email protected] >
Cc: Kajol Jain <[email protected] >
Cc: Kan Liang <[email protected] >
Cc: Leo Yan <[email protected] >
Cc: Mark Rutland <[email protected] >
Cc: Mike Leach <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Nick Forrington <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Rob Herring <[email protected] >
Cc: Sohom Datta <[email protected] >
Cc: Will Deacon <[email protected] >
Cc: [email protected]
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2023-08-17 14:12:14 -03:00
Namhyung Kim
c7e97f215a
perf build: Include generated header files properly
...
The flex and bison generate header files from the source. When user
specified a build directory with O= option, it'd generate files under
the directory. The build command has -I option to specify the header
include directory.
But the -I option only affects the files included like <...>. Let's
change the flex and bison headers to use it instead of "...".
Fixes: 80eeb67fe5 ("perf jevents: Program to convert JSON file")
Signed-off-by: Namhyung Kim <[email protected] >
Cc: Adrian Hunter <[email protected] >
Cc: Andi Kleen <[email protected] >
Cc: Anup Sharma <[email protected] >
Cc: Ian Rogers <[email protected] >
Cc: Ingo Molnar <[email protected] >
Cc: Jiri Olsa <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: [email protected]
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2023-08-03 17:01:24 -03:00
Ian Rogers
4a4a9bf907
perf expr: Add has_event function
...
Some events are dependent on firmware/kernel enablement. Allow such
events to be detected when the metric is parsed so that the metric's
event parsing doesn't fail.
Signed-off-by: Ian Rogers <[email protected] >
Tested-by: Namhyung Kim <[email protected] >
Cc: Mark Rutland <[email protected] >
Cc: Eduard Zingerman <[email protected] >
Cc: Sohom Datta <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Adrian Hunter <[email protected] >
Cc: Caleb Biggers <[email protected] >
Cc: Edward Baker <[email protected] >
Cc: Perry Taylor <[email protected] >
Cc: Samantha Alt <[email protected] >
Cc: Weilin Wang <[email protected] >
Cc: Arnaldo Carvalho de Melo <[email protected] >
Cc: Andrii Nakryiko <[email protected] >
Cc: Jiri Olsa <[email protected] >
Cc: Jing Zhang <[email protected] >
Cc: Kajol Jain <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Kan Liang <[email protected] >
Cc: Zhengjun Xing <[email protected] >
Cc: John Garry <[email protected] >
Cc: Ingo Molnar <[email protected] >
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Namhyung Kim <[email protected] >
2023-06-29 22:13:15 -07:00
Arnaldo Carvalho de Melo
a77f8184a0
perf expr: Use zfree() to reduce chances of use after free
...
Do defensive programming by using zfree() to initialize freed pointers
to NULL, so that eventual use after free result in a NULL pointer deref
instead of more subtle behaviour.
Also remove one NULL test before free(), as it accepts a NULL arg and we
get one line shaved not doing it explicitely.
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2023-04-12 10:06:11 -03:00
Ian Rogers
c3bf86f11d
perf metrics: Add has_pmem literal
...
Add literal so that if nvdimms aren't installed we can record fewer
events. The file detection mechanism was suggested by Dan Williams
<[email protected] > in:
https://lore.kernel.org/linux-perf-users/[email protected] /
Reviewed-by: Kan Liang <[email protected] >
Signed-off-by: Ian Rogers <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Caleb Biggers <[email protected] >
Cc: Dan Williams <[email protected] >
Cc: Edward Baker <[email protected] >
Cc: Ingo Molnar <[email protected] >
Cc: Jiri Olsa <[email protected] >
Cc: Mark Rutland <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Perry Taylor <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Samantha Alt <[email protected] >
Cc: Weilin Wang <[email protected] >
Cc: Xing Zhengjun <[email protected] >
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2023-04-04 09:39:55 -03:00
Ian Rogers
207f7df727
perf expr: Make the online topology accessible globally
...
Knowing the topology of online CPUs is useful for more than just expr
literals. Move to a global function that caches the value. An
additional upside is that this may also avoid computing the CPU
topology in some situations.
Signed-off-by: Ian Rogers <[email protected] >
Cc: Adrian Hunter <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Alexandre Torgue <[email protected] >
Cc: Andrii Nakryiko <[email protected] >
Cc: Athira Rajeev <[email protected] >
Cc: Caleb Biggers <[email protected] >
Cc: Eduard Zingerman <[email protected] >
Cc: Florian Fischer <[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: Kan Liang <[email protected] >
Cc: Leo Yan <[email protected] >
Cc: Mark Rutland <[email protected] >
Cc: Maxime Coquelin <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Perry Taylor <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Ravi Bangoria <[email protected] >
Cc: Sandipan Das <[email protected] >
Cc: Sean Christopherson <[email protected] >
Cc: Stephane Eranian <[email protected] >
Cc: Suzuki Poulouse <[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] >
2023-02-19 08:03:12 -03:00
Jing Zhang
acef233b7c
perf pmu: Add #slots literal support for arm64
...
The slots in each architecture may be different, so add #slots literal
to obtain the slots of different architectures, and the #slots can be
applied in the metric. Currently, The #slots just support for arm64,
and other architectures will return NAN.
On arm64, the value of slots is from the register PMMIR_EL1.SLOT, which
I can read in /sys/bus/event_source/device/armv8_pmuv3_*/caps/slots.
PMMIR_EL1.SLOT might read as zero if the PMU version is lower than
ID_AA64DFR0_EL1_PMUVer_V3P4 or the STALL_SLOT event is not implemented.
Reviewed-by: John Garry <[email protected] >
Signed-off-by: Jing Zhang <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Andrew Kilroy <[email protected] >
Cc: Ian Rogers <[email protected] >
Cc: Ingo Molnar <[email protected] >
Cc: James Clark <[email protected] >
Cc: Jiri Olsa <[email protected] >
Cc: Leo Yan <[email protected] >
Cc: Mark Rutland <[email protected] >
Cc: Mike Leach <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Shuai Xue <[email protected] >
Cc: Will Deacon <[email protected] >
Cc: Xing Zhengjun <[email protected] >
Cc: Zhuo Song <[email protected] >
Cc: [email protected]
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2023-01-19 09:38:55 -03:00
Arnaldo Carvalho de Melo
1a931707ad
Merge remote-tracking branch 'torvalds/master' into perf/core
...
To resolve a trivial merge conflict with c302378bc1 ("libbpf:
Hashmap interface update to allow both long and void* keys/values"),
where a function present upstream was removed in the perf tools
development tree.
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2022-12-16 09:53:53 -03:00
Ian Rogers
bd560973c5
perf expr: Tidy hashmap dependency
...
hashmap.h comes from libbpf but isn't installed with its
headers. Always use the header file of the code in util. Change the
hashmap.h dependency in expr.h to a forward declaration, add the
necessary header file includes in the C files.
Signed-off-by: Ian Rogers <[email protected] >
Acked-by: Namhyung Kim <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Andrii Nakryiko <[email protected] >
Cc: Jiri Olsa <[email protected] >
Cc: Mark Rutland <[email protected] >
Cc: Masahiro Yamada <[email protected] >
Cc: Nick Desaulniers <[email protected] >
Cc: Nicolas Schier <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Stephane Eranian <[email protected] >
Cc: [email protected]
Link: http://lore.kernel.org/lkml/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2022-11-16 12:17:15 -03:00
Eduard Zingerman
c302378bc1
libbpf: Hashmap interface update to allow both long and void* keys/values
...
An update for libbpf's hashmap interface from void* -> void* to a
polymorphic one, allowing both long and void* keys and values.
This simplifies many use cases in libbpf as hashmaps there are mostly
integer to integer.
Perf copies hashmap implementation from libbpf and has to be
updated as well.
Changes to libbpf, selftests/bpf and perf are packed as a single
commit to avoid compilation issues with any future bisect.
Polymorphic interface is acheived by hiding hashmap interface
functions behind auxiliary macros that take care of necessary
type casts, for example:
#define hashmap_cast_ptr(p) \
({ \
_Static_assert((p) == NULL || sizeof(*(p)) == sizeof(long),\
#p " pointee should be a long-sized integer or a pointer"); \
(long *)(p); \
})
bool hashmap_find(const struct hashmap *map, long key, long *value);
#define hashmap__find(map, key, value) \
hashmap_find((map), (long)(key), hashmap_cast_ptr(value))
- hashmap__find macro casts key and value parameters to long
and long* respectively
- hashmap_cast_ptr ensures that value pointer points to a memory
of appropriate size.
This hack was suggested by Andrii Nakryiko in [1].
This is a follow up for [2].
[1] https://lore.kernel.org/bpf/CAEf4BzZ8KFneEJxFAaNCCFPGqp20hSpS2aCj76uRk3-qZUH5xg@mail.gmail.com/
[2] https://lore.kernel.org/bpf/[email protected] /T/#m65b28f1d6d969fcd318b556db6a3ad499a42607d
Signed-off-by: Eduard Zingerman <[email protected] >
Signed-off-by: Andrii Nakryiko <[email protected] >
Link: https://lore.kernel.org/bpf/[email protected]
2022-11-09 20:45:14 -08:00
Ian Rogers
715b824f4a
perf expr: Remove jevents case workaround
...
jevents.py no longer lowercases metrics and altering the case can cause
hashmap lookups to fail, so remove.
Signed-off-by: Ian Rogers <[email protected] >
Cc: Ahmad Yasin <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Andi Kleen <[email protected] >
Cc: Caleb Biggers <[email protected] >
Cc: Florian Fischer <[email protected] >
Cc: Ingo Molnar <[email protected] >
Cc: James Clark <[email protected] >
Cc: Jiri Olsa <[email protected] >
Cc: John Garry <[email protected] >
Cc: Kajol Jain <[email protected] >
Cc: Kan Liang <[email protected] >
Cc: Kshipra Bopardikar <[email protected] >
Cc: Mark Rutland <[email protected] >
Cc: Miaoqian Lin <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Perry Taylor <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Samantha Alt <[email protected] >
Cc: Stephane Eranian <[email protected] >
Cc: Thomas Richter <[email protected] >
Cc: Xing Zhengjun <[email protected] >
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2022-10-06 08:03:52 -03:00
Ian Rogers
1725e9cd32
perf metrics: Wire up core_wide
...
Pass state necessary for core_wide into the expression parser. Add
system_wide and user_requested_cpu_list to perf_stat_config to make it
available at display time. evlist isn't used as the
evlist__create_maps, that computes user_requested_cpus, needs the list
of events which is generated by the metric.
Signed-off-by: Ian Rogers <[email protected] >
Cc: Ahmad Yasin <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Andi Kleen <[email protected] >
Cc: Caleb Biggers <[email protected] >
Cc: Florian Fischer <[email protected] >
Cc: Ingo Molnar <[email protected] >
Cc: James Clark <[email protected] >
Cc: Jiri Olsa <[email protected] >
Cc: John Garry <[email protected] >
Cc: Kan Liang <[email protected] >
Cc: Kshipra Bopardikar <[email protected] >
Cc: Mark Rutland <[email protected] >
Cc: Miaoqian Lin <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Perry Taylor <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Stephane Eranian <[email protected] >
Cc: Thomas Richter <[email protected] >
Cc: Xing Zhengjun <[email protected] >
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2022-10-04 08:55:22 -03:00
Ian Rogers
09b73fe9e3
perf smt: Compute SMT from topology
...
The topology records sibling threads. Rather than computing SMT using
siblings in sysfs, reuse the values in topology. This only applies
when the file smt/active isn't available.
Signed-off-by: Ian Rogers <[email protected] >
Cc: Ahmad Yasin <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Andi Kleen <[email protected] >
Cc: Caleb Biggers <[email protected] >
Cc: Florian Fischer <[email protected] >
Cc: Ingo Molnar <[email protected] >
Cc: James Clark <[email protected] >
Cc: Jiri Olsa <[email protected] >
Cc: John Garry <[email protected] >
Cc: Kan Liang <[email protected] >
Cc: Kshipra Bopardikar <[email protected] >
Cc: Mark Rutland <[email protected] >
Cc: Miaoqian Lin <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Perry Taylor <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Stephane Eranian <[email protected] >
Cc: Thomas Richter <[email protected] >
Cc: Xing Zhengjun <[email protected] >
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2022-10-04 08:55:22 -03:00
Ian Rogers
1a6abdde13
perf expr: Move the scanner_ctx into the parse_ctx
...
We currently maintain the two independently and copy from one to the
other. This is a burden when additional scanner context values are
necessary, so combine them.
Signed-off-by: Ian Rogers <[email protected] >
Cc: Ahmad Yasin <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Andi Kleen <[email protected] >
Cc: Caleb Biggers <[email protected] >
Cc: Florian Fischer <[email protected] >
Cc: Ingo Molnar <[email protected] >
Cc: James Clark <[email protected] >
Cc: Jiri Olsa <[email protected] >
Cc: John Garry <[email protected] >
Cc: Kan Liang <[email protected] >
Cc: Kshipra Bopardikar <[email protected] >
Cc: Mark Rutland <[email protected] >
Cc: Miaoqian Lin <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Perry Taylor <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Stephane Eranian <[email protected] >
Cc: Thomas Richter <[email protected] >
Cc: Xing Zhengjun <[email protected] >
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2022-10-04 08:55:22 -03:00
Kan Liang
bc2373a58a
perf tsc: Add arch TSC frequency information
...
The TSC frequency information is required for the event metrics with the
literal, system_tsc_freq. For the newer Intel platform, the TSC
frequency information can be retrieved from the CPUID leaf 0x15. If the
TSC frequency information isn't present the /proc/cpuinfo approach is
used.
Refactor cpuid() for this use. Note, the previous stack pushing/popping
approach was broken on x86-64 that has stack red zones that would be
clobbered.
Committer testing:
Before:
$ perf record sleep 0.0001
[ perf record: Woken up 1 times to write data ]
$ perf report --header-only |& grep cpuid
# cpuid : AuthenticAMD,25,33,0
$
After the patch:
$ perf record sleep 0.0001
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.002 MB perf.data (8 samples) ]
$ perf report --header-only |& grep cpuid
# cpuid : AuthenticAMD,25,33,0
$
Signed-off-by: Kan Liang <[email protected] >
Tested-by: Arnaldo Carvalho de Melo <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Alexandre Torgue <[email protected] >
Cc: Andi Kleen <[email protected] >
Cc: Caleb Biggers <[email protected] >
Cc: Ingo Molnar <[email protected] >
Cc: James Clark <[email protected] >
Cc: Jiri Olsa <[email protected] >
Cc: John Garry <[email protected] >
Cc: Kshipra Bopardikar <[email protected] >
Cc: Mark Rutland <[email protected] >
Cc: Maxime Coquelin <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Perry Taylor <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Stephane Eranian <[email protected] >
Cc: Xing Zhengjun <[email protected] >
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Ian Rogers <[email protected] >
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2022-07-25 12:28:00 -03:00
Ian Rogers
c0dd94558d
perf pmu-events: Don't lower case MetricExpr
...
This patch changes MetricExpr to be written out in the same case. This
enables events in metrics to use modifiers like 'G' which currently
yield parse errors when made lower case. To keep tests passing the
literal #smt_on is compared in a non-case sensitive way - #SMT_on is
present in at least SkylakeX metrics.
Signed-off-by: Ian Rogers <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Andi Kleen <[email protected] >
Cc: Jiri Olsa <[email protected] >
Cc: John Garry <[email protected] >
Cc: Kajol Jain <[email protected] >
Cc: Kan Liang <[email protected] >
Cc: Mark Rutland <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Paul Clarke <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Stephane Eranian <[email protected] >
Link: http://lore.kernel.org/lkml/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2022-01-12 15:02:48 -03:00
Ian Rogers
f56ef30a31
perf expr: Add debug logging for literals
...
Useful for diagnosing problems with metrics.
Signed-off-by: Ian Rogers <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Andi Kleen <[email protected] >
Cc: Jiri Olsa <[email protected] >
Cc: John Garry <[email protected] >
Cc: Kajol Jain <[email protected] >
Cc: Kan Liang <[email protected] >
Cc: Konstantin Khlebnikov <[email protected] >
Cc: Mark Rutland <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Paul Clarke <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Stephane Eranian <[email protected] >
Link: http://lore.kernel.org/lkml/[email protected]
[ Fixed up perf_cpu conflict, i.e. we need to append ".cpu" to cpu__max_present_cpu() result ]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2022-01-12 14:50:28 -03:00
Ian Rogers
6d18804b96
perf cpumap: Give CPUs their own type
...
A common problem is confusing CPU map indices with the CPU, by wrapping
the CPU with a struct then this is avoided. This approach is similar to
atomic_t.
Committer notes:
To make it build with BUILD_BPF_SKEL=1 these files needed the
conversions to 'struct perf_cpu' usage:
tools/perf/util/bpf_counter.c
tools/perf/util/bpf_counter_cgroup.c
tools/perf/util/bpf_ftrace.c
Also perf_env__get_cpu() was removed back in "perf cpumap: Switch
cpu_map__build_map to cpu function".
Additionally these needed to be fixed for the ARM builds to complete:
tools/perf/arch/arm/util/cs-etm.c
tools/perf/arch/arm64/util/pmu.c
Suggested-by: John Garry <[email protected] >
Signed-off-by: Ian Rogers <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Andi Kleen <[email protected] >
Cc: Ingo Molnar <[email protected] >
Cc: James Clark <[email protected] >
Cc: Jiri Olsa <[email protected] >
Cc: Kajol Jain <[email protected] >
Cc: Kan Liang <[email protected] >
Cc: Leo Yan <[email protected] >
Cc: Mark Rutland <[email protected] >
Cc: Mathieu Poirier <[email protected] >
Cc: Mike Leach <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Paul Clarke <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Riccardo Mancini <[email protected] >
Cc: Stephane Eranian <[email protected] >
Cc: Suzuki Poulouse <[email protected] >
Cc: Vineet Singh <[email protected] >
Cc: [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] >
2022-01-12 14:28:23 -03:00
Miaoqian Lin
9f3c16a430
perf expr: Fix return value of ids__new()
...
callers of ids__new() function only do NULL checking for the return
value. ids__new() calles hashmap__new(), which may return
ERR_PTR(-ENOMEM).
Instead of changing the checking one-by-one return NULL instead of
ERR_PTR(-ENOMEM) to keep it consistent.
Signed-off-by: Miaoqian Lin <[email protected] >
Reviewed-by: German Gomez <[email protected] >
Tested-by: German Gomez <[email protected] >
Acked-by: Jiri Olsa <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Andi Kleen <[email protected] >
Cc: Ian Rogers <[email protected] >
Cc: Mark Rutland <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Link: http://lore.kernel.org/lkml/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2021-12-28 17:26:25 -03:00
Miaoqian Lin
0a515a06c5
perf expr: Fix missing check for return value of hashmap__new()
...
The hashmap__new() function may return ERR_PTR(-ENOMEM) when malloc()
fails, add IS_ERR() checking for ctx->ids.
Signed-off-by: Miaoqian Lin <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Andi Kleen <[email protected] >
Cc: Ian Rogers <[email protected] >
Cc: Jiri Olsa <[email protected] >
Cc: Mark Rutland <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Link: http://lore.kernel.org/lkml/[email protected]
[ s/kfree()/free()/ and add missing linux/err.h include ]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2021-12-18 08:31:14 -03:00
Ian Rogers
9aba0adae8
perf expr: Add source_count for aggregating events
...
Events like uncore_imc/cas_count_read/ on Skylake open multiple events
and then aggregate in the metric leader. To determine the average value
per event the number of these events is needed. Add a source_count
function that returns this value by counting the number of events with
the given metric leader. For most events the value is 1 but for
uncore_imc/cas_count_read/ it can yield values like 6.
Add a generic test, but manually tested with a test metric that uses
the function.
Signed-off-by: Ian Rogers <[email protected] >
Acked-by: Jiri Olsa <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Andi Kleen <[email protected] >
Cc: Ingo Molnar <[email protected] >
Cc: John Garry <[email protected] >
Cc: Kajol Jain <[email protected] >
Cc: Kan Liang <[email protected] >
Cc: Madhavan Srinivasan <[email protected] >
Cc: Mark Rutland <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Paul A . Clarke <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Riccardo Mancini <[email protected] >
Cc: Song Liu <[email protected] >
Cc: Wan Jiabing <[email protected] >
Cc: Yury Norov <[email protected] >
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2021-11-13 18:11:50 -03:00
Ian Rogers
fdf1e29b61
perf expr: Add metric literals for topology.
...
Allow the number of cpus, cores, dies and packages to be queried by a
metric expression.
Signed-off-by: Ian Rogers <[email protected] >
Acked-by: Jiri Olsa <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Andi Kleen <[email protected] >
Cc: Ingo Molnar <[email protected] >
Cc: John Garry <[email protected] >
Cc: Kajol Jain <[email protected] >
Cc: Kan Liang <[email protected] >
Cc: Madhavan Srinivasan <[email protected] >
Cc: Mark Rutland <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Paul A . Clarke <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Riccardo Mancini <[email protected] >
Cc: Song Liu <[email protected] >
Cc: Wan Jiabing <[email protected] >
Cc: Yury Norov <[email protected] >
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2021-11-13 18:11:50 -03:00
Ian Rogers
3613f6c118
perf expr: Add literal values starting with #
...
It is useful to have literal values for constants relating to
topologies, SMT, etc. Make the parsing of literals shared code and add a
lookup function. Move #smt_on to this function.
Signed-off-by: Ian Rogers <[email protected] >
Acked-by: Jiri Olsa <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Andi Kleen <[email protected] >
Cc: Ingo Molnar <[email protected] >
Cc: John Garry <[email protected] >
Cc: Kajol Jain <[email protected] >
Cc: Kan Liang <[email protected] >
Cc: Madhavan Srinivasan <[email protected] >
Cc: Mark Rutland <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Paul A . Clarke <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Riccardo Mancini <[email protected] >
Cc: Song Liu <[email protected] >
Cc: Wan Jiabing <[email protected] >
Cc: Yury Norov <[email protected] >
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2021-11-13 18:11:50 -03:00
Ian Rogers
798c3f4a66
perf expr: Add subset_of_ids() utility
...
Add a helper that returns true if all the IDs in needles are present in
haystack.
Later this will be used in sharing events between metrics.
Signed-off-by: Ian Rogers <[email protected] >
Acked-by: Andi Kleen <[email protected] >
Cc: Adrian Hunter <[email protected] >
Cc: Alexander Antonov <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Andrew Kilroy <[email protected] >
Cc: Andrew Morton <[email protected] >
Cc: Changbin Du <[email protected] >
Cc: Denys Zagorui <[email protected] >
Cc: Fabian Hemmer <[email protected] >
Cc: Felix Fietkau <[email protected] >
Cc: Heiko Carstens <[email protected] >
Cc: Ingo Molnar <[email protected] >
Cc: Jacob Keller <[email protected] >
Cc: Jiapeng Chong <[email protected] >
Cc: Jin Yao <[email protected] >
Cc: Jiri Olsa <[email protected] >
Cc: Joakim Zhang <[email protected] >
Cc: John Garry <[email protected] >
Cc: Kajol Jain <[email protected] >
Cc: Kan Liang <[email protected] >
Cc: Kees Kook <[email protected] >
Cc: Mark Rutland <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Nicholas Fraser <[email protected] >
Cc: Nick Desaulniers <[email protected] >
Cc: Paul Clarke <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Riccardo Mancini <[email protected] >
Cc: Sami Tolvanen <[email protected] >
Cc: ShihCheng Tu <[email protected] >
Cc: Song Liu <[email protected] >
Cc: Stephane Eranian <[email protected] >
Cc: Sumanth Korikkar <[email protected] >
Cc: Thomas Richter <[email protected] >
Cc: Wan Jiabing <[email protected] >
Cc: Zhen Lei <[email protected] >
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2021-10-20 10:59:17 -03:00
Ian Rogers
80be6434c3
perf metric: Modify resolution and recursion check
...
Modify resolution. Rather than resolving a list of metrics, resolve a
metric immediately after it is added.
This simplifies knowing the root of the metric's tree so that IDs may be
associated with it.
A bug in the current implementation is that all the IDs were placed on
the first metric in a metric group.
Rather than maintain data on IDs' parents to detect cycles, maintain
a list of visited metrics and detect cycles if the same metric is
visited twice.
Only place the root metric onto the list of metrics.
Signed-off-by: Ian Rogers <[email protected] >
Acked-by: Andi Kleen <[email protected] >
Cc: Adrian Hunter <[email protected] >
Cc: Alexander Antonov <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Andrew Kilroy <[email protected] >
Cc: Andrew Morton <[email protected] >
Cc: Changbin Du <[email protected] >
Cc: Denys Zagorui <[email protected] >
Cc: Fabian Hemmer <[email protected] >
Cc: Felix Fietkau <[email protected] >
Cc: Heiko Carstens <[email protected] >
Cc: Ingo Molnar <[email protected] >
Cc: Jacob Keller <[email protected] >
Cc: Jiapeng Chong <[email protected] >
Cc: Jin Yao <[email protected] >
Cc: Jiri Olsa <[email protected] >
Cc: Joakim Zhang <[email protected] >
Cc: John Garry <[email protected] >
Cc: Kajol Jain <[email protected] >
Cc: Kan Liang <[email protected] >
Cc: Kees Kook <[email protected] >
Cc: Mark Rutland <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Nicholas Fraser <[email protected] >
Cc: Nick Desaulniers <[email protected] >
Cc: Paul Clarke <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Riccardo Mancini <[email protected] >
Cc: Sami Tolvanen <[email protected] >
Cc: ShihCheng Tu <[email protected] >
Cc: Song Liu <[email protected] >
Cc: Stephane Eranian <[email protected] >
Cc: Sumanth Korikkar <[email protected] >
Cc: Thomas Richter <[email protected] >
Cc: Wan Jiabing <[email protected] >
Cc: Zhen Lei <[email protected] >
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2021-10-20 10:35:33 -03:00
Ian Rogers
fa831fbb43
perf metric: Move runtime value to the expr context
...
The runtime value is needed when recursively parsing metrics, currently
a value of 1 is passed which is incorrect.
Rather than add more arguments to the bison parser, add runtime to the
context.
Fix call sites not to pass a value. The runtime value is defaulted to 0,
which is arbitrary. In some places this replaces a value of 1, which was
also arbitrary.
This shouldn't affect anything other than PPC.
The use of 0 or 1 shouldn't matter as a proper runtime value would be
needed in a case that it did matter.
Signed-off-by: Ian Rogers <[email protected] >
Acked-by: Andi Kleen <[email protected] >
Cc: Adrian Hunter <[email protected] >
Cc: Alexander Antonov <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Andrew Kilroy <[email protected] >
Cc: Andrew Morton <[email protected] >
Cc: Changbin Du <[email protected] >
Cc: Denys Zagorui <[email protected] >
Cc: Fabian Hemmer <[email protected] >
Cc: Felix Fietkau <[email protected] >
Cc: Heiko Carstens <[email protected] >
Cc: Ingo Molnar <[email protected] >
Cc: Jacob Keller <[email protected] >
Cc: Jiapeng Chong <[email protected] >
Cc: Jin Yao <[email protected] >
Cc: Jiri Olsa <[email protected] >
Cc: Joakim Zhang <[email protected] >
Cc: John Garry <[email protected] >
Cc: Kajol Jain <[email protected] >
Cc: Kan Liang <[email protected] >
Cc: Kees Kook <[email protected] >
Cc: Mark Rutland <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Nicholas Fraser <[email protected] >
Cc: Nick Desaulniers <[email protected] >
Cc: Paul Clarke <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Riccardo Mancini <[email protected] >
Cc: Sami Tolvanen <[email protected] >
Cc: ShihCheng Tu <[email protected] >
Cc: Song Liu <[email protected] >
Cc: Stephane Eranian <[email protected] >
Cc: Sumanth Korikkar <[email protected] >
Cc: Thomas Richter <[email protected] >
Cc: Wan Jiabing <[email protected] >
Cc: Zhen Lei <[email protected] >
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2021-10-20 10:33:02 -03:00
Ian Rogers
3f965a7df0
perf expr: Merge find_ids and regular parsing
...
Add a new option to parsing that the set of IDs being used should be
computed, this means every action needs to handle the compute_ids and
regular case. This means actions yield a new ids type is a set of ids or
the value being computed. Use the compute_ids case to replace find IDs
parsing.
Signed-off-by: Ian Rogers <[email protected] >
Tested-by: John Garry <[email protected] >
Acked-by: Jiri Olsa <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Andi Kleen <[email protected] >
Cc: Ingo Molnar <[email protected] >
Cc: Jin Yao <[email protected] >
Cc: Kajol Jain <[email protected] >
Cc: Mark Rutland <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Paul Clarke <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Sandeep Dasgupta <[email protected] >
Cc: Stephane Eranian <[email protected] >
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2021-09-29 13:51:04 -03:00
Ian Rogers
114a9d6e39
perf metric: Add utilities to work on ids map.
...
Add utilities to new/free an ids hashmap, as well as to union. Add
testing of the union. Unioning hashmaps will be used when parsing the
metric, if a value is known then the hashmap is unnecessary, otherwise
we need to union together all the event ids to compute their values for
reporting.
Signed-off-by: Ian Rogers <[email protected] >
Tested-by: John Garry <[email protected] >
Acked-by: Jiri Olsa <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Andi Kleen <[email protected] >
Cc: Ingo Molnar <[email protected] >
Cc: Jin Yao <[email protected] >
Cc: Kajol Jain <[email protected] >
Cc: Mark Rutland <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Paul Clarke <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Sandeep Dasgupta <[email protected] >
Cc: Stephane Eranian <[email protected] >
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2021-09-29 13:42:11 -03:00
Ian Rogers
7e06a5e30a
perf metric: Rename expr__find_other.
...
A later change will remove the notion of other, rename the function to
expr__find_ids as this is what it populates.
Signed-off-by: Ian Rogers <[email protected] >
Tested-by: John Garry <[email protected] >
Acked-by: Jiri Olsa <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Andi Kleen <[email protected] >
Cc: Ingo Molnar <[email protected] >
Cc: Jin Yao <[email protected] >
Cc: Kajol Jain <[email protected] >
Cc: Mark Rutland <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Paul Clarke <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Sandeep Dasgupta <[email protected] >
Cc: Stephane Eranian <[email protected] >
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2021-09-29 13:42:03 -03:00
Ian Rogers
cb94a02e74
perf metric: Restructure struct expr_parse_ctx.
...
A later change to parsing the ids out (in expr__find_other) will
potentially drop hashmaps and so it is more convenient to move
expr_parse_ctx to have a hashmap pointer rather than a struct value.
As this pointer must be freed, rather than just going out of scope, add
expr__ctx_new and expr__ctx_free to manage expr_parse_ctx memory.
Adjust use of struct expr_parse_ctx accordingly.
Reviewed-by: Andi Kleen <[email protected] >
Signed-off-by: Ian Rogers <[email protected] >
Tested-by: John Garry <[email protected] >
Acked-by: Jiri Olsa <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Ingo Molnar <[email protected] >
Cc: Jin Yao <[email protected] >
Cc: Kajol Jain <[email protected] >
Cc: Mark Rutland <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Paul Clarke <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Sandeep Dasgupta <[email protected] >
Cc: Stephane Eranian <[email protected] >
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2021-09-29 13:21:47 -03:00
Ian Rogers
29396cd573
perf expr: Force encapsulation on expr_id_data
...
This patch resolves some undefined behavior where variables in
expr_id_data were accessed (for debugging) without being defined. To
better enforce the tagged union behavior, the struct is moved into
expr.c and accessors provided. Tag values (kinds) are explicitly
identified.
Signed-off-by: Ian Rogers <[email protected] >
Reviewed-By: Kajol Jain<[email protected] >
Acked-by: Jiri Olsa <[email protected] >
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2020-11-16 14:09:18 -03:00
Jiri Olsa
f6fb0960f9
perf metric: Add recursion check when processing nested metrics
...
Keeping the stack of nested metrics via 'struct expr_id' objects
and checking if we are in recursion via already processed metric.
The stack is implemented as static array within the struct egroup
with 100 entries, which should be enough nesting depth for any
metric we have or plan to have at the moment.
Adding test that simulates the recursion and checks we can
detect it.
Committer notes:
Bumped RECURSION_ID_MAX to 1000 as per Jiri's reply to Paul Clark on the
patch series e-mail discussion.
Fixed these:
tests/parse-metric.c:308:7: error: missing field 'val' initializer [-Werror,-Wmissing-field-initializers]
{ 0 },
^
util/metricgroup.c:924:28: error: missing field 'parent' initializer [-Werror,-Wmissing-field-initializers]
struct expr_ids ids = { 0 };
^
util/metricgroup.c:924:26: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
struct expr_ids ids = { 0 };
^
{}
util/metricgroup.c:924:26: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
struct expr_ids ids = { 0 };
^
{}
util/metricgroup.c:924:28: error: missing field 'cnt' initializer [-Werror,-Wmissing-field-initializers]
struct expr_ids ids = { 0 };
^
Signed-off-by: Jiri Olsa <[email protected] >
Reviewed-by: Kajol Jain <[email protected] >
Acked-by: Ian Rogers <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Andi Kleen <[email protected] >
Cc: John Garry <[email protected] >
Cc: Michael Petlan <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Paul Clarke <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Stephane Eranian <[email protected] >
Link: http://lore.kernel.org/lkml/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2020-07-30 07:01:49 -03:00
Jiri Olsa
acf71b05d1
perf metric: Compute referenced metrics
...
Adding computation (expr__parse call) of referenced metric at
the point when it needs to be resolved during the parent metric
computation.
Once the inner metric is computed, the result is stored and
used if there's another usage of that metric.
Signed-off-by: Jiri Olsa <[email protected] >
Reviewed-by: Kajol Jain <[email protected] >
Acked-by: Ian Rogers <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Andi Kleen <[email protected] >
Cc: John Garry <[email protected] >
Cc: Michael Petlan <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Paul Clarke <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Stephane Eranian <[email protected] >
Link: http://lore.kernel.org/lkml/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2020-07-30 07:01:49 -03:00
Jiri Olsa
fc393839c1
perf metric: Add referenced metrics to hash data
...
Adding referenced metrics to the parsing context so they can be resolved
during the metric processing.
Adding expr__add_ref function to store referenced metrics into parse
context.
Signed-off-by: Jiri Olsa <[email protected] >
Reviewed-by: Kajol Jain <[email protected] >
Acked-by: Ian Rogers <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Andi Kleen <[email protected] >
Cc: John Garry <[email protected] >
Cc: Michael Petlan <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Paul Clarke <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Stephane Eranian <[email protected] >
Link: http://lore.kernel.org/lkml/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2020-07-30 07:01:49 -03:00
Jiri Olsa
3fd29fa6c1
perf metric: Add expr__del_id function
...
Adding expr__del_id function to remove ID from hashmap. It will save us
few lines in following changes.
Signed-off-by: Jiri Olsa <[email protected] >
Reviewed-by: Kajol Jain <[email protected] >
Acked-by: Ian Rogers <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Andi Kleen <[email protected] >
Cc: John Garry <[email protected] >
Cc: Michael Petlan <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Paul Clarke <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Stephane Eranian <[email protected] >
Link: http://lore.kernel.org/lkml/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2020-07-30 07:01:49 -03:00
Jiri Olsa
5c5f5e835f
perf metric: Change expr__get_id to return struct expr_id_data
...
Changing expr__get_id to use and return struct expr_id_data
pointer as value for the ID. This way we can access data other
than value for given ID in following changes.
Signed-off-by: Jiri Olsa <[email protected] >
Reviewed-by: Kajol Jain <[email protected] >
Acked-by: Ian Rogers <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Andi Kleen <[email protected] >
Cc: John Garry <[email protected] >
Cc: Michael Petlan <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Paul Clarke <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Stephane Eranian <[email protected] >
Link: http://lore.kernel.org/lkml/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2020-07-30 07:01:49 -03:00
Jiri Olsa
332603c2aa
perf metric: Add expr__add_id function
...
Add the expr__add_id() function to data for ID with zero value, which is
used when scanning the expression for IDs.
Signed-off-by: Jiri Olsa <[email protected] >
Reviewed-by: Kajol Jain <[email protected] >
Acked-by: Ian Rogers <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Andi Kleen <[email protected] >
Cc: John Garry <[email protected] >
Cc: Michael Petlan <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Paul Clarke <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Stephane Eranian <[email protected] >
Link: http://lore.kernel.org/lkml/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2020-07-30 07:01:49 -03:00
Jiri Olsa
60e10c0037
perf metric: Fix memory leak in expr__add_id function
...
Arnaldo found that we don't release value data in case the hashmap__set
fails. Releasing it in case of an error.
Reported-by: Arnaldo Carvalho de Melo <[email protected] >
Signed-off-by: Jiri Olsa <[email protected] >
Acked-by: Ian Rogers <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Andi Kleen <[email protected] >
Cc: John Garry <[email protected] >
Cc: Kajol Jain <[email protected] >
Cc: Michael Petlan <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Paul Clarke <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Stephane Eranian <[email protected] >
Link: http://lore.kernel.org/lkml/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2020-07-30 07:01:49 -03:00
Jiri Olsa
070b3b5ad7
perf metric: Add 'struct expr_id_data' to keep expr value
...
Add 'struct expr_id_data' to keep an expr value instead of just a simple
double pointer, so we can store more data for ID in the following
changes.
Signed-off-by: Jiri Olsa <[email protected] >
Acked-by: Ian Rogers <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Andi Kleen <[email protected] >
Cc: John Garry <[email protected] >
Cc: Kajol Jain <[email protected] >
Cc: Michael Petlan <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Paul Clarke <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Stephane Eranian <[email protected] >
Link: http://lore.kernel.org/lkml/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2020-07-17 09:09:48 -03:00
Jiri Olsa
2c46f54249
perf metric: Rename expr__add_id() to expr__add_val()
...
Rename expr__add_id() to expr__add_val() so we can use expr__add_id() to
actually add just the id without any value in following changes.
There's no functional change.
Signed-off-by: Jiri Olsa <[email protected] >
Acked-by: Ian Rogers <[email protected] >
Cc: Alexander Shishkin <[email protected] >
Cc: Andi Kleen <[email protected] >
Cc: John Garry <[email protected] >
Cc: Kajol Jain <[email protected] >
Cc: Michael Petlan <[email protected] >
Cc: Namhyung Kim <[email protected] >
Cc: Paul Clarke <[email protected] >
Cc: Peter Zijlstra <[email protected] >
Cc: Stephane Eranian <[email protected] >
Link: http://lore.kernel.org/lkml/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected] >
2020-07-17 09:09:48 -03:00