libperf: Move in event parse code
Subsystems (2)
cover libperf: Move in event parse code
hi,
this *RFC* patchset moves event parser code to libperf.
It keeps the current perf functionality intact (hopefully) and adds new libperf_parse_events API to libperf that provides events parsing.
At the moment libperf_parse_events function supports only breakpoint events, so it can be used to do things like:
(see the new libperf test)
evlist = perf_evlist__new(); err = libperf_parse_events(evlist, "mem:0:rw");
The other pmus parsing code directly depends on parsing code, so now when the parser is in the libperf, it will be easier to add the rest of pmus support.
I'm curious on any early feedback because it's big change. My primary target is using this interface for bpftool prog profile to allow using all the perf events there.
Also available in here:
git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.git
libperf/parse
I'm Cc-ing most of the folks just on the cover email, because it's a lot of changes and most people won't be interested ;-)
Please check the linux-perf-users mailing list or the git branch above for all the changes.
thanks,
jirka
---
Jiri Olsa (59):
libperf: Move pmu-events.h file to libperf
libperf: Move pmu-events framework to libperf
libperf: Move pmu-events build to libperf
libperf: Move perf_pmu__format_parse to libperf
tools api fs: Move in the fncache from perf
libperf: Move in the pmu hybrid support
libperf: Move name to perf_evsel
libperf: Move auto_merge_stats to perf_evsel
libperf: Move config_terms to perf_evsel
libperf: Move metric_id to perf_evsel
libperf: Move tool_event to perf_evsel
libperf: Move unit to perf_evsel
libperf: Move exclude_GH to perf_evsel
libperf: Move sample_read to perf_evsel
libperf: Move precise_max to perf_evsel
libperf: Move weak_group to perf_evsel
libperf: Move bpf_counter to perf_evsel
libperf: Move group_name to perf_evsel
perf tools: Fix parse_events_term__num call
perf tools: Pass parse_state all the way down to __add_event perf tools: Pass parse_state all the way down to add_tracepoint perf tools: Add evsel__new callback to parse_state_ops perf tools: Add evsel__new_tp callback to parse_state_ops perf tools: Add loc_term and loc_val helpers to parse_events_term__str perf tools: Add loc_term and loc_val helpers to parse_events_term__num
libperf: Move in the event_symbols_hw/event_symbols_sw
libperf: Move in struct parse_events_term code
perf tools: Add perf_evsel__add_event function
perf tools: Change struct parse_events_state::evlist to perf_evlist
libperf: Move in struct parse_events_state
perf tools: Move event_attr_init in evsel__new_idx function
libperf: Move in perf_pmu__warn_invalid_config function
libperf: Move in perf_evsel__add_event function
perf tools: Move parse_events_update_lists to parser unit
libperf: Add perf_evsel__is_group_leader function
perf tools: Make parse_events__modifier_event work over perf_evsel perf tool: Pass perf_guest in struct parse_events_state
libperf: Move in parse_events__modifier_group/event functions
libperf: Move in parse_events__handle_error function
libperf: Move in parse_events_evlist_error function
perf tools: Add perf_evsel__delete callback to struct parse_events_ops
libperf: Move in parse_events_name function
perf tools: Move out parse_events_add_pmu fallback from parser code perf tools: Add add_pmu callback to struct parse_events_ops perf tools: Add add_pmu_multi callback to struct parse_events_ops perf tools: Add add_numeric callback to struct parse_events_ops perf tools: Add add_cache callback to struct parse_events_ops perf tools: Add add_breakpoint callback to struct parse_events_ops perf tools: Add add_tracepoint callback to struct parse_events_ops perf tools: Add add_bpf callback to struct parse_events_ops perf tools: Add add_tool callback to struct parse_events_ops perf tools: Add set_leader callback to struct parse_events_ops perf tools: Add parse_check callback to struct parse_events_ops perf tools: Move PE_* enums in parse_events__scanner
libperf: Move in parse-events flex/bison parser
libperf: Move in parse_events_add_breakpoint function
libperf: Move in some lib objects from perf
libperf: Add libperf_parse_events function
libperf: Add parse-events test
tools/lib/api/fs/Build | 1 +
tools/{perf/util => lib/api/fs}/fncache.c | 4 +-
tools/lib/api/fs/fs.h | 2 +
tools/lib/perf/Build | 79 ++
tools/lib/perf/Makefile | 40 +-
tools/lib/perf/include/internal/evsel.h | 30 +
tools/lib/perf/include/internal/parse-events.h | 203 +++++
.../perf/include/internal}/pmu-hybrid.h | 2 +-
tools/lib/perf/include/internal/pmu.h | 59 ++
tools/lib/perf/include/perf/evlist.h | 2 +
.../perf/include/perf}/pmu-events.h | 0
tools/lib/perf/libperf.map | 1 +
tools/lib/perf/parse-events.c | 875 +++++++++++++++++++
tools/{perf/util => lib/perf}/parse-events.l | 16 +-
tools/{perf/util => lib/perf}/parse-events.y | 197 +++--
tools/{ => lib}/perf/pmu-events/Build | 2 +-
tools/{ => lib}/perf/pmu-events/README | 0
.../pmu-events/arch/arm64/ampere/emag/branch.json | 0
.../pmu-events/arch/arm64/ampere/emag/bus.json | 0
.../pmu-events/arch/arm64/ampere/emag/cache.json | 0
.../pmu-events/arch/arm64/ampere/emag/clock.json | 0
.../arch/arm64/ampere/emag/exception.json | 0
.../arch/arm64/ampere/emag/instruction.json | 0
.../arch/arm64/ampere/emag/intrinsic.json | 0
.../pmu-events/arch/arm64/ampere/emag/memory.json | 0
.../arch/arm64/ampere/emag/pipeline.json | 0
.../arch/arm64/arm/cortex-a53/branch.json | 0
.../pmu-events/arch/arm64/arm/cortex-a53/bus.json | 0
.../arch/arm64/arm/cortex-a53/cache.json | 0
.../arch/arm64/arm/cortex-a53/memory.json | 0
.../arch/arm64/arm/cortex-a53/other.json | 0
.../arch/arm64/arm/cortex-a53/pipeline.json | 0
.../arm64/arm/cortex-a57-a72/core-imp-def.json | 0
.../arch/arm64/arm/cortex-a76-n1/branch.json | 0
.../arch/arm64/arm/cortex-a76-n1/bus.json | 0
.../arch/arm64/arm/cortex-a76-n1/cache.json | 0
.../arch/arm64/arm/cortex-a76-n1/exception.json | 0
.../arch/arm64/arm/cortex-a76-n1/instruction.json | 0
.../arch/arm64/arm/cortex-a76-n1/memory.json | 0
.../arch/arm64/arm/cortex-a76-n1/other.json | 0
.../arch/arm64/arm/cortex-a76-n1/pipeline.json | 0
.../arch/arm64/arm/neoverse-v1/branch.json | 0
.../pmu-events/arch/arm64/arm/neoverse-v1/bus.json | 0
.../arch/arm64/arm/neoverse-v1/cache.json | 0
.../arch/arm64/arm/neoverse-v1/exception.json | 0
.../arch/arm64/arm/neoverse-v1/instruction.json | 0
.../arch/arm64/arm/neoverse-v1/memory.json | 0
.../arch/arm64/arm/neoverse-v1/other.json | 0
.../arch/arm64/arm/neoverse-v1/pipeline.json | 0
.../arch/arm64/armv8-common-and-microarch.json | 0
.../pmu-events/arch/arm64/armv8-recommended.json | 0
.../arch/arm64/cavium/thunderx2/core-imp-def.json | 0
.../arch/arm64/freescale/imx8mm/sys/ddrc.json | 0
.../arch/arm64/freescale/imx8mm/sys/metrics.json | 0
.../arch/arm64/freescale/imx8mn/sys/ddrc.json | 0
.../arch/arm64/freescale/imx8mn/sys/metrics.json | 0
.../arch/arm64/freescale/imx8mp/sys/ddrc.json | 0
.../arch/arm64/freescale/imx8mp/sys/metrics.json | 0
.../arch/arm64/freescale/imx8mq/sys/ddrc.json | 0
.../arch/arm64/freescale/imx8mq/sys/metrics.json | 0
.../arch/arm64/fujitsu/a64fx/branch.json | 0
.../pmu-events/arch/arm64/fujitsu/a64fx/bus.json | 0
.../pmu-events/arch/arm64/fujitsu/a64fx/cache.json | 0
.../pmu-events/arch/arm64/fujitsu/a64fx/cycle.json | 0
.../arch/arm64/fujitsu/a64fx/exception.json | 0
.../arch/arm64/fujitsu/a64fx/instruction.json | 0
.../arch/arm64/fujitsu/a64fx/memory.json | 0
.../pmu-events/arch/arm64/fujitsu/a64fx/other.json | 0
.../arch/arm64/fujitsu/a64fx/pipeline.json | 0
.../pmu-events/arch/arm64/fujitsu/a64fx/sve.json | 0
.../arch/arm64/hisilicon/hip08/core-imp-def.json | 0
.../arch/arm64/hisilicon/hip08/metrics.json | 0
.../arch/arm64/hisilicon/hip08/uncore-ddrc.json | 0
.../arch/arm64/hisilicon/hip08/uncore-hha.json | 0
.../arch/arm64/hisilicon/hip08/uncore-l3c.json | 0
.../perf/pmu-events/arch/arm64/mapfile.csv | 0
.../perf/pmu-events/arch/nds32/mapfile.csv | 0
.../perf/pmu-events/arch/nds32/n13/atcpmu.json | 0
.../perf/pmu-events/arch/powerpc/mapfile.csv | 0
.../pmu-events/arch/powerpc/power10/cache.json | 0
.../arch/powerpc/power10/floating_point.json | 0
.../pmu-events/arch/powerpc/power10/frontend.json | 0
.../pmu-events/arch/powerpc/power10/locks.json | 0
.../pmu-events/arch/powerpc/power10/marked.json | 0
.../pmu-events/arch/powerpc/power10/memory.json | 0
.../arch/powerpc/power10/nest_metrics.json | 0
.../pmu-events/arch/powerpc/power10/others.json | 0
.../pmu-events/arch/powerpc/power10/pipeline.json | 0
.../perf/pmu-events/arch/powerpc/power10/pmc.json | 0
.../arch/powerpc/power10/translation.json | 0
.../perf/pmu-events/arch/powerpc/power8/cache.json | 0
.../arch/powerpc/power8/floating-point.json | 0
.../pmu-events/arch/powerpc/power8/frontend.json | 0
.../pmu-events/arch/powerpc/power8/marked.json | 0
.../pmu-events/arch/powerpc/power8/memory.json | 0
.../pmu-events/arch/powerpc/power8/metrics.json | 0
.../perf/pmu-events/arch/powerpc/power8/other.json | 0
.../pmu-events/arch/powerpc/power8/pipeline.json | 0
.../perf/pmu-events/arch/powerpc/power8/pmc.json | 0
.../arch/powerpc/power8/translation.json | 0
.../perf/pmu-events/arch/powerpc/power9/cache.json | 0
.../arch/powerpc/power9/floating-point.json | 0
.../pmu-events/arch/powerpc/power9/frontend.json | 0
.../pmu-events/arch/powerpc/power9/marked.json | 0
.../pmu-events/arch/powerpc/power9/memory.json | 0
.../pmu-events/arch/powerpc/power9/metrics.json | 0
.../arch/powerpc/power9/nest_metrics.json | 0
.../perf/pmu-events/arch/powerpc/power9/other.json | 0
.../pmu-events/arch/powerpc/power9/pipeline.json | 0
.../perf/pmu-events/arch/powerpc/power9/pmc.json | 0
.../arch/powerpc/power9/translation.json | 0
.../perf/pmu-events/arch/s390/cf_z10/basic.json | 0
.../perf/pmu-events/arch/s390/cf_z10/crypto.json | 0
.../perf/pmu-events/arch/s390/cf_z10/extended.json | 0
.../perf/pmu-events/arch/s390/cf_z13/basic.json | 0
.../perf/pmu-events/arch/s390/cf_z13/crypto.json | 0
.../perf/pmu-events/arch/s390/cf_z13/extended.json | 0
.../pmu-events/arch/s390/cf_z13/transaction.json | 0
.../perf/pmu-events/arch/s390/cf_z14/basic.json | 0
.../perf/pmu-events/arch/s390/cf_z14/crypto.json | 0
.../perf/pmu-events/arch/s390/cf_z14/extended.json | 0
.../pmu-events/arch/s390/cf_z14/transaction.json | 0
.../perf/pmu-events/arch/s390/cf_z15/basic.json | 0
.../perf/pmu-events/arch/s390/cf_z15/crypto.json | 0
.../perf/pmu-events/arch/s390/cf_z15/crypto6.json | 0
.../perf/pmu-events/arch/s390/cf_z15/extended.json | 0
.../pmu-events/arch/s390/cf_z15/transaction.json | 0
.../perf/pmu-events/arch/s390/cf_z196/basic.json | 0
.../perf/pmu-events/arch/s390/cf_z196/crypto.json | 0
.../pmu-events/arch/s390/cf_z196/extended.json | 0
.../perf/pmu-events/arch/s390/cf_zec12/basic.json | 0
.../perf/pmu-events/arch/s390/cf_zec12/crypto.json | 0
.../pmu-events/arch/s390/cf_zec12/extended.json | 0
.../pmu-events/arch/s390/cf_zec12/transaction.json | 0
.../perf/pmu-events/arch/s390/mapfile.csv | 0
.../perf/pmu-events/arch/test/arch-std-events.json | 0
.../pmu-events/arch/test/test_soc/cpu/branch.json | 0
.../pmu-events/arch/test/test_soc/cpu/cache.json | 0
.../pmu-events/arch/test/test_soc/cpu/other.json | 0
.../pmu-events/arch/test/test_soc/cpu/uncore.json | 0
.../pmu-events/arch/test/test_soc/sys/uncore.json | 0
.../perf/pmu-events/arch/x86/amdzen1/branch.json | 0
.../perf/pmu-events/arch/x86/amdzen1/cache.json | 0
.../perf/pmu-events/arch/x86/amdzen1/core.json | 0
.../pmu-events/arch/x86/amdzen1/data-fabric.json | 0
.../arch/x86/amdzen1/floating-point.json | 0
.../perf/pmu-events/arch/x86/amdzen1/memory.json | 0
.../perf/pmu-events/arch/x86/amdzen1/other.json | 0
.../pmu-events/arch/x86/amdzen1/recommended.json | 0
.../perf/pmu-events/arch/x86/amdzen2/branch.json | 0
.../perf/pmu-events/arch/x86/amdzen2/cache.json | 0
.../perf/pmu-events/arch/x86/amdzen2/core.json | 0
.../pmu-events/arch/x86/amdzen2/data-fabric.json | 0
.../arch/x86/amdzen2/floating-point.json | 0
.../perf/pmu-events/arch/x86/amdzen2/memory.json | 0
.../perf/pmu-events/arch/x86/amdzen2/other.json | 0
.../pmu-events/arch/x86/amdzen2/recommended.json | 0
.../perf/pmu-events/arch/x86/amdzen3/branch.json | 0
.../perf/pmu-events/arch/x86/amdzen3/cache.json | 0
.../perf/pmu-events/arch/x86/amdzen3/core.json | 0
.../pmu-events/arch/x86/amdzen3/data-fabric.json | 0
.../arch/x86/amdzen3/floating-point.json | 0
.../perf/pmu-events/arch/x86/amdzen3/memory.json | 0
.../perf/pmu-events/arch/x86/amdzen3/other.json | 0
.../pmu-events/arch/x86/amdzen3/recommended.json | 0
.../perf/pmu-events/arch/x86/bonnell/cache.json | 0
.../arch/x86/bonnell/floating-point.json | 0
.../perf/pmu-events/arch/x86/bonnell/frontend.json | 0
.../perf/pmu-events/arch/x86/bonnell/memory.json | 0
.../perf/pmu-events/arch/x86/bonnell/other.json | 0
.../perf/pmu-events/arch/x86/bonnell/pipeline.json | 0
.../arch/x86/bonnell/virtual-memory.json | 0
.../pmu-events/arch/x86/broadwell/bdw-metrics.json | 0
.../perf/pmu-events/arch/x86/broadwell/cache.json | 0
.../arch/x86/broadwell/floating-point.json | 0
.../pmu-events/arch/x86/broadwell/frontend.json | 0
.../perf/pmu-events/arch/x86/broadwell/memory.json | 0
.../perf/pmu-events/arch/x86/broadwell/other.json | 0
.../pmu-events/arch/x86/broadwell/pipeline.json | 0
.../perf/pmu-events/arch/x86/broadwell/uncore.json | 0
.../arch/x86/broadwell/virtual-memory.json | 0
.../arch/x86/broadwellde/bdwde-metrics.json | 0
.../pmu-events/arch/x86/broadwellde/cache.json | 0
.../arch/x86/broadwellde/floating-point.json | 0
.../pmu-events/arch/x86/broadwellde/frontend.json | 0
.../pmu-events/arch/x86/broadwellde/memory.json | 0
.../pmu-events/arch/x86/broadwellde/other.json | 0
.../pmu-events/arch/x86/broadwellde/pipeline.json | 0
.../arch/x86/broadwellde/uncore-cache.json | 0
.../arch/x86/broadwellde/uncore-memory.json | 0
.../arch/x86/broadwellde/uncore-power.json | 0
.../arch/x86/broadwellde/virtual-memory.json | 0
.../arch/x86/broadwellx/bdx-metrics.json | 0
.../perf/pmu-events/arch/x86/broadwellx/cache.json | 0
.../arch/x86/broadwellx/floating-point.json | 0
.../pmu-events/arch/x86/broadwellx/frontend.json | 0
.../pmu-events/arch/x86/broadwellx/memory.json | 0
.../perf/pmu-events/arch/x86/broadwellx/other.json | 0
.../pmu-events/arch/x86/broadwellx/pipeline.json | 0
.../arch/x86/broadwellx/uncore-cache.json | 0
.../arch/x86/broadwellx/uncore-interconnect.json | 0
.../arch/x86/broadwellx/uncore-memory.json | 0
.../arch/x86/broadwellx/uncore-power.json | 0
.../arch/x86/broadwellx/virtual-memory.json | 0
.../pmu-events/arch/x86/cascadelakex/cache.json | 0
.../arch/x86/cascadelakex/clx-metrics.json | 0
.../arch/x86/cascadelakex/floating-point.json | 0
.../pmu-events/arch/x86/cascadelakex/frontend.json | 0
.../pmu-events/arch/x86/cascadelakex/memory.json | 0
.../pmu-events/arch/x86/cascadelakex/other.json | 0
.../pmu-events/arch/x86/cascadelakex/pipeline.json | 0
.../arch/x86/cascadelakex/uncore-memory.json | 0
.../arch/x86/cascadelakex/uncore-other.json | 0
.../arch/x86/cascadelakex/virtual-memory.json | 0
.../pmu-events/arch/x86/elkhartlake/cache.json | 0
.../arch/x86/elkhartlake/ehl-metrics.json | 0
.../arch/x86/elkhartlake/floating-point.json | 0
.../pmu-events/arch/x86/elkhartlake/frontend.json | 0
.../pmu-events/arch/x86/elkhartlake/memory.json | 0
.../pmu-events/arch/x86/elkhartlake/other.json | 0
.../pmu-events/arch/x86/elkhartlake/pipeline.json | 0
.../arch/x86/elkhartlake/virtual-memory.json | 0
.../perf/pmu-events/arch/x86/goldmont/cache.json | 0
.../pmu-events/arch/x86/goldmont/frontend.json | 0
.../perf/pmu-events/arch/x86/goldmont/memory.json | 0
.../perf/pmu-events/arch/x86/goldmont/other.json | 0
.../pmu-events/arch/x86/goldmont/pipeline.json | 0
.../arch/x86/goldmont/virtual-memory.json | 0
.../pmu-events/arch/x86/goldmontplus/cache.json | 0
.../pmu-events/arch/x86/goldmontplus/frontend.json | 0
.../pmu-events/arch/x86/goldmontplus/memory.json | 0
.../pmu-events/arch/x86/goldmontplus/other.json | 0
.../pmu-events/arch/x86/goldmontplus/pipeline.json | 0
.../arch/x86/goldmontplus/virtual-memory.json | 0
.../perf/pmu-events/arch/x86/haswell/cache.json | 0
.../arch/x86/haswell/floating-point.json | 0
.../perf/pmu-events/arch/x86/haswell/frontend.json | 0
.../pmu-events/arch/x86/haswell/hsw-metrics.json | 0
.../perf/pmu-events/arch/x86/haswell/memory.json | 0
.../perf/pmu-events/arch/x86/haswell/other.json | 0
.../perf/pmu-events/arch/x86/haswell/pipeline.json | 0
.../perf/pmu-events/arch/x86/haswell/uncore.json | 0
.../arch/x86/haswell/virtual-memory.json | 0
.../perf/pmu-events/arch/x86/haswellx/cache.json | 0
.../arch/x86/haswellx/floating-point.json | 0
.../pmu-events/arch/x86/haswellx/frontend.json | 0
.../pmu-events/arch/x86/haswellx/hsx-metrics.json | 0
.../perf/pmu-events/arch/x86/haswellx/memory.json | 0
.../perf/pmu-events/arch/x86/haswellx/other.json | 0
.../pmu-events/arch/x86/haswellx/pipeline.json | 0
.../pmu-events/arch/x86/haswellx/uncore-cache.json | 0
.../arch/x86/haswellx/uncore-interconnect.json | 0
.../arch/x86/haswellx/uncore-memory.json | 0
.../pmu-events/arch/x86/haswellx/uncore-power.json | 0
.../arch/x86/haswellx/virtual-memory.json | 0
.../perf/pmu-events/arch/x86/icelake/cache.json | 0
.../arch/x86/icelake/floating-point.json | 0
.../perf/pmu-events/arch/x86/icelake/frontend.json | 0
.../pmu-events/arch/x86/icelake/icl-metrics.json | 0
.../perf/pmu-events/arch/x86/icelake/memory.json | 0
.../perf/pmu-events/arch/x86/icelake/other.json | 0
.../perf/pmu-events/arch/x86/icelake/pipeline.json | 0
.../arch/x86/icelake/virtual-memory.json | 0
.../perf/pmu-events/arch/x86/icelakex/cache.json | 0
.../arch/x86/icelakex/floating-point.json | 0
.../pmu-events/arch/x86/icelakex/frontend.json | 0
.../pmu-events/arch/x86/icelakex/icx-metrics.json | 0
.../perf/pmu-events/arch/x86/icelakex/memory.json | 0
.../perf/pmu-events/arch/x86/icelakex/other.json | 0
.../pmu-events/arch/x86/icelakex/pipeline.json | 0
.../arch/x86/icelakex/uncore-memory.json | 0
.../pmu-events/arch/x86/icelakex/uncore-other.json | 0
.../pmu-events/arch/x86/icelakex/uncore-power.json | 0
.../arch/x86/icelakex/virtual-memory.json | 0
.../perf/pmu-events/arch/x86/ivybridge/cache.json | 0
.../arch/x86/ivybridge/floating-point.json | 0
.../pmu-events/arch/x86/ivybridge/frontend.json | 0
.../pmu-events/arch/x86/ivybridge/ivb-metrics.json | 0
.../perf/pmu-events/arch/x86/ivybridge/memory.json | 0
.../perf/pmu-events/arch/x86/ivybridge/other.json | 0
.../pmu-events/arch/x86/ivybridge/pipeline.json | 0
.../perf/pmu-events/arch/x86/ivybridge/uncore.json | 0
.../arch/x86/ivybridge/virtual-memory.json | 0
.../perf/pmu-events/arch/x86/ivytown/cache.json | 0
.../arch/x86/ivytown/floating-point.json | 0
.../perf/pmu-events/arch/x86/ivytown/frontend.json | 0
.../pmu-events/arch/x86/ivytown/ivt-metrics.json | 0
.../perf/pmu-events/arch/x86/ivytown/memory.json | 0
.../perf/pmu-events/arch/x86/ivytown/other.json | 0
.../perf/pmu-events/arch/x86/ivytown/pipeline.json | 0
.../pmu-events/arch/x86/ivytown/uncore-cache.json | 0
.../arch/x86/ivytown/uncore-interconnect.json | 0
.../pmu-events/arch/x86/ivytown/uncore-memory.json | 0
.../pmu-events/arch/x86/ivytown/uncore-power.json | 0
.../arch/x86/ivytown/virtual-memory.json | 0
.../perf/pmu-events/arch/x86/jaketown/cache.json | 0
.../arch/x86/jaketown/floating-point.json | 0
.../pmu-events/arch/x86/jaketown/frontend.json | 0
.../pmu-events/arch/x86/jaketown/jkt-metrics.json | 0
.../perf/pmu-events/arch/x86/jaketown/memory.json | 0
.../perf/pmu-events/arch/x86/jaketown/other.json | 0
.../pmu-events/arch/x86/jaketown/pipeline.json | 0
.../pmu-events/arch/x86/jaketown/uncore-cache.json | 0
.../arch/x86/jaketown/uncore-interconnect.json | 0
.../arch/x86/jaketown/uncore-memory.json | 0
.../pmu-events/arch/x86/jaketown/uncore-power.json | 0
.../arch/x86/jaketown/virtual-memory.json | 0
.../pmu-events/arch/x86/knightslanding/cache.json | 0
.../arch/x86/knightslanding/frontend.json | 0
.../pmu-events/arch/x86/knightslanding/memory.json | 0
.../arch/x86/knightslanding/pipeline.json | 0
.../arch/x86/knightslanding/uncore-memory.json | 0
.../arch/x86/knightslanding/virtual-memory.json | 0
.../{ => lib}/perf/pmu-events/arch/x86/mapfile.csv | 0
.../perf/pmu-events/arch/x86/nehalemep/cache.json | 0
.../arch/x86/nehalemep/floating-point.json | 0
.../pmu-events/arch/x86/nehalemep/frontend.json | 0
.../perf/pmu-events/arch/x86/nehalemep/memory.json | 0
.../perf/pmu-events/arch/x86/nehalemep/other.json | 0
.../pmu-events/arch/x86/nehalemep/pipeline.json | 0
.../arch/x86/nehalemep/virtual-memory.json | 0
.../perf/pmu-events/arch/x86/nehalemex/cache.json | 0
.../arch/x86/nehalemex/floating-point.json | 0
.../pmu-events/arch/x86/nehalemex/frontend.json | 0
.../perf/pmu-events/arch/x86/nehalemex/memory.json | 0
.../perf/pmu-events/arch/x86/nehalemex/other.json | 0
.../pmu-events/arch/x86/nehalemex/pipeline.json | 0
.../arch/x86/nehalemex/virtual-memory.json | 0
.../pmu-events/arch/x86/sandybridge/cache.json | 0
.../arch/x86/sandybridge/floating-point.json | 0
.../pmu-events/arch/x86/sandybridge/frontend.json | 0
.../pmu-events/arch/x86/sandybridge/memory.json | 0
.../pmu-events/arch/x86/sandybridge/other.json | 0
.../pmu-events/arch/x86/sandybridge/pipeline.json | 0
.../arch/x86/sandybridge/snb-metrics.json | 0
.../pmu-events/arch/x86/sandybridge/uncore.json | 0
.../arch/x86/sandybridge/virtual-memory.json | 0
.../perf/pmu-events/arch/x86/silvermont/cache.json | 0
.../pmu-events/arch/x86/silvermont/frontend.json | 0
.../pmu-events/arch/x86/silvermont/memory.json | 0
.../perf/pmu-events/arch/x86/silvermont/other.json | 0
.../pmu-events/arch/x86/silvermont/pipeline.json | 0
.../arch/x86/silvermont/virtual-memory.json | 0
.../perf/pmu-events/arch/x86/skylake/cache.json | 0
.../arch/x86/skylake/floating-point.json | 0
.../perf/pmu-events/arch/x86/skylake/frontend.json | 0
.../perf/pmu-events/arch/x86/skylake/memory.json | 0
.../perf/pmu-events/arch/x86/skylake/other.json | 0
.../perf/pmu-events/arch/x86/skylake/pipeline.json | 0
.../pmu-events/arch/x86/skylake/skl-metrics.json | 0
.../perf/pmu-events/arch/x86/skylake/uncore.json | 0
.../arch/x86/skylake/virtual-memory.json | 0
.../perf/pmu-events/arch/x86/skylakex/cache.json | 0
.../arch/x86/skylakex/floating-point.json | 0
.../pmu-events/arch/x86/skylakex/frontend.json | 0
.../perf/pmu-events/arch/x86/skylakex/memory.json | 0
.../perf/pmu-events/arch/x86/skylakex/other.json | 0
.../pmu-events/arch/x86/skylakex/pipeline.json | 0
.../pmu-events/arch/x86/skylakex/skx-metrics.json | 0
.../arch/x86/skylakex/uncore-memory.json | 0
.../pmu-events/arch/x86/skylakex/uncore-other.json | 0
.../arch/x86/skylakex/virtual-memory.json | 0
.../perf/pmu-events/arch/x86/tigerlake/cache.json | 0
.../arch/x86/tigerlake/floating-point.json | 0
.../pmu-events/arch/x86/tigerlake/frontend.json | 0
.../perf/pmu-events/arch/x86/tigerlake/memory.json | 0
.../perf/pmu-events/arch/x86/tigerlake/other.json | 0
.../pmu-events/arch/x86/tigerlake/pipeline.json | 0
.../pmu-events/arch/x86/tigerlake/tgl-metrics.json | 0
.../arch/x86/tigerlake/virtual-memory.json | 0
.../perf/pmu-events/arch/x86/tremontx/cache.json | 0
.../pmu-events/arch/x86/tremontx/frontend.json | 0
.../perf/pmu-events/arch/x86/tremontx/memory.json | 0
.../perf/pmu-events/arch/x86/tremontx/other.json | 0
.../pmu-events/arch/x86/tremontx/pipeline.json | 0
.../arch/x86/tremontx/uncore-memory.json | 0
.../pmu-events/arch/x86/tremontx/uncore-other.json | 0
.../pmu-events/arch/x86/tremontx/uncore-power.json | 0
.../arch/x86/tremontx/virtual-memory.json | 0
.../pmu-events/arch/x86/westmereep-dp/cache.json | 0
.../arch/x86/westmereep-dp/floating-point.json | 0
.../arch/x86/westmereep-dp/frontend.json | 0
.../pmu-events/arch/x86/westmereep-dp/memory.json | 0
.../pmu-events/arch/x86/westmereep-dp/other.json | 0
.../arch/x86/westmereep-dp/pipeline.json | 0
.../arch/x86/westmereep-dp/virtual-memory.json | 0
.../pmu-events/arch/x86/westmereep-sp/cache.json | 0
.../arch/x86/westmereep-sp/floating-point.json | 0
.../arch/x86/westmereep-sp/frontend.json | 0
.../pmu-events/arch/x86/westmereep-sp/memory.json | 0
.../pmu-events/arch/x86/westmereep-sp/other.json | 0
.../arch/x86/westmereep-sp/pipeline.json | 0
.../arch/x86/westmereep-sp/virtual-memory.json | 0
.../perf/pmu-events/arch/x86/westmereex/cache.json | 0
.../arch/x86/westmereex/floating-point.json | 0
.../pmu-events/arch/x86/westmereex/frontend.json | 0
.../pmu-events/arch/x86/westmereex/memory.json | 0
.../perf/pmu-events/arch/x86/westmereex/other.json | 0
.../pmu-events/arch/x86/westmereex/pipeline.json | 0
.../arch/x86/westmereex/virtual-memory.json | 0
tools/{ => lib}/perf/pmu-events/jevents.c | 6 +-
tools/{ => lib}/perf/pmu-events/jsmn.c | 0
tools/{ => lib}/perf/pmu-events/jsmn.h | 0
tools/{ => lib}/perf/pmu-events/json.c | 0
tools/{ => lib}/perf/pmu-events/json.h | 0
tools/{perf/util => lib/perf}/pmu-hybrid.c | 3 +-
tools/lib/perf/pmu.c | 117 +++
tools/{perf/util => lib/perf}/pmu.l | 3 +-
tools/{perf/util => lib/perf}/pmu.y | 2 +-
tools/lib/perf/tests/Build | 1 +
tools/lib/perf/tests/main.c | 1 +
tools/lib/perf/tests/test-evlist.c | 2 +
tools/lib/perf/tests/test-parse-events.c | 43 +
tools/lib/perf/tests/tests.h | 1 +
tools/perf/Makefile.perf | 22 +-
tools/perf/arch/x86/util/kvm-stat.c | 8 +-
tools/perf/arch/x86/util/pmu.c | 1 -
tools/perf/builtin-c2c.c | 2 +-
tools/perf/builtin-kvm.c | 6 +-
tools/perf/builtin-list.c | 2 +-
tools/perf/builtin-mem.c | 2 +-
tools/perf/builtin-record.c | 12 +-
tools/perf/builtin-stat.c | 18 +-
tools/perf/builtin-top.c | 2 +-
tools/perf/builtin-trace.c | 12 +-
tools/perf/tests/event_update.c | 2 +-
tools/perf/tests/evsel-roundtrip-name.c | 2 +-
tools/perf/tests/evsel-tp-sched.c | 6 +-
tools/perf/tests/expand-cgroup.c | 8 +-
tools/perf/tests/parse-events.c | 87 +-
tools/perf/tests/parse-metric.c | 6 +-
tools/perf/tests/perf-time-to-tsc.c | 2 +-
tools/perf/tests/pmu-events.c | 2 +-
tools/perf/util/Build | 55 --
tools/perf/util/amd-sample-raw.c | 2 +-
tools/perf/util/arm-spe.c | 6 +-
tools/perf/util/auxtrace.c | 6 +-
tools/perf/util/bpf_counter.c | 2 +-
tools/perf/util/cputopo.c | 2 +-
tools/perf/util/evlist-hybrid.c | 5 +-
tools/perf/util/evlist.c | 18 +-
tools/perf/util/evsel.c | 109 +--
tools/perf/util/evsel.h | 23 +-
tools/perf/util/evsel_fprintf.c | 2 +-
tools/perf/util/fncache.h | 7 -
tools/perf/util/header.c | 32 +-
tools/perf/util/intel-pt.c | 6 +-
tools/perf/util/mem-events.c | 2 +-
tools/perf/util/metricgroup.c | 22 +-
tools/perf/util/metricgroup.h | 2 +-
tools/perf/util/parse-events-hybrid.c | 26 +-
tools/perf/util/parse-events-hybrid.h | 6 +-
tools/perf/util/parse-events.c | 971 +++++----------------
tools/perf/util/parse-events.h | 167 +---
tools/perf/util/pmu.c | 113 +--
tools/perf/util/pmu.h | 44 +-
tools/perf/util/python-ext-sources | 2 -
tools/perf/util/record.c | 4 +-
tools/perf/util/s390-sample-raw.c | 2 +-
tools/perf/util/sideband_evlist.c | 2 +-
tools/perf/util/sort.c | 6 +-
tools/perf/util/srccode.c | 10 +-
tools/perf/util/stat-display.c | 29 +-
tools/perf/util/stat-shadow.c | 14 +-
tools/perf/util/synthetic-events.c | 10 +-
tools/perf/util/trace-event-info.c | 6 +-
466 files changed, 2051 insertions(+), 1556 deletions(-)
rename tools/{perf/util => lib/api/fs}/fncache.c (95%)
create mode 100644 tools/lib/perf/include/internal/parse-events.h
rename tools/{perf/util => lib/perf/include/internal}/pmu-hybrid.h (96%)
create mode 100644 tools/lib/perf/include/internal/pmu.h
rename tools/{perf/pmu-events => lib/perf/include/perf}/pmu-events.h (100%)
create mode 100644 tools/lib/perf/parse-events.c
rename tools/{perf/util => lib/perf}/parse-events.l (96%)
rename tools/{perf/util => lib/perf}/parse-events.y (76%)
rename tools/{ => lib}/perf/pmu-events/Build (87%)
rename tools/{ => lib}/perf/pmu-events/README (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/ampere/emag/branch.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/ampere/emag/bus.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/ampere/emag/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/ampere/emag/clock.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/ampere/emag/exception.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/ampere/emag/instruction.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/ampere/emag/intrinsic.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/ampere/emag/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/ampere/emag/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/cortex-a53/branch.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/cortex-a53/bus.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/cortex-a53/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/cortex-a53/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/cortex-a53/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/cortex-a53/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/cortex-a57-a72/core-imp-def.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/cortex-a76-n1/branch.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/cortex-a76-n1/bus.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/cortex-a76-n1/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/cortex-a76-n1/exception.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/cortex-a76-n1/instruction.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/cortex-a76-n1/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/cortex-a76-n1/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/cortex-a76-n1/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/neoverse-v1/branch.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/neoverse-v1/bus.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/neoverse-v1/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/neoverse-v1/exception.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/neoverse-v1/instruction.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/neoverse-v1/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/neoverse-v1/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/neoverse-v1/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/armv8-common-and-microarch.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/armv8-recommended.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/cavium/thunderx2/core-imp-def.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/freescale/imx8mm/sys/ddrc.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/freescale/imx8mm/sys/metrics.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/freescale/imx8mn/sys/ddrc.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/freescale/imx8mn/sys/metrics.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/freescale/imx8mp/sys/ddrc.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/freescale/imx8mp/sys/metrics.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/freescale/imx8mq/sys/ddrc.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/freescale/imx8mq/sys/metrics.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/fujitsu/a64fx/branch.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/fujitsu/a64fx/bus.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/fujitsu/a64fx/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/fujitsu/a64fx/cycle.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/fujitsu/a64fx/exception.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/fujitsu/a64fx/instruction.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/fujitsu/a64fx/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/fujitsu/a64fx/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/fujitsu/a64fx/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/fujitsu/a64fx/sve.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/hisilicon/hip08/core-imp-def.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/hisilicon/hip08/metrics.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-ddrc.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-hha.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-l3c.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/arm64/mapfile.csv (100%)
rename tools/{ => lib}/perf/pmu-events/arch/nds32/mapfile.csv (100%)
rename tools/{ => lib}/perf/pmu-events/arch/nds32/n13/atcpmu.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/mapfile.csv (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power10/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power10/floating_point.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power10/frontend.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power10/locks.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power10/marked.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power10/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power10/nest_metrics.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power10/others.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power10/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power10/pmc.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power10/translation.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power8/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power8/floating-point.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power8/frontend.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power8/marked.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power8/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power8/metrics.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power8/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power8/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power8/pmc.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power8/translation.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power9/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power9/floating-point.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power9/frontend.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power9/marked.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power9/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power9/metrics.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power9/nest_metrics.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power9/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power9/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power9/pmc.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power9/translation.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z10/basic.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z10/crypto.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z10/extended.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z13/basic.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z13/crypto.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z13/extended.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z13/transaction.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z14/basic.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z14/crypto.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z14/extended.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z14/transaction.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z15/basic.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z15/crypto.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z15/crypto6.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z15/extended.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z15/transaction.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z196/basic.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z196/crypto.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z196/extended.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_zec12/basic.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_zec12/crypto.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_zec12/extended.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_zec12/transaction.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/s390/mapfile.csv (100%)
rename tools/{ => lib}/perf/pmu-events/arch/test/arch-std-events.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/test/test_soc/cpu/branch.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/test/test_soc/cpu/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/test/test_soc/cpu/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/test/test_soc/cpu/uncore.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/test/test_soc/sys/uncore.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen1/branch.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen1/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen1/core.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen1/data-fabric.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen1/floating-point.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen1/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen1/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen1/recommended.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen2/branch.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen2/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen2/core.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen2/data-fabric.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen2/floating-point.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen2/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen2/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen2/recommended.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen3/branch.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen3/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen3/core.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen3/data-fabric.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen3/floating-point.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen3/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen3/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen3/recommended.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/bonnell/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/bonnell/floating-point.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/bonnell/frontend.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/bonnell/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/bonnell/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/bonnell/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/bonnell/virtual-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwell/bdw-metrics.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwell/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwell/floating-point.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwell/frontend.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwell/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwell/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwell/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwell/uncore.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwell/virtual-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellde/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellde/floating-point.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellde/frontend.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellde/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellde/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellde/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellde/uncore-cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellde/uncore-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellde/uncore-power.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellde/virtual-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellx/bdx-metrics.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellx/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellx/floating-point.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellx/frontend.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellx/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellx/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellx/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellx/uncore-cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellx/uncore-interconnect.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellx/uncore-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellx/uncore-power.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellx/virtual-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/cascadelakex/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/cascadelakex/clx-metrics.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/cascadelakex/floating-point.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/cascadelakex/frontend.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/cascadelakex/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/cascadelakex/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/cascadelakex/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/cascadelakex/uncore-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/cascadelakex/uncore-other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/cascadelakex/virtual-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/elkhartlake/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/elkhartlake/ehl-metrics.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/elkhartlake/floating-point.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/elkhartlake/frontend.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/elkhartlake/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/elkhartlake/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/elkhartlake/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/elkhartlake/virtual-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/goldmont/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/goldmont/frontend.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/goldmont/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/goldmont/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/goldmont/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/goldmont/virtual-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/goldmontplus/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/goldmontplus/frontend.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/goldmontplus/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/goldmontplus/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/goldmontplus/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/goldmontplus/virtual-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/haswell/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/haswell/floating-point.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/haswell/frontend.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/haswell/hsw-metrics.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/haswell/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/haswell/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/haswell/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/haswell/uncore.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/haswell/virtual-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/haswellx/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/haswellx/floating-point.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/haswellx/frontend.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/haswellx/hsx-metrics.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/haswellx/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/haswellx/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/haswellx/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/haswellx/uncore-cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/haswellx/uncore-interconnect.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/haswellx/uncore-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/haswellx/uncore-power.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/haswellx/virtual-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/icelake/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/icelake/floating-point.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/icelake/frontend.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/icelake/icl-metrics.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/icelake/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/icelake/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/icelake/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/icelake/virtual-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/icelakex/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/icelakex/floating-point.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/icelakex/frontend.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/icelakex/icx-metrics.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/icelakex/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/icelakex/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/icelakex/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/icelakex/uncore-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/icelakex/uncore-other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/icelakex/uncore-power.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/icelakex/virtual-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/ivybridge/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/ivybridge/floating-point.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/ivybridge/frontend.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/ivybridge/ivb-metrics.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/ivybridge/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/ivybridge/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/ivybridge/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/ivybridge/uncore.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/ivybridge/virtual-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/ivytown/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/ivytown/floating-point.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/ivytown/frontend.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/ivytown/ivt-metrics.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/ivytown/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/ivytown/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/ivytown/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/ivytown/uncore-cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/ivytown/uncore-interconnect.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/ivytown/uncore-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/ivytown/uncore-power.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/ivytown/virtual-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/jaketown/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/jaketown/floating-point.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/jaketown/frontend.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/jaketown/jkt-metrics.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/jaketown/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/jaketown/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/jaketown/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/jaketown/uncore-cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/jaketown/uncore-interconnect.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/jaketown/uncore-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/jaketown/uncore-power.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/jaketown/virtual-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/knightslanding/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/knightslanding/frontend.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/knightslanding/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/knightslanding/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/knightslanding/uncore-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/knightslanding/virtual-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/mapfile.csv (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/nehalemep/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/nehalemep/floating-point.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/nehalemep/frontend.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/nehalemep/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/nehalemep/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/nehalemep/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/nehalemep/virtual-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/nehalemex/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/nehalemex/floating-point.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/nehalemex/frontend.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/nehalemex/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/nehalemex/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/nehalemex/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/nehalemex/virtual-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/sandybridge/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/sandybridge/floating-point.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/sandybridge/frontend.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/sandybridge/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/sandybridge/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/sandybridge/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/sandybridge/snb-metrics.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/sandybridge/uncore.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/sandybridge/virtual-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/silvermont/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/silvermont/frontend.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/silvermont/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/silvermont/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/silvermont/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/silvermont/virtual-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/skylake/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/skylake/floating-point.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/skylake/frontend.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/skylake/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/skylake/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/skylake/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/skylake/skl-metrics.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/skylake/uncore.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/skylake/virtual-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/skylakex/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/skylakex/floating-point.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/skylakex/frontend.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/skylakex/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/skylakex/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/skylakex/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/skylakex/skx-metrics.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/skylakex/uncore-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/skylakex/uncore-other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/skylakex/virtual-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/tigerlake/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/tigerlake/floating-point.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/tigerlake/frontend.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/tigerlake/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/tigerlake/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/tigerlake/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/tigerlake/tgl-metrics.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/tigerlake/virtual-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/tremontx/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/tremontx/frontend.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/tremontx/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/tremontx/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/tremontx/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/tremontx/uncore-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/tremontx/uncore-other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/tremontx/uncore-power.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/tremontx/virtual-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereep-dp/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereep-dp/floating-point.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereep-dp/frontend.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereep-dp/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereep-dp/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereep-dp/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereep-dp/virtual-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereep-sp/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereep-sp/floating-point.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereep-sp/frontend.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereep-sp/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereep-sp/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereep-sp/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereep-sp/virtual-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereex/cache.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereex/floating-point.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereex/frontend.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereex/memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereex/other.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereex/pipeline.json (100%)
rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereex/virtual-memory.json (100%)
rename tools/{ => lib}/perf/pmu-events/jevents.c (99%)
rename tools/{ => lib}/perf/pmu-events/jsmn.c (100%)
rename tools/{ => lib}/perf/pmu-events/jsmn.h (100%)
rename tools/{ => lib}/perf/pmu-events/json.c (100%)
rename tools/{ => lib}/perf/pmu-events/json.h (100%)
rename tools/{perf/util => lib/perf}/pmu-hybrid.c (97%)
create mode 100644 tools/lib/perf/pmu.c
rename tools/{perf/util => lib/perf}/pmu.l (91%)
rename tools/{perf/util => lib/perf}/pmu.y (98%)
create mode 100644 tools/lib/perf/tests/test-parse-events.c
delete mode 100644 tools/perf/util/fncache.hPATCH 1/59 libperf: Move pmu-events.h file to libperf
Moving pmu-events.h under libperf to be exported as <perf/pmu-events.h> header.
This is a preparation before moving the whole pmu-events framework under libperf coming in following change.
--- tools/lib/perf/include/perf/pmu-events.h | 59 ++++++++++++++++++++++++ tools/perf/pmu-events/Build | 2 +- tools/perf/pmu-events/jevents.c | 6 +-- tools/perf/pmu-events/pmu-events.h | 59 ------------------------ tools/perf/tests/expand-cgroup.c | 2 +- tools/perf/tests/parse-metric.c | 2 +- tools/perf/tests/pmu-events.c | 2 +- tools/perf/util/amd-sample-raw.c | 2 +- tools/perf/util/metricgroup.h | 2 +- tools/perf/util/pmu.h | 2 +- tools/perf/util/s390-sample-raw.c | 2 +- 11 files changed, 70 insertions(+), 70 deletions(-) create mode 100644 tools/lib/perf/include/perf/pmu-events.h delete mode 100644 tools/perf/pmu-events/pmu-events.h
tools/lib/perf/include/perf/pmu-events.h new file +59 -0
@@ -0,0 +1,59 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef PMU_EVENTS_H +#define PMU_EVENTS_H + +enum aggr_mode_class { + PerChip =1 , + PerCore +}; + +/* +* Describe each PMU event. Each CPU has a table of PMU events. +*/ +struct pmu_event { +const char *name; +const char *compat; +const char *event; +const char *desc; +const char *topic; +const char *long_desc; +const char *pmu; +const char *unit; +const char *perpkg; +const char *aggr_mode; +const char *metric_expr; +const char *metric_name; +const char *metric_group; +const char *deprecated; +const char *metric_constraint; +}; + +/* +* +* Map a CPU to its table of PMU events. The CPU is identified by the +* cpuid field, which is an arch-specific identifier for the CPU. +* The identifier specified in tools/perf/pmu-events/arch/xxx/mapfile +* must match the get_cpuid_str() in tools/perf/arch/xxx/util/header.c) +* +* The cpuid can contain any character other than the comma. +*/ +struct pmu_events_map { +const char *cpuid; +const char *version; +const char *type;/* core, uncore etc */ +const struct pmu_event *table; +}; + +struct pmu_sys_events { +const char *name; +const struct pmu_event *table; +}; + +/* +* Global table mapping each known CPU for the architecture to its +* table of PMU events. +*/ +extern const struct pmu_events_map pmu_events_map[]; +extern const struct pmu_sys_events pmu_sys_event_tables[]; + +#endif
tools/perf/pmu-events/Build +1 -1
@@ -1,7 +1,7 @@ hostprogs := jevents jevents-y += json.o jsmn.o jevents.o -HOSTCFLAGS_jevents.o = -I$(srctree)/tools/include +HOSTCFLAGS_jevents.o = -I$(srctree)/tools/include -I$(srctree)/tools/lib/perf/include pmu-events-y += pmu-events.o JDIR = pmu-events/arch/$(SRCARCH) JSON = $(shell [ -d $(JDIR) ] && \
tools/perf/pmu-events/jevents.c +3 -3
@@ -49,7 +49,7 @@#include <linux/list.h> #include "jsmn.h" #include "json.h" -#include "pmu-events.h" +#include <perf/pmu-events.h> int verbose;char *prog;
@@ -958,7 +958,7 @@ static void create_empty_mapping(const char *output_file)_Exit (1 ); } -fprintf (outfp,"#include \"pmu-events/pmu-events.h\"\n" ); +fprintf (outfp,"#include <perf/pmu-events.h>\n" );print_mapping_table_prefix (outfp);print_mapping_table_suffix (outfp);print_system_event_mapping_table_prefix (outfp);
@@ -1239,7 +1239,7 @@ int main(int argc, char *argv[]) }/* Include pmu-events.h first */ -fprintf (eventsfp,"#include \"pmu-events/pmu-events.h\"\n" ); +fprintf (eventsfp,"#include <perf/pmu-events.h>\n" );/* * The mapfile allows multiple CPUids to point to the same JSON file,
tools/perf/pmu-events/pmu-events.h deleted +0 -59
59 lines not on this page · raw message
tools/perf/tests/expand-cgroup.c +1 -1
@@ -6,7 +6,7 @@#include "rblist.h" #include "metricgroup.h" #include "parse-events.h" -#include "pmu-events/pmu-events.h" +#include <perf/pmu-events.h> #include "pfm.h" #include <subcmd/parse-options.h> #include <stdio.h>
tools/perf/tests/parse-metric.c +1 -1
@@ -5,7 +5,7 @@#include <perf/evlist.h> #include "metricgroup.h" #include "tests.h" -#include "pmu-events/pmu-events.h" +#include <perf/pmu-events.h> #include "evlist.h" #include "rblist.h" #include "debug.h"
tools/perf/tests/pmu-events.c +1 -1
@@ -8,7 +8,7 @@#include <linux/kernel.h> #include <linux/zalloc.h> #include "debug.h" -#include "../pmu-events/pmu-events.h" +#include <perf/pmu-events.h> #include "util/evlist.h" #include "util/expr.h" #include "util/parse-events.h"
tools/perf/util/amd-sample-raw.c +1 -1
@@ -15,7 +15,7 @@#include "session.h" #include "evlist.h" #include "sample-raw.h" -#include "pmu-events/pmu-events.h" +#include <perf/pmu-events.h> static u32 cpu_family, cpu_model, ibs_fetch_type, ibs_op_type;
tools/perf/util/metricgroup.h +1 -1
@@ -5,7 +5,7 @@#include <linux/list.h> #include <linux/rbtree.h> #include <stdbool.h> -#include "pmu-events/pmu-events.h" +#include <perf/pmu-events.h> struct evlist ;struct evsel ;
tools/perf/util/pmu.h +1 -1
@@ -8,7 +8,7 @@#include <linux/list.h> #include <stdbool.h> #include "parse-events.h" -#include "pmu-events/pmu-events.h" +#include <perf/pmu-events.h> struct evsel_config_term ;struct perf_cpu_map ;
tools/perf/util/s390-sample-raw.c +1 -1
@@ -27,7 +27,7 @@#include "color.h" #include "sample-raw.h" #include "s390-cpumcf-kernel.h" -#include "pmu-events/pmu-events.h" +#include <perf/pmu-events.h> static size_t ctrset_size (struct cf_ctrset_entry *set) {
Signature · 1 line
2.31.1
PATCH 3/59 libperf: Move pmu-events build to libperf
In reply to Jiri OlsaMoving the compilation of pmu-events under libperf.
--- tools/lib/perf/Makefile | 33 +++++++++++++++++++++++++++++---- tools/perf/Makefile.perf | 22 +++------------------- 2 files changed, 32 insertions(+), 23 deletions(-)
tools/lib/perf/Makefile +29 -4
@@ -7,6 +7,12 @@ LIBPERF_EXTRAVERSION = 1 MAKEFLAGS += --no-print-directory +# Do not use make's built-in rules +# (this improves performance and avoids hard-to-debug behaviour); +MAKEFLAGS += -r + +.SUFFIXES: + ifeq ($(srctree),) srctree := $(patsubst %/,%,$(dir $(CURDIR))) srctree := $(patsubst %/,%,$(dir $(srctree)))
@@ -80,6 +86,8 @@ all: export srctree OUTPUT CC LD CFLAGS V export DESTDIR DESTDIR_SQ +export HOSTCC HOSTLD HOSTAR +export SRCARCH include $(srctree)/tools/build/Makefile.include
@@ -111,6 +119,22 @@ endif LIBAPI = $(API_PATH)libapi.a export LIBAPI +JEVENTS := $(OUTPUT)pmu-events/jevents +JEVENTS_IN := $(OUTPUT)pmu-events/jevents-in.o + +export JEVENTS + +PMU_EVENTS_IN := $(OUTPUT)pmu-events/pmu-events-in.o + +$(JEVENTS_IN): FORCE + $(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=pmu-events obj=jevents + +$(JEVENTS): $(JEVENTS_IN) + $(QUIET_LINK)$(HOSTCC) $(JEVENTS_IN) -o $@ + +$(PMU_EVENTS_IN): $(JEVENTS) FORCE + $(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=pmu-events obj=pmu-events + $(LIBAPI): FORCE $(Q)$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) $(OUTPUT)libapi.a
@@ -121,10 +145,10 @@ $(LIBAPI)-clean: $(LIBPERF_IN): FORCE $(Q)$(MAKE) $(build)=libperf -$(LIBPERF_A): $(LIBPERF_IN) - $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIBPERF_IN) +$(LIBPERF_A): $(LIBPERF_IN) $(PMU_EVENTS_IN) + $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $^ -$(LIBPERF_SO): $(LIBPERF_IN) $(LIBAPI) +$(LIBPERF_SO): $(LIBPERF_IN) $(LIBAPI) $(PMU_EVENTS_IN) $(QUIET_LINK)$(CC) --shared -Wl,-soname,libperf.so \ -Wl,--version-script=$(VERSION_SCRIPT) $^ -o $@ @ln -sf $(@F) $(OUTPUT)libperf.so
@@ -139,7 +163,8 @@ all: fixdep clean: $(LIBAPI)-clean $(call QUIET_CLEAN, libperf) $(RM) $(LIBPERF_A) \ *.o *~ *.a *.so *.so.$(VERSION) *.so.$(LIBPERF_VERSION) .*.d .*.cmd tests/*.o LIBPERF-CFLAGS $(LIBPERF_PC) \ - $(TESTS_STATIC) $(TESTS_SHARED) + $(TESTS_STATIC) $(TESTS_SHARED) \ + $(OUTPUT)pmu-events/pmu-events.c $(OUTPUT)pmu-events/jevents TESTS_IN = tests-in.o
tools/perf/Makefile.perf +3 -19
@@ -647,30 +647,14 @@ strip: $(PROGRAMS) $(OUTPUT)perf PERF_IN := $(OUTPUT)perf-in.o -JEVENTS := $(OUTPUT)pmu-events/jevents -JEVENTS_IN := $(OUTPUT)pmu-events/jevents-in.o - -PMU_EVENTS_IN := $(OUTPUT)pmu-events/pmu-events-in.o - -export JEVENTS - build := -f $(srctree)/tools/build/Makefile.build dir=. obj $(PERF_IN): prepare FORCE $(Q)$(MAKE) $(build)=perf -$(JEVENTS_IN): FORCE - $(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=pmu-events obj=jevents - -$(JEVENTS): $(JEVENTS_IN) - $(QUIET_LINK)$(HOSTCC) $(JEVENTS_IN) -o $@ - -$(PMU_EVENTS_IN): $(JEVENTS) FORCE - $(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=pmu-events obj=pmu-events - -$(OUTPUT)perf: $(PERFLIBS) $(PERF_IN) $(PMU_EVENTS_IN) $(LIBTRACEEVENT_DYNAMIC_LIST) +$(OUTPUT)perf: $(PERFLIBS) $(PERF_IN) $(LIBTRACEEVENT_DYNAMIC_LIST) $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBTRACEEVENT_DYNAMIC_LIST_LDFLAGS) \ - $(PERF_IN) $(PMU_EVENTS_IN) $(LIBS) -o $@ + $(PERF_IN) $(LIBS) -o $@ $(GTK_IN): FORCE $(Q)$(MAKE) $(build)=gtk
@@ -1086,7 +1070,7 @@ clean:: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clea $(call QUIET_CLEAN, core-objs) $(RM) $(LIBPERF_A) $(OUTPUT)perf-archive $(OUTPUT)perf-with-kcore $(OUTPUT)perf-iostat $(LANG_BINDINGS) $(Q)find $(if $(OUTPUT),$(OUTPUT),.) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete $(Q)$(RM) $(OUTPUT).config-detected - $(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 perf-read-vdsox32 $(OUTPUT)pmu-events/jevents $(OUTPUT)$(LIBJVMTI).so + $(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 perf-read-vdsox32 $(OUTPUT)$(LIBJVMTI).so $(call QUIET_CLEAN, core-gen) $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)FEATURE-DUMP $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex* \ $(OUTPUT)util/intel-pt-decoder/inat-tables.c \ $(OUTPUT)tests/llvm-src-{base,kbuild,prologue,relocation}.c \
Signature · 1 line
2.31.1
PATCH 4/59 libperf: Move perf_pmu__format_parse to libperf
In reply to Jiri OlsaMove perf_pmu__format_parse function into newpmu.c object under libperf.
--- tools/lib/perf/Build | 30 +++++++++ tools/lib/perf/Makefile | 8 ++- tools/lib/perf/include/internal/pmu.h | 29 +++++++++ tools/lib/perf/pmu.c | 83 ++++++++++++++++++++++++ tools/lib/perf/pmu.l | 44 +++++++++++++ tools/lib/perf/pmu.y | 92 +++++++++++++++++++++++++++ tools/perf/util/Build | 15 ----- tools/perf/util/pmu.c | 77 ---------------------- tools/perf/util/pmu.h | 12 +--- tools/perf/util/pmu.l | 43 ------------- tools/perf/util/pmu.y | 92 --------------------------- 11 files changed, 286 insertions(+), 239 deletions(-) create mode 100644 tools/lib/perf/include/internal/pmu.h create mode 100644 tools/lib/perf/pmu.c create mode 100644 tools/lib/perf/pmu.l create mode 100644 tools/lib/perf/pmu.y delete mode 100644 tools/perf/util/pmu.l delete mode 100644 tools/perf/util/pmu.y
tools/lib/perf/Build +30 -0
@@ -7,9 +7,39 @@ libperf-y += mmap.o libperf-y += zalloc.o libperf-y += xyarray.o libperf-y += lib.o +libperf-y += pmu-flex.o +libperf-y += pmu-bison.o +libperf-y += pmu.o $(OUTPUT)zalloc.o: ../../lib/zalloc.c FORCE $(call rule_mkdir) $(call if_changed_dep,cc_o_c) tests-y += tests/ + + +$(OUTPUT)pmu-flex.c $(OUTPUT)pmu-flex.h: pmu.l $(OUTPUT)pmu-bison.c + $(call rule_mkdir) + $(Q)$(call echo-cmd,flex)$(FLEX) -o $(OUTPUT)pmu-flex.c \ + --header-file=$(OUTPUT)pmu-flex.h $(PARSER_DEBUG_FLEX) $< + +$(OUTPUT)pmu-bison.c $(OUTPUT)pmu-bison.h: pmu.y + $(call rule_mkdir) + $(Q)$(call echo-cmd,bison)$(BISON) -v $< -d $(PARSER_DEBUG_BISON) $(BISON_FILE_PREFIX_MAP) \ + -o $(OUTPUT)pmu-bison.c -p perf_pmu_ + +FLEX_GE_26 := $(shell expr $(shell $(FLEX) --version | sed -e 's/flex \([0-9]\+\).\([0-9]\+\)/\1\2/g') \>\= 26) +ifeq ($(FLEX_GE_26),1) + flex_flags := -Wno-switch-enum -Wno-switch-default -Wno-unused-function -Wno-redundant-decls -Wno-sign-compare -Wno-unused-parameter -Wno-missing-prototypes -Wno-missing-declarations + CC_HASNT_MISLEADING_INDENTATION := $(shell echo "int main(void) { return 0 }" | $(CC) -Werror -Wno-misleading-indentation -o /dev/null -xc - 2>&1 | grep -q -- -Wno-misleading-indentation ; echo $$?) + ifeq ($(CC_HASNT_MISLEADING_INDENTATION), 1) + flex_flags += -Wno-misleading-indentation + endif +else + flex_flags := -w +endif + +CFLAGS_pmu-flex.o += $(flex_flags) +CFLAGS_pmu-bison.o += -DYYLTYPE_IS_TRIVIAL=0 $(bison_flags) + +$(OUTPUT)pmu.o: $(OUTPUT)pmu-flex.c $(OUTPUT)pmu-bison.c
tools/lib/perf/Makefile +7 -1
@@ -22,6 +22,11 @@ endif INSTALL = install +FLEX ?= flex +BISON ?= bison + +export FLEX BISON + # Use DESTDIR for installing into a different root directory. # This is useful for building a package. The program will be # installed in this directory as if it was the root directory.
@@ -164,7 +169,8 @@ clean: $(LIBAPI)-clean $(call QUIET_CLEAN, libperf) $(RM) $(LIBPERF_A) \ *.o *~ *.a *.so *.so.$(VERSION) *.so.$(LIBPERF_VERSION) .*.d .*.cmd tests/*.o LIBPERF-CFLAGS $(LIBPERF_PC) \ $(TESTS_STATIC) $(TESTS_SHARED) \ - $(OUTPUT)pmu-events/pmu-events.c $(OUTPUT)pmu-events/jevents + $(OUTPUT)pmu-events/pmu-events.c $(OUTPUT)pmu-events/jevents \ + $(OUTPUT)*-bison* $(OUTPUT)*-flex* TESTS_IN = tests-in.o
tools/lib/perf/include/internal/pmu.h new file +29 -0
@@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __LIBPERF_INTERNAL_PMU_H +#define __LIBPERF_INTERNAL_PMU_H + +#include <linux/list.h> +#include <linux/bitmap.h> + +enum { +PERF_PMU_FORMAT_VALUE_CONFIG , +PERF_PMU_FORMAT_VALUE_CONFIG1 , +PERF_PMU_FORMAT_VALUE_CONFIG2 , +}; + +#define PERF_PMU_FORMAT_BITS 64 + +struct perf_pmu_format { +char *name; +int value; + DECLARE_BITMAP(bits, PERF_PMU_FORMAT_BITS); +struct list_head list; +}; + +int perf_pmu__new_format (struct list_head *list,char *name, +int config,unsigned long *bits); +void perf_pmu__set_format (unsigned long *bits,long from,long to); +void perf_pmu_error (struct list_head *list,char *name,char const *msg); +int perf_pmu__format_parse (char *dir,struct list_head *head); + +#endif /* __LIBPERF_INTERNAL_PMU_H */
tools/lib/perf/pmu.c new file +83 -0
83 lines not on this page · raw message
tools/lib/perf/pmu.l new file +44 -0
44 lines not on this page · raw message
tools/lib/perf/pmu.y new file +92 -0
92 lines not on this page · raw message
tools/perf/util/Build +0 -15
@@ -70,8 +70,6 @@ perf-y += trace-event-parse.o perf-y += parse-events-flex.o perf-y += parse-events-bison.o perf-y += pmu.o -perf-y += pmu-flex.o -perf-y += pmu-bison.o perf-y += pmu-hybrid.o perf-y += trace-event-read.o perf-y += trace-event-info.o
@@ -233,16 +231,6 @@ $(OUTPUT)util/expr-bison.c $(OUTPUT)util/expr-bison.h: util/expr.y $(Q)$(call echo-cmd,bison)$(BISON) -v $< -d $(PARSER_DEBUG_BISON) $(BISON_FILE_PREFIX_MAP) \ -o $(OUTPUT)util/expr-bison.c -p expr_ -$(OUTPUT)util/pmu-flex.c $(OUTPUT)util/pmu-flex.h: util/pmu.l $(OUTPUT)util/pmu-bison.c - $(call rule_mkdir) - $(Q)$(call echo-cmd,flex)$(FLEX) -o $(OUTPUT)util/pmu-flex.c \ - --header-file=$(OUTPUT)util/pmu-flex.h $(PARSER_DEBUG_FLEX) $< - -$(OUTPUT)util/pmu-bison.c $(OUTPUT)util/pmu-bison.h: util/pmu.y - $(call rule_mkdir) - $(Q)$(call echo-cmd,bison)$(BISON) -v $< -d $(PARSER_DEBUG_BISON) $(BISON_FILE_PREFIX_MAP) \ - -o $(OUTPUT)util/pmu-bison.c -p perf_pmu_ - FLEX_GE_26 := $(shell expr $(shell $(FLEX) --version | sed -e 's/flex \([0-9]\+\).\([0-9]\+\)/\1\2/g') \>\= 26) ifeq ($(FLEX_GE_26),1) flex_flags := -Wno-switch-enum -Wno-switch-default -Wno-unused-function -Wno-redundant-decls -Wno-sign-compare -Wno-unused-parameter -Wno-missing-prototypes -Wno-missing-declarations
@@ -254,7 +242,6 @@ else flex_flags := -w endif CFLAGS_parse-events-flex.o += $(flex_flags) -CFLAGS_pmu-flex.o += $(flex_flags) CFLAGS_expr-flex.o += $(flex_flags) bison_flags := -DYYENABLE_NLS=0
@@ -265,11 +252,9 @@ else bison_flags += -w endif CFLAGS_parse-events-bison.o += $(bison_flags) -CFLAGS_pmu-bison.o += -DYYLTYPE_IS_TRIVIAL=0 $(bison_flags) CFLAGS_expr-bison.o += -DYYLTYPE_IS_TRIVIAL=0 $(bison_flags) $(OUTPUT)util/parse-events.o: $(OUTPUT)util/parse-events-flex.c $(OUTPUT)util/parse-events-bison.c -$(OUTPUT)util/pmu.o: $(OUTPUT)util/pmu-flex.c $(OUTPUT)util/pmu-bison.c $(OUTPUT)util/expr.o: $(OUTPUT)util/expr-flex.c $(OUTPUT)util/expr-bison.c CFLAGS_bitmap.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"
tools/perf/util/pmu.c +0 -77
92 lines not on this page · raw message
tools/perf/util/pmu.h +1 -11
@@ -9,16 +9,11 @@#include <stdbool.h> #include "parse-events.h" #include <perf/pmu-events.h> +#include <internal/pmu.h> struct evsel_config_term ;struct perf_cpu_map ; -enum { -PERF_PMU_FORMAT_VALUE_CONFIG , -PERF_PMU_FORMAT_VALUE_CONFIG1 , -PERF_PMU_FORMAT_VALUE_CONFIG2 , -}; -#define PERF_PMU_FORMAT_BITS 64#define EVENT_SOURCE_DEVICE_PATH "/bus/event_source/devices/"#define CPUS_TEMPLATE_CPU "%s/bus/event_source/devices/%s/cpus"
@@ -98,12 +93,7 @@ int perf_pmu__check_alias(struct perf_pmu *pmu, struct list_head *head_terms, struct perf_pmu_info *info);struct list_head *perf_pmu__alias (struct perf_pmu *pmu,struct list_head *head_terms); -void perf_pmu_error (struct list_head *list,char *name,char const *msg); -int perf_pmu__new_format (struct list_head *list,char *name, -int config,unsigned long *bits); -void perf_pmu__set_format (unsigned long *bits,long from,long to); -int perf_pmu__format_parse (char *dir,struct list_head *head);void perf_pmu__del_formats (struct list_head *formats);struct perf_pmu *perf_pmu__scan (struct perf_pmu *pmu);
tools/perf/util/pmu.l deleted +0 -43
43 lines not on this page · raw message
tools/perf/util/pmu.y deleted +0 -92
92 lines not on this page · raw message
Signature · 1 line
2.31.1
PATCH 5/59 tools api fs: Move in the fncache from perf
In reply to Jiri OlsaMoving fncache from perf under libapi.
--- tools/lib/api/fs/Build | 1 + tools/lib/api/fs/fncache.c | 63 ++++++++++++++++++++++++++++++ tools/lib/api/fs/fs.h | 2 + tools/perf/arch/x86/util/pmu.c | 1 - tools/perf/tests/parse-events.c | 1 - tools/perf/util/Build | 1 - tools/perf/util/fncache.c | 63 ------------------------------ tools/perf/util/fncache.h | 7 ---- tools/perf/util/pmu-hybrid.c | 1 - tools/perf/util/pmu.c | 1 - tools/perf/util/python-ext-sources | 1 - tools/perf/util/srccode.c | 10 ++++- 12 files changed, 75 insertions(+), 77 deletions(-) create mode 100644 tools/lib/api/fs/fncache.c delete mode 100644 tools/perf/util/fncache.c delete mode 100644 tools/perf/util/fncache.h
tools/lib/api/fs/Build +1 -0
@@ -1,3 +1,4 @@ libapi-y += fs.o libapi-y += tracing_path.o libapi-y += cgroup.o +libapi-y += fncache.o
tools/lib/api/fs/fncache.c new file +63 -0
63 lines not on this page · raw message
tools/lib/api/fs/fs.h +2 -0
@@ -59,4 +59,6 @@ int sysfs__read_str(const char *entry, char **buf, size_t *sizep);int sysfs__read_bool (const char *entry,bool *value);int sysfs__write_int (const char *entry,int value); + +bool file_available (const char *name);#endif /* __API_FS__ */
tools/perf/arch/x86/util/pmu.c +0 -1
@@ -13,7 +13,6 @@#include "../../../util/intel-pt.h" #include "../../../util/intel-bts.h" #include "../../../util/pmu.h" -#include "../../../util/fncache.h" #define TEMPLATE_ALIAS "%s/bus/event_source/devices/%s/alias"
tools/perf/tests/parse-events.c +0 -1
@@ -9,7 +9,6 @@#include "pmu-hybrid.h" #include <dirent.h> #include <errno.h> -#include "fncache.h" #include <sys/types.h> #include <sys/stat.h> #include <unistd.h>
tools/perf/util/Build +0 -1
@@ -52,7 +52,6 @@ perf-y += header.o perf-y += callchain.o perf-y += values.o perf-y += debug.o -perf-y += fncache.o perf-y += machine.o perf-y += map.o perf-y += pstack.o
tools/perf/util/fncache.c deleted +0 -63
63 lines not on this page · raw message
tools/perf/util/fncache.h deleted +0 -7
@@ -1,7 +0,0 @@ -#ifndef _FCACHE_H -#define _FCACHE_H 1 - -unsigned shash (const unsigned char *s); -bool file_available (const char *name); - -#endif
tools/perf/util/pmu-hybrid.c +0 -1
@@ -13,7 +13,6 @@#include <stdarg.h> #include <locale.h> #include <api/fs/fs.h> -#include "fncache.h" #include "pmu-hybrid.h" LIST_HEAD (perf_pmu__hybrid_pmus);
tools/perf/util/pmu.c +0 -1
@@ -26,7 +26,6 @@#include "header.h" #include "string2.h" #include "strbuf.h" -#include "fncache.h" #include "pmu-hybrid.h" struct perf_pmu perf_pmu__fake;
tools/perf/util/python-ext-sources +0 -1
@@ -39,4 +39,3 @@ util/affinity.c util/rwsem.c util/hashmap.c util/pmu-hybrid.c -util/fncache.c
tools/perf/util/srccode.c +9 -1
@@ -16,7 +16,7 @@#include "srccode.h" #include "debug.h" #include <internal/lib.h> // page_size -#include "fncache.h" +#include <api/fs/fs.h> #define MAXSRCCACHE (32*1024*1024)#define MAXSRCFILES 64
@@ -86,6 +86,14 @@ static void free_srcfile(struct srcfile *sf) num_srcfiles--; } +static unsigned shash (const unsigned char *s) +{ +unsigned h =0 ; +while (*s) + h =65599 * h + *s++; +return h ^ (h >>16 ); +} +static struct srcfile *find_srcfile (char *fn) {struct stat st;
Signature · 1 line
2.31.1
Ian Rogers
reviewerRe: [PATCH 05/59] tools api fs: Move in the fncache from perf
Quoted 4 lines · Jiri Olsa
Moving fncache from perf under libapi.
Signed-off-by Jiri Olsa <[email protected]>
Quoted 9 lines
--- tools/lib/api/fs/Build | 1 + tools/lib/api/fs/fncache.c | 63 ++++++++++++++++++++++++++++++ tools/lib/api/fs/fs.h | 2 + tools/perf/arch/x86/util/pmu.c | 1 - tools/perf/tests/parse-events.c | 1 - tools/perf/util/Build | 1 - tools/perf/util/fncache.c | 63 ------------------------------ tools/perf/util/fncache.h | 7 ----
This change looks like it could be independent. Could this code be simplified to just using a hashmap now that we have one?
Thanks,
Ian
Quoted 280 lines
tools/perf/util/pmu-hybrid.c | 1 - tools/perf/util/pmu.c | 1 - tools/perf/util/python-ext-sources | 1 - tools/perf/util/srccode.c | 10 ++++- 12 files changed, 75 insertions(+), 77 deletions(-) create mode 100644 tools/lib/api/fs/fncache.c delete mode 100644 tools/perf/util/fncache.c delete mode 100644 tools/perf/util/fncache.htools/lib/api/fs/Build +1
-0@@ -1,3 +1,4 @@ libapi-y += fs.o libapi-y += tracing_path.o libapi-y += cgroup.o +libapi-y += fncache.otools/lib/api/fs/fncache.c new file +63
-0@@ -0,0 +1,63 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* Manage a cache of file names' existence */ +#include <stdlib.h> +#include <unistd.h> +#include <string.h> +#include <linux/list.h> +#include "fs.h" + +struct fncache { +struct hlist_node nd; +bool res; +char name[]; +}; + +#define FNHSIZE 61 + +static struct hlist_head fncache_hash[FNHSIZE ]; + +static unsigned shash (const unsigned char *s) +{ +unsigned h =0 ; +while (*s) + h =65599 * h + *s++; +return h ^ (h >>16 ); +} + +static bool lookup_fncache (const char *name,bool *res) +{ +int h =shash ((const unsigned char *)name) %FNHSIZE ; +struct fncache *n; + +hlist_for_each_entry (n, &fncache_hash[h], nd) { +if (!strcmp (n->name, name)) { + *res = n->res; +return true; + } + } +return false; +} + +static void update_fncache (const char *name,bool res) +{ +struct fncache *n =malloc (sizeof (struct fncache ) +strlen (name) +1 ); +int h =shash ((const unsigned char *)name) %FNHSIZE ; + +if (!n) +return ; +strcpy (n->name, name); + n->res = res; +hlist_add_head (&n->nd, &fncache_hash[h]); +} + +/* No LRU, only use when bounded in some other way. */ +bool file_available (const char *name) +{ +bool res; + +if (lookup_fncache (name, &res)) +return res; + res =access (name,R_OK ) ==0 ; +update_fncache (name, res); +return res; +}tools/lib/api/fs/fs.h +2
-0@@ -59,4 +59,6 @@ int sysfs__read_str(const char *entry, char **buf, size_t *sizep);int sysfs__read_bool (const char *entry,bool *value);int sysfs__write_int (const char *entry,int value); + +bool file_available (const char *name);#endif /* __API_FS__ */ tools/perf/arch/x86/util/pmu.c +0
-1@@ -13,7 +13,6 @@#include "../../../util/intel-pt.h" #include "../../../util/intel-bts.h" #include "../../../util/pmu.h" -#include "../../../util/fncache.h" #define TEMPLATE_ALIAS "%s/bus/event_source/devices/%s/alias"tools/perf/tests/parse-events.c +0
-1@@ -9,7 +9,6 @@#include "pmu-hybrid.h" #include <dirent.h> #include <errno.h> -#include "fncache.h" #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> tools/perf/util/Build +0
-1@@ -52,7 +52,6 @@ perf-y += header.o perf-y += callchain.o perf-y += values.o perf-y += debug.o -perf-y += fncache.o perf-y += machine.o perf-y += map.o perf-y += pstack.otools/perf/util/fncache.c deleted +0
-63@@ -1,63 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* Manage a cache of file names' existence */ -#include <stdlib.h> -#include <unistd.h> -#include <string.h> -#include <linux/list.h> -#include "fncache.h" - -struct fncache { -struct hlist_node nd; -bool res; -char name[]; -}; - -#define FNHSIZE 61 - -static struct hlist_head fncache_hash[FNHSIZE ]; - -unsigned shash (const unsigned char *s) -{ -unsigned h =0 ; -while (*s) - h =65599 * h + *s++; -return h ^ (h >>16 ); -} - -static bool lookup_fncache (const char *name,bool *res) -{ -int h =shash ((const unsigned char *)name) %FNHSIZE ; -struct fncache *n; - -hlist_for_each_entry (n, &fncache_hash[h], nd) { -if (!strcmp (n->name, name)) { - *res = n->res; -return true; - } - } -return false; -} - -static void update_fncache (const char *name,bool res) -{ -struct fncache *n =malloc (sizeof (struct fncache ) +strlen (name) +1 ); -int h =shash ((const unsigned char *)name) %FNHSIZE ; - -if (!n) -return ; -strcpy (n->name, name); - n->res = res; -hlist_add_head (&n->nd, &fncache_hash[h]); -} - -/* No LRU, only use when bounded in some other way. */ -bool file_available (const char *name) -{ -bool res; - -if (lookup_fncache (name, &res)) -return res; - res =access (name,R_OK ) ==0 ; -update_fncache (name, res); -return res; -}tools/perf/util/fncache.h deleted +0
-7@@ -1,7 +0,0 @@ -#ifndef _FCACHE_H -#define _FCACHE_H 1 - -unsigned shash (const unsigned char *s); -bool file_available (const char *name); - -#endif tools/perf/util/pmu-hybrid.c +0
-1@@ -13,7 +13,6 @@#include <stdarg.h> #include <locale.h> #include <api/fs/fs.h> -#include "fncache.h" #include "pmu-hybrid.h" LIST_HEAD (perf_pmu__hybrid_pmus);tools/perf/util/pmu.c +0
-1@@ -26,7 +26,6 @@#include "header.h" #include "string2.h" #include "strbuf.h" -#include "fncache.h" #include "pmu-hybrid.h" struct perf_pmu perf_pmu__fake;tools/perf/util/python-ext-sources +0
-1@@ -39,4 +39,3 @@ util/affinity.c util/rwsem.c util/hashmap.c util/pmu-hybrid.c -util/fncache.ctools/perf/util/srccode.c +9
-2@@ -16,7 +16,7 @@#include "srccode.h" #include "debug.h" #include <internal/lib.h> // page_size -#include "fncache.h" +#include <api/fs/fs.h> #define MAXSRCCACHE (32*1024*1024)#define MAXSRCFILES 64@@ -86,6 +86,14 @@ static void free_srcfile(struct srcfile *sf) num_srcfiles--; } +static unsigned shash (const unsigned char *s) +{ +unsigned h =0 ; +while (*s) + h =65599 * h + *s++; +return h ^ (h >>16 ); +} +static struct srcfile *find_srcfile (char *fn) {struct stat st; --2.31.1
Re: [PATCH 05/59] tools api fs: Move in the fncache from perf
Quoted 15 lines · Ian Rogers
Quoted 4 lines · Jiri Olsa
Moving fncache from perf under libapi.
Signed-off-by Jiri Olsa <[email protected]>Quoted 9 lines
--- tools/lib/api/fs/Build | 1 + tools/lib/api/fs/fncache.c | 63 ++++++++++++++++++++++++++++++ tools/lib/api/fs/fs.h | 2 + tools/perf/arch/x86/util/pmu.c | 1 - tools/perf/tests/parse-events.c | 1 - tools/perf/util/Build | 1 - tools/perf/util/fncache.c | 63 ------------------------------ tools/perf/util/fncache.h | 7 ----
Quoted 2 lines
This change looks like it could be independent. Could this code be simplified to just using a hashmap now that we have one?
true, Sohaib, perhaps you might be interest in this?
jirka
Quoted 285 lines
Thanks,
IanQuoted 280 lines
tools/perf/util/pmu-hybrid.c | 1 - tools/perf/util/pmu.c | 1 - tools/perf/util/python-ext-sources | 1 - tools/perf/util/srccode.c | 10 ++++- 12 files changed, 75 insertions(+), 77 deletions(-) create mode 100644 tools/lib/api/fs/fncache.c delete mode 100644 tools/perf/util/fncache.c delete mode 100644 tools/perf/util/fncache.htools/lib/api/fs/Build +1
-0@@ -1,3 +1,4 @@ libapi-y += fs.o libapi-y += tracing_path.o libapi-y += cgroup.o +libapi-y += fncache.otools/lib/api/fs/fncache.c new file +63
-0@@ -0,0 +1,63 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* Manage a cache of file names' existence */ +#include <stdlib.h> +#include <unistd.h> +#include <string.h> +#include <linux/list.h> +#include "fs.h" + +struct fncache { +struct hlist_node nd; +bool res; +char name[]; +}; + +#define FNHSIZE 61 + +static struct hlist_head fncache_hash[FNHSIZE ]; + +static unsigned shash (const unsigned char *s) +{ +unsigned h =0 ; +while (*s) + h =65599 * h + *s++; +return h ^ (h >>16 ); +} + +static bool lookup_fncache (const char *name,bool *res) +{ +int h =shash ((const unsigned char *)name) %FNHSIZE ; +struct fncache *n; + +hlist_for_each_entry (n, &fncache_hash[h], nd) { +if (!strcmp (n->name, name)) { + *res = n->res; +return true; + } + } +return false; +} + +static void update_fncache (const char *name,bool res) +{ +struct fncache *n =malloc (sizeof (struct fncache ) +strlen (name) +1 ); +int h =shash ((const unsigned char *)name) %FNHSIZE ; + +if (!n) +return ; +strcpy (n->name, name); + n->res = res; +hlist_add_head (&n->nd, &fncache_hash[h]); +} + +/* No LRU, only use when bounded in some other way. */ +bool file_available (const char *name) +{ +bool res; + +if (lookup_fncache (name, &res)) +return res; + res =access (name,R_OK ) ==0 ; +update_fncache (name, res); +return res; +}tools/lib/api/fs/fs.h +2
-0@@ -59,4 +59,6 @@ int sysfs__read_str(const char *entry, char **buf, size_t *sizep);int sysfs__read_bool (const char *entry,bool *value);int sysfs__write_int (const char *entry,int value); + +bool file_available (const char *name);#endif /* __API_FS__ */ tools/perf/arch/x86/util/pmu.c +0
-1@@ -13,7 +13,6 @@#include "../../../util/intel-pt.h" #include "../../../util/intel-bts.h" #include "../../../util/pmu.h" -#include "../../../util/fncache.h" #define TEMPLATE_ALIAS "%s/bus/event_source/devices/%s/alias"tools/perf/tests/parse-events.c +0
-1@@ -9,7 +9,6 @@#include "pmu-hybrid.h" #include <dirent.h> #include <errno.h> -#include "fncache.h" #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> tools/perf/util/Build +0
-1@@ -52,7 +52,6 @@ perf-y += header.o perf-y += callchain.o perf-y += values.o perf-y += debug.o -perf-y += fncache.o perf-y += machine.o perf-y += map.o perf-y += pstack.otools/perf/util/fncache.c deleted +0
-63@@ -1,63 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* Manage a cache of file names' existence */ -#include <stdlib.h> -#include <unistd.h> -#include <string.h> -#include <linux/list.h> -#include "fncache.h" - -struct fncache { -struct hlist_node nd; -bool res; -char name[]; -}; - -#define FNHSIZE 61 - -static struct hlist_head fncache_hash[FNHSIZE ]; - -unsigned shash (const unsigned char *s) -{ -unsigned h =0 ; -while (*s) - h =65599 * h + *s++; -return h ^ (h >>16 ); -} - -static bool lookup_fncache (const char *name,bool *res) -{ -int h =shash ((const unsigned char *)name) %FNHSIZE ; -struct fncache *n; - -hlist_for_each_entry (n, &fncache_hash[h], nd) { -if (!strcmp (n->name, name)) { - *res = n->res; -return true; - } - } -return false; -} - -static void update_fncache (const char *name,bool res) -{ -struct fncache *n =malloc (sizeof (struct fncache ) +strlen (name) +1 ); -int h =shash ((const unsigned char *)name) %FNHSIZE ; - -if (!n) -return ; -strcpy (n->name, name); - n->res = res; -hlist_add_head (&n->nd, &fncache_hash[h]); -} - -/* No LRU, only use when bounded in some other way. */ -bool file_available (const char *name) -{ -bool res; - -if (lookup_fncache (name, &res)) -return res; - res =access (name,R_OK ) ==0 ; -update_fncache (name, res); -return res; -}tools/perf/util/fncache.h deleted +0
-7@@ -1,7 +0,0 @@ -#ifndef _FCACHE_H -#define _FCACHE_H 1 - -unsigned shash (const unsigned char *s); -bool file_available (const char *name); - -#endif tools/perf/util/pmu-hybrid.c +0
-1@@ -13,7 +13,6 @@#include <stdarg.h> #include <locale.h> #include <api/fs/fs.h> -#include "fncache.h" #include "pmu-hybrid.h" LIST_HEAD (perf_pmu__hybrid_pmus);tools/perf/util/pmu.c +0
-1@@ -26,7 +26,6 @@#include "header.h" #include "string2.h" #include "strbuf.h" -#include "fncache.h" #include "pmu-hybrid.h" struct perf_pmu perf_pmu__fake;tools/perf/util/python-ext-sources +0
-1@@ -39,4 +39,3 @@ util/affinity.c util/rwsem.c util/hashmap.c util/pmu-hybrid.c -util/fncache.ctools/perf/util/srccode.c +9
-2@@ -16,7 +16,7 @@#include "srccode.h" #include "debug.h" #include <internal/lib.h> // page_size -#include "fncache.h" +#include <api/fs/fs.h> #define MAXSRCCACHE (32*1024*1024)#define MAXSRCFILES 64@@ -86,6 +86,14 @@ static void free_srcfile(struct srcfile *sf) num_srcfiles--; } +static unsigned shash (const unsigned char *s) +{ +unsigned h =0 ; +while (*s) + h =65599 * h + *s++; +return h ^ (h >>16 ); +} +static struct srcfile *find_srcfile (char *fn) {struct stat st; --2.31.1
PATCH 6/59 libperf: Move in the pmu hybrid support
In reply to Jiri OlsaMoving in libperf the pmu hybrid support.
--- tools/lib/perf/Build | 1 + tools/lib/perf/Makefile | 1 + tools/lib/perf/include/internal/pmu-hybrid.h | 33 ++++++++ tools/lib/perf/include/internal/pmu.h | 28 +++++++ tools/lib/perf/pmu-hybrid.c | 88 ++++++++++++++++++++ tools/perf/builtin-c2c.c | 2 +- tools/perf/builtin-list.c | 2 +- tools/perf/builtin-mem.c | 2 +- tools/perf/builtin-record.c | 2 +- tools/perf/builtin-stat.c | 2 +- tools/perf/tests/evsel-roundtrip-name.c | 2 +- tools/perf/tests/parse-events.c | 2 +- tools/perf/tests/perf-time-to-tsc.c | 2 +- tools/perf/util/Build | 1 - tools/perf/util/cputopo.c | 2 +- tools/perf/util/evlist-hybrid.c | 3 +- tools/perf/util/evsel.c | 2 +- tools/perf/util/header.c | 2 +- tools/perf/util/mem-events.c | 2 +- tools/perf/util/metricgroup.c | 2 +- tools/perf/util/parse-events-hybrid.c | 2 +- tools/perf/util/parse-events.c | 2 +- tools/perf/util/pmu-hybrid.c | 88 -------------------- tools/perf/util/pmu-hybrid.h | 33 -------- tools/perf/util/pmu.c | 2 +- tools/perf/util/pmu.h | 27 ------ tools/perf/util/python-ext-sources | 1 - tools/perf/util/stat-display.c | 3 +- 28 files changed, 171 insertions(+), 168 deletions(-) create mode 100644 tools/lib/perf/include/internal/pmu-hybrid.h create mode 100644 tools/lib/perf/pmu-hybrid.c delete mode 100644 tools/perf/util/pmu-hybrid.c delete mode 100644 tools/perf/util/pmu-hybrid.h
tools/lib/perf/Build +1 -0
@@ -10,6 +10,7 @@ libperf-y += lib.o libperf-y += pmu-flex.o libperf-y += pmu-bison.o libperf-y += pmu.o +libperf-y += pmu-hybrid.o $(OUTPUT)zalloc.o: ../../lib/zalloc.c FORCE $(call rule_mkdir)
tools/lib/perf/Makefile +1 -0
@@ -86,6 +86,7 @@ override CFLAGS += -Werror -Wall override CFLAGS += -fPIC override CFLAGS += $(INCLUDES) override CFLAGS += -fvisibility=hidden +override CFLAGS += -D_GNU_SOURCE all:
tools/lib/perf/include/internal/pmu-hybrid.h new file +33 -0
@@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __PMU_HYBRID_H +#define __PMU_HYBRID_H + +#include <linux/perf_event.h> +#include <linux/compiler.h> +#include <linux/list.h> +#include <stdbool.h> +#include <internal/pmu.h> + +extern struct list_head perf_pmu__hybrid_pmus; + +#define perf_pmu__for_each_hybrid_pmu (pmu) \ + list_for_each_entry(pmu, &perf_pmu__hybrid_pmus, hybrid_list) + +bool perf_pmu__hybrid_mounted (const char *name); + +struct perf_pmu *perf_pmu__find_hybrid_pmu (const char *name); +bool perf_pmu__is_hybrid (const char *name); +char *perf_pmu__hybrid_type_to_pmu (const char *type); + +static inline int perf_pmu__hybrid_pmu_num (void ) +{ +struct perf_pmu *pmu; +int num =0 ; + +perf_pmu__for_each_hybrid_pmu (pmu) + num++; + +return num; +} + +#endif /* __PMU_HYBRID_H */
tools/lib/perf/include/internal/pmu.h +28 -0
@@ -12,6 +12,7 @@ enum { };#define PERF_PMU_FORMAT_BITS 64 +#define CPUS_TEMPLATE_CPU "%s/bus/event_source/devices/%s/cpus"struct perf_pmu_format {char *name;
@@ -20,6 +21,33 @@ struct perf_pmu_format {struct list_head list; }; +struct perf_pmu_caps { +char *name; +char *value; +struct list_head list; +}; + +struct perf_event_attr ; + +struct perf_pmu { +char *name; +char *alias_name; +char *id; +__u32 type; +bool selectable; +bool is_uncore; +bool is_hybrid; +bool auxtrace; +int max_precise; +struct perf_event_attr *default_config; +struct perf_cpu_map *cpus; +struct list_head format;/* HEAD struct perf_pmu_format -> list */ +struct list_head aliases;/* HEAD struct perf_pmu_alias -> list */ +struct list_head caps;/* HEAD struct perf_pmu_caps -> list */ +struct list_head list;/* ELEM */ +struct list_head hybrid_list; +}; +int perf_pmu__new_format (struct list_head *list,char *name,int config,unsigned long *bits);void perf_pmu__set_format (unsigned long *bits,long from,long to);
tools/lib/perf/pmu-hybrid.c new file +88 -0
88 lines not on this page · raw message
tools/perf/builtin-c2c.c +1 -1
@@ -43,7 +43,7 @@#include "ui/progress.h" #include "../perf.h" #include "pmu.h" -#include "pmu-hybrid.h" +#include <internal/pmu-hybrid.h> struct c2c_hists {struct hists hists;
tools/perf/builtin-list.c +1 -1
@@ -12,7 +12,7 @@#include "util/parse-events.h" #include "util/pmu.h" -#include "util/pmu-hybrid.h" +#include <internal/pmu-hybrid.h> #include "util/debug.h" #include "util/metricgroup.h" #include <subcmd/pager.h>
tools/perf/builtin-mem.c +1 -1
@@ -19,7 +19,7 @@#include "util/map.h" #include "util/symbol.h" #include "util/pmu.h" -#include "util/pmu-hybrid.h" +#include <internal/pmu-hybrid.h> #include <linux/err.h> #define MEM_OPERATION_LOAD 0x1
tools/perf/builtin-record.c +1 -1
@@ -47,7 +47,7 @@#include "util/util.h" #include "util/pfm.h" #include "util/clockid.h" -#include "util/pmu-hybrid.h" +#include <internal/pmu-hybrid.h> #include "util/evlist-hybrid.h" #include "asm/bug.h" #include "perf.h"
tools/perf/builtin-stat.c +1 -1
@@ -70,7 +70,7 @@#include "util/pfm.h" #include "util/bpf_counter.h" #include "util/iostat.h" -#include "util/pmu-hybrid.h" +#include <internal/pmu-hybrid.h> #include "asm/bug.h" #include <linux/time64.h>
tools/perf/tests/evsel-roundtrip-name.c +1 -1
@@ -5,7 +5,7 @@#include "tests.h" #include "debug.h" #include "pmu.h" -#include "pmu-hybrid.h" +#include <internal/pmu-hybrid.h> #include <errno.h> #include <linux/kernel.h>
tools/perf/tests/parse-events.c +1 -1
@@ -6,7 +6,7 @@#include "tests.h" #include "debug.h" #include "pmu.h" -#include "pmu-hybrid.h" +#include <internal/pmu-hybrid.h> #include <dirent.h> #include <errno.h> #include <sys/types.h>
tools/perf/tests/perf-time-to-tsc.c +1 -1
@@ -21,7 +21,7 @@#include "mmap.h" #include "tests.h" #include "pmu.h" -#include "pmu-hybrid.h" +#include <internal/pmu-hybrid.h> #define CHECK__ (x) { \ while ((x) < 0) { \
tools/perf/util/Build +0 -1
@@ -69,7 +69,6 @@ perf-y += trace-event-parse.o perf-y += parse-events-flex.o perf-y += parse-events-bison.o perf-y += pmu.o -perf-y += pmu-hybrid.o perf-y += trace-event-read.o perf-y += trace-event-info.o perf-y += trace-event-scripting.o
tools/perf/util/cputopo.c +1 -1
@@ -7,12 +7,12 @@#include <api/fs/fs.h> #include <linux/zalloc.h> #include <perf/cpumap.h> +#include <internal/pmu-hybrid.h> #include "cputopo.h" #include "cpumap.h" #include "debug.h" #include "env.h" -#include "pmu-hybrid.h" #define CORE_SIB_FMT \ "%s/devices/system/cpu/cpu%d/topology/core_siblings_list"
tools/perf/util/evlist-hybrid.c +2 -1
@@ -5,9 +5,10 @@#include "evlist.h" #include "evsel.h" #include "../perf.h" -#include "util/pmu-hybrid.h" +#include <internal/pmu-hybrid.h> #include "util/evlist-hybrid.h" #include "debug.h" +#include "pmu.h" #include <unistd.h> #include <stdlib.h> #include <linux/err.h>
tools/perf/util/evsel.c +1 -1
@@ -47,11 +47,11 @@#include "memswap.h" #include "util.h" #include "hashmap.h" -#include "pmu-hybrid.h" #include "../perf-sys.h" #include "util/parse-branch-options.h" #include <internal/xyarray.h> #include <internal/lib.h> +#include <internal/pmu-hybrid.h> #include <linux/ctype.h>
tools/perf/util/header.c +1 -1
@@ -49,10 +49,10 @@#include "cputopo.h" #include "bpf-event.h" #include "clockid.h" -#include "pmu-hybrid.h" #include <linux/ctype.h> #include <internal/lib.h> +#include <internal/pmu-hybrid.h> /* * magic2 = "PERFILE2"
tools/perf/util/mem-events.c +1 -1
@@ -13,7 +13,7 @@#include "debug.h" #include "symbol.h" #include "pmu.h" -#include "pmu-hybrid.h" +#include <internal/pmu-hybrid.h> unsigned int perf_mem_events__loads_ldlat =30 ;
tools/perf/util/metricgroup.c +1 -1
@@ -11,7 +11,7 @@#include "evsel.h" #include "strbuf.h" #include "pmu.h" -#include "pmu-hybrid.h" +#include <internal/pmu-hybrid.h> #include "expr.h" #include "rblist.h" #include <string.h>
tools/perf/util/parse-events-hybrid.c +1 -1
@@ -12,7 +12,7 @@#include "parse-events-hybrid.h" #include "debug.h" #include "pmu.h" -#include "pmu-hybrid.h" +#include <internal/pmu-hybrid.h> #include "perf.h" static void config_hybrid_attr(struct perf_event_attr *attr,
tools/perf/util/parse-events.c +1 -1
@@ -36,7 +36,7 @@#include "util/event.h" #include "util/pfm.h" #include "util/parse-events-hybrid.h" -#include "util/pmu-hybrid.h" +#include <internal/pmu-hybrid.h> #include "perf.h" #define MAX_NAME_LEN 100
tools/perf/util/pmu-hybrid.c deleted +0 -88
88 lines not on this page · raw message
tools/perf/util/pmu-hybrid.h deleted +0 -33
@@ -1,33 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __PMU_HYBRID_H -#define __PMU_HYBRID_H - -#include <linux/perf_event.h> -#include <linux/compiler.h> -#include <linux/list.h> -#include <stdbool.h> -#include "pmu.h" - -extern struct list_head perf_pmu__hybrid_pmus; - -#define perf_pmu__for_each_hybrid_pmu (pmu) \ - list_for_each_entry(pmu, &perf_pmu__hybrid_pmus, hybrid_list) - -bool perf_pmu__hybrid_mounted (const char *name); - -struct perf_pmu *perf_pmu__find_hybrid_pmu (const char *name); -bool perf_pmu__is_hybrid (const char *name); -char *perf_pmu__hybrid_type_to_pmu (const char *type); - -static inline int perf_pmu__hybrid_pmu_num (void ) -{ -struct perf_pmu *pmu; -int num =0 ; - -perf_pmu__for_each_hybrid_pmu (pmu) - num++; - -return num; -} - -#endif /* __PMU_HYBRID_H */
tools/perf/util/pmu.c +1 -1
@@ -26,7 +26,7 @@#include "header.h" #include "string2.h" #include "strbuf.h" -#include "pmu-hybrid.h" +#include <internal/pmu-hybrid.h> struct perf_pmu perf_pmu__fake;
tools/perf/util/pmu.h +0 -27
@@ -19,33 +19,6 @@ struct perf_cpu_map;#define CPUS_TEMPLATE_CPU "%s/bus/event_source/devices/%s/cpus"#define MAX_PMU_NAME_LEN 128 -struct perf_event_attr ; - -struct perf_pmu_caps { -char *name; -char *value; -struct list_head list; -}; - -struct perf_pmu { -char *name; -char *alias_name; -char *id; -__u32 type; -bool selectable; -bool is_uncore; -bool is_hybrid; -bool auxtrace; -int max_precise; -struct perf_event_attr *default_config; -struct perf_cpu_map *cpus; -struct list_head format;/* HEAD struct perf_pmu_format -> list */ -struct list_head aliases;/* HEAD struct perf_pmu_alias -> list */ -struct list_head caps;/* HEAD struct perf_pmu_caps -> list */ -struct list_head list;/* ELEM */ -struct list_head hybrid_list; -}; -extern struct perf_pmu perf_pmu__fake;struct perf_pmu_info {
tools/perf/util/python-ext-sources +0 -1
@@ -38,4 +38,3 @@ util/units.c util/affinity.c util/rwsem.c util/hashmap.c -util/pmu-hybrid.c
tools/perf/util/stat-display.c +2 -1
@@ -18,8 +18,9 @@#include <api/fs/fs.h> #include "util.h" #include "iostat.h" -#include "pmu-hybrid.h" +#include <internal/pmu-hybrid.h> #include "evlist-hybrid.h" +#include "pmu.h" #define CNTR_NOT_SUPPORTED "<not supported>"#define CNTR_NOT_COUNTED "<not counted>"
Signature · 1 line
2.31.1
PATCH 7/59 libperf: Move name to perf_evsel
In reply to Jiri OlsaMoving name to perf_evsel struct.
--- tools/lib/perf/include/internal/evsel.h | 9 ++++++ tools/perf/arch/x86/util/kvm-stat.c | 8 +++--- tools/perf/builtin-kvm.c | 6 ++-- tools/perf/builtin-record.c | 8 +++--- tools/perf/builtin-stat.c | 10 +++---- tools/perf/builtin-trace.c | 12 ++++---- tools/perf/tests/evsel-tp-sched.c | 6 ++-- tools/perf/tests/expand-cgroup.c | 6 ++-- tools/perf/tests/parse-events.c | 12 ++++---- tools/perf/tests/parse-metric.c | 4 +-- tools/perf/util/arm-spe.c | 6 ++-- tools/perf/util/evlist-hybrid.c | 2 +- tools/perf/util/evlist.c | 14 ++++----- tools/perf/util/evsel.c | 38 ++++++++++++------------- tools/perf/util/evsel.h | 1 - tools/perf/util/header.c | 22 +++++++------- tools/perf/util/intel-pt.c | 6 ++-- tools/perf/util/metricgroup.c | 10 +++---- tools/perf/util/parse-events.c | 8 +++--- tools/perf/util/sort.c | 6 ++-- tools/perf/util/stat-display.c | 16 +++++------ tools/perf/util/stat-shadow.c | 14 ++++----- tools/perf/util/synthetic-events.c | 4 +-- tools/perf/util/trace-event-info.c | 6 ++-- 24 files changed, 121 insertions(+), 113 deletions(-)
tools/lib/perf/include/internal/evsel.h +9 -0
@@ -51,6 +51,15 @@ struct perf_evsel {int nr_members;bool system_wide;int idx; + +/* +* These fields can be set in the parse-events code or similar. +* Please check evsel__clone() to copy them properly so that +* they can be released properly. +*/ +struct { +char *name; + }; }; void perf_evsel__init(struct perf_evsel *evsel, struct perf_event_attr *attr,
tools/perf/arch/x86/util/kvm-stat.c +4 -4
@@ -47,7 +47,7 @@ static bool mmio_event_begin(struct evsel *evsel,return true;/* MMIO write begin event in kernel. */ -if (!strcmp (evsel->name,"kvm:kvm_mmio" ) && +if (!strcmp (evsel->core.name,"kvm:kvm_mmio" ) &&evsel__intval (evsel, sample,"type" ) ==KVM_TRACE_MMIO_WRITE ) {mmio_event_get_key (evsel, sample, key);return true;
@@ -64,7 +64,7 @@ static bool mmio_event_end(struct evsel *evsel, struct perf_sample *sample,return true;/* MMIO read end event in kernel.*/ -if (!strcmp (evsel->name,"kvm:kvm_mmio" ) && +if (!strcmp (evsel->core.name,"kvm:kvm_mmio" ) &&evsel__intval (evsel, sample,"type" ) ==KVM_TRACE_MMIO_READ ) {mmio_event_get_key (evsel, sample, key);return true;
@@ -102,7 +102,7 @@ static bool ioport_event_begin(struct evsel *evsel, struct perf_sample *sample, struct event_key *key) { -if (!strcmp (evsel->name,"kvm:kvm_pio" )) { +if (!strcmp (evsel->core.name,"kvm:kvm_pio" )) {ioport_event_get_key (evsel, sample, key);return true; }
@@ -146,7 +146,7 @@ static bool msr_event_begin(struct evsel *evsel, struct perf_sample *sample, struct event_key *key) { -if (!strcmp (evsel->name,"kvm:kvm_msr" )) { +if (!strcmp (evsel->core.name,"kvm:kvm_msr" )) {msr_event_get_key (evsel, sample, key);return true; }
tools/perf/builtin-kvm.c +3 -3
@@ -74,7 +74,7 @@ void exit_event_get_key(struct evsel *evsel,bool kvm_exit_event (struct evsel *evsel) { -return !strcmp (evsel->name, kvm_exit_trace); +return !strcmp (evsel->core.name, kvm_exit_trace); } bool exit_event_begin(struct evsel *evsel,
@@ -90,7 +90,7 @@ bool exit_event_begin(struct evsel *evsel,bool kvm_entry_event (struct evsel *evsel) { -return !strcmp (evsel->name, kvm_entry_trace); +return !strcmp (evsel->core.name, kvm_entry_trace); } bool exit_event_end(struct evsel *evsel,
@@ -305,7 +305,7 @@ static bool is_child_event(struct perf_kvm_stat *kvm,return false;for (; child_ops->name; child_ops++) { -if (!strcmp (evsel->name, child_ops->name)) { +if (!strcmp (evsel->core.name, child_ops->name)) { child_ops->get_key (evsel, sample, key);return true; }
tools/perf/builtin-record.c +4 -4
@@ -1606,14 +1606,14 @@ static void record__uniquify_name(struct record *rec)if (!evsel__is_hybrid (pos))continue ; -if (strchr (pos->name,'/' )) +if (strchr (pos->core.name,'/' ))continue ; ret =asprintf (&new_name,"%s/%s/" , - pos->pmu_name, pos->name); + pos->pmu_name, pos->core.name);if (ret) { -free (pos->name); - pos->name = new_name; +free (pos->core.name); + pos->core.name = new_name; } } }
tools/perf/builtin-stat.c +5 -5
@@ -265,9 +265,9 @@ static void evlist__check_cpu_maps(struct evlist *evlist)if (verbose) {cpu_map__snprint (leader->core.cpus, buf,sizeof (buf)); -pr_warning (" %s: %s\n" , leader->name, buf); +pr_warning (" %s: %s\n" , leader->core.name, buf);cpu_map__snprint (evsel->core.cpus, buf,sizeof (buf)); -pr_warning (" %s: %s\n" , evsel->name, buf); +pr_warning (" %s: %s\n" , evsel->core.name, buf); }for_each_group_evsel (pos, leader) {
@@ -466,9 +466,9 @@ static void read_counters(struct timespec *rs)evlist__for_each_entry (evsel_list, counter) {if (counter->err) -pr_debug ("failed to read counter %s\n" , counter->name); +pr_debug ("failed to read counter %s\n" , counter->core.name);if (counter->err ==0 &&perf_stat_process_counter (&stat_config, counter)) -pr_warning ("failed to process counter %s\n" , counter->name); +pr_warning ("failed to process counter %s\n" , counter->core.name); counter->err =0 ; } }
@@ -2205,7 +2205,7 @@ static void setup_system_wide(int forks)evlist__for_each_entry (evsel_list, counter) {if (!counter->core.system_wide && -strcmp (counter->name,"duration_time" )) { +strcmp (counter->core.name,"duration_time" )) {return ; } }
tools/perf/builtin-trace.c +6 -6
@@ -2647,7 +2647,7 @@ static int trace__sched_stat_runtime(struct trace *trace, struct evsel *evsel, out_dump: fprintf(trace->output, "%s: comm=%s,pid=%u,runtime=%" PRIu64 ",vruntime=%" PRIu64 ")\n", - evsel->name, + evsel->core.name, evsel__strval(evsel, sample, "comm"), (pid_t)evsel__intval(evsel, sample, "pid"), runtime,
@@ -2814,7 +2814,7 @@ static int trace__event_handler(struct trace *trace, struct evsel *evsel,*/ } -fprintf (trace->output,"%s(" , evsel->name); +fprintf (trace->output,"%s(" , evsel->core.name);if (evsel__is_bpf_output (evsel)) {bpf_output__fprintf (trace, sample);
@@ -3842,7 +3842,7 @@ static int trace__expand_filter(struct trace *trace __maybe_unused, struct evsel fmt =evsel__find_syscall_arg_fmt_by_name (evsel, arg);if (fmt ==NULL ) {pr_err ("\"%s\" not found in \"%s\", can't set filter \"%s\"\n" , - arg, evsel->name, evsel->filter); + arg, evsel->core.name, evsel->filter);return -1 ; }
@@ -3873,12 +3873,12 @@ static int trace__expand_filter(struct trace *trace __maybe_unused, struct evsel new_filter = n; }else {pr_err ("\"%.*s\" not found for \"%s\" in \"%s\", can't set filter \"%s\"\n" , - right_size, right, arg, evsel->name, evsel->filter); + right_size, right, arg, evsel->core.name, evsel->filter);return -1 ; } }else {pr_err ("No resolver (strtoul) for \"%s\" in \"%s\", can't set filter \"%s\"\n" , - arg, evsel->name, evsel->filter); + arg, evsel->core.name, evsel->filter);return -1 ; }
@@ -3889,7 +3889,7 @@ static int trace__expand_filter(struct trace *trace __maybe_unused, struct evsel }if (new_filter != evsel->filter) { -pr_debug ("New filter for %s: %s\n" , evsel->name, new_filter); +pr_debug ("New filter for %s: %s\n" , evsel->core.name, new_filter);evsel__set_filter (evsel, new_filter);free (new_filter); }
tools/perf/tests/evsel-tp-sched.c +3 -3
@@ -12,20 +12,20 @@ static int evsel__test_field(struct evsel *evsel, const char *name, int size, boint ret =0 ;if (field ==NULL ) { -pr_debug ("%s: \"%s\" field not found!\n" , evsel->name, name); +pr_debug ("%s: \"%s\" field not found!\n" , evsel->core.name, name);return -1 ; } is_signed = !!(field->flags &TEP_FIELD_IS_SIGNED );if (should_be_signed && !is_signed) {pr_debug ("%s: \"%s\" signedness(%d) is wrong, should be %d\n" , - evsel->name, name, is_signed, should_be_signed); + evsel->core.name, name, is_signed, should_be_signed); ret =-1 ; }if (field->size != size) {pr_debug ("%s: \"%s\" size (%d) should be %d!\n" , - evsel->name, name, field->size, size); + evsel->core.name, name, field->size, size); ret =-1 ; }
tools/perf/tests/expand-cgroup.c +3 -3
@@ -36,7 +36,7 @@ static int test_expand_events(struct evlist *evlist, } i =0 ;evlist__for_each_entry (evlist, evsel) { - ev_name[i] =strdup (evsel->name); + ev_name[i] =strdup (evsel->core.name);if (ev_name[i] ==NULL ) {pr_debug ("memory allocation failure\n" ); goto out;
@@ -61,10 +61,10 @@ static int test_expand_events(struct evlist *evlist, i =0 ;evlist__for_each_entry (evlist, evsel) { -if (strcmp (evsel->name, ev_name[i % nr_events])) { +if (strcmp (evsel->core.name, ev_name[i % nr_events])) {pr_debug ("event name doesn't match:\n" );pr_debug (" evsel[%d]: %s\n expected: %s\n" , - i, evsel->name, ev_name[i % nr_events]); + i, evsel->core.name, ev_name[i % nr_events]); goto out; }if (strcmp (evsel->cgrp->name, cgrp_name[i / nr_events])) {
tools/perf/tests/parse-events.c +6 -6
@@ -1380,7 +1380,7 @@ static int test__checkevent_config_symbol(struct evlist *evlist) {struct evsel *evsel =evlist__first (evlist); -TEST_ASSERT_VAL ("wrong name setting" ,strcmp (evsel->name,"insn" ) ==0 ); +TEST_ASSERT_VAL ("wrong name setting" ,strcmp (evsel->core.name,"insn" ) ==0 );return 0 ; }
@@ -1388,7 +1388,7 @@ static int test__checkevent_config_raw(struct evlist *evlist) {struct evsel *evsel =evlist__first (evlist); -TEST_ASSERT_VAL ("wrong name setting" ,strcmp (evsel->name,"rawpmu" ) ==0 ); +TEST_ASSERT_VAL ("wrong name setting" ,strcmp (evsel->core.name,"rawpmu" ) ==0 );return 0 ; }
@@ -1396,7 +1396,7 @@ static int test__checkevent_config_num(struct evlist *evlist) {struct evsel *evsel =evlist__first (evlist); -TEST_ASSERT_VAL ("wrong name setting" ,strcmp (evsel->name,"numpmu" ) ==0 ); +TEST_ASSERT_VAL ("wrong name setting" ,strcmp (evsel->core.name,"numpmu" ) ==0 );return 0 ; }
@@ -1404,7 +1404,7 @@ static int test__checkevent_config_cache(struct evlist *evlist) {struct evsel *evsel =evlist__first (evlist); -TEST_ASSERT_VAL ("wrong name setting" ,strcmp (evsel->name,"cachepmu" ) ==0 ); +TEST_ASSERT_VAL ("wrong name setting" ,strcmp (evsel->core.name,"cachepmu" ) ==0 );return 0 ; }
@@ -1417,7 +1417,7 @@ static int test__intel_pt(struct evlist *evlist) {struct evsel *evsel =evlist__first (evlist); -TEST_ASSERT_VAL ("wrong name setting" ,strcmp (evsel->name,"intel_pt//u" ) ==0 ); +TEST_ASSERT_VAL ("wrong name setting" ,strcmp (evsel->core.name,"intel_pt//u" ) ==0 );return 0 ; }
@@ -1425,7 +1425,7 @@ static int test__checkevent_complex_name(struct evlist *evlist) {struct evsel *evsel =evlist__first (evlist); -TEST_ASSERT_VAL ("wrong complex name parsing" ,strcmp (evsel->name,"COMPLEX_CYCLES_NAME:orig=cycles,desc=chip-clock-ticks" ) ==0 ); +TEST_ASSERT_VAL ("wrong complex name parsing" ,strcmp (evsel->core.name,"COMPLEX_CYCLES_NAME:orig=cycles,desc=chip-clock-ticks" ) ==0 );return 0 ; }
tools/perf/tests/parse-metric.c +2 -2
@@ -110,9 +110,9 @@ static void load_runtime_stat(struct runtime_stat *st, struct evlist *evlist,u64 count;evlist__for_each_entry (evlist, evsel) { - count =find_value (evsel->name, vals); + count =find_value (evsel->core.name, vals);perf_stat__update_shadow_stats (evsel, count,0 , st); -if (!strcmp (evsel->name,"duration_time" )) +if (!strcmp (evsel->core.name,"duration_time" ))update_stats (&walltime_nsecs_stats, count); } }
tools/perf/util/arm-spe.c +3 -3
@@ -879,9 +879,9 @@ static void arm_spe_set_event_name(struct evlist *evlist, u64 id,evlist__for_each_entry (evlist, evsel) {if (evsel->core.id && evsel->core.id[0 ] == id) { -if (evsel->name) -zfree (&evsel->name); - evsel->name =strdup (name); +if (evsel->core.name) +zfree (&evsel->core.name); + evsel->core.name =strdup (name);break ; } }
tools/perf/util/evlist-hybrid.c +1 -1
@@ -136,7 +136,7 @@ int evlist__fix_hybrid_cpus(struct evlist *evlist, const char *cpu_list)if (unmatched_cpus->nr >0 ) {cpu_map__snprint (matched_cpus, buf1,sizeof (buf1));pr_warning ("WARNING: use %s in '%s' for '%s', skip other cpus in list.\n" , - buf1, pmu->name, evsel->name); + buf1, pmu->name, evsel->core.name); } }
tools/perf/util/evlist.c +7 -7
@@ -315,7 +315,7 @@ struct evsel *evlist__find_tracepoint_by_name(struct evlist *evlist, const charevlist__for_each_entry (evlist, evsel) {if ((evsel->core.attr.type ==PERF_TYPE_TRACEPOINT ) && - (strcmp (evsel->name, name) ==0 )) + (strcmp (evsel->core.name, name) ==0 ))return evsel; }
@@ -380,7 +380,7 @@ static int evsel__strcmp(struct evsel *pos, char *evsel_name)return 0 ;if (evsel__is_dummy_event (pos))return 1 ; -return strcmp (pos->name, evsel_name); +return strcmp (pos->core.name, evsel_name); }static int evlist__is_enabled (struct evlist *evlist)
@@ -1647,9 +1647,9 @@ struct evsel *evlist__find_evsel_by_str(struct evlist *evlist, const char *str)struct evsel *evsel;evlist__for_each_entry (evlist, evsel) { -if (!evsel->name) +if (!evsel->core.name)continue ; -if (strcmp (str, evsel->name) ==0 ) +if (strcmp (str, evsel->core.name) ==0 )return evsel; }
@@ -1748,7 +1748,7 @@ struct evsel *evlist__reset_weak_group(struct evlist *evsel_list, struct evsel * leader =evsel__leader (evsel);pr_debug ("Weak group for %s/%d failed\n" , - leader->name, leader->core.nr_members); + leader->core.name, leader->core.nr_members);/* * for_each_group_member doesn't work here because it doesn't
@@ -2016,7 +2016,7 @@ static int evlist__ctlfd_enable(struct evlist *evlist, char *cmd_data, bool enabevlist__enable_evsel (evlist, name); elseevlist__disable_evsel (evlist ,name ); -pr_info ("Event %s %s\n" , evsel->name, +pr_info ("Event %s %s\n" , evsel->core.name, enable ?"enabled" :"disabled" ); }else {pr_info ("failed: can't find '%s' event\n" , name);
@@ -2161,7 +2161,7 @@ void evlist__check_mem_load_aux(struct evlist *evlist)if (leader == evsel)continue ; -if (leader->name &&strstr (leader->name,"mem-loads-aux" )) { +if (leader->core.name &&strstr (leader->core.name,"mem-loads-aux" )) {for_each_group_evsel (pos, leader) {evsel__set_leader (pos, pos); pos->core.nr_members =0 ;
tools/perf/util/evsel.c +19 -19
@@ -230,8 +230,8 @@ bool evsel__is_function_event(struct evsel *evsel) {#define FUNCTION_EVENT "ftrace:function" -return evsel->name && - !strncmp (FUNCTION_EVENT , evsel->name,sizeof (FUNCTION_EVENT )); +return evsel->core.name && + !strncmp (FUNCTION_EVENT , evsel->core.name,sizeof (FUNCTION_EVENT ));#undef FUNCTION_EVENT }
@@ -320,7 +320,7 @@ struct evsel *evsel__new_cycles(bool precise, __u32 type, __u64 config) evsel->precise_max = true;/* use asprintf() because free(evsel) assumes name is allocated */ -if (asprintf (&evsel->name,"cycles%s%s%.*s" , +if (asprintf (&evsel->core.name,"cycles%s%s%.*s" , (attr.precise_ip || attr.exclude_kernel) ?":" :"" , attr.exclude_kernel ?"u" :"" , attr.precise_ip ? attr.precise_ip +1 :0 ,"ppp" ) <0 )
@@ -390,9 +390,9 @@ struct evsel *evsel__clone(struct evsel *orig) evsel->core.nr_members = orig->core.nr_members; evsel->core.system_wide = orig->core.system_wide; -if (orig->name) { - evsel->name =strdup (orig->name); -if (evsel->name ==NULL ) +if (orig->core.name) { + evsel->core.name =strdup (orig->core.name); +if (evsel->core.name ==NULL ) goto out_err; }if (orig->group_name) {
@@ -465,7 +465,7 @@ struct evsel *evsel__newtp_idx(const char *sys, const char *name, int idx) PERF_SAMPLE_CPU | PERF_SAMPLE_PERIOD), }; -if (asprintf (&evsel->name,"%s:%s" , sys, name) <0 ) +if (asprintf (&evsel->core.name,"%s:%s" , sys, name) <0 ) goto out_free; evsel->tp_format =trace_event__tp_format (sys, name);
@@ -483,7 +483,7 @@ struct evsel *evsel__newtp_idx(const char *sys, const char *name, int idx)return evsel; out_free: -zfree (&evsel->name); +zfree (&evsel->core.name);free (evsel); out_err:return ERR_PTR (err);
@@ -739,8 +739,8 @@ const char *evsel__name(struct evsel *evsel)if (!evsel) goto out_unknown; -if (evsel->name) -return evsel->name; +if (evsel->core.name) +return evsel->core.name;switch (evsel->core.attr.type) {case PERF_TYPE_RAW :
@@ -776,10 +776,10 @@ const char *evsel__name(struct evsel *evsel)break ; } - evsel->name =strdup (bf); + evsel->core.name =strdup (bf); -if (evsel->name) -return evsel->name; +if (evsel->core.name) +return evsel->core.name; out_unknown:return "unknown" ; }
@@ -1018,7 +1018,7 @@ static void evsel__apply_config_terms(struct evsel *evsel,if (parse_callchain_record (callgraph_buf, ¶m)) {pr_err ("per-event callgraph setting for %s failed. " "Apply callgraph global setting for it\n" , - evsel->name); + evsel->core.name);return ; }if (param.record_mode ==CALLCHAIN_DWARF )
@@ -1437,7 +1437,7 @@ void evsel__exit(struct evsel *evsel)perf_cpu_map__put (evsel->core.own_cpus);perf_thread_map__put (evsel->core.threads);zfree (&evsel->group_name); -zfree (&evsel->name); +zfree (&evsel->core.name);zfree (&evsel->pmu_name);zfree (&evsel->metric_id);evsel__zero_per_pkg (evsel);
@@ -2762,7 +2762,7 @@ bool evsel__fallback(struct evsel *evsel, int err, char *msg, size_t msgsize) evsel->core.attr.type =PERF_TYPE_SOFTWARE ; evsel->core.attr.config =PERF_COUNT_SW_CPU_CLOCK ; -zfree (&evsel->name); +zfree (&evsel->core.name);return true; }else if (err ==EACCES && !evsel->core.attr.exclude_kernel && (paranoid =perf_event_paranoid ()) >1 ) {
@@ -2782,9 +2782,9 @@ bool evsel__fallback(struct evsel *evsel, int err, char *msg, size_t msgsize)if (asprintf (&new_name,"%s%su" , name, sep) <0 )return false; -if (evsel->name) -free (evsel->name); - evsel->name = new_name; +if (evsel->core.name) +free (evsel->core.name); + evsel->core.name = new_name;scnprintf (msg, msgsize,"kernel.perf_event_paranoid=%d, trying " "to fall back to excluding kernel and hypervisor " " samples" , paranoid);
tools/perf/util/evsel.h +0 -1
@@ -59,7 +59,6 @@ struct evsel {* they can be released properly. */ struct { -char *name;char *group_name;const char *pmu_name;struct tep_event *tp_format;
tools/perf/util/header.c +11 -11
@@ -1773,7 +1773,7 @@ static void free_event_desc(struct evsel *events)return ;for (evsel = events; evsel->core.attr.size; evsel++) { -zfree (&evsel->name); +zfree (&evsel->core.name);zfree (&evsel->core.id); }
@@ -1867,8 +1867,8 @@ static struct evsel *read_event_desc(struct feat_fd *ff)if (ff->ph->needs_swap) evsel->needs_swap = true; - evsel->name =do_read_string (ff); -if (!evsel->name) + evsel->core.name =do_read_string (ff); +if (!evsel->core.name) goto error;if (!nr)
@@ -1918,7 +1918,7 @@ static void print_event_desc(struct feat_fd *ff, FILE *fp) }for (evsel = events; evsel->core.attr.size; evsel++) { -fprintf (fp,"# event : name = %s, " , evsel->name); +fprintf (fp,"# event : name = %s, " , evsel->core.name);if (evsel->core.ids) {fprintf (fp,", id = {" );
@@ -2390,17 +2390,17 @@ static void evlist__set_event_name(struct evlist *evlist, struct evsel *event) {struct evsel *evsel; -if (!event->name) +if (!event->core.name)return ; evsel =evlist__find_by_index (evlist, event->core.idx);if (!evsel)return ; -if (evsel->name) +if (evsel->core.name)return ; - evsel->name =strdup (event->name); + evsel->core.name =strdup (event->core.name); } static int
@@ -3971,10 +3971,10 @@ static int evsel__prepare_tracepoint_event(struct evsel *evsel, struct tep_handlreturn -1 ; } -if (!evsel->name) { +if (!evsel->core.name) {snprintf (bf,sizeof (bf),"%s:%s" , event->system, event->name); - evsel->name =strdup (bf); -if (evsel->name ==NULL ) + evsel->core.name =strdup (bf); +if (evsel->core.name ==NULL )return -1 ; }
@@ -4259,7 +4259,7 @@ int perf_event__process_event_update(struct perf_tool *tool __maybe_unused, evsel->unit =strdup (ev->data);break ;case PERF_EVENT_UPDATE__NAME : - evsel->name =strdup (ev->data); + evsel->core.name =strdup (ev->data);break ;case PERF_EVENT_UPDATE__SCALE : ev_scale = (struct perf_record_event_update_scale *)ev->data;
tools/perf/util/intel-pt.c +3 -3
@@ -3276,9 +3276,9 @@ static void intel_pt_set_event_name(struct evlist *evlist, u64 id,evlist__for_each_entry (evlist, evsel) {if (evsel->core.id && evsel->core.id[0 ] == id) { -if (evsel->name) -zfree (&evsel->name); - evsel->name =strdup (name); +if (evsel->core.name) +zfree (&evsel->core.name); + evsel->core.name =strdup (name);break ; } }
tools/perf/util/metricgroup.c +5 -5
@@ -690,10 +690,10 @@ static int decode_all_metric_ids(struct evlist *perf_evlist, const char *modifie* If the name is just the parsed event, use the metric-id to * give a more friendly display version. */ -if (strstr (ev->name,"metric-id=" )) { +if (strstr (ev->core.name,"metric-id=" )) {bool has_slash = false; -free (ev->name); +free (ev->core.name);for (cur =strchr (sb.buf,'@' ) ; cur; cur =strchr (++cur,'@' )) { *cur ='/' ; has_slash = true;
@@ -709,8 +709,8 @@ static int decode_all_metric_ids(struct evlist *perf_evlist, const char *modifieif (ret)break ; } - ev->name =strdup (sb.buf); -if (!ev->name) { + ev->core.name =strdup (sb.buf); +if (!ev->core.name) { ret = -ENOMEM ;break ; }
@@ -1565,7 +1565,7 @@ int metricgroup__copy_metric_events(struct evlist *evlist, struct cgroup *cgrp,return -ENOMEM ;pr_debug ("copying metric event for cgroup '%s': %s (idx=%d)\n" , - cgrp ? cgrp->name :"root" , evsel->name, evsel->core.idx); + cgrp ? cgrp->name :"root" , evsel->core.name, evsel->core.idx);list_for_each_entry (old_expr, &old_me->head, nd) { new_expr =malloc (sizeof (*new_expr));
tools/perf/util/parse-events.c +4 -4
@@ -387,7 +387,7 @@ __add_event(struct list_head *list, int *idx, evsel->auto_merge_stats = auto_merge_stats;if (name) - evsel->name =strdup (name); + evsel->core.name =strdup (name);if (metric_id) evsel->metric_id =strdup (metric_id);
@@ -1653,7 +1653,7 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,if (!evsel)return -ENOMEM ; -if (evsel->name) +if (evsel->core.name) evsel->use_config_name = true; evsel->pmu_name = name ?strdup (name) :NULL ;
@@ -2069,8 +2069,8 @@ int parse_events_name(struct list_head *list, const char *name)struct evsel *evsel;__evlist__for_each_entry (list, evsel) { -if (!evsel->name) - evsel->name =strdup (name); +if (!evsel->core.name) + evsel->core.name =strdup (name); }return 0 ;
tools/perf/util/sort.c +3 -3
@@ -2543,13 +2543,13 @@ static struct evsel *find_evsel(struct evlist *evlist, char *event_name) full_name = !!strchr (event_name,':' );evlist__for_each_entry (evlist, pos) {/* case 2 */ -if (full_name && !strcmp (pos->name, event_name)) +if (full_name && !strcmp (pos->core.name, event_name))return pos;/* case 3 */ -if (!full_name &&strstr (pos->name, event_name)) { +if (!full_name &&strstr (pos->core.name, event_name)) {if (evsel) {pr_debug ("'%s' event is ambiguous: it can be %s or %s\n" , - event_name, evsel->name, pos->name); + event_name, evsel->core.name, pos->core.name);return NULL ; } evsel = pos;
tools/perf/util/stat-display.c +8 -8
@@ -546,29 +546,29 @@ static void uniquify_event_name(struct evsel *counter)int ret =0 ;if (counter->uniquified_name || counter->use_config_name || - !counter->pmu_name || !strncmp (counter->name, counter->pmu_name, + !counter->pmu_name || !strncmp (counter->core.name, counter->pmu_name,strlen (counter->pmu_name)))return ; - config =strchr (counter->name,'/' ); + config =strchr (counter->core.name,'/' );if (config) {if (asprintf (&new_name,"%s%s" , counter->pmu_name, config) >0 ) { -free (counter->name); - counter->name = new_name; +free (counter->core.name); + counter->core.name = new_name; } }else {if (perf_pmu__has_hybrid ()) { ret =asprintf (&new_name,"%s/%s/" , - counter->pmu_name, counter->name); + counter->pmu_name, counter->core.name); }else { ret =asprintf (&new_name,"%s [%s]" , - counter->name, counter->pmu_name); + counter->core.name, counter->pmu_name); }if (ret) { -free (counter->name); - counter->name = new_name; +free (counter->core.name); + counter->core.name = new_name; } }
tools/perf/util/stat-shadow.c +7 -7
@@ -361,7 +361,7 @@ static struct evsel *perf_stat__find_event(struct evlist *evsel_list,struct evsel *c2; evlist__for_each_entry (evsel_list, c2) { -if (!strcasecmp (c2->name, name) && !c2->collect_stat) +if (!strcasecmp (c2->core.name, name) && !c2->collect_stat)return c2; }return NULL ;
@@ -393,7 +393,7 @@ void perf_stat__collect_metric_expr(struct evlist *evsel_list) metric_events = counter->metric_events;if (!metric_events) {if (expr__find_ids (counter->metric_expr, - counter->name, + counter->core.name, ctx) <0 )continue ;
@@ -414,7 +414,7 @@ void perf_stat__collect_metric_expr(struct evlist *evsel_list)if (leader) {/* Search in group */ for_each_group_member (oc, leader) { -if (!strcasecmp (oc->name, +if (!strcasecmp (oc->core.name, metric_name) && !oc->collect_stat) { found = true;
@@ -443,7 +443,7 @@ void perf_stat__collect_metric_expr(struct evlist *evsel_list)fprintf (stderr,"Add %s event to groups to get metric expression for %s\n" , metric_name, - counter->name); + counter->core.name); printed =strdup (metric_name); } invalid = true;
@@ -829,7 +829,7 @@ static int prepare_metric(struct evsel **metric_events,struct stats *stats;u64 metric_total =0 ; -if (!strcmp (metric_events[i]->name,"duration_time" )) { +if (!strcmp (metric_events[i]->core.name,"duration_time" )) { stats = &walltime_nsecs_stats; scale =1e-9 ; }else {
@@ -1275,7 +1275,7 @@ void perf_stat__print_shadow_stats(struct perf_stat_config *config, core_bound * 100.); }else if (evsel->metric_expr) {generic_metric (config, evsel->metric_expr, evsel->metric_events,NULL , - evsel->name, evsel->metric_name,NULL ,1 , cpu, out, st); + evsel->core.name, evsel->metric_name,NULL ,1 , cpu, out, st); }else if (runtime_stat_n (st,STAT_NSECS , cpu, &rsd) !=0 ) {char unit =' ' ;char unit_buf[10 ] ="/sec" ;
@@ -1300,7 +1300,7 @@ void perf_stat__print_shadow_stats(struct perf_stat_config *config,if (num++ >0 ) out->new_line (config, ctxp);generic_metric (config, mexp->metric_expr, mexp->metric_events, - mexp->metric_refs, evsel->name, mexp->metric_name, + mexp->metric_refs, evsel->core.name, mexp->metric_name, mexp->metric_unit, mexp->runtime, cpu, out, st); } }
tools/perf/util/synthetic-events.c +2 -2
@@ -1860,14 +1860,14 @@ int perf_event__synthesize_event_update_name(struct perf_tool *tool, struct evse perf_event__handler_t process) {struct perf_record_event_update *ev; -size_t len =strlen (evsel->name); +size_t len =strlen (evsel->core.name);int err; ev =event_update_event__new (len +1 ,PERF_EVENT_UPDATE__NAME , evsel->core.id[0 ]);if (ev ==NULL )return -ENOMEM ; -strlcpy (ev->data, evsel->name, len +1 ); +strlcpy (ev->data, evsel->core.name, len +1 ); err =process (tool, (union perf_event *)ev,NULL ,NULL );free (ev);return err;
tools/perf/util/trace-event-info.c +3 -3
@@ -412,12 +412,12 @@ get_tracepoints_path(struct list_head *pattrs)continue ; ++nr_tracepoints; -if (pos->name) { - ppath->next =tracepoint_name_to_path (pos->name); +if (pos->core.name) { + ppath->next =tracepoint_name_to_path (pos->core.name);if (ppath->next) goto next; -if (strchr (pos->name,':' ) ==NULL ) +if (strchr (pos->core.name,':' ) ==NULL ) goto try_id; goto error;
Signature · 1 line
2.31.1
PATCH 8/59 libperf: Move auto_merge_stats to perf_evsel
In reply to Jiri OlsaMoving auto_merge_stats to perf_evsel struct.
--- tools/lib/perf/include/internal/evsel.h | 1 + tools/perf/util/evsel.c | 2 +- tools/perf/util/evsel.h | 1 - tools/perf/util/parse-events.c | 2 +- tools/perf/util/stat-display.c | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-)
tools/lib/perf/include/internal/evsel.h +1 -0
@@ -59,6 +59,7 @@ struct perf_evsel {*/ struct {char *name; +bool auto_merge_stats; }; };
tools/perf/util/evsel.c +1 -1
@@ -433,7 +433,7 @@ struct evsel *evsel__clone(struct evsel *orig) evsel->exclude_GH = orig->exclude_GH; evsel->sample_read = orig->sample_read; - evsel->auto_merge_stats = orig->auto_merge_stats; + evsel->core.auto_merge_stats = orig->core.auto_merge_stats; evsel->collect_stat = orig->collect_stat; evsel->weak_group = orig->weak_group; evsel->use_config_name = orig->use_config_name;
tools/perf/util/evsel.h +0 -1
@@ -78,7 +78,6 @@ struct evsel {bool precise_max;bool use_uncore_alias;bool is_libpfm_event; -bool auto_merge_stats;bool collect_stat;bool weak_group;bool bpf_counter;
tools/perf/util/parse-events.c +1 -1
@@ -384,7 +384,7 @@ __add_event(struct list_head *list, int *idx, evsel->core.cpus = cpus; evsel->core.own_cpus =perf_cpu_map__get (cpus); evsel->core.system_wide = pmu ? pmu->is_uncore : false; - evsel->auto_merge_stats = auto_merge_stats; + evsel->core.auto_merge_stats = auto_merge_stats;if (name) evsel->core.name =strdup (name);
tools/perf/util/stat-display.c +1 -1
@@ -619,7 +619,7 @@ static bool collect_data(struct perf_stat_config *config, struct evsel *counter,cb (config, counter, data, true);if (config->no_merge ||hybrid_uniquify (counter))uniquify_event_name (counter); -else if (counter->auto_merge_stats) +else if (counter->core.auto_merge_stats)collect_all_aliases (config, counter, cb, data);return true; }
Signature · 1 line
2.31.1
PATCH 9/59 libperf: Move config_terms to perf_evsel
In reply to Jiri OlsaMoving config_terms to perf_evsel struct.
--- tools/lib/perf/include/internal/evsel.h | 1 + tools/perf/builtin-top.c | 2 +- tools/perf/util/evsel.c | 10 +++++----- tools/perf/util/evsel.h | 1 - tools/perf/util/parse-events.c | 6 +++--- tools/perf/util/record.c | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-)
tools/lib/perf/include/internal/evsel.h +1 -0
@@ -60,6 +60,7 @@ struct perf_evsel {struct {char *name;bool auto_merge_stats; +struct list_head config_terms; }; };
tools/perf/builtin-top.c +1 -1
@@ -951,7 +951,7 @@ static int perf_top__overwrite_check(struct perf_top *top)evlist__for_each_entry (evlist, evsel) { set =-1 ; - config_terms = &evsel->config_terms; + config_terms = &evsel->core.config_terms;list_for_each_entry (term, config_terms, list) {if (term->type ==EVSEL__CONFIG_TERM_OVERWRITE ) set = term->val.overwrite ?1 :0 ;
tools/perf/util/evsel.c +5 -5
@@ -247,7 +247,7 @@ void evsel__init(struct evsel *evsel, evsel->evlist =NULL ; evsel->bpf_obj =NULL ; evsel->bpf_fd =-1 ; -INIT_LIST_HEAD (&evsel->config_terms); +INIT_LIST_HEAD (&evsel->core.config_terms);INIT_LIST_HEAD (&evsel->bpf_counter_list); perf_evsel__object.init (evsel); evsel->sample_size =__evsel__sample_size (attr->sample_type);
@@ -357,7 +357,7 @@ int copy_config_terms(struct list_head *dst, struct list_head *src)static int evsel__copy_config_terms (struct evsel *dst,struct evsel *src) { -return copy_config_terms (&dst->config_terms, &src->config_terms); +return copy_config_terms (&dst->core.config_terms, &src->core.config_terms); }/**
@@ -917,7 +917,7 @@ static void evsel__apply_config_terms(struct evsel *evsel, struct record_opts *opts, bool track) {struct evsel_config_term *term; -struct list_head *config_terms = &evsel->config_terms; +struct list_head *config_terms = &evsel->core.config_terms;struct perf_event_attr *attr = &evsel->core.attr;/* callgraph default */ struct callchain_param param = {
@@ -1050,7 +1050,7 @@ struct evsel_config_term *__evsel__get_config_term(struct evsel *evsel, enum evs {struct evsel_config_term *term, *found_term =NULL ; -list_for_each_entry (term, &evsel->config_terms, list) { +list_for_each_entry (term, &evsel->core.config_terms, list) {if (term->type == type) found_term = term; }
@@ -1420,7 +1420,7 @@ void free_config_terms(struct list_head *config_terms)static void evsel__free_config_terms (struct evsel *evsel) { -free_config_terms (&evsel->config_terms); +free_config_terms (&evsel->core.config_terms); }void evsel__exit (struct evsel *evsel)
tools/perf/util/evsel.h +0 -1
@@ -84,7 +84,6 @@ struct evsel {bool use_config_name;int bpf_fd;struct bpf_object *bpf_obj; -struct list_head config_terms; };/*
tools/perf/util/parse-events.c +3 -3
@@ -393,7 +393,7 @@ __add_event(struct list_head *list, int *idx, evsel->metric_id =strdup (metric_id);if (config_terms) -list_splice_init (config_terms, &evsel->config_terms); +list_splice_init (config_terms, &evsel->core.config_terms);if (list)list_add_tail (&evsel->core.node, list);
@@ -607,7 +607,7 @@ static int add_tracepoint(struct list_head *list, int *idx,if (get_config_terms (head_config, &config_terms))return -ENOMEM ; -list_splice (&config_terms, &evsel->config_terms); +list_splice (&config_terms, &evsel->core.config_terms); }list_add_tail (&evsel->core.node, list);
@@ -1658,7 +1658,7 @@ int parse_events_add_pmu(struct parse_events_state *parse_state, evsel->pmu_name = name ?strdup (name) :NULL ; evsel->use_uncore_alias = use_uncore_alias; - evsel->percore =config_term_percore (&evsel->config_terms); + evsel->percore =config_term_percore (&evsel->core.config_terms);if (parse_state->fake_pmu)return 0 ;
tools/perf/util/record.c +1 -1
@@ -41,7 +41,7 @@ static struct evsel *evsel__read_sampler(struct evsel *evsel, struct evlist *evlstatic u64 evsel__config_term_mask (struct evsel *evsel) {struct evsel_config_term *term; -struct list_head *config_terms = &evsel->config_terms; +struct list_head *config_terms = &evsel->core.config_terms;u64 term_types =0 ;list_for_each_entry (term, config_terms, list) {
Signature · 1 line
2.31.1
PATCH 10/59 libperf: Move metric_id to perf_evsel
In reply to Jiri OlsaMoving metric_id to perf_evsel struct.
--- tools/lib/perf/include/internal/evsel.h | 1 + tools/perf/util/evsel.c | 12 ++++++------ tools/perf/util/evsel.h | 1 - tools/perf/util/metricgroup.c | 10 +++++----- tools/perf/util/parse-events.c | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-)
tools/lib/perf/include/internal/evsel.h +1 -0
@@ -61,6 +61,7 @@ struct perf_evsel {char *name;bool auto_merge_stats;struct list_head config_terms; +const char *metric_id; }; };
tools/perf/util/evsel.c +6 -6
@@ -410,9 +410,9 @@ struct evsel *evsel__clone(struct evsel *orig)if (evsel->filter ==NULL ) goto out_err; } -if (orig->metric_id) { - evsel->metric_id =strdup (orig->metric_id); -if (evsel->metric_id ==NULL ) +if (orig->core.metric_id) { + evsel->core.metric_id =strdup (orig->core.metric_id); +if (evsel->core.metric_id ==NULL ) goto out_err; } evsel->cgrp =cgroup__get (orig->cgrp);
@@ -786,8 +786,8 @@ const char *evsel__name(struct evsel *evsel)const char *evsel__metric_id (const struct evsel *evsel) { -if (evsel->metric_id) -return evsel->metric_id; +if (evsel->core.metric_id) +return evsel->core.metric_id;if (evsel->core.attr.type ==PERF_TYPE_SOFTWARE && evsel->tool_event)return "duration_time" ;
@@ -1439,7 +1439,7 @@ void evsel__exit(struct evsel *evsel)zfree (&evsel->group_name);zfree (&evsel->core.name);zfree (&evsel->pmu_name); -zfree (&evsel->metric_id); +zfree (&evsel->core.metric_id);evsel__zero_per_pkg (evsel);hashmap__free (evsel->per_pkg_mask); evsel->per_pkg_mask =NULL ;
tools/perf/util/evsel.h +0 -1
@@ -67,7 +67,6 @@ struct evsel {double scale;const char *unit;struct cgroup *cgrp; -const char *metric_id;enum perf_tool_event tool_event;/* parse modifier helper */ int exclude_GH;
tools/perf/util/metricgroup.c +5 -5
@@ -669,20 +669,20 @@ static int decode_all_metric_ids(struct evlist *perf_evlist, const char *modifieint ret =0 ;evlist__for_each_entry (perf_evlist, ev) { -if (!ev->metric_id) +if (!ev->core.metric_id)continue ; ret =strbuf_setlen (&sb,0 );if (ret)break ; - ret =decode_metric_id (&sb, ev->metric_id); + ret =decode_metric_id (&sb, ev->core.metric_id);if (ret)break ; -free ((char *)ev->metric_id); - ev->metric_id =strdup (sb.buf); -if (!ev->metric_id) { +free ((char *)ev->core.metric_id); + ev->core.metric_id =strdup (sb.buf); +if (!ev->core.metric_id) { ret = -ENOMEM ;break ; }
tools/perf/util/parse-events.c +1 -1
@@ -390,7 +390,7 @@ __add_event(struct list_head *list, int *idx, evsel->core.name =strdup (name);if (metric_id) - evsel->metric_id =strdup (metric_id); + evsel->core.metric_id =strdup (metric_id);if (config_terms)list_splice_init (config_terms, &evsel->core.config_terms);
Signature · 1 line
2.31.1
PATCH 11/59 libperf: Move tool_event to perf_evsel
In reply to Jiri OlsaMoving tool_event to perf_evsel struct.
--- tools/lib/perf/include/internal/evsel.h | 6 ++++++ tools/perf/builtin-stat.c | 2 +- tools/perf/util/evsel.c | 6 +++--- tools/perf/util/evsel.h | 6 ------ tools/perf/util/parse-events.c | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-)
tools/lib/perf/include/internal/evsel.h +6 -0
@@ -11,6 +11,11 @@ struct perf_cpu_map;struct perf_thread_map ;struct xyarray ; +enum perf_tool_event { +PERF_TOOL_NONE =0 , +PERF_TOOL_DURATION_TIME =1 , +}; +/* * Per fd, to map back from PERF_SAMPLE_ID to evsel, only used when there are * more than one entry in the evlist.
@@ -62,6 +67,7 @@ struct perf_evsel {bool auto_merge_stats;struct list_head config_terms;const char *metric_id; +enum perf_tool_event tool_event; }; };
tools/perf/builtin-stat.c +1 -1
@@ -339,7 +339,7 @@ static int evsel__write_stat_event(struct evsel *counter, u32 cpu, u32 thread,static int read_single_counter (struct evsel *counter,int cpu,int thread,struct timespec *rs) { -if (counter->tool_event ==PERF_TOOL_DURATION_TIME ) { +if (counter->core.tool_event ==PERF_TOOL_DURATION_TIME ) {u64 val = rs->tv_nsec + rs->tv_sec*1000000000ULL ;struct perf_counts_values *count =perf_counts (counter->counts, cpu, thread);
tools/perf/util/evsel.c +3 -3
@@ -421,7 +421,7 @@ struct evsel *evsel__clone(struct evsel *orig) evsel->core.leader = orig->core.leader; evsel->max_events = orig->max_events; - evsel->tool_event = orig->tool_event; + evsel->core.tool_event = orig->core.tool_event; evsel->unit = orig->unit; evsel->scale = orig->scale; evsel->snapshot = orig->snapshot;
@@ -756,7 +756,7 @@ const char *evsel__name(struct evsel *evsel)break ;case PERF_TYPE_SOFTWARE : -if (evsel->tool_event) +if (evsel->core.tool_event)evsel__tool_name (bf,sizeof (bf));else evsel__sw_name (evsel, bf,sizeof (bf));
@@ -789,7 +789,7 @@ const char *evsel__metric_id(const struct evsel *evsel)if (evsel->core.metric_id)return evsel->core.metric_id; -if (evsel->core.attr.type ==PERF_TYPE_SOFTWARE && evsel->tool_event) +if (evsel->core.attr.type ==PERF_TYPE_SOFTWARE && evsel->core.tool_event)return "duration_time" ;return "unknown" ;
tools/perf/util/evsel.h +0 -6
@@ -25,11 +25,6 @@ struct bperf_follower_bpf;typedef int (evsel__sb_cb_t )(union perf_event *event,void *data); -enum perf_tool_event { -PERF_TOOL_NONE =0 , -PERF_TOOL_DURATION_TIME =1 , -}; -/** struct evsel - event selector * * @evlist - evlist this evsel is in, if it is in one.
@@ -67,7 +62,6 @@ struct evsel {double scale;const char *unit;struct cgroup *cgrp; -enum perf_tool_event tool_event;/* parse modifier helper */ int exclude_GH;int sample_read;
tools/perf/util/parse-events.c +1 -1
@@ -434,7 +434,7 @@ static int add_event_tool(struct list_head *list, int *idx, /*cpu_list=*/"0");if (!evsel)return -ENOMEM ; - evsel->tool_event = tool_event; + evsel->core.tool_event = tool_event;if (tool_event ==PERF_TOOL_DURATION_TIME ) evsel->unit ="ns" ;return 0 ;
Signature · 1 line
2.31.1
PATCH 12/59 libperf: Move unit to perf_evsel
In reply to Jiri OlsaMoving unit to perf_evsel struct.
--- tools/lib/perf/include/internal/evsel.h | 1 + tools/perf/builtin-stat.c | 2 +- tools/perf/tests/event_update.c | 2 +- tools/perf/util/evsel.c | 8 ++++---- tools/perf/util/evsel.h | 1 - tools/perf/util/header.c | 2 +- tools/perf/util/parse-events.c | 4 ++-- tools/perf/util/stat-display.c | 8 ++++---- tools/perf/util/synthetic-events.c | 6 +++--- 9 files changed, 17 insertions(+), 17 deletions(-)
tools/lib/perf/include/internal/evsel.h +1 -0
@@ -68,6 +68,7 @@ struct perf_evsel {struct list_head config_terms;const char *metric_id;enum perf_tool_event tool_event; +const char *unit; }; };
tools/perf/builtin-stat.c +1 -1
@@ -917,7 +917,7 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)continue ; } - l =strlen (counter->unit); + l =strlen (counter->core.unit);if (l > stat_config.unit_width) stat_config.unit_width = l;
tools/perf/tests/event_update.c +1 -1
@@ -99,7 +99,7 @@ int test__event_update(struct test *test __maybe_unused, int subtest __maybe_unuperf_evlist__id_add (&evlist->core, &evsel->core,0 ,0 ,123 ); - evsel->unit = unit; + evsel->core.unit = unit;TEST_ASSERT_VAL ("failed to synthesize attr update unit" , !perf_event__synthesize_event_update_unit (NULL , evsel, process_event_unit));
tools/perf/util/evsel.c +4 -4
@@ -241,7 +241,7 @@ void evsel__init(struct evsel *evsel, {perf_evsel__init (&evsel->core, attr, idx); evsel->tracking = !idx; - evsel->unit ="" ; + evsel->core.unit ="" ; evsel->scale =1.0 ; evsel->max_events =ULONG_MAX ; evsel->evlist =NULL ;
@@ -282,7 +282,7 @@ struct evsel *evsel__new_idx(struct perf_event_attr *attr, int idx)*/ static const char *unit ="msec" ; - evsel->unit = unit; + evsel->core.unit = unit; evsel->scale =1e-6 ; }
@@ -422,7 +422,7 @@ struct evsel *evsel__clone(struct evsel *orig) evsel->max_events = orig->max_events; evsel->core.tool_event = orig->core.tool_event; - evsel->unit = orig->unit; + evsel->core.unit = orig->core.unit; evsel->scale = orig->scale; evsel->snapshot = orig->snapshot; evsel->per_pkg = orig->per_pkg;
@@ -1300,7 +1300,7 @@ void evsel__config(struct evsel *evsel, struct record_opts *opts, attr->exclude_user =1 ; } -if (evsel->core.own_cpus || evsel->unit) +if (evsel->core.own_cpus || evsel->core.unit) evsel->core.attr.read_format |=PERF_FORMAT_ID ;/*
tools/perf/util/evsel.h +0 -1
@@ -60,7 +60,6 @@ struct evsel {char *filter;unsigned long max_events;double scale; -const char *unit;struct cgroup *cgrp;/* parse modifier helper */ int exclude_GH;
tools/perf/util/header.c +1 -1
@@ -4256,7 +4256,7 @@ int perf_event__process_event_update(struct perf_tool *tool __maybe_unused,switch (ev->type) {case PERF_EVENT_UPDATE__UNIT : - evsel->unit =strdup (ev->data); + evsel->core.unit =strdup (ev->data);break ;case PERF_EVENT_UPDATE__NAME : evsel->core.name =strdup (ev->data);
tools/perf/util/parse-events.c +2 -2
@@ -436,7 +436,7 @@ static int add_event_tool(struct list_head *list, int *idx,return -ENOMEM ; evsel->core.tool_event = tool_event;if (tool_event ==PERF_TOOL_DURATION_TIME ) - evsel->unit ="ns" ; + evsel->core.unit ="ns" ;return 0 ; }
@@ -1663,7 +1663,7 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,if (parse_state->fake_pmu)return 0 ; - evsel->unit = info.unit; + evsel->core.unit = info.unit; evsel->scale = info.scale; evsel->per_pkg = info.per_pkg; evsel->snapshot = info.snapshot;
tools/perf/util/stat-display.c +4 -4
@@ -372,10 +372,10 @@ static void abs_printout(struct perf_stat_config *config,fprintf (output, fmt, avg, config->csv_sep); -if (evsel->unit) +if (evsel->core.unit)fprintf (output,"%-*s%s" , config->csv_output ?0 : config->unit_width, - evsel->unit, config->csv_sep); + evsel->core.unit, config->csv_sep);fprintf (output,"%-*s" , config->csv_output ?0 :25 ,evsel__name (evsel));
@@ -476,7 +476,7 @@ static void printout(struct perf_stat_config *config, struct aggr_cpu_id id, intfprintf (config->output,"%-*s%s" , config->csv_output ?0 : config->unit_width, - counter->unit, config->csv_sep); + counter->core.unit, config->csv_sep);fprintf (config->output,"%*s" , config->csv_output ?0 :-25 ,evsel__name (counter));
@@ -588,7 +588,7 @@ static void collect_all_aliases(struct perf_stat_config *config, struct evsel *cif (strcmp (evsel__name (alias),evsel__name (counter)) || alias->scale != counter->scale || alias->cgrp != counter->cgrp || -strcmp (alias->unit, counter->unit) || +strcmp (alias->core.unit, counter->core.unit) ||evsel__is_clock (alias) !=evsel__is_clock (counter) || !strcmp (alias->pmu_name, counter->pmu_name))break ;
tools/perf/util/synthetic-events.c +3 -3
@@ -1824,7 +1824,7 @@ static struct perf_record_event_update *event_update_event__new(size_t size, u64int perf_event__synthesize_event_update_unit (struct perf_tool *tool,struct evsel *evsel,perf_event__handler_t process) { -size_t size =strlen (evsel->unit); +size_t size =strlen (evsel->core.unit);struct perf_record_event_update *ev;int err;
@@ -1832,7 +1832,7 @@ int perf_event__synthesize_event_update_unit(struct perf_tool *tool, struct evseif (ev ==NULL )return -ENOMEM ; -strlcpy (ev->data, evsel->unit, size +1 ); +strlcpy (ev->data, evsel->core.unit, size +1 ); err =process (tool, (union perf_event *)ev,NULL ,NULL );free (ev);return err;
@@ -1921,7 +1921,7 @@ int perf_event__synthesize_attrs(struct perf_tool *tool, struct evlist *evlist,static bool has_unit (struct evsel *evsel) { -return evsel->unit && *evsel->unit; +return evsel->core.unit && *evsel->core.unit; }static bool has_scale (struct evsel *evsel)
Signature · 1 line
2.31.1
PATCH 13/59 libperf: Move exclude_GH to perf_evsel
In reply to Jiri OlsaMoving exclude_GH to perf_evsel struct.
--- tools/lib/perf/include/internal/evsel.h | 1 + tools/perf/util/evsel.c | 2 +- tools/perf/util/evsel.h | 1 - tools/perf/util/parse-events.c | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-)
tools/lib/perf/include/internal/evsel.h +1 -0
@@ -69,6 +69,7 @@ struct perf_evsel {const char *metric_id;enum perf_tool_event tool_event;const char *unit; +int exclude_GH; }; };
tools/perf/util/evsel.c +1 -1
@@ -431,7 +431,7 @@ struct evsel *evsel__clone(struct evsel *orig) evsel->use_uncore_alias = orig->use_uncore_alias; evsel->is_libpfm_event = orig->is_libpfm_event; - evsel->exclude_GH = orig->exclude_GH; + evsel->core.exclude_GH = orig->core.exclude_GH; evsel->sample_read = orig->sample_read; evsel->core.auto_merge_stats = orig->core.auto_merge_stats; evsel->collect_stat = orig->collect_stat;
tools/perf/util/evsel.h +0 -1
@@ -62,7 +62,6 @@ struct evsel {double scale;struct cgroup *cgrp;/* parse modifier helper */ -int exclude_GH;int sample_read;bool snapshot;bool per_pkg;
tools/perf/util/parse-events.c +2 -2
@@ -1918,7 +1918,7 @@ static int get_event_modifier(struct event_modifier *mod, char *str,int exclusive = evsel ? evsel->core.attr.exclusive :0 ;int exclude = eu | ek | eh; -int exclude_GH = evsel ? evsel->exclude_GH :0 ; +int exclude_GH = evsel ? evsel->core.exclude_GH :0 ;int weak =0 ;int bpf_counter =0 ;
@@ -2049,7 +2049,7 @@ int parse_events__modifier_event(struct list_head *list, char *str, bool add) evsel->core.attr.exclude_host = mod.eH; evsel->core.attr.exclude_guest = mod.eG; evsel->core.attr.exclude_idle = mod.eI; - evsel->exclude_GH = mod.exclude_GH; + evsel->core.exclude_GH = mod.exclude_GH; evsel->sample_read = mod.sample_read; evsel->precise_max = mod.precise_max; evsel->weak_group = mod.weak;
Signature · 1 line
2.31.1
Ian Rogers
reviewerRe: [PATCH 13/59] libperf: Move exclude_GH to perf_evsel
Quoted 16 lines · Jiri Olsa
Moving
exclude_GHtoperf_evselstruct.Signed-off-by Jiri Olsa <[email protected]>--- tools/lib/perf/include/internal/evsel.h | 1 + tools/perf/util/evsel.c | 2 +- tools/perf/util/evsel.h | 1 - tools/perf/util/parse-events.c | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-)tools/lib/perf/include/internal/evsel.h +0
-0
tools/lib/perf/include/internal/evsel.h struct perf_evsel { · line 72
Quoted 4 lines
tools/lib/perf/include/internal/evsel.h +1
-0@@ -69,6 +69,7 @@ struct perf_evsel {const char *metric_id;enum perf_tool_event tool_event;const char *unit; +int exclude_GH;
I think it'd be pretty awesome if when these things get moved around we added a comment here to explain what the variable means. Perhaps even put an example :-) In this case it could explain why this is an int and not a bool. This is a while you are here request rather than a criticism of the changes which I find fine.
Thanks,
Ian
Quoted 53 lines
tools/lib/perf/include/internal/evsel.h +0
-0}; };tools/perf/util/evsel.c +1
-1@@ -431,7 +431,7 @@ struct evsel *evsel__clone(struct evsel *orig) evsel->use_uncore_alias = orig->use_uncore_alias; evsel->is_libpfm_event = orig->is_libpfm_event; - evsel->exclude_GH = orig->exclude_GH; + evsel->core.exclude_GH = orig->core.exclude_GH; evsel->sample_read = orig->sample_read; evsel->core.auto_merge_stats = orig->core.auto_merge_stats; evsel->collect_stat = orig->collect_stat;tools/perf/util/evsel.h +0
-1@@ -62,7 +62,6 @@ struct evsel {double scale;struct cgroup *cgrp;/* parse modifier helper */ -int exclude_GH;int sample_read;bool snapshot;bool per_pkg;tools/perf/util/parse-events.c +2
-3@@ -1918,7 +1918,7 @@ static int get_event_modifier(struct event_modifier *mod, char *str,int exclusive = evsel ? evsel->core.attr.exclusive :0 ;int exclude = eu | ek | eh; -int exclude_GH = evsel ? evsel->exclude_GH :0 ; +int exclude_GH = evsel ? evsel->core.exclude_GH :0 ;int weak =0 ;int bpf_counter =0 ;@@ -2049,7 +2049,7 @@ int parse_events__modifier_event(struct list_head *list, char *str, bool add) evsel->core.attr.exclude_host = mod.eH; evsel->core.attr.exclude_guest = mod.eG; evsel->core.attr.exclude_idle = mod.eI; - evsel->exclude_GH = mod.exclude_GH; + evsel->core.exclude_GH = mod.exclude_GH; evsel->sample_read = mod.sample_read; evsel->precise_max = mod.precise_max; evsel->weak_group = mod.weak; --2.31.1
Re: [PATCH 13/59] libperf: Move exclude_GH to perf_evsel
Quoted 12 lines · Ian Rogers
Quoted 11 lines · Jiri Olsa
Moving
exclude_GHtoperf_evselstruct.Signed-off-by Jiri Olsa <[email protected]>--- tools/lib/perf/include/internal/evsel.h | 1 + tools/perf/util/evsel.c | 2 +- tools/perf/util/evsel.h | 1 - tools/perf/util/parse-events.c | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-)
Quoted 15 lines
tools/lib/perf/include/internal/evsel.h struct perf_evsel { · line 72
Quoted 9 lines
tools/lib/perf/include/internal/evsel.h +1
-0@@ -69,6 +69,7 @@ struct perf_evsel {const char *metric_id;enum perf_tool_event tool_event;const char *unit; +int exclude_GH;I think it'd be pretty awesome if when these things get moved around we added a comment here to explain what the variable means. Perhaps even put an example :-) In this case it could explain why this is an int and not a bool. This is a while you are here request rather than a criticism of the changes which I find fine.
ok, I noticed you added several comments like that already, I'll put some in here in next version
thanks,
jirka
Quoted 58 lines
Thanks,
IanQuoted 53 lines
tools/lib/perf/include/internal/evsel.h +0
-0}; };tools/perf/util/evsel.c +1
-1@@ -431,7 +431,7 @@ struct evsel *evsel__clone(struct evsel *orig) evsel->use_uncore_alias = orig->use_uncore_alias; evsel->is_libpfm_event = orig->is_libpfm_event; - evsel->exclude_GH = orig->exclude_GH; + evsel->core.exclude_GH = orig->core.exclude_GH; evsel->sample_read = orig->sample_read; evsel->core.auto_merge_stats = orig->core.auto_merge_stats; evsel->collect_stat = orig->collect_stat;tools/perf/util/evsel.h +0
-1@@ -62,7 +62,6 @@ struct evsel {double scale;struct cgroup *cgrp;/* parse modifier helper */ -int exclude_GH;int sample_read;bool snapshot;bool per_pkg;tools/perf/util/parse-events.c +2
-3@@ -1918,7 +1918,7 @@ static int get_event_modifier(struct event_modifier *mod, char *str,int exclusive = evsel ? evsel->core.attr.exclusive :0 ;int exclude = eu | ek | eh; -int exclude_GH = evsel ? evsel->exclude_GH :0 ; +int exclude_GH = evsel ? evsel->core.exclude_GH :0 ;int weak =0 ;int bpf_counter =0 ;@@ -2049,7 +2049,7 @@ int parse_events__modifier_event(struct list_head *list, char *str, bool add) evsel->core.attr.exclude_host = mod.eH; evsel->core.attr.exclude_guest = mod.eG; evsel->core.attr.exclude_idle = mod.eI; - evsel->exclude_GH = mod.exclude_GH; + evsel->core.exclude_GH = mod.exclude_GH; evsel->sample_read = mod.sample_read; evsel->precise_max = mod.precise_max; evsel->weak_group = mod.weak; --2.31.1
PATCH 14/59 libperf: Move sample_read to perf_evsel
In reply to Jiri OlsaMoving sample_read to perf_evsel struct.
--- tools/lib/perf/include/internal/evsel.h | 1 + tools/perf/tests/parse-events.c | 40 ++++++++++++------------- tools/perf/util/evsel.c | 4 +-- tools/perf/util/evsel.h | 1 - tools/perf/util/parse-events.c | 2 +- tools/perf/util/record.c | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-)
tools/lib/perf/include/internal/evsel.h +1 -0
@@ -70,6 +70,7 @@ struct perf_evsel {enum perf_tool_event tool_event;const char *unit;int exclude_GH; +int sample_read; }; };
tools/perf/tests/parse-events.c +20 -20
@@ -685,7 +685,7 @@ static int test__group1(struct evlist *evlist)TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 ); -TEST_ASSERT_VAL ("wrong sample_read" , !evsel->sample_read); +TEST_ASSERT_VAL ("wrong sample_read" , !evsel->core.sample_read);/* cycles:upp */ evsel =evsel__next (evsel);
@@ -701,7 +701,7 @@ static int test__group1(struct evlist *evlist)TEST_ASSERT_VAL ("wrong precise_ip" , evsel->core.attr.precise_ip ==2 );TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==1 ); -TEST_ASSERT_VAL ("wrong sample_read" , !evsel->sample_read); +TEST_ASSERT_VAL ("wrong sample_read" , !evsel->core.sample_read);return 0 ; }
@@ -727,7 +727,7 @@ static int test__group2(struct evlist *evlist)TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 ); -TEST_ASSERT_VAL ("wrong sample_read" , !evsel->sample_read); +TEST_ASSERT_VAL ("wrong sample_read" , !evsel->core.sample_read);/* cache-references + :u modifier */ evsel =evsel__next (evsel);
@@ -742,7 +742,7 @@ static int test__group2(struct evlist *evlist)TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==1 ); -TEST_ASSERT_VAL ("wrong sample_read" , !evsel->sample_read); +TEST_ASSERT_VAL ("wrong sample_read" , !evsel->core.sample_read);/* cycles:k */ evsel =evsel__next (evsel);
@@ -756,7 +756,7 @@ static int test__group2(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel)); -TEST_ASSERT_VAL ("wrong sample_read" , !evsel->sample_read); +TEST_ASSERT_VAL ("wrong sample_read" , !evsel->core.sample_read);return 0 ; }
@@ -785,7 +785,7 @@ static int test__group3(struct evlist *evlist __maybe_unused) !strcmp(leader->group_name, "group1"));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 ); -TEST_ASSERT_VAL ("wrong sample_read" , !evsel->sample_read); +TEST_ASSERT_VAL ("wrong sample_read" , !evsel->core.sample_read);/* group1 cycles:kppp */ evsel =evsel__next (evsel);
@@ -802,7 +802,7 @@ static int test__group3(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name);TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==1 ); -TEST_ASSERT_VAL ("wrong sample_read" , !evsel->sample_read); +TEST_ASSERT_VAL ("wrong sample_read" , !evsel->core.sample_read);/* group2 cycles + G modifier */ evsel = leader =evsel__next (evsel);
@@ -820,7 +820,7 @@ static int test__group3(struct evlist *evlist __maybe_unused) !strcmp(leader->group_name, "group2"));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 ); -TEST_ASSERT_VAL ("wrong sample_read" , !evsel->sample_read); +TEST_ASSERT_VAL ("wrong sample_read" , !evsel->core.sample_read);/* group2 1:3 + G modifier */ evsel =evsel__next (evsel);
@@ -834,7 +834,7 @@ static int test__group3(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==1 ); -TEST_ASSERT_VAL ("wrong sample_read" , !evsel->sample_read); +TEST_ASSERT_VAL ("wrong sample_read" , !evsel->core.sample_read);/* instructions:u */ evsel =evsel__next (evsel);
@@ -848,7 +848,7 @@ static int test__group3(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel)); -TEST_ASSERT_VAL ("wrong sample_read" , !evsel->sample_read); +TEST_ASSERT_VAL ("wrong sample_read" , !evsel->core.sample_read);return 0 ; }
@@ -876,7 +876,7 @@ static int test__group4(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 ); -TEST_ASSERT_VAL ("wrong sample_read" , !evsel->sample_read); +TEST_ASSERT_VAL ("wrong sample_read" , !evsel->core.sample_read);/* instructions:kp + p */ evsel =evsel__next (evsel);
@@ -892,7 +892,7 @@ static int test__group4(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong precise_ip" , evsel->core.attr.precise_ip ==2 );TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==1 ); -TEST_ASSERT_VAL ("wrong sample_read" , !evsel->sample_read); +TEST_ASSERT_VAL ("wrong sample_read" , !evsel->core.sample_read);return 0 ; }
@@ -919,7 +919,7 @@ static int test__group5(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 ); -TEST_ASSERT_VAL ("wrong sample_read" , !evsel->sample_read); +TEST_ASSERT_VAL ("wrong sample_read" , !evsel->core.sample_read);/* instructions + G */ evsel =evsel__next (evsel);
@@ -934,7 +934,7 @@ static int test__group5(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==1 ); -TEST_ASSERT_VAL ("wrong sample_read" , !evsel->sample_read); +TEST_ASSERT_VAL ("wrong sample_read" , !evsel->core.sample_read);/* cycles:G */ evsel = leader =evsel__next (evsel);
@@ -951,7 +951,7 @@ static int test__group5(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 ); -TEST_ASSERT_VAL ("wrong sample_read" , !evsel->sample_read); +TEST_ASSERT_VAL ("wrong sample_read" , !evsel->core.sample_read);/* instructions:G */ evsel =evsel__next (evsel);
@@ -1162,7 +1162,7 @@ static int test__leader_sample1(struct evlist *evlist)TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader)); -TEST_ASSERT_VAL ("wrong sample_read" , evsel->sample_read); +TEST_ASSERT_VAL ("wrong sample_read" , evsel->core.sample_read);/* cache-misses - not sampling */ evsel =evsel__next (evsel);
@@ -1176,7 +1176,7 @@ static int test__leader_sample1(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader)); -TEST_ASSERT_VAL ("wrong sample_read" , evsel->sample_read); +TEST_ASSERT_VAL ("wrong sample_read" , evsel->core.sample_read);/* branch-misses - not sampling */ evsel =evsel__next (evsel);
@@ -1191,7 +1191,7 @@ static int test__leader_sample1(struct evlist *evlist)TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader)); -TEST_ASSERT_VAL ("wrong sample_read" , evsel->sample_read); +TEST_ASSERT_VAL ("wrong sample_read" , evsel->core.sample_read);return 0 ; }
@@ -1215,7 +1215,7 @@ static int test__leader_sample2(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader)); -TEST_ASSERT_VAL ("wrong sample_read" , evsel->sample_read); +TEST_ASSERT_VAL ("wrong sample_read" , evsel->core.sample_read);/* branch-misses - not sampling */ evsel =evsel__next (evsel);
@@ -1230,7 +1230,7 @@ static int test__leader_sample2(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader)); -TEST_ASSERT_VAL ("wrong sample_read" , evsel->sample_read); +TEST_ASSERT_VAL ("wrong sample_read" , evsel->core.sample_read);return 0 ; }
tools/perf/util/evsel.c +2 -2
@@ -432,7 +432,7 @@ struct evsel *evsel__clone(struct evsel *orig) evsel->is_libpfm_event = orig->is_libpfm_event; evsel->core.exclude_GH = orig->core.exclude_GH; - evsel->sample_read = orig->sample_read; + evsel->core.sample_read = orig->core.sample_read; evsel->core.auto_merge_stats = orig->core.auto_merge_stats; evsel->collect_stat = orig->collect_stat; evsel->weak_group = orig->weak_group;
@@ -1106,7 +1106,7 @@ void evsel__config(struct evsel *evsel, struct record_opts *opts,evsel__set_sample_bit (evsel,IP );evsel__set_sample_bit (evsel,TID ); -if (evsel->sample_read) { +if (evsel->core.sample_read) {evsel__set_sample_bit (evsel,READ );/*
tools/perf/util/evsel.h +0 -1
@@ -62,7 +62,6 @@ struct evsel {double scale;struct cgroup *cgrp;/* parse modifier helper */ -int sample_read;bool snapshot;bool per_pkg;bool percore;
tools/perf/util/parse-events.c +1 -1
@@ -2050,7 +2050,7 @@ int parse_events__modifier_event(struct list_head *list, char *str, bool add) evsel->core.attr.exclude_guest = mod.eG; evsel->core.attr.exclude_idle = mod.eI; evsel->core.exclude_GH = mod.exclude_GH; - evsel->sample_read = mod.sample_read; + evsel->core.sample_read = mod.sample_read; evsel->precise_max = mod.precise_max; evsel->weak_group = mod.weak; evsel->bpf_counter = mod.bpf_counter;
tools/perf/util/record.c +1 -1
@@ -57,7 +57,7 @@ static void evsel__config_leader_sampling(struct evsel *evsel, struct evlist *evstruct evsel *read_sampler;u64 term_types, freq_mask; -if (!leader->sample_read) +if (!leader->core.sample_read)return ; read_sampler =evsel__read_sampler (evsel, evlist);
Signature · 1 line
2.31.1
PATCH 15/59 libperf: Move precise_max to perf_evsel
In reply to Jiri OlsaMoving precise_max to perf_evsel struct.
--- tools/lib/perf/include/internal/evsel.h | 1 + tools/perf/util/evsel.c | 8 ++++---- tools/perf/util/evsel.h | 1 - tools/perf/util/parse-events.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)
tools/lib/perf/include/internal/evsel.h +1 -0
@@ -71,6 +71,7 @@ struct perf_evsel {const char *unit;int exclude_GH;int sample_read; +bool precise_max; }; };
tools/perf/util/evsel.c +4 -4
@@ -317,7 +317,7 @@ struct evsel *evsel__new_cycles(bool precise, __u32 type, __u64 config)if (evsel ==NULL ) goto out; - evsel->precise_max = true; + evsel->core.precise_max = true;/* use asprintf() because free(evsel) assumes name is allocated */ if (asprintf(&evsel->core.name, "cycles%s%s%.*s",
@@ -427,7 +427,7 @@ struct evsel *evsel__clone(struct evsel *orig) evsel->snapshot = orig->snapshot; evsel->per_pkg = orig->per_pkg; evsel->percore = orig->percore; - evsel->precise_max = orig->precise_max; + evsel->core.precise_max = orig->core.precise_max; evsel->use_uncore_alias = orig->use_uncore_alias; evsel->is_libpfm_event = orig->is_libpfm_event;
@@ -1287,7 +1287,7 @@ void evsel__config(struct evsel *evsel, struct record_opts *opts, attr->clockid = opts->clockid; } -if (evsel->precise_max) +if (evsel->core.precise_max) attr->precise_ip =3 ;if (opts->all_user) {
@@ -1739,7 +1739,7 @@ static void display_attr(struct perf_event_attr *attr)bool evsel__precise_ip_fallback (struct evsel *evsel) {/* Do not try less precise if not requested. */ -if (!evsel->precise_max) +if (!evsel->core.precise_max)return false;/*
tools/perf/util/evsel.h +0 -1
@@ -65,7 +65,6 @@ struct evsel {bool snapshot;bool per_pkg;bool percore; -bool precise_max;bool use_uncore_alias;bool is_libpfm_event;bool collect_stat;
tools/perf/util/parse-events.c +1 -1
@@ -2051,7 +2051,7 @@ int parse_events__modifier_event(struct list_head *list, char *str, bool add) evsel->core.attr.exclude_idle = mod.eI; evsel->core.exclude_GH = mod.exclude_GH; evsel->core.sample_read = mod.sample_read; - evsel->precise_max = mod.precise_max; + evsel->core.precise_max = mod.precise_max; evsel->weak_group = mod.weak; evsel->bpf_counter = mod.bpf_counter;
Signature · 1 line
2.31.1
PATCH 16/59 libperf: Move weak_group to perf_evsel
In reply to Jiri OlsaMoving weak_group to perf_evsel struct.
--- tools/lib/perf/include/internal/evsel.h | 1 + tools/perf/builtin-record.c | 2 +- tools/perf/builtin-stat.c | 2 +- tools/perf/util/evsel.c | 2 +- tools/perf/util/evsel.h | 1 - tools/perf/util/parse-events.c | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-)
tools/lib/perf/include/internal/evsel.h +1 -0
@@ -72,6 +72,7 @@ struct perf_evsel {int exclude_GH;int sample_read;bool precise_max; +bool weak_group; }; };
tools/perf/builtin-record.c +1 -1
@@ -929,7 +929,7 @@ static int record__open(struct record *rec) }if ((errno ==EINVAL || errno ==EBADF ) && pos->core.leader != &pos->core && - pos->weak_group) { + pos->core.weak_group) { pos =evlist__reset_weak_group (evlist, pos, true); goto try_again; }
tools/perf/builtin-stat.c +1 -1
@@ -842,7 +842,7 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)*/ if ((errno ==EINVAL || errno ==EBADF ) &&evsel__leader (counter) != counter && - counter->weak_group) { + counter->core.weak_group) {evlist__reset_weak_group (evsel_list, counter, false);assert (counter->reset_group); second_pass = true;
tools/perf/util/evsel.c +1 -1
@@ -435,7 +435,7 @@ struct evsel *evsel__clone(struct evsel *orig) evsel->core.sample_read = orig->core.sample_read; evsel->core.auto_merge_stats = orig->core.auto_merge_stats; evsel->collect_stat = orig->collect_stat; - evsel->weak_group = orig->weak_group; + evsel->core.weak_group = orig->core.weak_group; evsel->use_config_name = orig->use_config_name;if (evsel__copy_config_terms (evsel, orig) <0 )
tools/perf/util/evsel.h +0 -1
@@ -68,7 +68,6 @@ struct evsel {bool use_uncore_alias;bool is_libpfm_event;bool collect_stat; -bool weak_group;bool bpf_counter;bool use_config_name;int bpf_fd;
tools/perf/util/parse-events.c +1 -1
@@ -2052,7 +2052,7 @@ int parse_events__modifier_event(struct list_head *list, char *str, bool add) evsel->core.exclude_GH = mod.exclude_GH; evsel->core.sample_read = mod.sample_read; evsel->core.precise_max = mod.precise_max; - evsel->weak_group = mod.weak; + evsel->core.weak_group = mod.weak; evsel->bpf_counter = mod.bpf_counter;if (evsel__is_group_leader (evsel)) {
Signature · 1 line
2.31.1
PATCH 17/59 libperf: Move bpf_counter to perf_evsel
In reply to Jiri OlsaMoving bpf_counter to perf_evsel struct.
--- tools/lib/perf/include/internal/evsel.h | 1 + tools/perf/util/bpf_counter.c | 2 +- tools/perf/util/evsel.h | 1 - tools/perf/util/parse-events.c | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-)
tools/lib/perf/include/internal/evsel.h +1 -0
@@ -73,6 +73,7 @@ struct perf_evsel {int sample_read;bool precise_max;bool weak_group; +bool bpf_counter; }; };
tools/perf/util/bpf_counter.c +1 -1
@@ -770,7 +770,7 @@ int bpf_counter__load(struct evsel *evsel, struct target *target) evsel->bpf_counter_ops = &bpf_program_profiler_ops; else if (cgrp_event_expanded && target->use_bpf) evsel->bpf_counter_ops = &bperf_cgrp_ops; - else if (target->use_bpf || evsel->bpf_counter || + else if (target->use_bpf || evsel->core.bpf_counter || evsel__match_bpf_counter_events(evsel->name)) evsel->bpf_counter_ops = &bperf_ops;
tools/perf/util/evsel.h +0 -1
@@ -68,7 +68,6 @@ struct evsel {bool use_uncore_alias;bool is_libpfm_event;bool collect_stat; -bool bpf_counter;bool use_config_name;int bpf_fd;struct bpf_object *bpf_obj;
tools/perf/util/parse-events.c +1 -1
@@ -2053,7 +2053,7 @@ int parse_events__modifier_event(struct list_head *list, char *str, bool add) evsel->core.sample_read = mod.sample_read; evsel->core.precise_max = mod.precise_max; evsel->core.weak_group = mod.weak; - evsel->bpf_counter = mod.bpf_counter; + evsel->core.bpf_counter = mod.bpf_counter;if (evsel__is_group_leader (evsel)) { evsel->core.attr.pinned = mod.pinned;
Signature · 1 line
2.31.1
PATCH 18/59 libperf: Move group_name to perf_evsel
In reply to Jiri OlsaMoving group_name to perf_evsel struct.
--- tools/lib/perf/include/internal/evsel.h | 1 + tools/perf/tests/parse-events.c | 32 ++++++++++++------------- tools/perf/util/auxtrace.c | 6 ++--- tools/perf/util/evsel.c | 10 ++++---- tools/perf/util/evsel.h | 1 - tools/perf/util/evsel_fprintf.c | 2 +- tools/perf/util/header.c | 6 ++--- tools/perf/util/parse-events.c | 4 ++-- 8 files changed, 31 insertions(+), 31 deletions(-)
tools/lib/perf/include/internal/evsel.h +1 -0
@@ -64,6 +64,7 @@ struct perf_evsel {*/ struct {char *name; +const char *group_name;bool auto_merge_stats;struct list_head config_terms;const char *metric_id;
tools/perf/tests/parse-events.c +16 -16
@@ -782,7 +782,7 @@ static int test__group3(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong group name" , - !strcmp (leader->group_name,"group1" )); + !strcmp (leader->core.group_name,"group1" ));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );TEST_ASSERT_VAL ("wrong sample_read" , !evsel->core.sample_read);
@@ -800,7 +800,7 @@ static int test__group3(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , evsel->core.attr.precise_ip ==3 );TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader)); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==1 );TEST_ASSERT_VAL ("wrong sample_read" , !evsel->core.sample_read);
@@ -817,7 +817,7 @@ static int test__group3(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong group name" , - !strcmp (leader->group_name,"group2" )); + !strcmp (leader->core.group_name,"group2" ));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );TEST_ASSERT_VAL ("wrong sample_read" , !evsel->core.sample_read);
@@ -872,7 +872,7 @@ static int test__group4(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , evsel->core.attr.precise_ip ==1 ); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );
@@ -915,7 +915,7 @@ static int test__group5(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );
@@ -947,7 +947,7 @@ static int test__group5(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );
@@ -1001,7 +1001,7 @@ static int test__group_gh1(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );
@@ -1041,7 +1041,7 @@ static int test__group_gh2(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );
@@ -1081,7 +1081,7 @@ static int test__group_gh3(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );
@@ -1121,7 +1121,7 @@ static int test__group_gh4(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );
@@ -1160,7 +1160,7 @@ static int test__leader_sample1(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong sample_read" , evsel->core.sample_read);
@@ -1189,7 +1189,7 @@ static int test__leader_sample1(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong sample_read" , evsel->core.sample_read);
@@ -1213,7 +1213,7 @@ static int test__leader_sample2(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong sample_read" , evsel->core.sample_read);
@@ -1228,7 +1228,7 @@ static int test__leader_sample2(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong sample_read" , evsel->core.sample_read);
@@ -1259,7 +1259,7 @@ static int test__pinned_group(struct evlist *evlist)TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" ,PERF_COUNT_HW_CPU_CYCLES == evsel->core.attr.config); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong pinned" , evsel->core.attr.pinned);
@@ -1303,7 +1303,7 @@ static int test__exclusive_group(struct evlist *evlist)TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" ,PERF_COUNT_HW_CPU_CYCLES == evsel->core.attr.config); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong exclusive" , evsel->core.attr.exclusive);
tools/perf/util/auxtrace.c +3 -3
@@ -1235,9 +1235,9 @@ static void unleader_evsel(struct evlist *evlist, struct evsel *leader)/* Update group information */ if (new_leader) { -zfree (&new_leader->group_name); - new_leader->group_name = leader->group_name; - leader->group_name =NULL ; +zfree (&new_leader->core.group_name); + new_leader->core.group_name = leader->core.group_name; + leader->core.group_name =NULL ; new_leader->core.nr_members = leader->core.nr_members -1 ; leader->core.nr_members =1 ;
tools/perf/util/evsel.c +5 -5
@@ -395,9 +395,9 @@ struct evsel *evsel__clone(struct evsel *orig)if (evsel->core.name ==NULL ) goto out_err; } -if (orig->group_name) { - evsel->group_name =strdup (orig->group_name); -if (evsel->group_name ==NULL ) +if (orig->core.group_name) { + evsel->core.group_name =strdup (orig->core.group_name); +if (evsel->core.group_name ==NULL ) goto out_err; }if (orig->pmu_name) {
@@ -797,7 +797,7 @@ const char *evsel__metric_id(const struct evsel *evsel)const char *evsel__group_name (struct evsel *evsel) { -return evsel->group_name ?:"anon group" ; +return evsel->core.group_name ?:"anon group" ; }/*
@@ -1436,7 +1436,7 @@ void evsel__exit(struct evsel *evsel)perf_cpu_map__put (evsel->core.cpus);perf_cpu_map__put (evsel->core.own_cpus);perf_thread_map__put (evsel->core.threads); -zfree (&evsel->group_name); +zfree (&evsel->core.group_name);zfree (&evsel->core.name);zfree (&evsel->pmu_name);zfree (&evsel->core.metric_id);
tools/perf/util/evsel.h +0 -1
@@ -54,7 +54,6 @@ struct evsel {* they can be released properly. */ struct { -char *group_name;const char *pmu_name;struct tep_event *tp_format;char *filter;
tools/perf/util/evsel_fprintf.c +1 -1
@@ -48,7 +48,7 @@ int evsel__fprintf(struct evsel *evsel, struct perf_attr_details *details, FILEreturn 0 ;if (evsel->core.nr_members >1 ) - printed +=fprintf (fp,"%s{" , evsel->group_name ?:"" ); + printed +=fprintf (fp,"%s{" , evsel->core.group_name ?:"" ); printed +=fprintf (fp,"%s" ,evsel__name (evsel));for_each_group_member (pos, evsel)
tools/perf/util/header.c +3 -3
@@ -788,7 +788,7 @@ static int write_group_desc(struct feat_fd *ff,evlist__for_each_entry (evlist, evsel) {if (evsel__is_group_leader (evsel) && evsel->core.nr_members >1 ) { -const char *name = evsel->group_name ?:"{anon_group}" ; +const char *name = evsel->core.group_name ?:"{anon_group}" ;u32 leader_idx = evsel->core.idx;u32 nr_members = evsel->core.nr_members;
@@ -2094,7 +2094,7 @@ static void print_group_desc(struct feat_fd *ff, FILE *fp)evlist__for_each_entry (session->evlist, evsel) {if (evsel__is_group_leader (evsel) && evsel->core.nr_members >1 ) { -fprintf (fp,"# group: %s{%s" , evsel->group_name ?:"" ,evsel__name (evsel)); +fprintf (fp,"# group: %s{%s" , evsel->core.group_name ?:"" ,evsel__name (evsel)); nr = evsel->core.nr_members -1 ; }else if (nr) {
@@ -2743,7 +2743,7 @@ static int process_group_desc(struct feat_fd *ff, void *data __maybe_unused)evsel__set_leader (evsel, evsel);/* {anon_group} is a dummy name */ if (strcmp (desc[i].name,"{anon_group}" )) { - evsel->group_name = desc[i].name; + evsel->core.group_name = desc[i].name; desc[i].name =NULL ; } evsel->core.nr_members = desc[i].nr_members;
tools/perf/util/parse-events.c +2 -2
@@ -1841,7 +1841,7 @@ parse_events__set_leader_for_uncore_aliase(char *name, struct list_head *list,for (i =0 ; i < nr_pmu; i++) { evsel = (struct evsel *) leaders[i]; evsel->core.nr_members = total_members / nr_pmu; - evsel->group_name = name ?strdup (name) :NULL ; + evsel->core.group_name = name ?strdup (name) :NULL ; }/* Take the new small groups into account */
@@ -1869,7 +1869,7 @@ void parse_events__set_leader(char *name, struct list_head *list,__perf_evlist__set_leader (list); leader = list_entry(list->next, struct evsel, core.node); - leader->group_name = name ?strdup (name) :NULL ; + leader->core.group_name = name ?strdup (name) :NULL ; }/* list_event is assumed to point to malloc'ed memory */
Signature · 1 line
2.31.1
Ian Rogers
reviewerRe: [PATCH 18/59] libperf: Move group_name to perf_evsel
Quoted 20 lines · Jiri Olsa
Moving
group_nametoperf_evselstruct.Signed-off-by Jiri Olsa <[email protected]>--- tools/lib/perf/include/internal/evsel.h | 1 + tools/perf/tests/parse-events.c | 32 ++++++++++++------------- tools/perf/util/auxtrace.c | 6 ++--- tools/perf/util/evsel.c | 10 ++++---- tools/perf/util/evsel.h | 1 - tools/perf/util/evsel_fprintf.c | 2 +- tools/perf/util/header.c | 6 ++--- tools/perf/util/parse-events.c | 4 ++-- 8 files changed, 31 insertions(+), 31 deletions(-)tools/lib/perf/include/internal/evsel.h +0
-0
tools/lib/perf/include/internal/evsel.h struct perf_evsel { · line 67
Quoted 4 lines
tools/lib/perf/include/internal/evsel.h +1
-0@@ -64,6 +64,7 @@ struct perf_evsel {*/ struct {char *name; +const char *group_name;
I like the constification here. But why constify group_name and not name as well?
Thanks,
Ian
Quoted 284 lines
tools/lib/perf/include/internal/evsel.h +0
-0bool auto_merge_stats;struct list_head config_terms;const char *metric_id;tools/perf/tests/parse-events.c +16
-16@@ -782,7 +782,7 @@ static int test__group3(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong group name" , - !strcmp (leader->group_name,"group1" )); + !strcmp (leader->core.group_name,"group1" ));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );TEST_ASSERT_VAL ("wrong sample_read" , !evsel->core.sample_read);@@ -800,7 +800,7 @@ static int test__group3(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , evsel->core.attr.precise_ip ==3 );TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader)); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==1 );TEST_ASSERT_VAL ("wrong sample_read" , !evsel->core.sample_read);@@ -817,7 +817,7 @@ static int test__group3(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong group name" , - !strcmp (leader->group_name,"group2" )); + !strcmp (leader->core.group_name,"group2" ));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );TEST_ASSERT_VAL ("wrong sample_read" , !evsel->core.sample_read);@@ -872,7 +872,7 @@ static int test__group4(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , evsel->core.attr.precise_ip ==1 ); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );@@ -915,7 +915,7 @@ static int test__group5(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );@@ -947,7 +947,7 @@ static int test__group5(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );@@ -1001,7 +1001,7 @@ static int test__group_gh1(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );@@ -1041,7 +1041,7 @@ static int test__group_gh2(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );@@ -1081,7 +1081,7 @@ static int test__group_gh3(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );@@ -1121,7 +1121,7 @@ static int test__group_gh4(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );@@ -1160,7 +1160,7 @@ static int test__leader_sample1(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong sample_read" , evsel->core.sample_read);@@ -1189,7 +1189,7 @@ static int test__leader_sample1(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong sample_read" , evsel->core.sample_read);@@ -1213,7 +1213,7 @@ static int test__leader_sample2(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong sample_read" , evsel->core.sample_read);@@ -1228,7 +1228,7 @@ static int test__leader_sample2(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong sample_read" , evsel->core.sample_read);@@ -1259,7 +1259,7 @@ static int test__pinned_group(struct evlist *evlist)TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" ,PERF_COUNT_HW_CPU_CYCLES == evsel->core.attr.config); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong pinned" , evsel->core.attr.pinned);@@ -1303,7 +1303,7 @@ static int test__exclusive_group(struct evlist *evlist)TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" ,PERF_COUNT_HW_CPU_CYCLES == evsel->core.attr.config); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong exclusive" , evsel->core.attr.exclusive);tools/perf/util/auxtrace.c +3
-3@@ -1235,9 +1235,9 @@ static void unleader_evsel(struct evlist *evlist, struct evsel *leader)/* Update group information */ if (new_leader) { -zfree (&new_leader->group_name); - new_leader->group_name = leader->group_name; - leader->group_name =NULL ; +zfree (&new_leader->core.group_name); + new_leader->core.group_name = leader->core.group_name; + leader->core.group_name =NULL ; new_leader->core.nr_members = leader->core.nr_members -1 ; leader->core.nr_members =1 ;tools/perf/util/evsel.c +5
-5@@ -395,9 +395,9 @@ struct evsel *evsel__clone(struct evsel *orig)if (evsel->core.name ==NULL ) goto out_err; } -if (orig->group_name) { - evsel->group_name =strdup (orig->group_name); -if (evsel->group_name ==NULL ) +if (orig->core.group_name) { + evsel->core.group_name =strdup (orig->core.group_name); +if (evsel->core.group_name ==NULL ) goto out_err; }if (orig->pmu_name) {@@ -797,7 +797,7 @@ const char *evsel__metric_id(const struct evsel *evsel)const char *evsel__group_name (struct evsel *evsel) { -return evsel->group_name ?:"anon group" ; +return evsel->core.group_name ?:"anon group" ; }/* @@ -1436,7 +1436,7 @@ void evsel__exit(struct evsel *evsel)perf_cpu_map__put (evsel->core.cpus);perf_cpu_map__put (evsel->core.own_cpus);perf_thread_map__put (evsel->core.threads); -zfree (&evsel->group_name); +zfree (&evsel->core.group_name);zfree (&evsel->core.name);zfree (&evsel->pmu_name);zfree (&evsel->core.metric_id);tools/perf/util/evsel.h +0
-1@@ -54,7 +54,6 @@ struct evsel {* they can be released properly. */ struct { -char *group_name;const char *pmu_name;struct tep_event *tp_format;char *filter;tools/perf/util/evsel_fprintf.c +1
-1@@ -48,7 +48,7 @@ int evsel__fprintf(struct evsel *evsel, struct perf_attr_details *details, FILEreturn 0 ;if (evsel->core.nr_members >1 ) - printed +=fprintf (fp,"%s{" , evsel->group_name ?:"" ); + printed +=fprintf (fp,"%s{" , evsel->core.group_name ?:"" ); printed +=fprintf (fp,"%s" ,evsel__name (evsel));for_each_group_member (pos, evsel)tools/perf/util/header.c +3
-3@@ -788,7 +788,7 @@ static int write_group_desc(struct feat_fd *ff,evlist__for_each_entry (evlist, evsel) {if (evsel__is_group_leader (evsel) && evsel->core.nr_members >1 ) { -const char *name = evsel->group_name ?:"{anon_group}" ; +const char *name = evsel->core.group_name ?:"{anon_group}" ;u32 leader_idx = evsel->core.idx;u32 nr_members = evsel->core.nr_members;@@ -2094,7 +2094,7 @@ static void print_group_desc(struct feat_fd *ff, FILE *fp)evlist__for_each_entry (session->evlist, evsel) {if (evsel__is_group_leader (evsel) && evsel->core.nr_members >1 ) { -fprintf (fp,"# group: %s{%s" , evsel->group_name ?:"" ,evsel__name (evsel)); +fprintf (fp,"# group: %s{%s" , evsel->core.group_name ?:"" ,evsel__name (evsel)); nr = evsel->core.nr_members -1 ; }else if (nr) {@@ -2743,7 +2743,7 @@ static int process_group_desc(struct feat_fd *ff, void *data __maybe_unused)evsel__set_leader (evsel, evsel);/* {anon_group} is a dummy name */ if (strcmp (desc[i].name,"{anon_group}" )) { - evsel->group_name = desc[i].name; + evsel->core.group_name = desc[i].name; desc[i].name =NULL ; } evsel->core.nr_members = desc[i].nr_members;tools/perf/util/parse-events.c +2
-3@@ -1841,7 +1841,7 @@ parse_events__set_leader_for_uncore_aliase(char *name, struct list_head *list,for (i =0 ; i < nr_pmu; i++) { evsel = (struct evsel *) leaders[i]; evsel->core.nr_members = total_members / nr_pmu; - evsel->group_name = name ?strdup (name) :NULL ; + evsel->core.group_name = name ?strdup (name) :NULL ; }/* Take the new small groups into account */ @@ -1869,7 +1869,7 @@ void parse_events__set_leader(char *name, struct list_head *list,__perf_evlist__set_leader (list); leader = list_entry(list->next, struct evsel, core.node); - leader->group_name = name ?strdup (name) :NULL ; + leader->core.group_name = name ?strdup (name) :NULL ; }/* list_event is assumed to point to malloc'ed memory */ --2.31.1
Re: [PATCH 18/59] libperf: Move group_name to perf_evsel
Quoted 16 lines · Ian Rogers
Quoted 15 lines · Jiri Olsa
Moving
group_nametoperf_evselstruct.Signed-off-by Jiri Olsa <[email protected]>--- tools/lib/perf/include/internal/evsel.h | 1 + tools/perf/tests/parse-events.c | 32 ++++++++++++------------- tools/perf/util/auxtrace.c | 6 ++--- tools/perf/util/evsel.c | 10 ++++---- tools/perf/util/evsel.h | 1 - tools/perf/util/evsel_fprintf.c | 2 +- tools/perf/util/header.c | 6 ++--- tools/perf/util/parse-events.c | 4 ++-- 8 files changed, 31 insertions(+), 31 deletions(-)
Quoted 12 lines
tools/lib/perf/include/internal/evsel.h struct perf_evsel { · line 67
Quoted 9 lines
tools/lib/perf/include/internal/evsel.h +1
-0@@ -64,6 +64,7 @@ struct perf_evsel {*/ struct {char *name; +const char *group_name;I like the constification here. But why constify
group_nameand not name as well?
Can be done in a separate patch, in other series, no?
I understand that he probably is taking advantage of this move do constify 'group_name', but then, looks unrelated too this move to libperf as well.
- Arnaldo
Quoted 288 lines
Thanks,
IanQuoted 284 lines
tools/lib/perf/include/internal/evsel.h +0
-0bool auto_merge_stats;struct list_head config_terms;const char *metric_id;tools/perf/tests/parse-events.c +16
-16@@ -782,7 +782,7 @@ static int test__group3(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong group name" , - !strcmp (leader->group_name,"group1" )); + !strcmp (leader->core.group_name,"group1" ));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );TEST_ASSERT_VAL ("wrong sample_read" , !evsel->core.sample_read);@@ -800,7 +800,7 @@ static int test__group3(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , evsel->core.attr.precise_ip ==3 );TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader)); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==1 );TEST_ASSERT_VAL ("wrong sample_read" , !evsel->core.sample_read);@@ -817,7 +817,7 @@ static int test__group3(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong group name" , - !strcmp (leader->group_name,"group2" )); + !strcmp (leader->core.group_name,"group2" ));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );TEST_ASSERT_VAL ("wrong sample_read" , !evsel->core.sample_read);@@ -872,7 +872,7 @@ static int test__group4(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , evsel->core.attr.precise_ip ==1 ); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );@@ -915,7 +915,7 @@ static int test__group5(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );@@ -947,7 +947,7 @@ static int test__group5(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );@@ -1001,7 +1001,7 @@ static int test__group_gh1(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );@@ -1041,7 +1041,7 @@ static int test__group_gh2(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );@@ -1081,7 +1081,7 @@ static int test__group_gh3(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );@@ -1121,7 +1121,7 @@ static int test__group_gh4(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );@@ -1160,7 +1160,7 @@ static int test__leader_sample1(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong sample_read" , evsel->core.sample_read);@@ -1189,7 +1189,7 @@ static int test__leader_sample1(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong sample_read" , evsel->core.sample_read);@@ -1213,7 +1213,7 @@ static int test__leader_sample2(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong sample_read" , evsel->core.sample_read);@@ -1228,7 +1228,7 @@ static int test__leader_sample2(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong sample_read" , evsel->core.sample_read);@@ -1259,7 +1259,7 @@ static int test__pinned_group(struct evlist *evlist)TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" ,PERF_COUNT_HW_CPU_CYCLES == evsel->core.attr.config); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong pinned" , evsel->core.attr.pinned);@@ -1303,7 +1303,7 @@ static int test__exclusive_group(struct evlist *evlist)TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" ,PERF_COUNT_HW_CPU_CYCLES == evsel->core.attr.config); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong exclusive" , evsel->core.attr.exclusive);tools/perf/util/auxtrace.c +3
-3@@ -1235,9 +1235,9 @@ static void unleader_evsel(struct evlist *evlist, struct evsel *leader)/* Update group information */ if (new_leader) { -zfree (&new_leader->group_name); - new_leader->group_name = leader->group_name; - leader->group_name =NULL ; +zfree (&new_leader->core.group_name); + new_leader->core.group_name = leader->core.group_name; + leader->core.group_name =NULL ; new_leader->core.nr_members = leader->core.nr_members -1 ; leader->core.nr_members =1 ;tools/perf/util/evsel.c +5
-5@@ -395,9 +395,9 @@ struct evsel *evsel__clone(struct evsel *orig)if (evsel->core.name ==NULL ) goto out_err; } -if (orig->group_name) { - evsel->group_name =strdup (orig->group_name); -if (evsel->group_name ==NULL ) +if (orig->core.group_name) { + evsel->core.group_name =strdup (orig->core.group_name); +if (evsel->core.group_name ==NULL ) goto out_err; }if (orig->pmu_name) {@@ -797,7 +797,7 @@ const char *evsel__metric_id(const struct evsel *evsel)const char *evsel__group_name (struct evsel *evsel) { -return evsel->group_name ?:"anon group" ; +return evsel->core.group_name ?:"anon group" ; }/* @@ -1436,7 +1436,7 @@ void evsel__exit(struct evsel *evsel)perf_cpu_map__put (evsel->core.cpus);perf_cpu_map__put (evsel->core.own_cpus);perf_thread_map__put (evsel->core.threads); -zfree (&evsel->group_name); +zfree (&evsel->core.group_name);zfree (&evsel->core.name);zfree (&evsel->pmu_name);zfree (&evsel->core.metric_id);tools/perf/util/evsel.h +0
-1@@ -54,7 +54,6 @@ struct evsel {* they can be released properly. */ struct { -char *group_name;const char *pmu_name;struct tep_event *tp_format;char *filter;tools/perf/util/evsel_fprintf.c +1
-1@@ -48,7 +48,7 @@ int evsel__fprintf(struct evsel *evsel, struct perf_attr_details *details, FILEreturn 0 ;if (evsel->core.nr_members >1 ) - printed +=fprintf (fp,"%s{" , evsel->group_name ?:"" ); + printed +=fprintf (fp,"%s{" , evsel->core.group_name ?:"" ); printed +=fprintf (fp,"%s" ,evsel__name (evsel));for_each_group_member (pos, evsel)tools/perf/util/header.c +3
-3@@ -788,7 +788,7 @@ static int write_group_desc(struct feat_fd *ff,evlist__for_each_entry (evlist, evsel) {if (evsel__is_group_leader (evsel) && evsel->core.nr_members >1 ) { -const char *name = evsel->group_name ?:"{anon_group}" ; +const char *name = evsel->core.group_name ?:"{anon_group}" ;u32 leader_idx = evsel->core.idx;u32 nr_members = evsel->core.nr_members;@@ -2094,7 +2094,7 @@ static void print_group_desc(struct feat_fd *ff, FILE *fp)evlist__for_each_entry (session->evlist, evsel) {if (evsel__is_group_leader (evsel) && evsel->core.nr_members >1 ) { -fprintf (fp,"# group: %s{%s" , evsel->group_name ?:"" ,evsel__name (evsel)); +fprintf (fp,"# group: %s{%s" , evsel->core.group_name ?:"" ,evsel__name (evsel)); nr = evsel->core.nr_members -1 ; }else if (nr) {@@ -2743,7 +2743,7 @@ static int process_group_desc(struct feat_fd *ff, void *data __maybe_unused)evsel__set_leader (evsel, evsel);/* {anon_group} is a dummy name */ if (strcmp (desc[i].name,"{anon_group}" )) { - evsel->group_name = desc[i].name; + evsel->core.group_name = desc[i].name; desc[i].name =NULL ; } evsel->core.nr_members = desc[i].nr_members;tools/perf/util/parse-events.c +2
-3@@ -1841,7 +1841,7 @@ parse_events__set_leader_for_uncore_aliase(char *name, struct list_head *list,for (i =0 ; i < nr_pmu; i++) { evsel = (struct evsel *) leaders[i]; evsel->core.nr_members = total_members / nr_pmu; - evsel->group_name = name ?strdup (name) :NULL ; + evsel->core.group_name = name ?strdup (name) :NULL ; }/* Take the new small groups into account */ @@ -1869,7 +1869,7 @@ void parse_events__set_leader(char *name, struct list_head *list,__perf_evlist__set_leader (list); leader = list_entry(list->next, struct evsel, core.node); - leader->group_name = name ?strdup (name) :NULL ; + leader->core.group_name = name ?strdup (name) :NULL ; }/* list_event is assumed to point to malloc'ed memory */ --2.31.1
Re: [PATCH 18/59] libperf: Move group_name to perf_evsel
Quoted 33 lines · Arnaldo Carvalho de Melo
Quoted 16 lines · Ian Rogers
Quoted 15 lines · Jiri Olsa
Moving
group_nametoperf_evselstruct.Signed-off-by Jiri Olsa <[email protected]>--- tools/lib/perf/include/internal/evsel.h | 1 + tools/perf/tests/parse-events.c | 32 ++++++++++++------------- tools/perf/util/auxtrace.c | 6 ++--- tools/perf/util/evsel.c | 10 ++++---- tools/perf/util/evsel.h | 1 - tools/perf/util/evsel_fprintf.c | 2 +- tools/perf/util/header.c | 6 ++--- tools/perf/util/parse-events.c | 4 ++-- 8 files changed, 31 insertions(+), 31 deletions(-)Quoted 12 lines
tools/lib/perf/include/internal/evsel.h struct perf_evsel { · line 67
Quoted 9 lines
tools/lib/perf/include/internal/evsel.h +1
-0@@ -64,6 +64,7 @@ struct perf_evsel {*/ struct {char *name; +const char *group_name;I like the constification here. But why constify
group_nameand not name as well?
Quoted 3 lines
Can be done in a separate patch, in other series, no?
I understand that he probably is taking advantage of this move do constify '
group_name', but then, looks unrelated too this move to libperf as well.
definitely separate patch, to have the move separated.. perhaps someone could do constification patchset ;-) I'll put this one on top of the patchset
thanks,
jirka
Quoted 294 lines
- Arnaldo
Quoted 288 lines
Thanks,
IanQuoted 284 lines
tools/lib/perf/include/internal/evsel.h +0
-0bool auto_merge_stats;struct list_head config_terms;const char *metric_id;tools/perf/tests/parse-events.c +16
-16@@ -782,7 +782,7 @@ static int test__group3(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong group name" , - !strcmp (leader->group_name,"group1" )); + !strcmp (leader->core.group_name,"group1" ));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );TEST_ASSERT_VAL ("wrong sample_read" , !evsel->core.sample_read);@@ -800,7 +800,7 @@ static int test__group3(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , evsel->core.attr.precise_ip ==3 );TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader)); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==1 );TEST_ASSERT_VAL ("wrong sample_read" , !evsel->core.sample_read);@@ -817,7 +817,7 @@ static int test__group3(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong group name" , - !strcmp (leader->group_name,"group2" )); + !strcmp (leader->core.group_name,"group2" ));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );TEST_ASSERT_VAL ("wrong sample_read" , !evsel->core.sample_read);@@ -872,7 +872,7 @@ static int test__group4(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , evsel->core.attr.precise_ip ==1 ); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );@@ -915,7 +915,7 @@ static int test__group5(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );@@ -947,7 +947,7 @@ static int test__group5(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );@@ -1001,7 +1001,7 @@ static int test__group_gh1(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );@@ -1041,7 +1041,7 @@ static int test__group_gh2(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );@@ -1081,7 +1081,7 @@ static int test__group_gh3(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );@@ -1121,7 +1121,7 @@ static int test__group_gh4(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude guest" , !evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__is_group_leader (evsel));TEST_ASSERT_VAL ("wrong core.nr_members" , evsel->core.nr_members ==2 );TEST_ASSERT_VAL ("wrong group_idx" ,evsel__group_idx (evsel) ==0 );@@ -1160,7 +1160,7 @@ static int test__leader_sample1(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong sample_read" , evsel->core.sample_read);@@ -1189,7 +1189,7 @@ static int test__leader_sample1(struct evlist *evlist)TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong sample_read" , evsel->core.sample_read);@@ -1213,7 +1213,7 @@ static int test__leader_sample2(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong sample_read" , evsel->core.sample_read);@@ -1228,7 +1228,7 @@ static int test__leader_sample2(struct evlist *evlist __maybe_unused)TEST_ASSERT_VAL ("wrong exclude guest" , evsel->core.attr.exclude_guest);TEST_ASSERT_VAL ("wrong exclude host" , !evsel->core.attr.exclude_host);TEST_ASSERT_VAL ("wrong precise_ip" , !evsel->core.attr.precise_ip); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong sample_read" , evsel->core.sample_read);@@ -1259,7 +1259,7 @@ static int test__pinned_group(struct evlist *evlist)TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" ,PERF_COUNT_HW_CPU_CYCLES == evsel->core.attr.config); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong pinned" , evsel->core.attr.pinned);@@ -1303,7 +1303,7 @@ static int test__exclusive_group(struct evlist *evlist)TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong config" ,PERF_COUNT_HW_CPU_CYCLES == evsel->core.attr.config); -TEST_ASSERT_VAL ("wrong group name" , !evsel->group_name); +TEST_ASSERT_VAL ("wrong group name" , !evsel->core.group_name);TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong exclusive" , evsel->core.attr.exclusive);tools/perf/util/auxtrace.c +3
-3@@ -1235,9 +1235,9 @@ static void unleader_evsel(struct evlist *evlist, struct evsel *leader)/* Update group information */ if (new_leader) { -zfree (&new_leader->group_name); - new_leader->group_name = leader->group_name; - leader->group_name =NULL ; +zfree (&new_leader->core.group_name); + new_leader->core.group_name = leader->core.group_name; + leader->core.group_name =NULL ; new_leader->core.nr_members = leader->core.nr_members -1 ; leader->core.nr_members =1 ;tools/perf/util/evsel.c +5
-5@@ -395,9 +395,9 @@ struct evsel *evsel__clone(struct evsel *orig)if (evsel->core.name ==NULL ) goto out_err; } -if (orig->group_name) { - evsel->group_name =strdup (orig->group_name); -if (evsel->group_name ==NULL ) +if (orig->core.group_name) { + evsel->core.group_name =strdup (orig->core.group_name); +if (evsel->core.group_name ==NULL ) goto out_err; }if (orig->pmu_name) {@@ -797,7 +797,7 @@ const char *evsel__metric_id(const struct evsel *evsel)const char *evsel__group_name (struct evsel *evsel) { -return evsel->group_name ?:"anon group" ; +return evsel->core.group_name ?:"anon group" ; }/* @@ -1436,7 +1436,7 @@ void evsel__exit(struct evsel *evsel)perf_cpu_map__put (evsel->core.cpus);perf_cpu_map__put (evsel->core.own_cpus);perf_thread_map__put (evsel->core.threads); -zfree (&evsel->group_name); +zfree (&evsel->core.group_name);zfree (&evsel->core.name);zfree (&evsel->pmu_name);zfree (&evsel->core.metric_id);tools/perf/util/evsel.h +0
-1@@ -54,7 +54,6 @@ struct evsel {* they can be released properly. */ struct { -char *group_name;const char *pmu_name;struct tep_event *tp_format;char *filter;tools/perf/util/evsel_fprintf.c +1
-1@@ -48,7 +48,7 @@ int evsel__fprintf(struct evsel *evsel, struct perf_attr_details *details, FILEreturn 0 ;if (evsel->core.nr_members >1 ) - printed +=fprintf (fp,"%s{" , evsel->group_name ?:"" ); + printed +=fprintf (fp,"%s{" , evsel->core.group_name ?:"" ); printed +=fprintf (fp,"%s" ,evsel__name (evsel));for_each_group_member (pos, evsel)tools/perf/util/header.c +3
-3@@ -788,7 +788,7 @@ static int write_group_desc(struct feat_fd *ff,evlist__for_each_entry (evlist, evsel) {if (evsel__is_group_leader (evsel) && evsel->core.nr_members >1 ) { -const char *name = evsel->group_name ?:"{anon_group}" ; +const char *name = evsel->core.group_name ?:"{anon_group}" ;u32 leader_idx = evsel->core.idx;u32 nr_members = evsel->core.nr_members;@@ -2094,7 +2094,7 @@ static void print_group_desc(struct feat_fd *ff, FILE *fp)evlist__for_each_entry (session->evlist, evsel) {if (evsel__is_group_leader (evsel) && evsel->core.nr_members >1 ) { -fprintf (fp,"# group: %s{%s" , evsel->group_name ?:"" ,evsel__name (evsel)); +fprintf (fp,"# group: %s{%s" , evsel->core.group_name ?:"" ,evsel__name (evsel)); nr = evsel->core.nr_members -1 ; }else if (nr) {@@ -2743,7 +2743,7 @@ static int process_group_desc(struct feat_fd *ff, void *data __maybe_unused)evsel__set_leader (evsel, evsel);/* {anon_group} is a dummy name */ if (strcmp (desc[i].name,"{anon_group}" )) { - evsel->group_name = desc[i].name; + evsel->core.group_name = desc[i].name; desc[i].name =NULL ; } evsel->core.nr_members = desc[i].nr_members;tools/perf/util/parse-events.c +2
-3@@ -1841,7 +1841,7 @@ parse_events__set_leader_for_uncore_aliase(char *name, struct list_head *list,for (i =0 ; i < nr_pmu; i++) { evsel = (struct evsel *) leaders[i]; evsel->core.nr_members = total_members / nr_pmu; - evsel->group_name = name ?strdup (name) :NULL ; + evsel->core.group_name = name ?strdup (name) :NULL ; }/* Take the new small groups into account */ @@ -1869,7 +1869,7 @@ void parse_events__set_leader(char *name, struct list_head *list,__perf_evlist__set_leader (list); leader = list_entry(list->next, struct evsel, core.node); - leader->group_name = name ?strdup (name) :NULL ; + leader->core.group_name = name ?strdup (name) :NULL ; }/* list_event is assumed to point to malloc'ed memory */ --2.31.1
PATCH 19/59 perf tools: Fix parse_events_term__num call
In reply to Jiri OlsaWe are wrongly passing &config to parse_events_term__num as loc_term_ argument.
--- tools/perf/util/parse-events.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
tools/perf/util/parse-events.c +1 -2
@@ -1697,8 +1697,7 @@ int parse_events_multi_pmu_add(struct parse_events_state *parse_state,if (parse_events_term__num (&term,PARSE_EVENTS__TERM_TYPE_USER , - config,1 , false, &config, -NULL ) <0 ) { + config,1 , false,NULL ,NULL ) <0 ) {free (config); goto out_err; }
Signature · 1 line
2.31.1
Ian Rogers
reviewerRe: [PATCH 19/59] perf tools: Fix parse_events_term__num call
Quoted 5 lines · Jiri Olsa
We are wrongly passing &config to
parse_events_term__numasloc_term_argument.Fixes fb0811535e92 ("perf parse-events: Allow config on kernel PMU events")
I think this shows up on the fix as this change moved the code around, but it didn't originate the issue. This pattern is common in parse-events.y, are they also problematic?
https://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git/tree/tools/perf/util/parse-events.y?h=perf/core#n783
Thanks,
Ian
Quoted 22 lines
Signed-off-by Jiri Olsa <[email protected]>--- tools/perf/util/parse-events.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)tools/perf/util/parse-events.c +1
-3@@ -1697,8 +1697,7 @@ int parse_events_multi_pmu_add(struct parse_events_state *parse_state,if (parse_events_term__num (&term,PARSE_EVENTS__TERM_TYPE_USER , - config,1 , false, &config, -NULL ) <0 ) { + config,1 , false,NULL ,NULL ) <0 ) {free (config); goto out_err; } --2.31.1
Re: [PATCH 19/59] perf tools: Fix parse_events_term__num call
Quoted 11 lines · Ian Rogers
Quoted 5 lines · Jiri Olsa
We are wrongly passing &config to
parse_events_term__numasloc_term_argument.Fixes fb0811535e92 ("perf parse-events: Allow config on kernel PMU events")I think this shows up on the fix as this change moved the code around, but it didn't originate the issue. This pattern is common in parse-events.y, are they also problematic?
https://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git/tree/tools/perf/util/parse-events.y?h=perf/core#n783
they all seem to pass proper loc_term pointer.. I spot this one by accident and made quick patch, I'll double check the others
thanks,
jirka
Quoted 27 lines
Thanks,
IanQuoted 22 lines
Signed-off-by Jiri Olsa <[email protected]>--- tools/perf/util/parse-events.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)tools/perf/util/parse-events.c +1
-3@@ -1697,8 +1697,7 @@ int parse_events_multi_pmu_add(struct parse_events_state *parse_state,if (parse_events_term__num (&term,PARSE_EVENTS__TERM_TYPE_USER , - config,1 , false, &config, -NULL ) <0 ) { + config,1 , false,NULL ,NULL ) <0 ) {free (config); goto out_err; } --2.31.1
PATCH 20/59 perf tools: Pass parse_state all the way down to __add_event
In reply to Jiri OlsaSo we can provide event allocation callbacks.
--- tools/perf/util/parse-events-hybrid.c | 24 +++++++------ tools/perf/util/parse-events-hybrid.h | 6 ++-- tools/perf/util/parse-events.c | 49 +++++++++++++++------------ tools/perf/util/parse-events.h | 15 ++++---- tools/perf/util/parse-events.y | 21 ++++-------- 5 files changed, 60 insertions(+), 55 deletions(-)
tools/perf/util/parse-events-hybrid.c +13 -11
@@ -36,7 +36,8 @@ static void config_hybrid_attr(struct perf_event_attr *attr, attr->config = attr->config | ((__u64 )pmu_type <<PERF_PMU_TYPE_SHIFT ); } -static int create_event_hybrid(__u32 config_type, int *idx, +static int create_event_hybrid(struct parse_events_state *parse_state, + __u32 config_type, struct list_head *list, struct perf_event_attr *attr, const char *name, const char *metric_id,
@@ -48,7 +49,7 @@ static int create_event_hybrid(__u32 config_type, int *idx,__u64 config = attr->config;config_hybrid_attr (attr, config_type, pmu->type); - evsel =parse_events__add_event_hybrid (list, idx, attr, name, metric_id, + evsel =parse_events__add_event_hybrid (parse_state, list, attr, name, metric_id, pmu, config_terms);if (evsel) evsel->pmu_name =strdup (pmu->name);
@@ -84,8 +85,8 @@ static int add_hw_hybrid(struct parse_events_state *parse_state,continue ;copy_config_terms (&terms, config_terms); - ret =create_event_hybrid (PERF_TYPE_HARDWARE , - &parse_state->idx, list, attr, name, + ret =create_event_hybrid (parse_state,PERF_TYPE_HARDWARE , + list, attr, name, metric_id, &terms, pmu);free_config_terms (&terms);if (ret)
@@ -95,7 +96,8 @@ static int add_hw_hybrid(struct parse_events_state *parse_state,return 0 ; } -static int create_raw_event_hybrid(int *idx, struct list_head *list, +static int create_raw_event_hybrid(struct parse_events_state *parse_state, + struct list_head *list, struct perf_event_attr *attr, const char *name, const char *metric_id,
@@ -105,7 +107,7 @@ static int create_raw_event_hybrid(int *idx, struct list_head *list,struct evsel *evsel; attr->type = pmu->type; - evsel =parse_events__add_event_hybrid (list, idx, attr, name, metric_id, + evsel =parse_events__add_event_hybrid (parse_state, list, attr, name, metric_id, pmu, config_terms);if (evsel) evsel->pmu_name =strdup (pmu->name);
@@ -130,7 +132,7 @@ static int add_raw_hybrid(struct parse_events_state *parse_state,continue ;copy_config_terms (&terms, config_terms); - ret =create_raw_event_hybrid (&parse_state->idx, list, attr, + ret =create_raw_event_hybrid (parse_state, list, attr, name, metric_id, &terms, pmu);free_config_terms (&terms);if (ret)
@@ -164,13 +166,13 @@ int parse_events__add_numeric_hybrid(struct parse_events_state *parse_state, config_terms); } -int parse_events__add_cache_hybrid (struct list_head *list,int *idx, +int parse_events__add_cache_hybrid (struct parse_events_state *parse_state, +struct list_head *list,struct perf_event_attr *attr,const char *name,const char *metric_id,struct list_head *config_terms, -bool *hybrid, -struct parse_events_state *parse_state) +bool *hybrid) {struct perf_pmu *pmu;int ret;
@@ -187,7 +189,7 @@ int parse_events__add_cache_hybrid(struct list_head *list, int *idx,continue ;copy_config_terms (&terms, config_terms); - ret =create_event_hybrid (PERF_TYPE_HW_CACHE , idx, list, + ret =create_event_hybrid (parse_state,PERF_TYPE_HW_CACHE , list, attr, name, metric_id, &terms, pmu);free_config_terms (&terms);if (ret)
tools/perf/util/parse-events-hybrid.h +3 -3
@@ -15,11 +15,11 @@ int parse_events__add_numeric_hybrid(struct parse_events_state *parse_state,struct list_head *config_terms, bool *hybrid); -int parse_events__add_cache_hybrid (struct list_head *list,int *idx, +int parse_events__add_cache_hybrid (struct parse_events_state *parse_state, +struct list_head *list,struct perf_event_attr *attr,const char *name,const char *metric_id,struct list_head *config_terms, -bool *hybrid, -struct parse_events_state *parse_state); +bool *hybrid);#endif /* __PERF_PARSE_EVENTS_HYBRID_H */
tools/perf/util/parse-events.c +28 -21
155 lines not on this page · raw message
tools/perf/util/parse-events.h +9 -6
@@ -186,12 +186,13 @@ int parse_events_add_numeric(struct parse_events_state *parse_state,int parse_events_add_tool (struct parse_events_state *parse_state,struct list_head *list,int tool_event); -int parse_events_add_cache (struct list_head *list,int *idx, +int parse_events_add_cache (struct parse_events_state *parse_state, +struct list_head *list,char *type,char *op_result1,char *op_result2,struct parse_events_error *error, -struct list_head *head_config, -struct parse_events_state *parse_state); -int parse_events_add_breakpoint (struct list_head *list,int *idx, +struct list_head *head_config); +int parse_events_add_breakpoint (struct parse_events_state *parse_state, +struct list_head *list,u64 addr,char *type,u64 len); int parse_events_add_pmu(struct parse_events_state *parse_state, struct list_head *list, char *name,
@@ -199,7 +200,8 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,bool auto_merge_stats, bool use_alias); -struct evsel *parse_events__add_event (int idx,struct perf_event_attr *attr, +struct evsel *parse_events__add_event (struct parse_events_state *parse_state, +struct perf_event_attr *attr,const char *name,const char *metric_id,struct perf_pmu *pmu);
@@ -268,7 +270,8 @@ static inline bool is_sdt_event(char *str __maybe_unused)int perf_pmu__test_parse_init (void ); -struct evsel *parse_events__add_event_hybrid(struct list_head *list, int *idx, +struct evsel *parse_events__add_event_hybrid(struct parse_events_state *parse_state, + struct list_head *list, struct perf_event_attr *attr, const char *name, const char *metric_id,
tools/perf/util/parse-events.y +7 -14
@@ -478,8 +478,7 @@ PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT '-' PE_NAME_CACHE_OP_RESULT opt_e list = alloc_list(); ABORT_ON(!list); - err = parse_events_add_cache(list, &parse_state->idx, $1, $3, $5, error, $6, - parse_state); + err = parse_events_add_cache(parse_state, list, $1, $3, $5, error, $6); parse_events_terms__delete($6); free($1); free($3);
@@ -500,8 +499,7 @@ PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT opt_event_config list = alloc_list(); ABORT_ON(!list); - err = parse_events_add_cache(list, &parse_state->idx, $1, $3, NULL, error, $4, - parse_state); + err = parse_events_add_cache(parse_state, list, $1, $3, NULL, error, $4); parse_events_terms__delete($4); free($1); free($3);
@@ -521,8 +519,7 @@ PE_NAME_CACHE_TYPE opt_event_config list = alloc_list(); ABORT_ON(!list); - err = parse_events_add_cache(list, &parse_state->idx, $1, NULL, NULL, error, $2, - parse_state); + err = parse_events_add_cache(parse_state, list, $1, NULL, NULL, error, $2); parse_events_terms__delete($2); free($1); if (err) {
@@ -541,8 +538,7 @@ PE_PREFIX_MEM PE_VALUE '/' PE_VALUE ':' PE_MODIFIER_BP sep_dc list = alloc_list(); ABORT_ON(!list); - err = parse_events_add_breakpoint(list, &parse_state->idx, - $2, $6, $4); + err = parse_events_add_breakpoint(parse_state, list, $2, $6, $4); free($6); if (err) { free(list);
@@ -558,8 +554,7 @@ PE_PREFIX_MEM PE_VALUE '/' PE_VALUE sep_dc list = alloc_list(); ABORT_ON(!list); - if (parse_events_add_breakpoint(list, &parse_state->idx, - $2, NULL, $4)) { + if (parse_events_add_breakpoint(parse_state, list, $2, NULL, $4)) { free(list); YYABORT; }
@@ -574,8 +569,7 @@ PE_PREFIX_MEM PE_VALUE ':' PE_MODIFIER_BP sep_dc list = alloc_list(); ABORT_ON(!list); - err = parse_events_add_breakpoint(list, &parse_state->idx, - $2, $4, 0); + err = parse_events_add_breakpoint(parse_state, list, $2, $4, 0); free($4); if (err) { free(list);
@@ -591,8 +585,7 @@ PE_PREFIX_MEM PE_VALUE sep_dc list = alloc_list(); ABORT_ON(!list); - if (parse_events_add_breakpoint(list, &parse_state->idx, - $2, NULL, 0)) { + if (parse_events_add_breakpoint(parse_state, list, $2, NULL, 0)) { free(list); YYABORT; }
Signature · 1 line
2.31.1
PATCH 21/59 perf tools: Pass parse_state all the way down to add_tracepoint
In reply to Jiri OlsaSo we can provide event allocation callbacks.
--- tools/perf/util/parse-events.c | 30 ++++++++++++++++++------------ tools/perf/util/parse-events.h | 3 ++- tools/perf/util/parse-events.y | 2 +- 3 files changed, 21 insertions(+), 14 deletions(-)
tools/perf/util/parse-events.c +18 -12
@@ -595,11 +595,13 @@ static void tracepoint_error(struct parse_events_error *e, int err,parse_events__handle_error (e,0 ,strdup (str),strdup (help)); } -static int add_tracepoint (struct list_head *list,int *idx, +static int add_tracepoint (struct parse_events_state *parse_state, +struct list_head *list,const char *sys_name,const char *evt_name,struct parse_events_error *err,struct list_head *head_config) { +int *idx = &parse_state->idx;struct evsel *evsel =evsel__newtp_idx (sys_name, evt_name, (*idx)++);if (IS_ERR (evsel)) {
@@ -619,7 +621,8 @@ static int add_tracepoint(struct list_head *list, int *idx,return 0 ; } -static int add_tracepoint_multi_event (struct list_head *list,int *idx, +static int add_tracepoint_multi_event (struct parse_events_state *parse_state, +struct list_head *list,const char *sys_name,const char *evt_name,struct parse_events_error *err,struct list_head *head_config)
@@ -653,7 +656,7 @@ static int add_tracepoint_multi_event(struct list_head *list, int *idx, found++; - ret =add_tracepoint (list, idx, sys_name, evt_ent->d_name, + ret =add_tracepoint (parse_state, list, sys_name, evt_ent->d_name, err, head_config); }
@@ -667,19 +670,21 @@ static int add_tracepoint_multi_event(struct list_head *list, int *idx,return ret; } -static int add_tracepoint_event (struct list_head *list,int *idx, +static int add_tracepoint_event (struct parse_events_state *parse_state, +struct list_head *list,const char *sys_name,const char *evt_name,struct parse_events_error *err,struct list_head *head_config) {return strpbrk (evt_name,"*?" ) ? -add_tracepoint_multi_event (list, idx, sys_name, evt_name, +add_tracepoint_multi_event (parse_state, list, sys_name, evt_name, err, head_config) : -add_tracepoint (list, idx, sys_name, evt_name, +add_tracepoint (parse_state, list, sys_name, evt_name, err, head_config); } -static int add_tracepoint_multi_sys (struct list_head *list,int *idx, +static int add_tracepoint_multi_sys (struct parse_events_state *parse_state, +struct list_head *list,const char *sys_name,const char *evt_name,struct parse_events_error *err,struct list_head *head_config)
@@ -705,7 +710,7 @@ static int add_tracepoint_multi_sys(struct list_head *list, int *idx,if (!strglobmatch (events_ent->d_name, sys_name))continue ; - ret =add_tracepoint_event (list, idx, events_ent->d_name, + ret =add_tracepoint_event (parse_state, list, events_ent->d_name, evt_name, err, head_config); }
@@ -742,7 +747,7 @@ static int add_bpf_event(const char *group, const char *event, int fd, struct bppr_debug ("add bpf event %s:%s and attach bpf program %d\n" , group, event, fd); - err =parse_events_add_tracepoint (&new_evsels, &parse_state->idx, group, + err =parse_events_add_tracepoint (parse_state, &new_evsels, group, event, parse_state->error, param->head_config);if (err) {
@@ -1440,7 +1445,8 @@ static int get_config_chgs(struct perf_pmu *pmu, struct list_head *head_config,return 0 ; } -int parse_events_add_tracepoint (struct list_head *list,int *idx, +int parse_events_add_tracepoint (struct parse_events_state *parse_state, +struct list_head *list,const char *sys,const char *event,struct parse_events_error *err,struct list_head *head_config)
@@ -1454,10 +1460,10 @@ int parse_events_add_tracepoint(struct list_head *list, int *idx, }if (strpbrk (sys,"*?" )) -return add_tracepoint_multi_sys (list, idx, sys, event, +return add_tracepoint_multi_sys (parse_state, list, sys, event, err, head_config);else -return add_tracepoint_event (list, idx, sys, event, +return add_tracepoint_event (parse_state, list, sys, event, err, head_config); }
tools/perf/util/parse-events.h +2 -1
@@ -164,7 +164,8 @@ void parse_events__clear_array(struct parse_events_array *a);int parse_events__modifier_event (struct list_head *list,char *str,bool add);int parse_events__modifier_group (struct list_head *list,char *event_mod);int parse_events_name (struct list_head *list,const char *name); -int parse_events_add_tracepoint (struct list_head *list,int *idx, +int parse_events_add_tracepoint (struct parse_events_state *parse_state, +struct list_head *list,const char *sys,const char *event,struct parse_events_error *error,struct list_head *head_config);
tools/perf/util/parse-events.y +1 -1
@@ -605,7 +605,7 @@ tracepoint_name opt_event_config if (error) error->idx = @1.first_column; - err = parse_events_add_tracepoint(list, &parse_state->idx, $1.sys, $1.event, + err = parse_events_add_tracepoint(parse_state, list, $1.sys, $1.event, error, $2); parse_events_terms__delete($2);
Signature · 1 line
2.31.1
PATCH 22/59 perf tools: Add evsel__new callback to parse_state_ops
In reply to Jiri OlsaAdding evsel__new callback to parse_state_ops to allow custom event allocation for event parsing.
--- tools/perf/util/parse-events.c | 13 ++++++++++--- tools/perf/util/parse-events.h | 5 +++++ 2 files changed, 15 insertions(+), 3 deletions(-)
tools/perf/util/parse-events.c +10 -3
@@ -154,6 +154,10 @@ struct event_symbol event_symbols_sw[PERF_COUNT_SW_MAX] = { }, }; +static struct parse_events_ops parse_state_ops = { + .evsel__new = evsel__new_idx, +}; +#define __PERF_EVENT_FIELD (config, name) \ ((config & PERF_EVENT_##name##_MASK) >> PERF_EVENT_##name##_SHIFT)
@@ -376,7 +380,7 @@ __add_event(struct parse_events_state *parse_state,if (init_attr)event_attr_init (attr); - evsel =evsel__new_idx (attr, *idx); + evsel = parse_state->ops->evsel__new (attr, *idx);if (!evsel) {perf_cpu_map__put (cpus);return NULL ;
@@ -2256,8 +2260,9 @@ static int parse_events__scanner(const char *str,int parse_events_terms (struct list_head *terms,const char *str) {struct parse_events_state parse_state = { - .terms =NULL , - .stoken =PE_START_TERMS , + .ops = &parse_state_ops, + .terms =NULL , + .stoken =PE_START_TERMS , };int ret;
@@ -2283,6 +2288,7 @@ static int parse_events__with_hybrid_pmu(struct parse_events_state *parse_state, .stoken = PE_START_EVENTS, .hybrid_pmu_name = pmu_name, .idx = parse_state->idx, + .ops = &parse_state_ops, };int ret;
@@ -2311,6 +2317,7 @@ int __parse_events(struct evlist *evlist, const char *str, .evlist = evlist, .stoken = PE_START_EVENTS, .fake_pmu = fake_pmu, + .ops = &parse_state_ops, };int ret;
tools/perf/util/parse-events.h +5 -0
@@ -130,6 +130,10 @@ struct parse_events_error {char *first_help; }; +struct parse_events_ops { +struct evsel * (*evsel__new)(struct perf_event_attr *attr,int idx); +}; +struct parse_events_state {struct list_head list;int idx;
@@ -140,6 +144,7 @@ struct parse_events_state {int stoken;struct perf_pmu *fake_pmu;char *hybrid_pmu_name; +struct parse_events_ops *ops; }; void parse_events__handle_error(struct parse_events_error *err, int idx,
Signature · 1 line
2.31.1
PATCH 23/59 perf tools: Add evsel__new_tp callback to parse_state_ops
In reply to Jiri OlsaAdding evsel__new_tp callback to parse_state_ops to allow custom tracepoint event allocation for event parsing.
--- tools/perf/util/parse-events.c | 5 +++-- tools/perf/util/parse-events.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-)
tools/perf/util/parse-events.c +3 -2
@@ -155,7 +155,8 @@ struct event_symbol event_symbols_sw[PERF_COUNT_SW_MAX] = { };static struct parse_events_ops parse_state_ops = { - .evsel__new = evsel__new_idx, + .evsel__new = evsel__new_idx, + .evsel__new_tp = evsel__newtp_idx, };#define __PERF_EVENT_FIELD (config, name) \
@@ -606,7 +607,7 @@ static int add_tracepoint(struct parse_events_state *parse_state, struct list_head *head_config) {int *idx = &parse_state->idx; -struct evsel *evsel =evsel__newtp_idx (sys_name, evt_name, (*idx)++); +struct evsel *evsel = parse_state->ops->evsel__new_tp (sys_name, evt_name, (*idx)++);if (IS_ERR (evsel)) {tracepoint_error (err,PTR_ERR (evsel), sys_name, evt_name);
tools/perf/util/parse-events.h +1 -0
@@ -132,6 +132,7 @@ struct parse_events_error {struct parse_events_ops {struct evsel * (*evsel__new)(struct perf_event_attr *attr,int idx); +struct evsel * (*evsel__new_tp)(const char *sys,const char *name,int idx); };struct parse_events_state {
Signature · 1 line
2.31.1
PATCH 24/59 perf tools: Add loc_term and loc_val helpers to parse_events_term__str
In reply to Jiri OlsaMove out bison specific code out of parse_events_term__str.
--- tools/perf/util/parse-events.c | 9 +++------ tools/perf/util/parse-events.h | 2 +- tools/perf/util/parse-events.y | 23 +++++++++++++++++++---- 3 files changed, 23 insertions(+), 11 deletions(-)
tools/perf/util/parse-events.c +3 -6
@@ -3210,17 +3210,14 @@ int parse_events_term__num(struct parse_events_term **term,int parse_events_term__str (struct parse_events_term **term,int type_term,char *config,char *str, -void *loc_term_,void *loc_val_) +int loc_term,int loc_val) { -YYLTYPE *loc_term = loc_term_; -YYLTYPE *loc_val = loc_val_; -struct parse_events_term temp = { .type_val =PARSE_EVENTS__TERM_TYPE_STR , .type_term = type_term, .config = config, - .err_term = loc_term ? loc_term->first_column :0 , - .err_val = loc_val ? loc_val->first_column :0 , + .err_term = loc_term, + .err_val = loc_val, };return new_term (term, &temp, str,0 );
tools/perf/util/parse-events.h +1 -1
@@ -158,7 +158,7 @@ int parse_events_term__num(struct parse_events_term **term, void *loc_term, void *loc_val);int parse_events_term__str (struct parse_events_term **term,int type_term,char *config,char *str, -void *loc_term,void *loc_val); +int loc_term,int loc_val);int parse_events_term__sym_hw (struct parse_events_term **term,char *config,unsigned idx); int parse_events_term__clone(struct parse_events_term **new,
tools/perf/util/parse-events.y +19 -4
@@ -57,6 +57,20 @@ static void inc_group_count(struct list_head *list, parse_state->nr_groups++; } +static int loc_term(void *loc_term_) +{ + YYLTYPE *loc_term = loc_term_; + + return loc_term ? loc_term->first_column : 0; +} + +static int loc_val(void *loc_val_) +{ + YYLTYPE *loc_val = loc_val_; + + return loc_val ? loc_val->first_column : 0; +} + %} %token PE_START_EVENTS PE_START_TERMS
@@ -782,7 +796,7 @@ PE_NAME '=' PE_NAME struct parse_events_term *term; if (parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_USER, - $1, $3, &@1, &@3)) { + $1, $3, loc_term(&@1), loc_val(&@3))) { free($1); free($3); YYABORT;
@@ -839,7 +853,8 @@ PE_TERM '=' PE_NAME { struct parse_events_term *term; - if (parse_events_term__str(&term, (int)$1, NULL, $3, &@1, &@3)) { + if (parse_events_term__str(&term, (int)$1, NULL, $3, + loc_term(&@1), loc_val(&@3))) { free($3); YYABORT; }
@@ -867,7 +882,7 @@ PE_NAME array '=' PE_NAME struct parse_events_term *term; if (parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_USER, - $1, $4, &@1, &@4)) { + $1, $4, loc_term(&@1), loc_val(&@4))) { free($1); free($4); free($2.ranges);
@@ -898,7 +913,7 @@ PE_DRV_CFG_TERM ABORT_ON(!config); if (parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_DRV_CFG, - config, $1, &@1, NULL)) { + config, $1, loc_term(&@1), 0)) { free($1); free(config); YYABORT;
Signature · 1 line
2.31.1
PATCH 25/59 perf tools: Add loc_term and loc_val helpers to parse_events_term__num
In reply to Jiri OlsaMove out bison specific code out of parse_events_term__num.
--- tools/perf/util/parse-events.c | 11 ++++------- tools/perf/util/parse-events.h | 2 +- tools/perf/util/parse-events.y | 13 +++++++------ 3 files changed, 12 insertions(+), 14 deletions(-)
tools/perf/util/parse-events.c +4 -7
@@ -1714,7 +1714,7 @@ int parse_events_multi_pmu_add(struct parse_events_state *parse_state,if (parse_events_term__num (&term,PARSE_EVENTS__TERM_TYPE_USER , - config,1 , false,NULL ,NULL ) <0 ) { + config,1 , false,0 ,0 ) <0 ) {free (config); goto out_err; }
@@ -3191,18 +3191,15 @@ static int new_term(struct parse_events_term **_term,int parse_events_term__num (struct parse_events_term **term,int type_term,char *config,u64 num,bool no_value, -void *loc_term_,void *loc_val_) +int loc_term,int loc_val) { -YYLTYPE *loc_term = loc_term_; -YYLTYPE *loc_val = loc_val_; -struct parse_events_term temp = { .type_val =PARSE_EVENTS__TERM_TYPE_NUM , .type_term = type_term, .config = config ? :strdup (config_term_names[type_term]), .no_value = no_value, - .err_term = loc_term ? loc_term->first_column :0 , - .err_val = loc_val ? loc_val->first_column :0 , + .err_term = loc_term, + .err_val = loc_val, };return new_term (term, &temp,NULL , num);
tools/perf/util/parse-events.h +1 -1
@@ -155,7 +155,7 @@ int parse_events__is_hardcoded_term(struct parse_events_term *term);int parse_events_term__num (struct parse_events_term **term,int type_term,char *config,u64 num,bool novalue, -void *loc_term,void *loc_val); +int loc_term,int loc_val);int parse_events_term__str (struct parse_events_term **term,int type_term,char *config,char *str,int loc_term,int loc_val);
tools/perf/util/parse-events.y +7 -6
@@ -787,7 +787,7 @@ PE_RAW struct parse_events_term *term; ABORT_ON(parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_CONFIG, - NULL, $1, false, &@1, NULL)); + NULL, $1, false, loc_term(&@1), 0)); $$ = term; } |
@@ -809,7 +809,7 @@ PE_NAME '=' PE_VALUE struct parse_events_term *term; if (parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER, - $1, $3, false, &@1, &@3)) { + $1, $3, false, loc_term(&@1), loc_val(&@3))) { free($1); YYABORT; }
@@ -833,7 +833,7 @@ PE_NAME struct parse_events_term *term; if (parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER, - $1, 1, true, &@1, NULL)) { + $1, 1, true, loc_term(&@1), 0)) { free($1); YYABORT; }
@@ -865,7 +865,8 @@ PE_TERM '=' PE_VALUE { struct parse_events_term *term; - ABORT_ON(parse_events_term__num(&term, (int)$1, NULL, $3, false, &@1, &@3)); + ABORT_ON(parse_events_term__num(&term, (int)$1, NULL, $3, false, + loc_term(&@1), loc_val(&@3))); $$ = term; } |
@@ -873,7 +874,7 @@ PE_TERM { struct parse_events_term *term; - ABORT_ON(parse_events_term__num(&term, (int)$1, NULL, 1, true, &@1, NULL)); + ABORT_ON(parse_events_term__num(&term, (int)$1, NULL, 1, true, loc_term(&@1), 0)); $$ = term; } |
@@ -897,7 +898,7 @@ PE_NAME array '=' PE_VALUE struct parse_events_term *term; if (parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER, - $1, $4, false, &@1, &@4)) { + $1, $4, false, loc_term(&@1), loc_val(&@4))) { free($1); free($2.ranges); YYABORT;
Signature · 1 line
2.31.1
PATCH 26/59 libperf: Move in the event_symbols_hw/event_symbols_sw
In reply to Jiri OlsaMoving event_symbols_hw/event_symbols_sw to libperf.
--- tools/lib/perf/Build | 1 + .../lib/perf/include/internal/parse-events.h | 12 +++ tools/lib/perf/parse-events.c | 99 +++++++++++++++++++ tools/perf/util/parse-events.c | 94 ------------------ tools/perf/util/parse-events.h | 6 -- 5 files changed, 112 insertions(+), 100 deletions(-) create mode 100644 tools/lib/perf/include/internal/parse-events.h create mode 100644 tools/lib/perf/parse-events.c
tools/lib/perf/Build +1 -0
@@ -11,6 +11,7 @@ libperf-y += pmu-flex.o libperf-y += pmu-bison.o libperf-y += pmu.o libperf-y += pmu-hybrid.o +libperf-y += parse-events.o $(OUTPUT)zalloc.o: ../../lib/zalloc.c FORCE $(call rule_mkdir)
tools/lib/perf/include/internal/parse-events.h new file +12 -0
@@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __LIBPERF_PARSE_EVENTS_H +#define __LIBPERF_PARSE_EVENTS_H + +struct event_symbol { +const char *symbol; +const char *alias; +}; +extern struct event_symbol event_symbols_hw[]; +extern struct event_symbol event_symbols_sw[]; + +#endif /* __LIBPERF_PARSE_EVENTS_H */
tools/lib/perf/parse-events.c new file +99 -0
99 lines not on this page · raw message
tools/perf/util/parse-events.c +0 -94
100 lines not on this page · raw message
tools/perf/util/parse-events.h +0 -6
@@ -233,12 +233,6 @@ void print_events(const char *event_glob, bool name_only, bool quiet, bool long_desc, bool details_flag, bool deprecated, const char *pmu_name); -struct event_symbol { -const char *symbol; -const char *alias; -}; -extern struct event_symbol event_symbols_hw[]; -extern struct event_symbol event_symbols_sw[];void print_symbol_events (const char *event_glob,unsigned type,struct event_symbol *syms,unsigned max,bool name_only);
Signature · 1 line
2.31.1
PATCH 27/59 libperf: Move in struct parse_events_term code
In reply to Jiri OlsaMoving parse_events_term related code to libperf.
--- .../lib/perf/include/internal/parse-events.h | 82 +++++++ tools/lib/perf/parse-events.c | 205 ++++++++++++++++++ tools/perf/util/parse-events.c | 201 ----------------- tools/perf/util/parse-events.h | 78 +------ 4 files changed, 288 insertions(+), 278 deletions(-)
tools/lib/perf/include/internal/parse-events.h +82 -0
@@ -2,11 +2,93 @@#ifndef __LIBPERF_PARSE_EVENTS_H#define __LIBPERF_PARSE_EVENTS_H +#include <linux/types.h> +#include <linux/list.h> +#include <unistd.h> +struct event_symbol {const char *symbol;const char *alias; };extern struct event_symbol event_symbols_hw[];extern struct event_symbol event_symbols_sw[]; +extern const char *config_term_names[]; + +enum { +PARSE_EVENTS__TERM_TYPE_NUM , +PARSE_EVENTS__TERM_TYPE_STR , +}; + +enum { +PARSE_EVENTS__TERM_TYPE_USER , +PARSE_EVENTS__TERM_TYPE_CONFIG , +PARSE_EVENTS__TERM_TYPE_CONFIG1 , +PARSE_EVENTS__TERM_TYPE_CONFIG2 , +PARSE_EVENTS__TERM_TYPE_NAME , +PARSE_EVENTS__TERM_TYPE_SAMPLE_PERIOD , +PARSE_EVENTS__TERM_TYPE_SAMPLE_FREQ , +PARSE_EVENTS__TERM_TYPE_BRANCH_SAMPLE_TYPE , +PARSE_EVENTS__TERM_TYPE_TIME , +PARSE_EVENTS__TERM_TYPE_CALLGRAPH , +PARSE_EVENTS__TERM_TYPE_STACKSIZE , +PARSE_EVENTS__TERM_TYPE_NOINHERIT , +PARSE_EVENTS__TERM_TYPE_INHERIT , +PARSE_EVENTS__TERM_TYPE_MAX_STACK , +PARSE_EVENTS__TERM_TYPE_MAX_EVENTS , +PARSE_EVENTS__TERM_TYPE_NOOVERWRITE , +PARSE_EVENTS__TERM_TYPE_OVERWRITE , +PARSE_EVENTS__TERM_TYPE_DRV_CFG , +PARSE_EVENTS__TERM_TYPE_PERCORE , +PARSE_EVENTS__TERM_TYPE_AUX_OUTPUT , +PARSE_EVENTS__TERM_TYPE_AUX_SAMPLE_SIZE , +PARSE_EVENTS__TERM_TYPE_METRIC_ID , + __PARSE_EVENTS__TERM_TYPE_NR, +}; + +struct parse_events_array { +size_t nr_ranges; +struct { +unsigned int start; +size_t length; + } *ranges; +}; + +struct parse_events_term { +char *config; +struct parse_events_array array; +union { +char *str; +u64 num; + } val; +int type_val; +int type_term; +struct list_head list; +bool used; +bool no_value; + +/* error string indexes for within parsed string */ +int err_term; +int err_val; + +/* Coming from implicit alias */ +bool weak; +}; +int parse_events_term__num (struct parse_events_term **term, +int type_term,char *config,u64 num, +bool novalue, +int loc_term,int loc_val); +int parse_events_term__str (struct parse_events_term **term, +int type_term,char *config,char *str, +int loc_term,int loc_val); +int parse_events_term__sym_hw (struct parse_events_term **term, +char *config,unsigned idx); +int parse_events_term__clone (struct parse_events_term **new, +struct parse_events_term *term); +int parse_events__is_hardcoded_term (struct parse_events_term *term); +void parse_events_term__delete (struct parse_events_term *term); +void parse_events_terms__delete (struct list_head *terms); +void parse_events_terms__purge (struct list_head *terms); +int parse_events_copy_term_list (struct list_head *old, +struct list_head **new);#endif /* __LIBPERF_PARSE_EVENTS_H */
tools/lib/perf/parse-events.c +205 -0
214 lines not on this page · raw message
tools/perf/util/parse-events.c +0 -201
213 lines not on this page · raw message
tools/perf/util/parse-events.h +1 -77
102 lines not on this page · raw message
Signature · 1 line
2.31.1
PATCH 28/59 perf tools: Add perf_evsel__add_event function
In reply to Jiri OlsaAdding perf_evsel__add_event function as a replacement for __add_event and prepare it for moving to libperf.
That includes changing current parse_state_ops callbacks to work over perf_evsel instead of evsel.
--- tools/perf/util/parse-events.c | 121 +++++++++++++++++++++------------ tools/perf/util/parse-events.h | 4 +- 2 files changed, 78 insertions(+), 47 deletions(-)
tools/perf/util/parse-events.c +76 -45
@@ -60,9 +60,23 @@ static struct perf_pmu_event_symbol *perf_pmu_events_list;*/ static int perf_pmu_events_list_num; +static struct perf_evsel *perf_evsel__new_idx (struct perf_event_attr *attr,int idx) +{ +struct evsel *evsel =evsel__new_idx (attr, idx); + +return evsel ? &evsel->core :NULL ; +} + +static struct perf_evsel *perf_evsel__newtp_idx (const char *sys,const char *name,int idx) +{ +struct evsel *evsel =evsel__newtp_idx (sys, name, idx); + +return IS_ERR (evsel) ? (void *) evsel : &evsel->core; +} +static struct parse_events_ops parse_state_ops = { - .evsel__new = evsel__new_idx, - .evsel__new_tp = evsel__newtp_idx, + .perf_evsel__new = perf_evsel__new_idx, + .perf_evsel__new_tp = perf_evsel__newtp_idx, };#define __PERF_EVENT_FIELD (config, name) \
@@ -267,16 +281,16 @@ static char *get_config_name(struct list_head *head_terms)return get_config_str (head_terms,PARSE_EVENTS__TERM_TYPE_NAME ); } -static struct evsel * -__add_event (struct parse_events_state *parse_state, -struct list_head *list, -struct perf_event_attr *attr, -bool init_attr, -const char *name,const char *metric_id,struct perf_pmu *pmu, -struct list_head *config_terms,bool auto_merge_stats, -const char *cpu_list) +static struct perf_evsel * +perf_evsel__add_event (struct parse_events_state *parse_state, +struct list_head *list, +struct perf_event_attr *attr, +bool init_attr, +const char *name,const char *metric_id,struct perf_pmu *pmu, +struct list_head *config_terms,bool auto_merge_stats, +const char *cpu_list) { -struct evsel *evsel; +struct perf_evsel *evsel;struct perf_cpu_map *cpus = pmu ?perf_cpu_map__get (pmu->cpus) : cpu_list ?perf_cpu_map__new (cpu_list) :NULL ;int *idx = &parse_state->idx;
@@ -287,41 +301,58 @@ __add_event(struct parse_events_state *parse_state,if (init_attr)event_attr_init (attr); - evsel = parse_state->ops->evsel__new (attr, *idx); + evsel = parse_state->ops->perf_evsel__new (attr, *idx);if (!evsel) {perf_cpu_map__put (cpus);return NULL ; } (*idx)++; - evsel->core.cpus = cpus; - evsel->core.own_cpus =perf_cpu_map__get (cpus); - evsel->core.system_wide = pmu ? pmu->is_uncore : false; - evsel->core.auto_merge_stats = auto_merge_stats; + evsel->cpus = cpus; + evsel->own_cpus =perf_cpu_map__get (cpus); + evsel->system_wide = pmu ? pmu->is_uncore : false; + evsel->auto_merge_stats = auto_merge_stats;if (name) - evsel->core.name =strdup (name); + evsel->name =strdup (name);if (metric_id) - evsel->core.metric_id =strdup (metric_id); + evsel->metric_id =strdup (metric_id);if (config_terms) -list_splice_init (config_terms, &evsel->core.config_terms); +list_splice_init (config_terms, &evsel->config_terms);if (list) -list_add_tail (&evsel->core.node, list); +list_add_tail (&evsel->node, list);return evsel; } +static struct evsel * +evsel__add_event (struct parse_events_state *parse_state, +struct list_head *list, +struct perf_event_attr *attr, +bool init_attr, +const char *name,const char *metric_id,struct perf_pmu *pmu, +struct list_head *config_terms,bool auto_merge_stats, +const char *cpu_list) +{ +struct perf_evsel *evsel; + + evsel =perf_evsel__add_event (parse_state, list, attr, init_attr, + name, metric_id, pmu, config_terms, + auto_merge_stats, cpu_list); + return container_of(evsel, struct evsel, core); +} +struct evsel *parse_events__add_event (struct parse_events_state *parse_state,struct perf_event_attr *attr,const char *name,const char *metric_id,struct perf_pmu *pmu) { -return __add_event (parse_state,/*list=*/ NULL , attr,/*init_attr=*/ false, name, - metric_id, pmu,/*config_terms=*/ NULL , -/*auto_merge_stats=*/ false,/*cpu_list=*/ NULL ); +return evsel__add_event (parse_state,/*list=*/ NULL , attr,/*init_attr=*/ false, name, + metric_id, pmu,/*config_terms=*/ NULL , +/*auto_merge_stats=*/ false,/*cpu_list=*/ NULL ); } static int add_event(struct parse_events_state *parse_state,
@@ -329,9 +360,9 @@ static int add_event(struct parse_events_state *parse_state, struct perf_event_attr *attr, const char *name, const char *metric_id, struct list_head *config_terms) { - return __add_event(parse_state, list, attr, /*init_attr*/true, name, metric_id, - /*pmu=*/NULL, config_terms, - /*auto_merge_stats=*/false, /*cpu_list=*/NULL) ? 0 : -ENOMEM; + return evsel__add_event(parse_state, list, attr, /*init_attr*/true, name, metric_id, + /*pmu=*/NULL, config_terms, + /*auto_merge_stats=*/false, /*cpu_list=*/NULL) ? 0 : -ENOMEM; } static int add_event_tool(struct parse_events_state *parse_state,
@@ -344,10 +375,10 @@ static int add_event_tool(struct parse_events_state *parse_state, .config = PERF_COUNT_SW_DUMMY, }; - evsel =__add_event (parse_state, list, &attr,/*init_attr=*/ true,/*name=*/ NULL , -/*metric_id=*/ NULL ,/*pmu=*/ NULL , -/*config_terms=*/ NULL ,/*auto_merge_stats=*/ false, -/*cpu_list=*/ "0" ); + evsel =evsel__add_event (parse_state, list, &attr,/*init_attr=*/ true,/*name=*/ NULL , +/*metric_id=*/ NULL ,/*pmu=*/ NULL , +/*config_terms=*/ NULL ,/*auto_merge_stats=*/ false, +/*cpu_list=*/ "0" );if (!evsel)return -ENOMEM ; evsel->core.tool_event = tool_event;
@@ -513,7 +544,7 @@ static int add_tracepoint(struct parse_events_state *parse_state, struct list_head *head_config) {int *idx = &parse_state->idx; -struct evsel *evsel = parse_state->ops->evsel__new_tp (sys_name, evt_name, (*idx)++); +struct perf_evsel *evsel = parse_state->ops->perf_evsel__new_tp (sys_name, evt_name, (*idx)++);if (IS_ERR (evsel)) {tracepoint_error (err,PTR_ERR (evsel), sys_name, evt_name);
@@ -525,10 +556,10 @@ static int add_tracepoint(struct parse_events_state *parse_state,if (get_config_terms (head_config, &config_terms))return -ENOMEM ; -list_splice (&config_terms, &evsel->core.config_terms); +list_splice (&config_terms, &evsel->config_terms); } -list_add_tail (&evsel->core.node, list); +list_add_tail (&evsel->node, list);return 0 ; }
@@ -1484,11 +1515,11 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,if (!head_config) { attr.type = pmu->type; - evsel =__add_event (parse_state, list, &attr, -/*init_attr=*/ true,/*name=*/ NULL , -/*metric_id=*/ NULL , pmu, -/*config_terms=*/ NULL , auto_merge_stats, -/*cpu_list=*/ NULL ); + evsel =evsel__add_event (parse_state, list, &attr, +/*init_attr=*/ true,/*name=*/ NULL , +/*metric_id=*/ NULL , pmu, +/*config_terms=*/ NULL , auto_merge_stats, +/*cpu_list=*/ NULL );if (evsel) { evsel->pmu_name = name ?strdup (name) :NULL ; evsel->use_uncore_alias = use_uncore_alias;
@@ -1541,10 +1572,10 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,return -EINVAL ; } - evsel =__add_event (parse_state, list, &attr,/*init_attr=*/ true, -get_config_name (head_config), -get_config_metric_id (head_config), pmu, - &config_terms, auto_merge_stats,/*cpu_list=*/ NULL ); + evsel =evsel__add_event (parse_state, list, &attr,/*init_attr=*/ true, +get_config_name (head_config), +get_config_metric_id (head_config), pmu, + &config_terms, auto_merge_stats,/*cpu_list=*/ NULL );if (!evsel)return -ENOMEM ;
@@ -3107,7 +3138,7 @@ struct evsel *parse_events__add_event_hybrid(struct parse_events_state *parse_ststruct perf_pmu *pmu, struct list_head *config_terms) { - return __add_event(parse_state, list, attr, /*init_attr=*/true, name, metric_id, -pmu ,config_terms ,/*auto_merge_stats=*/ false , -/*cpu_list=*/ NULL ); + return evsel__add_event(parse_state, list, attr, /*init_attr=*/true, name, metric_id, +pmu ,config_terms ,/*auto_merge_stats=*/ false , +/*cpu_list=*/ NULL ); }
tools/perf/util/parse-events.h +2 -2
@@ -72,8 +72,8 @@ struct parse_events_error { };struct parse_events_ops { -struct evsel * (*evsel__new)(struct perf_event_attr *attr,int idx); -struct evsel * (*evsel__new_tp)(const char *sys,const char *name,int idx); +struct perf_evsel * (*perf_evsel__new)(struct perf_event_attr *attr,int idx); +struct perf_evsel * (*perf_evsel__new_tp)(const char *sys,const char *name,int idx); };struct parse_events_state {
Signature · 1 line
2.31.1
PATCH 29/59 perf tools: Change struct parse_events_state::evlist to perf_evlist
In reply to Jiri OlsaChanging struct parse_events_state::evlist to perf_evlist to prepare it for moving to libperf.
--- tools/perf/util/parse-events.c | 8 +++++--- tools/perf/util/parse-events.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-)
tools/perf/util/parse-events.c +5 -3
@@ -774,6 +774,7 @@ parse_events_config_bpf(struct parse_events_state *parse_state, struct list_head *head_config) {struct parse_events_term *term; +struct evlist *evlist;int error_pos;if (!head_config ||list_empty (head_config))
@@ -789,12 +790,13 @@ parse_events_config_bpf(struct parse_events_state *parse_state,return -EINVAL ; } - err =bpf__config_obj (obj, term, parse_state->evlist, &error_pos); + evlist = container_of(parse_state->evlist, struct evlist, core); + err =bpf__config_obj (obj, term, evlist, &error_pos);if (err) {char errbuf[BUFSIZ ];int idx; -bpf__strerror_config_obj (obj, term, parse_state->evlist, +bpf__strerror_config_obj (obj, term, evlist, &error_pos, err, errbuf,sizeof (errbuf));
@@ -2224,7 +2226,7 @@ int __parse_events(struct evlist *evlist, const char *str, .list = LIST_HEAD_INIT(parse_state.list), .idx = evlist->core.nr_entries, .error = err, - .evlist = evlist, + .evlist = &evlist->core, .stoken = PE_START_EVENTS, .fake_pmu = fake_pmu, .ops = &parse_state_ops,
tools/perf/util/parse-events.h +1 -1
@@ -81,7 +81,7 @@ struct parse_events_state {int idx;int nr_groups;struct parse_events_error *error; -struct evlist *evlist; +struct perf_evlist *evlist;struct list_head *terms;int stoken;struct perf_pmu *fake_pmu;
Signature · 1 line
2.31.1
PATCH 30/59 libperf: Move in struct parse_events_state
In reply to Jiri OlsaMoving in struct parse_events_state to libperf
together with related structs.
--- .../lib/perf/include/internal/parse-events.h | 29 +++++++++++++++++++ tools/perf/util/parse-events.h | 28 ------------------ 2 files changed, 29 insertions(+), 28 deletions(-)
tools/lib/perf/include/internal/parse-events.h +29 -0
@@ -5,6 +5,7 @@#include <linux/types.h> #include <linux/list.h> #include <unistd.h> +#include <linux/perf_event.h> struct event_symbol {const char *symbol;
@@ -74,6 +75,34 @@ struct parse_events_term {bool weak; }; +struct parse_events_error { +int num_errors;/* number of errors encountered */ +int idx;/* index in the parsed string */ +char *str;/* string to display at the index */ +char *help;/* optional help string */ +int first_idx;/* as above, but for the first encountered error */ +char *first_str; +char *first_help; +}; + +struct parse_events_ops { +struct perf_evsel * (*perf_evsel__new)(struct perf_event_attr *attr,int idx); +struct perf_evsel * (*perf_evsel__new_tp)(const char *sys,const char *name,int idx); +}; + +struct parse_events_state { +struct list_head list; +int idx; +int nr_groups; +struct parse_events_error *error; +struct perf_evlist *evlist; +struct list_head *terms; +int stoken; +struct perf_pmu *fake_pmu; +char *hybrid_pmu_name; +struct parse_events_ops *ops; +}; + int parse_events_term__num(struct parse_events_term **term, int type_term, char *config, u64 num, bool novalue,
tools/perf/util/parse-events.h +0 -28
@@ -61,34 +61,6 @@ struct perf_pmu_event_symbol {enum perf_pmu_event_symbol_type type; }; -struct parse_events_error { -int num_errors;/* number of errors encountered */ -int idx;/* index in the parsed string */ -char *str;/* string to display at the index */ -char *help;/* optional help string */ -int first_idx;/* as above, but for the first encountered error */ -char *first_str; -char *first_help; -}; - -struct parse_events_ops { -struct perf_evsel * (*perf_evsel__new)(struct perf_event_attr *attr,int idx); -struct perf_evsel * (*perf_evsel__new_tp)(const char *sys,const char *name,int idx); -}; - -struct parse_events_state { -struct list_head list; -int idx; -int nr_groups; -struct parse_events_error *error; -struct perf_evlist *evlist; -struct list_head *terms; -int stoken; -struct perf_pmu *fake_pmu; -char *hybrid_pmu_name; -struct parse_events_ops *ops; -}; -void parse_events__handle_error (struct parse_events_error *err,int idx,char *str,char *help);void parse_events__shrink_config_terms (void );
Signature · 1 line
2.31.1
Ian Rogers
reviewerRe: [PATCH 30/59] libperf: Move in struct parse_events_state
Quoted 25 lines · Jiri Olsa
Moving in struct
parse_events_stateto libperf
together with related structs.Signed-off-by Jiri Olsa <[email protected]>--- .../lib/perf/include/internal/parse-events.h | 29 +++++++++++++++++++ tools/perf/util/parse-events.h | 28 ------------------ 2 files changed, 29 insertions(+), 28 deletions(-)tools/lib/perf/include/internal/parse-events.h +1
-0@@ -5,6 +5,7 @@#include <linux/types.h> #include <linux/list.h> #include <unistd.h> +#include <linux/perf_event.h> struct event_symbol {const char *symbol;@@ -74,6 +75,34 @@ struct parse_events_term {bool weak; };
tools/lib/perf/include/internal/parse-events.h struct parse_events_term { · line 86
Quoted 10 lines
tools/lib/perf/include/internal/parse-events.h +9
-0+struct parse_events_error { +int num_errors;/* number of errors encountered */ +int idx;/* index in the parsed string */ +char *str;/* string to display at the index */ +char *help;/* optional help string */ +int first_idx;/* as above, but for the first encountered error */ +char *first_str; +char *first_help; +};
Just to note that this will conflict with the patches in:
https://lore.kernel.org/lkml/[email protected]/
Which may mean a bit larger change.
Thanks,
Ian
Quoted 63 lines
tools/lib/perf/include/internal/parse-events.h +18
-0+struct parse_events_ops { +struct perf_evsel * (*perf_evsel__new)(struct perf_event_attr *attr,int idx); +struct perf_evsel * (*perf_evsel__new_tp)(const char *sys,const char *name,int idx); +}; + +struct parse_events_state { +struct list_head list; +int idx; +int nr_groups; +struct parse_events_error *error; +struct perf_evlist *evlist; +struct list_head *terms; +int stoken; +struct perf_pmu *fake_pmu; +char *hybrid_pmu_name; +struct parse_events_ops *ops; +}; + int parse_events_term__num(struct parse_events_term **term, int type_term, char *config, u64 num, bool novalue,tools/perf/util/parse-events.h +0
-29@@ -61,34 +61,6 @@ struct perf_pmu_event_symbol {enum perf_pmu_event_symbol_type type; }; -struct parse_events_error { -int num_errors;/* number of errors encountered */ -int idx;/* index in the parsed string */ -char *str;/* string to display at the index */ -char *help;/* optional help string */ -int first_idx;/* as above, but for the first encountered error */ -char *first_str; -char *first_help; -}; - -struct parse_events_ops { -struct perf_evsel * (*perf_evsel__new)(struct perf_event_attr *attr,int idx); -struct perf_evsel * (*perf_evsel__new_tp)(const char *sys,const char *name,int idx); -}; - -struct parse_events_state { -struct list_head list; -int idx; -int nr_groups; -struct parse_events_error *error; -struct perf_evlist *evlist; -struct list_head *terms; -int stoken; -struct perf_pmu *fake_pmu; -char *hybrid_pmu_name; -struct parse_events_ops *ops; -}; -void parse_events__handle_error (struct parse_events_error *err,int idx,char *str,char *help);void parse_events__shrink_config_terms (void ); --2.31.1
Re: [PATCH 30/59] libperf: Move in struct parse_events_state
Quoted 27 lines · Ian Rogers
Quoted 26 lines · Jiri Olsa
Moving in struct
parse_events_stateto libperf
together with related structs.Signed-off-by Jiri Olsa <[email protected]>--- .../lib/perf/include/internal/parse-events.h | 29 +++++++++++++++++++ tools/perf/util/parse-events.h | 28 ------------------ 2 files changed, 29 insertions(+), 28 deletions(-)tools/lib/perf/include/internal/parse-events.h +1
-0@@ -5,6 +5,7 @@#include <linux/types.h> #include <linux/list.h> #include <unistd.h> +#include <linux/perf_event.h> struct event_symbol {const char *symbol;@@ -74,6 +75,34 @@ struct parse_events_term {bool weak; };
Quoted 13 lines
tools/lib/perf/include/internal/parse-events.h struct parse_events_term { · line 86
Quoted 9 lines
tools/lib/perf/include/internal/parse-events.h +9
-0+struct parse_events_error { +int num_errors;/* number of errors encountered */ +int idx;/* index in the parsed string */ +char *str;/* string to display at the index */ +char *help;/* optional help string */ +int first_idx;/* as above, but for the first encountered error */ +char *first_str; +char *first_help; +};Just to note that this will conflict with the patches in:
https://lore.kernel.org/lkml/[email protected]/
Which may mean a bit larger change.
right, thanks for heads up.. I'm ok with rebasing this on top of that and other changes.. I did that many times already ;-)
jirka
Quoted 68 lines
Thanks,
IanQuoted 63 lines
tools/lib/perf/include/internal/parse-events.h +18
-0+struct parse_events_ops { +struct perf_evsel * (*perf_evsel__new)(struct perf_event_attr *attr,int idx); +struct perf_evsel * (*perf_evsel__new_tp)(const char *sys,const char *name,int idx); +}; + +struct parse_events_state { +struct list_head list; +int idx; +int nr_groups; +struct parse_events_error *error; +struct perf_evlist *evlist; +struct list_head *terms; +int stoken; +struct perf_pmu *fake_pmu; +char *hybrid_pmu_name; +struct parse_events_ops *ops; +}; + int parse_events_term__num(struct parse_events_term **term, int type_term, char *config, u64 num, bool novalue,tools/perf/util/parse-events.h +0
-29@@ -61,34 +61,6 @@ struct perf_pmu_event_symbol {enum perf_pmu_event_symbol_type type; }; -struct parse_events_error { -int num_errors;/* number of errors encountered */ -int idx;/* index in the parsed string */ -char *str;/* string to display at the index */ -char *help;/* optional help string */ -int first_idx;/* as above, but for the first encountered error */ -char *first_str; -char *first_help; -}; - -struct parse_events_ops { -struct perf_evsel * (*perf_evsel__new)(struct perf_event_attr *attr,int idx); -struct perf_evsel * (*perf_evsel__new_tp)(const char *sys,const char *name,int idx); -}; - -struct parse_events_state { -struct list_head list; -int idx; -int nr_groups; -struct parse_events_error *error; -struct perf_evlist *evlist; -struct list_head *terms; -int stoken; -struct perf_pmu *fake_pmu; -char *hybrid_pmu_name; -struct parse_events_ops *ops; -}; -void parse_events__handle_error (struct parse_events_error *err,int idx,char *str,char *help);void parse_events__shrink_config_terms (void ); --2.31.1
PATCH 31/59 perf tools: Move event_attr_init in evsel__new_idx function
In reply to Jiri OlsaMoving event_attr_init in evsel__new_idx function so we can move perf_evsel__add_event into libperf later.
--- tools/lib/perf/include/internal/parse-events.h | 2 +- tools/perf/util/evlist.c | 4 ++-- tools/perf/util/evsel.c | 5 ++++- tools/perf/util/evsel.h | 4 ++-- tools/perf/util/parse-events.c | 9 +++------ tools/perf/util/sideband_evlist.c | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-)
tools/lib/perf/include/internal/parse-events.h +1 -1
@@ -86,7 +86,7 @@ struct parse_events_error { };struct parse_events_ops { -struct perf_evsel * (*perf_evsel__new)(struct perf_event_attr *attr,int idx); +struct perf_evsel * (*perf_evsel__new)(struct perf_event_attr *attr,int idx,bool init_attr);struct perf_evsel * (*perf_evsel__new_tp)(const char *sys,const char *name,int idx); };
tools/perf/util/evlist.c +2 -2
@@ -249,7 +249,7 @@ int evlist__add_dummy(struct evlist *evlist) .config = PERF_COUNT_SW_DUMMY, .size = sizeof(attr), /* to capture ABI version */ }; -struct evsel *evsel =evsel__new_idx (&attr, evlist->core.nr_entries); +struct evsel *evsel =evsel__new_idx (&attr, evlist->core.nr_entries, false);if (evsel ==NULL )return -ENOMEM ;
@@ -265,7 +265,7 @@ static int evlist__add_attrs(struct evlist *evlist, struct perf_event_attr *attrsize_t i;for (i =0 ; i < nr_attrs; i++) { - evsel =evsel__new_idx (attrs + i, evlist->core.nr_entries + i); + evsel =evsel__new_idx (attrs + i, evlist->core.nr_entries + i, false);if (evsel ==NULL ) goto out_delete_partial_list;list_add_tail (&evsel->core.node, &head);
tools/perf/util/evsel.c +4 -1
@@ -261,12 +261,15 @@ void evsel__init(struct evsel *evsel, evsel->pmu_name =NULL ; } -struct evsel *evsel__new_idx (struct perf_event_attr *attr,int idx) +struct evsel *evsel__new_idx (struct perf_event_attr *attr,int idx,bool init_attr) {struct evsel *evsel =zalloc (perf_evsel__object.size);if (!evsel)return NULL ; +if (init_attr) +event_attr_init (attr); +evsel__init (evsel, attr, idx);if (evsel__is_bpf_output (evsel)) {
tools/perf/util/evsel.h +2 -2
@@ -187,11 +187,11 @@ int evsel__object_config(size_t object_size,struct perf_pmu *evsel__find_pmu (struct evsel *evsel);bool evsel__is_aux_event (struct evsel *evsel); -struct evsel *evsel__new_idx (struct perf_event_attr *attr,int idx); +struct evsel *evsel__new_idx (struct perf_event_attr *attr,int idx,bool init_attr);static inline struct evsel *evsel__new (struct perf_event_attr *attr) { -return evsel__new_idx (attr,0 ); +return evsel__new_idx (attr,0 , false); }struct evsel *evsel__clone (struct evsel *orig);
tools/perf/util/parse-events.c +3 -6
@@ -60,9 +60,9 @@ static struct perf_pmu_event_symbol *perf_pmu_events_list;*/ static int perf_pmu_events_list_num; -static struct perf_evsel *perf_evsel__new_idx (struct perf_event_attr *attr,int idx) +static struct perf_evsel *perf_evsel__new_idx (struct perf_event_attr *attr,int idx,bool init_attr) { -struct evsel *evsel =evsel__new_idx (attr, idx); +struct evsel *evsel =evsel__new_idx (attr, idx, init_attr);return evsel ? &evsel->core :NULL ; }
@@ -298,10 +298,7 @@ perf_evsel__add_event(struct parse_events_state *parse_state,if (pmu && attr->type ==PERF_TYPE_RAW )perf_pmu__warn_invalid_config (pmu, attr->config, name); -if (init_attr) -event_attr_init (attr); - - evsel = parse_state->ops->perf_evsel__new (attr, *idx); + evsel = parse_state->ops->perf_evsel__new (attr, *idx, init_attr);if (!evsel) {perf_cpu_map__put (cpus);return NULL ;
tools/perf/util/sideband_evlist.c +1 -1
@@ -22,7 +22,7 @@ int evlist__add_sb_event(struct evlist *evlist, struct perf_event_attr *attr, attr->sample_id_all =1 ; } - evsel =evsel__new_idx (attr, evlist->core.nr_entries); + evsel =evsel__new_idx (attr, evlist->core.nr_entries, false);if (!evsel)return -1 ;
Signature · 1 line
2.31.1
PATCH 32/59 libperf: Move in perf_pmu__warn_invalid_config function
In reply to Jiri OlsaMoving perf_pmu__warn_invalid_config function to libperf.
--- tools/lib/perf/include/internal/pmu.h | 2 ++ tools/lib/perf/pmu.c | 34 +++++++++++++++++++++++++++ tools/perf/util/pmu.c | 33 -------------------------- tools/perf/util/pmu.h | 3 --- 4 files changed, 36 insertions(+), 36 deletions(-)
tools/lib/perf/include/internal/pmu.h +2 -0
@@ -54,4 +54,6 @@ void perf_pmu__set_format(unsigned long *bits, long from, long to);void perf_pmu_error (struct list_head *list,char *name,char const *msg);int perf_pmu__format_parse (char *dir,struct list_head *head); +void perf_pmu__warn_invalid_config (struct perf_pmu *pmu,__u64 config, +const char *name);#endif /* __LIBPERF_INTERNAL_PMU_H */
tools/lib/perf/pmu.c +34 -0
@@ -10,6 +10,7 @@#include <sys/types.h> #include <dirent.h> #include <internal/pmu.h> +#include "internal.h" extern FILE *perf_pmu_in;
@@ -81,3 +82,36 @@ int perf_pmu__format_parse(char *dir, struct list_head *head)closedir (format_dir);return ret; } + +void perf_pmu__warn_invalid_config (struct perf_pmu *pmu,__u64 config, +const char *name) +{ +struct perf_pmu_format *format; +__u64 masks =0 , bits; +char buf[100 ]; +unsigned int i; + +list_for_each_entry (format, &pmu->format, list) { +if (format->value !=PERF_PMU_FORMAT_VALUE_CONFIG ) +continue ; + +for_each_set_bit (i, format->bits,PERF_PMU_FORMAT_BITS ) + masks |=1ULL << i; + } + +/* +* Kernel doesn't export any valid format bits. +*/ +if (masks ==0 ) +return ; + + bits = config & ~masks; +if (bits ==0 ) +return ; + +bitmap_scnprintf ((unsigned long *)&bits,sizeof (bits) *8 , buf,sizeof (buf)); + +pr_warning ("WARNING: event '%s' not valid (bits %s of config " +"'%llx' not supported by kernel)!\n" , + name ?:"N/A" , buf, config); +}
tools/perf/util/pmu.c +0 -33
@@ -1846,39 +1846,6 @@ int perf_pmu__caps_parse(struct perf_pmu *pmu)return nr_caps; } -void perf_pmu__warn_invalid_config (struct perf_pmu *pmu,__u64 config, -const char *name) -{ -struct perf_pmu_format *format; -__u64 masks =0 , bits; -char buf[100 ]; -unsigned int i; - -list_for_each_entry (format, &pmu->format, list) { -if (format->value !=PERF_PMU_FORMAT_VALUE_CONFIG ) -continue ; - -for_each_set_bit (i, format->bits,PERF_PMU_FORMAT_BITS ) - masks |=1ULL << i; - } - -/* -* Kernel doesn't export any valid format bits. -*/ -if (masks ==0 ) -return ; - - bits = config & ~masks; -if (bits ==0 ) -return ; - -bitmap_scnprintf ((unsigned long *)&bits,sizeof (bits) *8 , buf,sizeof (buf)); - -pr_warning ("WARNING: event '%s' not valid (bits %s of config " -"'%llx' not supported by kernel)!\n" , - name ?:"N/A" , buf, config); -} -bool perf_pmu__has_hybrid (void ) {if (!hybrid_scanned) {
tools/perf/util/pmu.h +0 -3
@@ -96,9 +96,6 @@ int perf_pmu__convert_scale(const char *scale, char **end, double *sval);int perf_pmu__caps_parse (struct perf_pmu *pmu); -void perf_pmu__warn_invalid_config (struct perf_pmu *pmu,__u64 config, -const char *name); -bool perf_pmu__has_hybrid (void );int perf_pmu__match (char *pattern,char *name,char *tok);
Signature · 1 line
2.31.1
PATCH 33/59 libperf: Move in perf_evsel__add_event function
In reply to Jiri OlsaMoving perf_evsel__add_event function to libperf.
--- .../lib/perf/include/internal/parse-events.h | 9 ++++ tools/lib/perf/parse-events.c | 47 +++++++++++++++++++ tools/perf/util/parse-events.c | 44 ----------------- 3 files changed, 56 insertions(+), 44 deletions(-)
tools/lib/perf/include/internal/parse-events.h +9 -0
@@ -120,4 +120,13 @@ void parse_events_terms__delete(struct list_head *terms);void parse_events_terms__purge (struct list_head *terms);int parse_events_copy_term_list (struct list_head *old,struct list_head **new); + +struct perf_evsel * +perf_evsel__add_event (struct parse_events_state *parse_state, +struct list_head *list, +struct perf_event_attr *attr, +bool init_attr, +const char *name,const char *metric_id,struct perf_pmu *pmu, +struct list_head *config_terms,bool auto_merge_stats, +const char *cpu_list);#endif /* __LIBPERF_PARSE_EVENTS_H */
tools/lib/perf/parse-events.c +47 -0
56 lines not on this page · raw message
tools/perf/util/parse-events.c +0 -44
50 lines not on this page · raw message
Signature · 1 line
2.31.1
PATCH 34/59 perf tools: Move parse_events_update_lists to parser unit
In reply to Jiri OlsaMoving parse_events_update_lists to parser unit,
so we can easily move it to libperf.
--- tools/perf/util/parse-events.c | 13 ------------- tools/perf/util/parse-events.h | 2 -- tools/perf/util/parse-events.y | 21 +++++++++++++++++---- 3 files changed, 17 insertions(+), 19 deletions(-)
tools/perf/util/parse-events.c +0 -13
@@ -1752,19 +1752,6 @@ void parse_events__set_leader(char *name, struct list_head *list, leader->core.group_name = name ?strdup (name) :NULL ; } -/* list_event is assumed to point to malloc'ed memory */ -void parse_events_update_lists (struct list_head *list_event, -struct list_head *list_all) -{ -/* -* Called for single event definition. Update the -* 'all event' list, and reinit the 'single event' -* list, for next event definition. -*/ -list_splice_tail (list_event, list_all); -free (list_event); -} -struct event_modifier {int eu;int ek;
tools/perf/util/parse-events.h +0 -2
@@ -120,8 +120,6 @@ enum perf_pmu_event_symbol_type perf_pmu__parse_check(const char *name);void parse_events__set_leader (char *name,struct list_head *list,struct parse_events_state *parse_state); -void parse_events_update_lists (struct list_head *list_event, -struct list_head *list_all);void parse_events_evlist_error (struct parse_events_state *parse_state,int idx,const char *str);
tools/perf/util/parse-events.y +17 -4
@@ -49,6 +49,19 @@ static void free_list_evsel(struct list_head* list_evsel) free(list_evsel); } +/* list_event is assumed to point to malloc'ed memory */ +static void update_lists(struct list_head *list_event, + struct list_head *list_all) +{ + /* + * Called for single event definition. Update the + * 'all event' list, and reinit the 'single event' + * list, for next event definition. + */ + list_splice_tail(list_event, list_all); + free(list_event); +} + static void inc_group_count(struct list_head *list, struct parse_events_state *parse_state) {
@@ -160,7 +173,7 @@ start_events: groups struct parse_events_state *parse_state = _parse_state; /* frees $1 */ - parse_events_update_lists($1, &parse_state->list); + update_lists($1, &parse_state->list); } groups:
@@ -170,7 +183,7 @@ groups ',' group struct list_head *group = $3; /* frees $3 */ - parse_events_update_lists(group, list); + update_lists(group, list); $$ = list; } |
@@ -180,7 +193,7 @@ groups ',' event struct list_head *event = $3; /* frees $3 */ - parse_events_update_lists(event, list); + update_lists(event, list); $$ = list; } |
@@ -237,7 +250,7 @@ events ',' event struct list_head *list = $1; /* frees $3 */ - parse_events_update_lists(event, list); + update_lists(event, list); $$ = list; } |
Signature · 1 line
2.31.1
PATCH 35/59 libperf: Add perf_evsel__is_group_leader function
In reply to Jiri OlsaAdding perf_evsel__is_group_leader function.
--- tools/lib/perf/include/internal/evsel.h | 5 +++++ tools/perf/util/evsel.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)
tools/lib/perf/include/internal/evsel.h +5 -0
@@ -89,4 +89,9 @@ int perf_evsel__apply_filter(struct perf_evsel *evsel, const char *filter);int perf_evsel__alloc_id (struct perf_evsel *evsel,int ncpus,int nthreads);void perf_evsel__free_id (struct perf_evsel *evsel); +static inline bool perf_evsel__is_group_leader (const struct perf_evsel *evsel) +{ +return evsel->leader == evsel; +} +#endif /* __LIBPERF_INTERNAL_EVSEL_H */
tools/perf/util/evsel.h +1 -1
@@ -368,7 +368,7 @@ static inline struct evsel *evsel__prev(struct evsel *evsel)*/ static inline bool evsel__is_group_leader (const struct evsel *evsel) { -return evsel->core.leader == &evsel->core; +return perf_evsel__is_group_leader (&evsel->core); }/**
Signature · 1 line
2.31.1
PATCH 36/59 perf tools: Make parse_events__modifier_event work over perf_evsel
In reply to Jiri OlsaMaking parse_events__modifier_event work over perf_evsel.
--- tools/perf/util/parse-events.c | 60 +++++++++++++++++----------------- 1 file changed, 30 insertions(+), 30 deletions(-)
tools/perf/util/parse-events.c +30 -30
@@ -1770,22 +1770,22 @@ struct event_modifier { };static int get_event_modifier (struct event_modifier *mod,char *str, -struct evsel *evsel) -{ -int eu = evsel ? evsel->core.attr.exclude_user :0 ; -int ek = evsel ? evsel->core.attr.exclude_kernel :0 ; -int eh = evsel ? evsel->core.attr.exclude_hv :0 ; -int eH = evsel ? evsel->core.attr.exclude_host :0 ; -int eG = evsel ? evsel->core.attr.exclude_guest :0 ; -int eI = evsel ? evsel->core.attr.exclude_idle :0 ; -int precise = evsel ? evsel->core.attr.precise_ip :0 ; +struct perf_evsel *evsel) +{ +int eu = evsel ? evsel->attr.exclude_user :0 ; +int ek = evsel ? evsel->attr.exclude_kernel :0 ; +int eh = evsel ? evsel->attr.exclude_hv :0 ; +int eH = evsel ? evsel->attr.exclude_host :0 ; +int eG = evsel ? evsel->attr.exclude_guest :0 ; +int eI = evsel ? evsel->attr.exclude_idle :0 ; +int precise = evsel ? evsel->attr.precise_ip :0 ;int precise_max =0 ;int sample_read =0 ; -int pinned = evsel ? evsel->core.attr.pinned :0 ; -int exclusive = evsel ? evsel->core.attr.exclusive :0 ; +int pinned = evsel ? evsel->attr.pinned :0 ; +int exclusive = evsel ? evsel->attr.exclusive :0 ;int exclude = eu | ek | eh; -int exclude_GH = evsel ? evsel->core.exclude_GH :0 ; +int exclude_GH = evsel ? evsel->exclude_GH :0 ;int weak =0 ;int bpf_counter =0 ;
@@ -1893,7 +1893,7 @@ static int check_modifier(char *str)int parse_events__modifier_event (struct list_head *list,char *str,bool add) { -struct evsel *evsel; +struct perf_evsel *evsel;struct event_modifier mod;if (str ==NULL )
@@ -1905,26 +1905,26 @@ int parse_events__modifier_event(struct list_head *list, char *str, bool add)if (!add &&get_event_modifier (&mod, str,NULL ))return -EINVAL ; -__evlist__for_each_entry (list, evsel) { +__perf_evlist__for_each_entry (list, evsel) {if (add &&get_event_modifier (&mod, str, evsel))return -EINVAL ; - evsel->core.attr.exclude_user = mod.eu; - evsel->core.attr.exclude_kernel = mod.ek; - evsel->core.attr.exclude_hv = mod.eh; - evsel->core.attr.precise_ip = mod.precise; - evsel->core.attr.exclude_host = mod.eH; - evsel->core.attr.exclude_guest = mod.eG; - evsel->core.attr.exclude_idle = mod.eI; - evsel->core.exclude_GH = mod.exclude_GH; - evsel->core.sample_read = mod.sample_read; - evsel->core.precise_max = mod.precise_max; - evsel->core.weak_group = mod.weak; - evsel->core.bpf_counter = mod.bpf_counter; - -if (evsel__is_group_leader (evsel)) { - evsel->core.attr.pinned = mod.pinned; - evsel->core.attr.exclusive = mod.exclusive; + evsel->attr.exclude_user = mod.eu; + evsel->attr.exclude_kernel = mod.ek; + evsel->attr.exclude_hv = mod.eh; + evsel->attr.precise_ip = mod.precise; + evsel->attr.exclude_host = mod.eH; + evsel->attr.exclude_guest = mod.eG; + evsel->attr.exclude_idle = mod.eI; + evsel->exclude_GH = mod.exclude_GH; + evsel->sample_read = mod.sample_read; + evsel->precise_max = mod.precise_max; + evsel->weak_group = mod.weak; + evsel->bpf_counter = mod.bpf_counter; + +if (perf_evsel__is_group_leader (evsel)) { + evsel->attr.pinned = mod.pinned; + evsel->attr.exclusive = mod.exclusive; } }
Signature · 1 line
2.31.1
PATCH 37/59 perf tool: Pass perf_guest in struct parse_events_state
In reply to Jiri OlsaPassing perf_guest in struct parse_events_state so the parsing code does not depend on perf_guest variable.
--- tools/lib/perf/include/internal/parse-events.h | 1 + tools/perf/util/parse-events.c | 18 +++++++++++------- tools/perf/util/parse-events.h | 4 ++-- tools/perf/util/parse-events.y | 8 ++++---- 4 files changed, 18 insertions(+), 13 deletions(-)
tools/lib/perf/include/internal/parse-events.h +1 -0
@@ -101,6 +101,7 @@ struct parse_events_state {struct perf_pmu *fake_pmu;char *hybrid_pmu_name;struct parse_events_ops *ops; +bool guest; }; int parse_events_term__num(struct parse_events_term **term,
tools/perf/util/parse-events.c +11 -7
@@ -1618,9 +1618,9 @@ int parse_events_multi_pmu_add(struct parse_events_state *parse_state, }int parse_events__modifier_group (struct list_head *list, -char *event_mod) +char *event_mod,bool guest) { -return parse_events__modifier_event (list, event_mod, true); +return parse_events__modifier_event (list, event_mod, true, guest); }/*
@@ -1770,7 +1770,7 @@ struct event_modifier { };static int get_event_modifier (struct event_modifier *mod,char *str, -struct perf_evsel *evsel) +struct perf_evsel *evsel,bool guest) {int eu = evsel ? evsel->attr.exclude_user :0 ;int ek = evsel ? evsel->attr.exclude_kernel :0 ;
@@ -1795,7 +1795,7 @@ static int get_event_modifier(struct event_modifier *mod, char *str,if (*str =='u' ) {if (!exclude) exclude = eu = ek = eh =1 ; -if (!exclude_GH && !perf_guest) +if (!exclude_GH && !guest) eG =1 ; eu =0 ; }else if (*str =='k' ) {
@@ -1891,7 +1891,8 @@ static int check_modifier(char *str)return 0 ; } -int parse_events__modifier_event (struct list_head *list,char *str,bool add) +int parse_events__modifier_event (struct list_head *list,char *str, +bool add,bool guest) {struct perf_evsel *evsel;struct event_modifier mod;
@@ -1902,11 +1903,11 @@ int parse_events__modifier_event(struct list_head *list, char *str, bool add)if (check_modifier (str))return -EINVAL ; -if (!add &&get_event_modifier (&mod, str,NULL )) +if (!add &&get_event_modifier (&mod, str,NULL , guest))return -EINVAL ;__perf_evlist__for_each_entry (list, evsel) { -if (add &&get_event_modifier (&mod, str, evsel)) +if (add &&get_event_modifier (&mod, str, evsel, guest))return -EINVAL ; evsel->attr.exclude_user = mod.eu;
@@ -2115,6 +2116,7 @@ int parse_events_terms(struct list_head *terms, const char *str) .ops = &parse_state_ops, .terms = NULL, .stoken = PE_START_TERMS, + .guest = perf_guest, };int ret;
@@ -2141,6 +2143,7 @@ static int parse_events__with_hybrid_pmu(struct parse_events_state *parse_state, .hybrid_pmu_name = pmu_name, .idx = parse_state->idx, .ops = &parse_state_ops, + .guest = perf_guest, };int ret;
@@ -2170,6 +2173,7 @@ int __parse_events(struct evlist *evlist, const char *str, .stoken = PE_START_EVENTS, .fake_pmu = fake_pmu, .ops = &parse_state_ops, + .guest = perf_guest, };int ret;
tools/perf/util/parse-events.h +2 -2
@@ -65,8 +65,8 @@ void parse_events__handle_error(struct parse_events_error *err, int idx, char *str, char *help);void parse_events__shrink_config_terms (void );void parse_events__clear_array (struct parse_events_array *a); -int parse_events__modifier_event (struct list_head *list,char *str,bool add); -int parse_events__modifier_group (struct list_head *list,char *event_mod); +int parse_events__modifier_event (struct list_head *list,char *str,bool add,bool guest); +int parse_events__modifier_group (struct list_head *list,char *event_mod,bool guest);int parse_events_name (struct list_head *list,const char *name); int parse_events_add_tracepoint(struct parse_events_state *parse_state, struct list_head *list,
tools/perf/util/parse-events.y +4 -4
@@ -204,13 +204,13 @@ event group: group_def ':' PE_MODIFIER_EVENT { + struct parse_events_state *parse_state = _parse_state; struct list_head *list = $1; int err; - err = parse_events__modifier_group(list, $3); + err = parse_events__modifier_group(list, $3, parse_state->guest); free($3); if (err) { - struct parse_events_state *parse_state = _parse_state; struct parse_events_error *error = parse_state->error; parse_events__handle_error(error, @3.first_column,
@@ -261,6 +261,7 @@ event: event_mod event_mod: event_name PE_MODIFIER_EVENT { + struct parse_events_state *parse_state = _parse_state; struct list_head *list = $1; int err;
@@ -269,10 +270,9 @@ event_name PE_MODIFIER_EVENT * (there could be more events added for multiple tracepoint * definitions via '*?'. */ - err = parse_events__modifier_event(list, $2, false); + err = parse_events__modifier_event(list, $2, false, parse_state->guest); free($2); if (err) { - struct parse_events_state *parse_state = _parse_state; struct parse_events_error *error = parse_state->error; parse_events__handle_error(error, @2.first_column,
Signature · 1 line
2.31.1
PATCH 38/59 libperf: Move in parse_events__modifier_group/event functions
In reply to Jiri OlsaMoving parse_events__modifier_group/event functions to libperf.
--- .../lib/perf/include/internal/parse-events.h | 2 + tools/lib/perf/parse-events.c | 187 ++++++++++++++++++ tools/perf/util/parse-events.c | 186 ----------------- tools/perf/util/parse-events.h | 2 - 4 files changed, 189 insertions(+), 188 deletions(-)
tools/lib/perf/include/internal/parse-events.h +2 -0
@@ -130,4 +130,6 @@ perf_evsel__add_event(struct parse_events_state *parse_state, const char *name, const char *metric_id, struct perf_pmu *pmu, struct list_head *config_terms, bool auto_merge_stats, const char *cpu_list); +int parse_events__modifier_event (struct list_head *list,char *str,bool add,bool guest); +int parse_events__modifier_group (struct list_head *list,char *event_mod,bool guest);#endif /* __LIBPERF_PARSE_EVENTS_H */
tools/lib/perf/parse-events.c +187 -0
196 lines not on this page · raw message
tools/perf/util/parse-events.c +0 -186
198 lines not on this page · raw message
tools/perf/util/parse-events.h +0 -2
@@ -65,8 +65,6 @@ void parse_events__handle_error(struct parse_events_error *err, int idx, char *str, char *help);void parse_events__shrink_config_terms (void );void parse_events__clear_array (struct parse_events_array *a); -int parse_events__modifier_event (struct list_head *list,char *str,bool add,bool guest); -int parse_events__modifier_group (struct list_head *list,char *event_mod,bool guest);int parse_events_name (struct list_head *list,const char *name); int parse_events_add_tracepoint(struct parse_events_state *parse_state, struct list_head *list,
Signature · 1 line
2.31.1
PATCH 39/59 libperf: Move in parse_events__handle_error function
In reply to Jiri OlsaMoving parse_events__handle_error function to libperf.
--- .../lib/perf/include/internal/parse-events.h | 2 ++ tools/lib/perf/parse-events.c | 35 +++++++++++++++++++ tools/perf/util/parse-events.c | 33 ----------------- tools/perf/util/parse-events.h | 2 -- 4 files changed, 37 insertions(+), 35 deletions(-)
tools/lib/perf/include/internal/parse-events.h +2 -0
@@ -132,4 +132,6 @@ perf_evsel__add_event(struct parse_events_state *parse_state, const char *cpu_list);int parse_events__modifier_event (struct list_head *list,char *str,bool add,bool guest);int parse_events__modifier_group (struct list_head *list,char *event_mod,bool guest); +void parse_events__handle_error (struct parse_events_error *err,int idx, +char *str,char *help);#endif /* __LIBPERF_PARSE_EVENTS_H */
tools/lib/perf/parse-events.c +35 -0
@@ -11,6 +11,8 @@#include <perf/cpumap.h> #include <stdlib.h> #include <errno.h> +#include <asm/bug.h> +#include "internal.h" struct event_symbol event_symbols_hw[PERF_COUNT_HW_MAX ] = { [PERF_COUNT_HW_CPU_CYCLES ] = {
@@ -536,3 +538,36 @@ int parse_events__modifier_group(struct list_head *list, {return parse_events__modifier_event (list, event_mod, true, guest); } + +void parse_events__handle_error (struct parse_events_error *err,int idx, +char *str,char *help) +{ +if (WARN (!str,"WARNING: failed to provide error string\n" )) { +free (help); +return ; + } +switch (err->num_errors) { +case 0 : + err->idx = idx; + err->str = str; + err->help = help; +break ; +case 1 : + err->first_idx = err->idx; + err->idx = idx; + err->first_str = err->str; + err->str = str; + err->first_help = err->help; + err->help = help; +break ; +default : +pr_debug ("Multiple errors dropping message: %s (%s)\n" , + err->str, err->help); +free (err->str); + err->str = str; +free (err->help); + err->help = help; +break ; + } + err->num_errors++; +}
tools/perf/util/parse-events.c +0 -33
@@ -116,39 +116,6 @@ static int tp_event_has_id(const char *dir_path, struct dirent *evt_dir)#define MAX_EVENT_LENGTH 512 -void parse_events__handle_error (struct parse_events_error *err,int idx, -char *str,char *help) -{ -if (WARN (!str,"WARNING: failed to provide error string\n" )) { -free (help); -return ; - } -switch (err->num_errors) { -case 0 : - err->idx = idx; - err->str = str; - err->help = help; -break ; -case 1 : - err->first_idx = err->idx; - err->idx = idx; - err->first_str = err->str; - err->str = str; - err->first_help = err->help; - err->help = help; -break ; -default : -pr_debug ("Multiple errors dropping message: %s (%s)\n" , - err->str, err->help); -free (err->str); - err->str = str; -free (err->help); - err->help = help; -break ; - } - err->num_errors++; -} -struct tracepoint_path *tracepoint_id_to_path (u64 config) {struct tracepoint_path *path =NULL ;
tools/perf/util/parse-events.h +0 -2
@@ -61,8 +61,6 @@ struct perf_pmu_event_symbol {enum perf_pmu_event_symbol_type type; }; -void parse_events__handle_error (struct parse_events_error *err,int idx, -char *str,char *help);void parse_events__shrink_config_terms (void );void parse_events__clear_array (struct parse_events_array *a);int parse_events_name (struct list_head *list,const char *name);
Signature · 1 line
2.31.1
PATCH 40/59 libperf: Move in parse_events_evlist_error function
In reply to Jiri OlsaMoving parse_events_evlist_error function to libperf.
--- tools/lib/perf/include/internal/parse-events.h | 2 ++ tools/lib/perf/parse-events.c | 9 +++++++++ tools/perf/util/parse-events.c | 9 --------- tools/perf/util/parse-events.h | 2 -- 4 files changed, 11 insertions(+), 11 deletions(-)
tools/lib/perf/include/internal/parse-events.h +2 -0
@@ -134,4 +134,6 @@ int parse_events__modifier_event(struct list_head *list, char *str, bool add, boint parse_events__modifier_group (struct list_head *list,char *event_mod,bool guest);void parse_events__handle_error (struct parse_events_error *err,int idx,char *str,char *help); +void parse_events_evlist_error (struct parse_events_state *parse_state, +int idx,const char *str);#endif /* __LIBPERF_PARSE_EVENTS_H */
tools/lib/perf/parse-events.c +9 -0
@@ -571,3 +571,12 @@ void parse_events__handle_error(struct parse_events_error *err, int idx, } err->num_errors++; } + +void parse_events_evlist_error (struct parse_events_state *parse_state, +int idx,const char *str) +{ +if (!parse_state->error) +return ; + +parse_events__handle_error (parse_state->error, idx,strdup (str),NULL ); +}
tools/perf/util/parse-events.c +0 -9
@@ -2794,15 +2794,6 @@ void parse_events__clear_array(struct parse_events_array *a)zfree (&a->ranges); } -void parse_events_evlist_error (struct parse_events_state *parse_state, -int idx,const char *str) -{ -if (!parse_state->error) -return ; - -parse_events__handle_error (parse_state->error, idx,strdup (str),NULL ); -} -static void config_terms_list (char *buf,size_t buf_sz) {int i;
tools/perf/util/parse-events.h +0 -2
@@ -116,8 +116,6 @@ enum perf_pmu_event_symbol_type perf_pmu__parse_check(const char *name);void parse_events__set_leader (char *name,struct list_head *list,struct parse_events_state *parse_state); -void parse_events_evlist_error (struct parse_events_state *parse_state, -int idx,const char *str); void print_events(const char *event_glob, bool name_only, bool quiet, bool long_desc, bool details_flag, bool deprecated,
Signature · 1 line
2.31.1
PATCH 41/59 perf tools: Add perf_evsel__delete callback to struct parse_events_ops
In reply to Jiri OlsaAdding perf_evsel__delete callback to struct parse_events_ops, to allow custom event free for event parsing.
--- .../lib/perf/include/internal/parse-events.h | 1 + tools/perf/util/parse-events.c | 8 ++++++ tools/perf/util/parse-events.y | 27 ++++++++++--------- 3 files changed, 23 insertions(+), 13 deletions(-)
tools/lib/perf/include/internal/parse-events.h +1 -0
@@ -88,6 +88,7 @@ struct parse_events_error {struct parse_events_ops {struct perf_evsel * (*perf_evsel__new)(struct perf_event_attr *attr,int idx,bool init_attr);struct perf_evsel * (*perf_evsel__new_tp)(const char *sys,const char *name,int idx); +void (*perf_evsel__delete)(struct perf_evsel *evsel); };struct parse_events_state {
tools/perf/util/parse-events.c +8 -0
@@ -74,9 +74,17 @@ static struct perf_evsel *perf_evsel__newtp_idx(const char *sys, const char *namreturn IS_ERR (evsel) ? (void *) evsel : &evsel->core; } +static void perf_evsel__delete_helper (struct perf_evsel *evsel) +{ + struct evsel *tmp = container_of(evsel, struct evsel, core); + +free (tmp); +} +static struct parse_events_ops parse_state_ops = { .perf_evsel__new = perf_evsel__new_idx, .perf_evsel__new_tp = perf_evsel__newtp_idx, + .perf_evsel__delete = perf_evsel__delete_helper, };#define __PERF_EVENT_FIELD (config, name) \
tools/perf/util/parse-events.y +14 -13
@@ -38,13 +38,14 @@ static struct list_head* alloc_list(void) return list; } -static void free_list_evsel(struct list_head* list_evsel) +static void free_list_evsel(struct parse_events_state *parse_state, + struct list_head* list_evsel) { - struct evsel *evsel, *tmp; + struct perf_evsel *evsel, *tmp; - list_for_each_entry_safe(evsel, tmp, list_evsel, core.node) { - list_del_init(&evsel->core.node); - evsel__delete(evsel); + list_for_each_entry_safe(evsel, tmp, list_evsel, node) { + list_del_init(&evsel->node); + parse_state->ops->perf_evsel__delete(evsel); } free(list_evsel); }
@@ -140,7 +141,7 @@ static int loc_val(void *loc_val_) %type <list_evsel> group_def %type <list_evsel> group %type <list_evsel> groups -%destructor { free_list_evsel ($$); } <list_evsel> +%destructor { free_list_evsel (_parse_state, $$); } <list_evsel> %type <tracepoint_name> tracepoint_name %destructor { free ($$.sys); free ($$.event); } <tracepoint_name> %type <array> array
@@ -215,7 +216,7 @@ group_def ':' PE_MODIFIER_EVENT parse_events__handle_error(error, @3.first_column, strdup("Bad modifier"), NULL); - free_list_evsel(list); + free_list_evsel(parse_state, list); YYABORT; } $$ = list;
@@ -277,7 +278,7 @@ event_name PE_MODIFIER_EVENT parse_events__handle_error(error, @2.first_column, strdup("Bad modifier"), NULL); - free_list_evsel(list); + free_list_evsel(parse_state, list); YYABORT; } $$ = list;
@@ -293,7 +294,7 @@ PE_EVENT_NAME event_def err = parse_events_name($2, $1); free($1); if (err) { - free_list_evsel($2); + free_list_evsel(_parse_state, $2); YYABORT; } $$ = $2;
@@ -467,7 +468,7 @@ value_sym '/' event_config '/' err = parse_events_add_numeric(_parse_state, list, type, config, $3); parse_events_terms__delete($3); if (err) { - free_list_evsel(list); + free_list_evsel(_parse_state, list); YYABORT; } $$ = list;
@@ -511,7 +512,7 @@ PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT '-' PE_NAME_CACHE_OP_RESULT opt_e free($3); free($5); if (err) { - free_list_evsel(list); + free_list_evsel(parse_state, list); YYABORT; } $$ = list;
@@ -531,7 +532,7 @@ PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT opt_event_config free($1); free($3); if (err) { - free_list_evsel(list); + free_list_evsel(parse_state, list); YYABORT; } $$ = list;
@@ -550,7 +551,7 @@ PE_NAME_CACHE_TYPE opt_event_config parse_events_terms__delete($2); free($1); if (err) { - free_list_evsel(list); + free_list_evsel(parse_state, list); YYABORT; } $$ = list;
Signature · 1 line
2.31.1
PATCH 42/59 libperf: Move in parse_events_name function
In reply to Jiri OlsaMoving parse_events_name function to libperf.
--- tools/lib/perf/include/internal/parse-events.h | 1 + tools/lib/perf/parse-events.c | 12 ++++++++++++ tools/perf/util/parse-events.c | 12 ------------ tools/perf/util/parse-events.h | 1 - 4 files changed, 13 insertions(+), 13 deletions(-)
tools/lib/perf/include/internal/parse-events.h +1 -0
@@ -137,4 +137,5 @@ void parse_events__handle_error(struct parse_events_error *err, int idx, char *str, char *help);void parse_events_evlist_error (struct parse_events_state *parse_state,int idx,const char *str); +int parse_events_name (struct list_head *list,const char *name);#endif /* __LIBPERF_PARSE_EVENTS_H */
tools/lib/perf/parse-events.c +12 -0
@@ -580,3 +580,15 @@ void parse_events_evlist_error(struct parse_events_state *parse_state,parse_events__handle_error (parse_state->error, idx,strdup (str),NULL ); } + +int parse_events_name (struct list_head *list,const char *name) +{ +struct perf_evsel *evsel; + +__perf_evlist__for_each_entry (list, evsel) { +if (!evsel->name) + evsel->name =strdup (name); + } + +return 0 ; +}
tools/perf/util/parse-events.c +0 -12
@@ -1721,18 +1721,6 @@ void parse_events__set_leader(char *name, struct list_head *list, leader->core.group_name = name ?strdup (name) :NULL ; } -int parse_events_name (struct list_head *list,const char *name) -{ -struct evsel *evsel; - -__evlist__for_each_entry (list, evsel) { -if (!evsel->core.name) - evsel->core.name =strdup (name); - } - -return 0 ; -} -static int comp_pmu (const void *p1,const void *p2) {
tools/perf/util/parse-events.h +0 -1
@@ -63,7 +63,6 @@ struct perf_pmu_event_symbol {void parse_events__shrink_config_terms (void );void parse_events__clear_array (struct parse_events_array *a); -int parse_events_name (struct list_head *list,const char *name); int parse_events_add_tracepoint(struct parse_events_state *parse_state, struct list_head *list, const char *sys, const char *event,
Signature · 1 line
2.31.1
Ian Rogers
reviewerRe: [PATCH 42/59] libperf: Move in parse_events_name function
Quoted 27 lines · Jiri Olsa
Moving
parse_events_namefunction to libperf.Signed-off-by Jiri Olsa <[email protected]>--- tools/lib/perf/include/internal/parse-events.h | 1 + tools/lib/perf/parse-events.c | 12 ++++++++++++ tools/perf/util/parse-events.c | 12 ------------ tools/perf/util/parse-events.h | 1 - 4 files changed, 13 insertions(+), 13 deletions(-)tools/lib/perf/include/internal/parse-events.h +1
-0@@ -137,4 +137,5 @@ void parse_events__handle_error(struct parse_events_error *err, int idx, char *str, char *help);void parse_events_evlist_error (struct parse_events_state *parse_state,int idx,const char *str); +int parse_events_name (struct list_head *list,const char *name);#endif /* __LIBPERF_PARSE_EVENTS_H */ tools/lib/perf/parse-events.c +0
-0@@ -580,3 +580,15 @@ void parse_events_evlist_error(struct parse_events_state *parse_state,
tools/lib/perf/parse-events.c void parse_events_evlist_error(struct parse_events_state *parse_state, · line 590
Quoted 10 lines
tools/lib/perf/parse-events.c +8
-0parse_events__handle_error (parse_state->error, idx,strdup (str),NULL ); } + +int parse_events_name (struct list_head *list,const char *name) +{ +struct perf_evsel *evsel; + +__perf_evlist__for_each_entry (list, evsel) { +if (!evsel->name) + evsel->name =strdup (name);
It is a pre-existing problem but there should probably be an ENOMEM check here.
Thanks,
Ian
Quoted 42 lines
tools/lib/perf/parse-events.c +4
-0+ } + +return 0 ; +}tools/perf/util/parse-events.c +0
-12@@ -1721,18 +1721,6 @@ void parse_events__set_leader(char *name, struct list_head *list, leader->core.group_name = name ?strdup (name) :NULL ; } -int parse_events_name (struct list_head *list,const char *name) -{ -struct evsel *evsel; - -__evlist__for_each_entry (list, evsel) { -if (!evsel->core.name) - evsel->core.name =strdup (name); - } - -return 0 ; -} -static int comp_pmu (const void *p1,const void *p2) {tools/perf/util/parse-events.h +0
-2@@ -63,7 +63,6 @@ struct perf_pmu_event_symbol {void parse_events__shrink_config_terms (void );void parse_events__clear_array (struct parse_events_array *a); -int parse_events_name (struct list_head *list,const char *name); int parse_events_add_tracepoint(struct parse_events_state *parse_state, struct list_head *list, const char *sys, const char *event, --2.31.1
Re: [PATCH 42/59] libperf: Move in parse_events_name function
Quoted 28 lines · Ian Rogers
Quoted 27 lines · Jiri Olsa
Moving
parse_events_namefunction to libperf.Signed-off-by Jiri Olsa <[email protected]>--- tools/lib/perf/include/internal/parse-events.h | 1 + tools/lib/perf/parse-events.c | 12 ++++++++++++ tools/perf/util/parse-events.c | 12 ------------ tools/perf/util/parse-events.h | 1 - 4 files changed, 13 insertions(+), 13 deletions(-)tools/lib/perf/include/internal/parse-events.h +1
-0@@ -137,4 +137,5 @@ void parse_events__handle_error(struct parse_events_error *err, int idx, char *str, char *help);void parse_events_evlist_error (struct parse_events_state *parse_state,int idx,const char *str); +int parse_events_name (struct list_head *list,const char *name);#endif /* __LIBPERF_PARSE_EVENTS_H */ tools/lib/perf/parse-events.c +0
-0@@ -580,3 +580,15 @@ void parse_events_evlist_error(struct parse_events_state *parse_state,
Quoted 12 lines
tools/lib/perf/parse-events.c void parse_events_evlist_error(struct parse_events_state *parse_state, · line 590
Quoted 10 lines
tools/lib/perf/parse-events.c +8
-0parse_events__handle_error (parse_state->error, idx,strdup (str),NULL ); } + +int parse_events_name (struct list_head *list,const char *name) +{ +struct perf_evsel *evsel; + +__perf_evlist__for_each_entry (list, evsel) { +if (!evsel->name) + evsel->name =strdup (name);It is a pre-existing problem but there should probably be an ENOMEM check here.
and we even return int.. thanks for noticing, will fix
jirka
Quoted 47 lines
Thanks,
IanQuoted 42 lines
tools/lib/perf/parse-events.c +4
-0+ } + +return 0 ; +}tools/perf/util/parse-events.c +0
-12@@ -1721,18 +1721,6 @@ void parse_events__set_leader(char *name, struct list_head *list, leader->core.group_name = name ?strdup (name) :NULL ; } -int parse_events_name (struct list_head *list,const char *name) -{ -struct evsel *evsel; - -__evlist__for_each_entry (list, evsel) { -if (!evsel->core.name) - evsel->core.name =strdup (name); - } - -return 0 ; -} -static int comp_pmu (const void *p1,const void *p2) {tools/perf/util/parse-events.h +0
-2@@ -63,7 +63,6 @@ struct perf_pmu_event_symbol {void parse_events__shrink_config_terms (void );void parse_events__clear_array (struct parse_events_array *a); -int parse_events_name (struct list_head *list,const char *name); int parse_events_add_tracepoint(struct parse_events_state *parse_state, struct list_head *list, const char *sys, const char *event, --2.31.1
PATCH 43/59 perf tools: Move out parse_events_add_pmu fallback from parser code
In reply to Jiri OlsaMoving out parse_events_add_pmu fallback from parser code into parse_events_add_pmu, so we can easily move parser code to libperf later.
--- tools/perf/util/parse-events.c | 60 +++++++++++++++++++++++++++++----- tools/perf/util/parse-events.h | 1 + tools/perf/util/parse-events.y | 37 +++------------------ 3 files changed, 58 insertions(+), 40 deletions(-)
tools/perf/util/parse-events.c +52 -8
@@ -1396,11 +1396,11 @@ static int parse_events__inside_hybrid_pmu(struct parse_events_state *parse_statreturn ret; } -int parse_events_add_pmu (struct parse_events_state *parse_state, -struct list_head *list,char *name, -struct list_head *head_config, -bool auto_merge_stats, -bool use_alias) +static int __parse_events_add_pmu (struct parse_events_state *parse_state, +struct list_head *list,char *name, +struct list_head *head_config, +bool auto_merge_stats, +bool use_alias) {struct perf_event_attr attr;struct perf_pmu_info info;
@@ -1528,6 +1528,50 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,return 0 ; } +int parse_events_add_pmu (struct parse_events_state *parse_state, +struct list_head *list,char *pmu_name, +struct list_head *head_config, +struct list_head *orig_terms, +bool auto_merge_stats, +bool use_alias) +{ +int err; + + err =__parse_events_add_pmu (parse_state, list, pmu_name, head_config, + auto_merge_stats, use_alias); +if (err && orig_terms) { +struct list_head *terms; +struct perf_pmu *pmu =NULL ; +char *pattern =NULL ; +int ok =0 ; + +if (asprintf (&pattern,"%s*" , pmu_name) <0 ) +return -1 ; + +while ((pmu =perf_pmu__scan (pmu)) !=NULL ) { +char *name = pmu->name; + +if (!strncmp (name,"uncore_" ,7 ) && +strncmp (pmu_name,"uncore_" ,7 )) + name +=7 ; +if (!perf_pmu__match (pattern, name, pmu_name) || + !perf_pmu__match (pattern, pmu->alias_name, pmu_name)) { +if (parse_events_copy_term_list (orig_terms, &terms)) { +free (pattern); +return -1 ; + } +if (!__parse_events_add_pmu (parse_state, list, pmu->name, terms, true, false)) + ok++; +parse_events_terms__delete (terms); + } + } +free (pattern); +if (!ok) +return -1 ; + } +return err; +} +int parse_events_multi_pmu_add (struct parse_events_state *parse_state,char *str,struct list_head *head,struct list_head **listp)
@@ -1572,9 +1616,9 @@ int parse_events_multi_pmu_add(struct parse_events_state *parse_state,list_for_each_entry (alias, &pmu->aliases, list) {if (!strcasecmp (alias->name, str)) { -if (!parse_events_add_pmu (parse_state, list, - pmu->name, head, - true, true)) { +if (!__parse_events_add_pmu (parse_state, list, + pmu->name, head, + true, true)) {pr_debug ("%s -> %s/%s/\n" , str, pmu->name, alias->str); ok++;
tools/perf/util/parse-events.h +1 -0
@@ -97,6 +97,7 @@ int parse_events_add_breakpoint(struct parse_events_state *parse_state,int parse_events_add_pmu (struct parse_events_state *parse_state,struct list_head *list,char *name,struct list_head *head_config, +struct list_head *orig_terms,bool auto_merge_stats,bool use_alias);
tools/perf/util/parse-events.y +5 -32
@@ -319,8 +319,7 @@ event_pmu_name opt_pmu_config { struct parse_events_state *parse_state = _parse_state; struct parse_events_error *error = parse_state->error; - struct list_head *list = NULL, *orig_terms = NULL, *terms= NULL; - char *pattern = NULL; + struct list_head *list = NULL, *orig_terms = NULL; #define CLEANUP_YYABORT \ do { \
@@ -328,7 +327,6 @@ event_pmu_name opt_pmu_config parse_events_terms__delete(orig_terms); \ free(list); \ free($1); \ - free(pattern); \ YYABORT; \ } while(0)
@@ -341,35 +339,10 @@ event_pmu_name opt_pmu_config list = alloc_list(); if (!list) CLEANUP_YYABORT; - if (parse_events_add_pmu(_parse_state, list, $1, $2, false, false)) { - struct perf_pmu *pmu = NULL; - int ok = 0; - - if (asprintf(&pattern, "%s*", $1) < 0) - CLEANUP_YYABORT; - - while ((pmu = perf_pmu__scan(pmu)) != NULL) { - char *name = pmu->name; - - if (!strncmp(name, "uncore_", 7) && - strncmp($1, "uncore_", 7)) - name += 7; - if (!perf_pmu__match(pattern, name, $1) || - !perf_pmu__match(pattern, pmu->alias_name, $1)) { - if (parse_events_copy_term_list(orig_terms, &terms)) - CLEANUP_YYABORT; - if (!parse_events_add_pmu(_parse_state, list, pmu->name, terms, true, false)) - ok++; - parse_events_terms__delete(terms); - } - } - - if (!ok) - CLEANUP_YYABORT; - } + if (parse_events_add_pmu(_parse_state, list, $1, $2, orig_terms, false, false)) + CLEANUP_YYABORT; parse_events_terms__delete($2); parse_events_terms__delete(orig_terms); - free(pattern); free($1); $$ = list; #undef CLEANUP_YYABORT
@@ -422,7 +395,7 @@ PE_PMU_EVENT_FAKE sep_dc if (!list) YYABORT; - err = parse_events_add_pmu(_parse_state, list, $1, NULL, false, false); + err = parse_events_add_pmu(_parse_state, list, $1, NULL, NULL, false, false); free($1); if (err < 0) { free(list);
@@ -440,7 +413,7 @@ PE_PMU_EVENT_FAKE opt_pmu_config if (!list) YYABORT; - err = parse_events_add_pmu(_parse_state, list, $1, $2, false, false); + err = parse_events_add_pmu(_parse_state, list, $1, $2, NULL, false, false); free($1); parse_events_terms__delete($2); if (err < 0) {
Signature · 1 line
2.31.1
PATCH 44/59 perf tools: Add add_pmu callback to struct parse_events_ops
In reply to Jiri OlsaAdding add_pmu callback to struct parse_events_ops, to allow custom pmu parsing code.
--- tools/lib/perf/include/internal/parse-events.h | 9 +++++++++ tools/perf/util/parse-events.c | 15 +++++++++------ tools/perf/util/parse-events.h | 6 ------ tools/perf/util/parse-events.y | 8 +++++--- 4 files changed, 23 insertions(+), 15 deletions(-)
tools/lib/perf/include/internal/parse-events.h +9 -0
@@ -85,10 +85,19 @@ struct parse_events_error {char *first_help; }; +struct parse_events_state ; +struct parse_events_ops {struct perf_evsel * (*perf_evsel__new)(struct perf_event_attr *attr,int idx,bool init_attr);struct perf_evsel * (*perf_evsel__new_tp)(const char *sys,const char *name,int idx);void (*perf_evsel__delete)(struct perf_evsel *evsel); + +int (*add_pmu)(struct parse_events_state *parse_state, +struct list_head *list,char *pmu_name, +struct list_head *head_config, +struct list_head *orig_terms, +bool auto_merge_stats, +bool use_alias); };struct parse_events_state {
tools/perf/util/parse-events.c +9 -6
@@ -51,6 +51,7 @@ static int parse_events__with_hybrid_pmu(struct parse_events_state *parse_state, const char *str, char *pmu_name, struct list_head *list); +static struct parse_events_ops parse_state_ops;static struct perf_pmu_event_symbol *perf_pmu_events_list;/* * The variable indicates the number of supported pmu event symbols.
@@ -81,12 +82,6 @@ static void perf_evsel__delete_helper(struct perf_evsel *evsel)free (tmp); } -static struct parse_events_ops parse_state_ops = { - .perf_evsel__new = perf_evsel__new_idx, - .perf_evsel__new_tp = perf_evsel__newtp_idx, - .perf_evsel__delete = perf_evsel__delete_helper, -}; -#define __PERF_EVENT_FIELD (config, name) \ ((config & PERF_EVENT_##name##_MASK) >> PERF_EVENT_##name##_SHIFT)
@@ -1528,6 +1523,7 @@ static int __parse_events_add_pmu(struct parse_events_state *parse_state,return 0 ; } +static int parse_events_add_pmu(struct parse_events_state *parse_state, struct list_head *list, char *pmu_name, struct list_head *head_config,
@@ -2900,3 +2896,10 @@ struct evsel *parse_events__add_event_hybrid(struct parse_events_state *parse_st pmu, config_terms,/*auto_merge_stats=*/ false, /*cpu_list=*/NULL); } + +static struct parse_events_ops parse_state_ops = { + .perf_evsel__new = perf_evsel__new_idx, + .perf_evsel__new_tp = perf_evsel__newtp_idx, + .perf_evsel__delete = perf_evsel__delete_helper, + .add_pmu = parse_events_add_pmu, +};
tools/perf/util/parse-events.h +0 -6
@@ -94,12 +94,6 @@ int parse_events_add_cache(struct parse_events_state *parse_state,int parse_events_add_breakpoint (struct parse_events_state *parse_state,struct list_head *list,u64 addr,char *type,u64 len); -int parse_events_add_pmu (struct parse_events_state *parse_state, -struct list_head *list,char *name, -struct list_head *head_config, -struct list_head *orig_terms, -bool auto_merge_stats, -bool use_alias); struct evsel *parse_events__add_event(struct parse_events_state *parse_state, struct perf_event_attr *attr,
tools/perf/util/parse-events.y +5 -3
@@ -339,7 +339,7 @@ event_pmu_name opt_pmu_config list = alloc_list(); if (!list) CLEANUP_YYABORT; - if (parse_events_add_pmu(_parse_state, list, $1, $2, orig_terms, false, false)) + if (parse_state->ops->add_pmu(parse_state, list, $1, $2, orig_terms, false, false)) CLEANUP_YYABORT; parse_events_terms__delete($2); parse_events_terms__delete(orig_terms);
@@ -388,6 +388,7 @@ PE_PMU_EVENT_PRE '-' PE_PMU_EVENT_SUF sep_dc | PE_PMU_EVENT_FAKE sep_dc { + struct parse_events_state *parse_state = _parse_state; struct list_head *list; int err;
@@ -395,7 +396,7 @@ PE_PMU_EVENT_FAKE sep_dc if (!list) YYABORT; - err = parse_events_add_pmu(_parse_state, list, $1, NULL, NULL, false, false); + err = parse_state->ops->add_pmu(parse_state, list, $1, NULL, NULL, false, false); free($1); if (err < 0) { free(list);
@@ -406,6 +407,7 @@ PE_PMU_EVENT_FAKE sep_dc | PE_PMU_EVENT_FAKE opt_pmu_config { + struct parse_events_state *parse_state = _parse_state; struct list_head *list; int err;
@@ -413,7 +415,7 @@ PE_PMU_EVENT_FAKE opt_pmu_config if (!list) YYABORT; - err = parse_events_add_pmu(_parse_state, list, $1, $2, NULL, false, false); + err = parse_state->ops->add_pmu(parse_state, list, $1, $2, NULL, false, false); free($1); parse_events_terms__delete($2); if (err < 0) {
Signature · 1 line
2.31.1
PATCH 45/59 perf tools: Add add_pmu_multi callback to struct parse_events_ops
In reply to Jiri OlsaAdding add_pmu_multi callback to struct parse_events_ops, to allow custom multi pmu parsing code.
--- tools/lib/perf/include/internal/parse-events.h | 4 ++++ tools/perf/util/parse-events.c | 2 ++ tools/perf/util/parse-events.h | 6 ------ tools/perf/util/parse-events.y | 9 ++++++--- 4 files changed, 12 insertions(+), 9 deletions(-)
tools/lib/perf/include/internal/parse-events.h +4 -0
@@ -98,6 +98,10 @@ struct parse_events_ops {struct list_head *orig_terms, bool auto_merge_stats, bool use_alias); + +int (*add_pmu_multi)(struct parse_events_state *parse_state, +char *str,struct list_head *head, +struct list_head **listp); };struct parse_events_state {
tools/perf/util/parse-events.c +2 -0
@@ -1568,6 +1568,7 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,return err; } +static int parse_events_multi_pmu_add (struct parse_events_state *parse_state,char *str,struct list_head *head,struct list_head **listp)
@@ -2902,4 +2903,5 @@ static struct parse_events_ops parse_state_ops = { .perf_evsel__new_tp = perf_evsel__newtp_idx, .perf_evsel__delete = perf_evsel__delete_helper, .add_pmu = parse_events_add_pmu, + .add_pmu_multi = parse_events_multi_pmu_add, };
tools/perf/util/parse-events.h +0 -6
@@ -100,12 +100,6 @@ struct evsel *parse_events__add_event(struct parse_events_state *parse_state, const char *name, const char *metric_id, struct perf_pmu *pmu); -int parse_events_multi_pmu_add (struct parse_events_state *parse_state, -char *str, -struct list_head *head_config, -struct list_head **listp); - -enum perf_pmu_event_symbol_type perf_pmu__parse_check (const char *name); void parse_events__set_leader(char *name, struct list_head *list,
tools/perf/util/parse-events.y +6 -3
@@ -350,10 +350,11 @@ event_pmu_name opt_pmu_config | PE_KERNEL_PMU_EVENT sep_dc { + struct parse_events_state *parse_state = _parse_state; struct list_head *list; int err; - err = parse_events_multi_pmu_add(_parse_state, $1, NULL, &list); + err = parse_state->ops->add_pmu_multi(parse_state, $1, NULL, &list); free($1); if (err < 0) YYABORT;
@@ -362,11 +363,12 @@ PE_KERNEL_PMU_EVENT sep_dc | PE_KERNEL_PMU_EVENT opt_pmu_config { + struct parse_events_state *parse_state = _parse_state; struct list_head *list; int err; /* frees $2 */ - err = parse_events_multi_pmu_add(_parse_state, $1, $2, &list); + err = parse_state->ops->add_pmu_multi(_parse_state, $1, $2, &list); free($1); if (err < 0) YYABORT;
@@ -375,13 +377,14 @@ PE_KERNEL_PMU_EVENT opt_pmu_config | PE_PMU_EVENT_PRE '-' PE_PMU_EVENT_SUF sep_dc { + struct parse_events_state *parse_state = _parse_state; struct list_head *list; char pmu_name[128]; snprintf(pmu_name, sizeof(pmu_name), "%s-%s", $1, $3); free($1); free($3); - if (parse_events_multi_pmu_add(_parse_state, pmu_name, NULL, &list) < 0) + if (parse_state->ops->add_pmu_multi(_parse_state, pmu_name, NULL, &list) < 0) YYABORT; $$ = list; }
Signature · 1 line
2.31.1
PATCH 46/59 perf tools: Add add_numeric callback to struct parse_events_ops
In reply to Jiri OlsaAdding add_numeric callback to struct parse_events_ops, to allow custom numeric parsing code.
--- tools/lib/perf/include/internal/parse-events.h | 5 +++++ tools/perf/util/parse-events.c | 2 ++ tools/perf/util/parse-events.h | 4 ---- tools/perf/util/parse-events.y | 12 ++++++++---- 4 files changed, 15 insertions(+), 8 deletions(-)
tools/lib/perf/include/internal/parse-events.h +5 -0
@@ -102,6 +102,11 @@ struct parse_events_ops {int (*add_pmu_multi)(struct parse_events_state *parse_state,char *str,struct list_head *head,struct list_head **listp); + +int (*add_numeric)(struct parse_events_state *parse_state, +struct list_head *list, +u32 type,u64 config, +struct list_head *head_config); };struct parse_events_state {
tools/perf/util/parse-events.c +2 -0
@@ -1306,6 +1306,7 @@ int parse_events_add_tracepoint(struct parse_events_state *parse_state, err, head_config); } +static int parse_events_add_numeric(struct parse_events_state *parse_state, struct list_head *list, u32 type, u64 config,
@@ -2904,4 +2905,5 @@ static struct parse_events_ops parse_state_ops = { .perf_evsel__delete = perf_evsel__delete_helper, .add_pmu = parse_events_add_pmu, .add_pmu_multi = parse_events_multi_pmu_add, + .add_numeric = parse_events_add_numeric, };
tools/perf/util/parse-events.h +0 -4
@@ -79,10 +79,6 @@ int parse_events_load_bpf_obj(struct parse_events_state *parse_state,struct list_head *list, struct bpf_object *obj, struct list_head *head_config); -int parse_events_add_numeric (struct parse_events_state *parse_state, -struct list_head *list, -u32 type,u64 config, -struct list_head *head_config);int parse_events_add_tool (struct parse_events_state *parse_state,struct list_head *list,int tool_event);
tools/perf/util/parse-events.y +8 -4
@@ -436,6 +436,7 @@ PE_VALUE_SYM_SW event_legacy_symbol: value_sym '/' event_config '/' { + struct parse_events_state *parse_state = _parse_state; struct list_head *list; int type = $1 >> 16; int config = $1 & 255;
@@ -443,7 +444,7 @@ value_sym '/' event_config '/' list = alloc_list(); ABORT_ON(!list); - err = parse_events_add_numeric(_parse_state, list, type, config, $3); + err = parse_state->ops->add_numeric(parse_state, list, type, config, $3); parse_events_terms__delete($3); if (err) { free_list_evsel(_parse_state, list);
@@ -454,13 +455,14 @@ value_sym '/' event_config '/' | value_sym sep_slash_slash_dc { + struct parse_events_state *parse_state = _parse_state; struct list_head *list; int type = $1 >> 16; int config = $1 & 255; list = alloc_list(); ABORT_ON(!list); - ABORT_ON(parse_events_add_numeric(_parse_state, list, type, config, NULL)); + ABORT_ON(parse_state->ops->add_numeric(parse_state, list, type, config, NULL)); $$ = list; } |
@@ -646,12 +648,13 @@ PE_NAME ':' PE_NAME event_legacy_numeric: PE_VALUE ':' PE_VALUE opt_event_config { + struct parse_events_state *parse_state = _parse_state; struct list_head *list; int err; list = alloc_list(); ABORT_ON(!list); - err = parse_events_add_numeric(_parse_state, list, (u32)$1, $3, $4); + err = parse_state->ops->add_numeric(_parse_state, list, (u32)$1, $3, $4); parse_events_terms__delete($4); if (err) { free(list);
@@ -663,12 +666,13 @@ PE_VALUE ':' PE_VALUE opt_event_config event_legacy_raw: PE_RAW opt_event_config { + struct parse_events_state *parse_state = _parse_state; struct list_head *list; int err; list = alloc_list(); ABORT_ON(!list); - err = parse_events_add_numeric(_parse_state, list, PERF_TYPE_RAW, $1, $2); + err = parse_state->ops->add_numeric(_parse_state, list, PERF_TYPE_RAW, $1, $2); parse_events_terms__delete($2); if (err) { free(list);
Signature · 1 line
2.31.1
Ian Rogers
reviewerRe: [PATCH 46/59] perf tools: Add add_numeric callback to struct parse_events_ops
Quoted 41 lines · Jiri Olsa
Adding
add_numericcallback to structparse_events_ops, to allow custom numeric parsing code.Signed-off-by Jiri Olsa <[email protected]>--- tools/lib/perf/include/internal/parse-events.h | 5 +++++ tools/perf/util/parse-events.c | 2 ++ tools/perf/util/parse-events.h | 4 ---- tools/perf/util/parse-events.y | 12 ++++++++---- 4 files changed, 15 insertions(+), 8 deletions(-)tools/lib/perf/include/internal/parse-events.h +5
-0@@ -102,6 +102,11 @@ struct parse_events_ops {int (*add_pmu_multi)(struct parse_events_state *parse_state,char *str,struct list_head *head,struct list_head **listp); + +int (*add_numeric)(struct parse_events_state *parse_state, +struct list_head *list, +u32 type,u64 config, +struct list_head *head_config); };struct parse_events_state {tools/perf/util/parse-events.c +1
-0@@ -1306,6 +1306,7 @@ int parse_events_add_tracepoint(struct parse_events_state *parse_state, err, head_config); } +static int parse_events_add_numeric(struct parse_events_state *parse_state, struct list_head *list, u32 type, u64 config,
tools/perf/util/parse-events.c static struct parse_events_ops parse_state_ops = { · line 2908
Quoted 4 lines
tools/perf/util/parse-events.c +1
-0@@ -2904,4 +2905,5 @@ static struct parse_events_ops parse_state_ops = { .perf_evsel__delete = perf_evsel__delete_helper, .add_pmu = parse_events_add_pmu, .add_pmu_multi = parse_events_multi_pmu_add, + .add_numeric = parse_events_add_numeric,
Some documentation on the ops would be awesome :-) Especially as this is allowing configuration and it is not immediately clear what that could mean when changes happen.
Thanks,
Ian
Quoted 86 lines
tools/perf/util/parse-events.c +0
-0};tools/perf/util/parse-events.h +0
-4@@ -79,10 +79,6 @@ int parse_events_load_bpf_obj(struct parse_events_state *parse_state,struct list_head *list, struct bpf_object *obj, struct list_head *head_config); -int parse_events_add_numeric (struct parse_events_state *parse_state, -struct list_head *list, -u32 type,u64 config, -struct list_head *head_config);int parse_events_add_tool (struct parse_events_state *parse_state,struct list_head *list,int tool_event);tools/perf/util/parse-events.y +8
-5@@ -436,6 +436,7 @@ PE_VALUE_SYM_SW event_legacy_symbol: value_sym '/' event_config '/' { + struct parse_events_state *parse_state = _parse_state; struct list_head *list; int type = $1 >> 16; int config = $1 & 255;@@ -443,7 +444,7 @@ value_sym '/' event_config '/' list = alloc_list(); ABORT_ON(!list); - err = parse_events_add_numeric(_parse_state, list, type, config, $3); + err = parse_state->ops->add_numeric(parse_state, list, type, config, $3); parse_events_terms__delete($3); if (err) { free_list_evsel(_parse_state, list);@@ -454,13 +455,14 @@ value_sym '/' event_config '/' | value_sym sep_slash_slash_dc { + struct parse_events_state *parse_state = _parse_state; struct list_head *list; int type = $1 >> 16; int config = $1 & 255; list = alloc_list(); ABORT_ON(!list); - ABORT_ON(parse_events_add_numeric(_parse_state, list, type, config, NULL)); + ABORT_ON(parse_state->ops->add_numeric(parse_state, list, type, config, NULL)); $$ = list; } |@@ -646,12 +648,13 @@ PE_NAME ':' PE_NAME event_legacy_numeric: PE_VALUE ':' PE_VALUE opt_event_config { + struct parse_events_state *parse_state = _parse_state; struct list_head *list; int err; list = alloc_list(); ABORT_ON(!list); - err = parse_events_add_numeric(_parse_state, list, (u32)$1, $3, $4); + err = parse_state->ops->add_numeric(_parse_state, list, (u32)$1, $3, $4); parse_events_terms__delete($4); if (err) { free(list);@@ -663,12 +666,13 @@ PE_VALUE ':' PE_VALUE opt_event_config event_legacy_raw: PE_RAW opt_event_config { + struct parse_events_state *parse_state = _parse_state; struct list_head *list; int err; list = alloc_list(); ABORT_ON(!list); - err = parse_events_add_numeric(_parse_state, list, PERF_TYPE_RAW, $1, $2); + err = parse_state->ops->add_numeric(_parse_state, list, PERF_TYPE_RAW, $1, $2); parse_events_terms__delete($2); if (err) { free(list); --2.31.1
Re: [PATCH 46/59] perf tools: Add add_numeric callback to struct parse_events_ops
Quoted 37 lines · Ian Rogers
Quoted 36 lines · Jiri Olsa
Adding
add_numericcallback to structparse_events_ops, to allow custom numeric parsing code.Signed-off-by Jiri Olsa <[email protected]>--- tools/lib/perf/include/internal/parse-events.h | 5 +++++ tools/perf/util/parse-events.c | 2 ++ tools/perf/util/parse-events.h | 4 ---- tools/perf/util/parse-events.y | 12 ++++++++---- 4 files changed, 15 insertions(+), 8 deletions(-)tools/lib/perf/include/internal/parse-events.h +5
-0@@ -102,6 +102,11 @@ struct parse_events_ops {int (*add_pmu_multi)(struct parse_events_state *parse_state,char *str,struct list_head *head,struct list_head **listp); + +int (*add_numeric)(struct parse_events_state *parse_state, +struct list_head *list, +u32 type,u64 config, +struct list_head *head_config); };struct parse_events_state {tools/perf/util/parse-events.c +0
-0@@ -1306,6 +1306,7 @@ int parse_events_add_tracepoint(struct parse_events_state *parse_state, err, head_config); }
Quoted 13 lines
tools/perf/util/parse-events.c static struct parse_events_ops parse_state_ops = { · line 2908
Quoted 9 lines
tools/perf/util/parse-events.c +2
-0+static int parse_events_add_numeric(struct parse_events_state *parse_state, struct list_head *list, u32 type, u64 config,@@ -2904,4 +2905,5 @@ static struct parse_events_ops parse_state_ops = { .perf_evsel__delete = perf_evsel__delete_helper, .add_pmu = parse_events_add_pmu, .add_pmu_multi = parse_events_multi_pmu_add, + .add_numeric = parse_events_add_numeric,Some documentation on the ops would be awesome :-) Especially as this is allowing configuration and it is not immediately clear what that could mean when changes happen.
so the ops are to help with perf specific code like 'evsel allocation and one chicken and egg problem we have in event parsing
to move flex/bison code to libperf I need to move all functions called from that code to libperf.. and some of those functions end up calling parser again - the pmu_loopup for terms parsing, which is sharing parser/flexer code with event parsing
having the ops allows us to keep this 'so far unmovable code' in perf and move just the flexer/bison, which is the base for everything
I expect some of the callbacks will go away at the end, because the code for them will be completely in libperf, so there would be no need for special perf implementation
but yes, I'll put some docs on them
thanks,
jirka
Quoted 91 lines
Thanks,
IanQuoted 86 lines
tools/perf/util/parse-events.c +0
-0};tools/perf/util/parse-events.h +0
-4@@ -79,10 +79,6 @@ int parse_events_load_bpf_obj(struct parse_events_state *parse_state,struct list_head *list, struct bpf_object *obj, struct list_head *head_config); -int parse_events_add_numeric (struct parse_events_state *parse_state, -struct list_head *list, -u32 type,u64 config, -struct list_head *head_config);int parse_events_add_tool (struct parse_events_state *parse_state,struct list_head *list,int tool_event);tools/perf/util/parse-events.y +8
-5@@ -436,6 +436,7 @@ PE_VALUE_SYM_SW event_legacy_symbol: value_sym '/' event_config '/' { + struct parse_events_state *parse_state = _parse_state; struct list_head *list; int type = $1 >> 16; int config = $1 & 255;@@ -443,7 +444,7 @@ value_sym '/' event_config '/' list = alloc_list(); ABORT_ON(!list); - err = parse_events_add_numeric(_parse_state, list, type, config, $3); + err = parse_state->ops->add_numeric(parse_state, list, type, config, $3); parse_events_terms__delete($3); if (err) { free_list_evsel(_parse_state, list);@@ -454,13 +455,14 @@ value_sym '/' event_config '/' | value_sym sep_slash_slash_dc { + struct parse_events_state *parse_state = _parse_state; struct list_head *list; int type = $1 >> 16; int config = $1 & 255; list = alloc_list(); ABORT_ON(!list); - ABORT_ON(parse_events_add_numeric(_parse_state, list, type, config, NULL)); + ABORT_ON(parse_state->ops->add_numeric(parse_state, list, type, config, NULL)); $$ = list; } |@@ -646,12 +648,13 @@ PE_NAME ':' PE_NAME event_legacy_numeric: PE_VALUE ':' PE_VALUE opt_event_config { + struct parse_events_state *parse_state = _parse_state; struct list_head *list; int err; list = alloc_list(); ABORT_ON(!list); - err = parse_events_add_numeric(_parse_state, list, (u32)$1, $3, $4); + err = parse_state->ops->add_numeric(_parse_state, list, (u32)$1, $3, $4); parse_events_terms__delete($4); if (err) { free(list);@@ -663,12 +666,13 @@ PE_VALUE ':' PE_VALUE opt_event_config event_legacy_raw: PE_RAW opt_event_config { + struct parse_events_state *parse_state = _parse_state; struct list_head *list; int err; list = alloc_list(); ABORT_ON(!list); - err = parse_events_add_numeric(_parse_state, list, PERF_TYPE_RAW, $1, $2); + err = parse_state->ops->add_numeric(_parse_state, list, PERF_TYPE_RAW, $1, $2); parse_events_terms__delete($2); if (err) { free(list); --2.31.1
PATCH 47/59 perf tools: Add add_cache callback to struct parse_events_ops
In reply to Jiri OlsaAdding add_cache callback to struct parse_events_ops, to allow custom cache parsing code.
--- tools/lib/perf/include/internal/parse-events.h | 6 ++++++ tools/perf/util/parse-events.c | 2 ++ tools/perf/util/parse-events.h | 5 ----- tools/perf/util/parse-events.y | 6 +++--- 4 files changed, 11 insertions(+), 8 deletions(-)
tools/lib/perf/include/internal/parse-events.h +6 -0
@@ -107,6 +107,12 @@ struct parse_events_ops {struct list_head *list, u32 type, u64 config, struct list_head *head_config); + +int (*add_cache)(struct parse_events_state *parse_state, +struct list_head *list, +char *type,char *op_result1,char *op_result2, +struct parse_events_error *err, +struct list_head *head_config); };struct parse_events_state {
tools/perf/util/parse-events.c +2 -0
@@ -339,6 +339,7 @@ static int config_attr(struct perf_event_attr *attr,struct parse_events_error *err, config_term_func_t config_term); +static int parse_events_add_cache(struct parse_events_state *parse_state, struct list_head *list, char *type, char *op_result1, char *op_result2,
@@ -2906,4 +2907,5 @@ static struct parse_events_ops parse_state_ops = { .add_pmu = parse_events_add_pmu, .add_pmu_multi = parse_events_multi_pmu_add, .add_numeric = parse_events_add_numeric, + .add_cache = parse_events_add_cache, };
tools/perf/util/parse-events.h +0 -5
@@ -82,11 +82,6 @@ int parse_events_load_bpf_obj(struct parse_events_state *parse_state,int parse_events_add_tool (struct parse_events_state *parse_state,struct list_head *list,int tool_event); -int parse_events_add_cache (struct parse_events_state *parse_state, -struct list_head *list, -char *type,char *op_result1,char *op_result2, -struct parse_events_error *error, -struct list_head *head_config);int parse_events_add_breakpoint (struct parse_events_state *parse_state,struct list_head *list,u64 addr,char *type,u64 len);
tools/perf/util/parse-events.y +3 -3
@@ -486,7 +486,7 @@ PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT '-' PE_NAME_CACHE_OP_RESULT opt_e list = alloc_list(); ABORT_ON(!list); - err = parse_events_add_cache(parse_state, list, $1, $3, $5, error, $6); + err = parse_state->ops->add_cache(parse_state, list, $1, $3, $5, error, $6); parse_events_terms__delete($6); free($1); free($3);
@@ -507,7 +507,7 @@ PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT opt_event_config list = alloc_list(); ABORT_ON(!list); - err = parse_events_add_cache(parse_state, list, $1, $3, NULL, error, $4); + err = parse_state->ops->add_cache(parse_state, list, $1, $3, NULL, error, $4); parse_events_terms__delete($4); free($1); free($3);
@@ -527,7 +527,7 @@ PE_NAME_CACHE_TYPE opt_event_config list = alloc_list(); ABORT_ON(!list); - err = parse_events_add_cache(parse_state, list, $1, NULL, NULL, error, $2); + err = parse_state->ops->add_cache(parse_state, list, $1, NULL, NULL, error, $2); parse_events_terms__delete($2); free($1); if (err) {
Signature · 1 line
2.31.1
PATCH 48/59 perf tools: Add add_breakpoint callback to struct parse_events_ops
In reply to Jiri OlsaAdding add_breakpoint callback to struct parse_events_ops, to allow custom breakpoint parsing code.
--- tools/lib/perf/include/internal/parse-events.h | 4 ++++ tools/perf/util/parse-events.c | 2 ++ tools/perf/util/parse-events.h | 3 --- tools/perf/util/parse-events.y | 8 ++++---- 4 files changed, 10 insertions(+), 7 deletions(-)
tools/lib/perf/include/internal/parse-events.h +4 -0
@@ -113,6 +113,10 @@ struct parse_events_ops { char *type, char *op_result1, char *op_result2, struct parse_events_error *err, struct list_head *head_config); + +int (*add_breakpoint)(struct parse_events_state *parse_state, +struct list_head *list, +u64 addr,char *type,u64 len); };struct parse_events_state {
tools/perf/util/parse-events.c +2 -0
@@ -884,6 +884,7 @@ do { \return 0 ; } +static int parse_events_add_breakpoint (struct parse_events_state *parse_state,struct list_head *list,u64 addr,char *type,u64 len)
@@ -2908,4 +2909,5 @@ static struct parse_events_ops parse_state_ops = { .add_pmu_multi = parse_events_multi_pmu_add, .add_numeric = parse_events_add_numeric, .add_cache = parse_events_add_cache, + .add_breakpoint = parse_events_add_breakpoint, };
tools/perf/util/parse-events.h +0 -3
@@ -82,9 +82,6 @@ int parse_events_load_bpf_obj(struct parse_events_state *parse_state,int parse_events_add_tool (struct parse_events_state *parse_state,struct list_head *list,int tool_event); -int parse_events_add_breakpoint (struct parse_events_state *parse_state, -struct list_head *list, -u64 addr,char *type,u64 len); struct evsel *parse_events__add_event(struct parse_events_state *parse_state, struct perf_event_attr *attr,
tools/perf/util/parse-events.y +4 -4
@@ -546,7 +546,7 @@ PE_PREFIX_MEM PE_VALUE '/' PE_VALUE ':' PE_MODIFIER_BP sep_dc list = alloc_list(); ABORT_ON(!list); - err = parse_events_add_breakpoint(parse_state, list, $2, $6, $4); + err = parse_state->ops->add_breakpoint(parse_state, list, $2, $6, $4); free($6); if (err) { free(list);
@@ -562,7 +562,7 @@ PE_PREFIX_MEM PE_VALUE '/' PE_VALUE sep_dc list = alloc_list(); ABORT_ON(!list); - if (parse_events_add_breakpoint(parse_state, list, $2, NULL, $4)) { + if (parse_state->ops->add_breakpoint(parse_state, list, $2, NULL, $4)) { free(list); YYABORT; }
@@ -577,7 +577,7 @@ PE_PREFIX_MEM PE_VALUE ':' PE_MODIFIER_BP sep_dc list = alloc_list(); ABORT_ON(!list); - err = parse_events_add_breakpoint(parse_state, list, $2, $4, 0); + err = parse_state->ops->add_breakpoint(parse_state, list, $2, $4, 0); free($4); if (err) { free(list);
@@ -593,7 +593,7 @@ PE_PREFIX_MEM PE_VALUE sep_dc list = alloc_list(); ABORT_ON(!list); - if (parse_events_add_breakpoint(parse_state, list, $2, NULL, 0)) { + if (parse_state->ops->add_breakpoint(parse_state, list, $2, NULL, 0)) { free(list); YYABORT; }
Signature · 1 line
2.31.1
PATCH 49/59 perf tools: Add add_tracepoint callback to struct parse_events_ops
In reply to Jiri OlsaAdding add_tracepoint callback to struct parse_events_ops, to allow custom tracepoint parsing code.
--- tools/lib/perf/include/internal/parse-events.h | 6 ++++++ tools/perf/util/parse-events.c | 8 ++++++++ tools/perf/util/parse-events.h | 5 ----- tools/perf/util/parse-events.y | 4 ++-- 4 files changed, 16 insertions(+), 7 deletions(-)
tools/lib/perf/include/internal/parse-events.h +6 -0
@@ -117,6 +117,12 @@ struct parse_events_ops {int (*add_breakpoint)(struct parse_events_state *parse_state,struct list_head *list,u64 addr,char *type,u64 len); + +int (*add_tracepoint)(struct parse_events_state *parse_state, +struct list_head *list, +const char *sys,const char *event, +struct parse_events_error *err, +struct list_head *head_config); };struct parse_events_state {
tools/perf/util/parse-events.c +8 -0
@@ -50,6 +50,12 @@ static int get_config_terms(struct list_head *head_config,static int parse_events__with_hybrid_pmu (struct parse_events_state *parse_state,const char *str,char *pmu_name,struct list_head *list); +static +int parse_events_add_tracepoint (struct parse_events_state *parse_state, +struct list_head *list, +const char *sys,const char *event, +struct parse_events_error *err, +struct list_head *head_config);static struct parse_events_ops parse_state_ops;static struct perf_pmu_event_symbol *perf_pmu_events_list;
@@ -1286,6 +1292,7 @@ static int get_config_chgs(struct perf_pmu *pmu, struct list_head *head_config,return 0 ; } +static int parse_events_add_tracepoint(struct parse_events_state *parse_state, struct list_head *list, const char *sys, const char *event,
@@ -2910,4 +2917,5 @@ static struct parse_events_ops parse_state_ops = { .add_numeric = parse_events_add_numeric, .add_cache = parse_events_add_cache, .add_breakpoint = parse_events_add_breakpoint, + .add_tracepoint = parse_events_add_tracepoint, };
tools/perf/util/parse-events.h +0 -5
@@ -63,11 +63,6 @@ struct perf_pmu_event_symbol {void parse_events__shrink_config_terms (void );void parse_events__clear_array (struct parse_events_array *a); -int parse_events_add_tracepoint (struct parse_events_state *parse_state, -struct list_head *list, -const char *sys,const char *event, -struct parse_events_error *error, -struct list_head *head_config); int parse_events_load_bpf(struct parse_events_state *parse_state, struct list_head *list, char *bpf_file_name,
tools/perf/util/parse-events.y +2 -2
@@ -613,8 +613,8 @@ tracepoint_name opt_event_config if (error) error->idx = @1.first_column; - err = parse_events_add_tracepoint(parse_state, list, $1.sys, $1.event, - error, $2); + err = parse_state->ops->add_tracepoint(parse_state, list, $1.sys, $1.event, + error, $2); parse_events_terms__delete($2); free($1.sys);
Signature · 1 line
2.31.1
PATCH 50/59 perf tools: Add add_bpf callback to struct parse_events_ops
In reply to Jiri OlsaAdding add_bpf callback to struct parse_events_ops, to allow custom bpf parsing code.
--- tools/lib/perf/include/internal/parse-events.h | 6 ++++++ tools/perf/util/parse-events.c | 2 ++ tools/perf/util/parse-events.h | 5 ----- tools/perf/util/parse-events.y | 5 +++-- 4 files changed, 11 insertions(+), 7 deletions(-)
tools/lib/perf/include/internal/parse-events.h +6 -0
@@ -123,6 +123,12 @@ struct parse_events_ops { const char *sys, const char *event, struct parse_events_error *err, struct list_head *head_config); + +int (*add_bpf)(struct parse_events_state *parse_state, +struct list_head *list, +char *bpf_file_name, +bool source, +struct list_head *head_config); };struct parse_events_state {
tools/perf/util/parse-events.c +2 -0
@@ -779,6 +779,7 @@ split_bpf_config_terms(struct list_head *evt_head_config,list_move_tail (&term->list, obj_head_config); } +static int parse_events_load_bpf(struct parse_events_state *parse_state, struct list_head *list, char *bpf_file_name,
@@ -2918,4 +2919,5 @@ static struct parse_events_ops parse_state_ops = { .add_cache = parse_events_add_cache, .add_breakpoint = parse_events_add_breakpoint, .add_tracepoint = parse_events_add_tracepoint, + .add_bpf = parse_events_load_bpf, };
tools/perf/util/parse-events.h +0 -5
@@ -63,11 +63,6 @@ struct perf_pmu_event_symbol {void parse_events__shrink_config_terms (void );void parse_events__clear_array (struct parse_events_array *a); -int parse_events_load_bpf (struct parse_events_state *parse_state, -struct list_head *list, -char *bpf_file_name, -bool source, -struct list_head *head_config);/* Provide this function for perf test */ struct bpf_object ; int parse_events_load_bpf_obj(struct parse_events_state *parse_state,
tools/perf/util/parse-events.y +3 -2
@@ -690,7 +690,7 @@ PE_BPF_OBJECT opt_event_config list = alloc_list(); ABORT_ON(!list); - err = parse_events_load_bpf(parse_state, list, $1, false, $2); + err = parse_state->ops->add_bpf(parse_state, list, $1, false, $2); parse_events_terms__delete($2); free($1); if (err) {
@@ -702,12 +702,13 @@ PE_BPF_OBJECT opt_event_config | PE_BPF_SOURCE opt_event_config { + struct parse_events_state *parse_state = _parse_state; struct list_head *list; int err; list = alloc_list(); ABORT_ON(!list); - err = parse_events_load_bpf(_parse_state, list, $1, true, $2); + err = parse_state->ops->add_bpf(parse_state, list, $1, true, $2); parse_events_terms__delete($2); if (err) { free(list);
Signature · 1 line
2.31.1
PATCH 51/59 perf tools: Add add_tool callback to struct parse_events_ops
In reply to Jiri OlsaAdding add_tool callback to struct parse_events_ops, to allow custom tool parsing code.
--- tools/lib/perf/include/internal/parse-events.h | 4 ++++ tools/perf/util/parse-events.c | 2 ++ tools/perf/util/parse-events.h | 3 --- tools/perf/util/parse-events.y | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-)
tools/lib/perf/include/internal/parse-events.h +4 -0
@@ -129,6 +129,10 @@ struct parse_events_ops {char *bpf_file_name, bool source, struct list_head *head_config); + +int (*add_tool)(struct parse_events_state *parse_state, +struct list_head *list, +int tool_event); };struct parse_events_state {
tools/perf/util/parse-events.c +2 -0
@@ -1356,6 +1356,7 @@ int parse_events_add_numeric(struct parse_events_state *parse_state,return ret; } +static int parse_events_add_tool (struct parse_events_state *parse_state,struct list_head *list,int tool_event)
@@ -2920,4 +2921,5 @@ static struct parse_events_ops parse_state_ops = { .add_breakpoint = parse_events_add_breakpoint, .add_tracepoint = parse_events_add_tracepoint, .add_bpf = parse_events_load_bpf, + .add_tool = parse_events_add_tool, };
tools/perf/util/parse-events.h +0 -3
@@ -69,9 +69,6 @@ int parse_events_load_bpf_obj(struct parse_events_state *parse_state,struct list_head *list, struct bpf_object *obj, struct list_head *head_config); -int parse_events_add_tool (struct parse_events_state *parse_state, -struct list_head *list, -int tool_event); struct evsel *parse_events__add_event(struct parse_events_state *parse_state, struct perf_event_attr *attr,
tools/perf/util/parse-events.y +2 -1
@@ -468,11 +468,12 @@ value_sym sep_slash_slash_dc | PE_VALUE_SYM_TOOL sep_slash_slash_dc { + struct parse_events_state *parse_state = _parse_state; struct list_head *list; list = alloc_list(); ABORT_ON(!list); - ABORT_ON(parse_events_add_tool(_parse_state, list, $1)); + ABORT_ON(parse_state->ops->add_tool(_parse_state, list, $1)); $$ = list; }
Signature · 1 line
2.31.1
PATCH 52/59 perf tools: Add set_leader callback to struct parse_events_ops
In reply to Jiri OlsaAdding add_numeric callback to struct parse_events_ops, to allow custom leader setting in parsing code.
--- tools/lib/perf/include/internal/parse-events.h | 3 +++ tools/perf/util/parse-events.c | 6 ++++-- tools/perf/util/parse-events.h | 2 -- tools/perf/util/parse-events.y | 6 ++++-- 4 files changed, 11 insertions(+), 6 deletions(-)
tools/lib/perf/include/internal/parse-events.h +3 -0
@@ -133,6 +133,9 @@ struct parse_events_ops {int (*add_tool)(struct parse_events_state *parse_state,struct list_head *list,int tool_event); + +void (*set_leader)(char *name,struct list_head *list, +struct parse_events_state *parse_state); };struct parse_events_state {
tools/perf/util/parse-events.c +4 -2
@@ -1756,8 +1756,9 @@ parse_events__set_leader_for_uncore_aliase(char *name, struct list_head *list,return ret; } -void parse_events__set_leader (char *name,struct list_head *list, -struct parse_events_state *parse_state) +static +void parse_events_set_leader (char *name,struct list_head *list, +struct parse_events_state *parse_state) {struct evsel *leader;
@@ -2922,4 +2923,5 @@ static struct parse_events_ops parse_state_ops = { .add_tracepoint = parse_events_add_tracepoint, .add_bpf = parse_events_load_bpf, .add_tool = parse_events_add_tool, + .set_leader = parse_events_set_leader, };
tools/perf/util/parse-events.h +0 -2
@@ -77,8 +77,6 @@ struct evsel *parse_events__add_event(struct parse_events_state *parse_state,enum perf_pmu_event_symbol_type perf_pmu__parse_check (const char *name); -void parse_events__set_leader (char *name,struct list_head *list, -struct parse_events_state *parse_state); void print_events(const char *event_glob, bool name_only, bool quiet, bool long_desc, bool details_flag, bool deprecated,
tools/perf/util/parse-events.y +4 -2
@@ -227,20 +227,22 @@ group_def group_def: PE_NAME '{' events '}' { + struct parse_events_state *parse_state = _parse_state; struct list_head *list = $3; inc_group_count(list, _parse_state); - parse_events__set_leader($1, list, _parse_state); + parse_state->ops->set_leader($1, list, parse_state); free($1); $$ = list; } | '{' events '}' { + struct parse_events_state *parse_state = _parse_state; struct list_head *list = $2; inc_group_count(list, _parse_state); - parse_events__set_leader(NULL, list, _parse_state); + parse_state->ops->set_leader(NULL, list, parse_state); $$ = list; }
Signature · 1 line
2.31.1
PATCH 53/59 perf tools: Add parse_check callback to struct parse_events_ops
In reply to Jiri OlsaAdding parse_check callback to struct parse_events_ops, to allow custom parse_check method in tracing flexer code.
--- tools/lib/perf/include/internal/parse-events.h | 9 +++++++++ tools/perf/util/parse-events.c | 3 ++- tools/perf/util/parse-events.h | 10 ---------- tools/perf/util/parse-events.l | 12 ++++++------ 4 files changed, 17 insertions(+), 17 deletions(-)
tools/lib/perf/include/internal/parse-events.h +9 -0
@@ -46,6 +46,13 @@ enum { __PARSE_EVENTS__TERM_TYPE_NR, }; +enum perf_pmu_event_symbol_type { +PMU_EVENT_SYMBOL_ERR ,/* not a PMU EVENT */ +PMU_EVENT_SYMBOL ,/* normal style PMU event */ +PMU_EVENT_SYMBOL_PREFIX ,/* prefix of pre-suf style event */ +PMU_EVENT_SYMBOL_SUFFIX ,/* suffix of pre-suf style event */ +}; +struct parse_events_array {size_t nr_ranges;struct {
@@ -136,6 +143,8 @@ struct parse_events_ops {void (*set_leader)(char *name,struct list_head *list,struct parse_events_state *parse_state); + +enum perf_pmu_event_symbol_type (*parse_check)(const char *name); };struct parse_events_state {
tools/perf/util/parse-events.c +2 -1
@@ -1889,7 +1889,7 @@ int perf_pmu__test_parse_init(void)return 0 ; } -enum perf_pmu_event_symbol_type +static enum perf_pmu_event_symbol_type perf_pmu__parse_check (const char *name) {struct perf_pmu_event_symbol p, *r;
@@ -2924,4 +2924,5 @@ static struct parse_events_ops parse_state_ops = { .add_bpf = parse_events_load_bpf, .add_tool = parse_events_add_tool, .set_leader = parse_events_set_leader, + .parse_check = perf_pmu__parse_check, };
tools/perf/util/parse-events.h +0 -10
@@ -49,13 +49,6 @@ int exclude_perf(const struct option *opt, const char *arg, int unset);#define EVENTS_HELP_MAX (128*1024) -enum perf_pmu_event_symbol_type { -PMU_EVENT_SYMBOL_ERR ,/* not a PMU EVENT */ -PMU_EVENT_SYMBOL ,/* normal style PMU event */ -PMU_EVENT_SYMBOL_PREFIX ,/* prefix of pre-suf style event */ -PMU_EVENT_SYMBOL_SUFFIX ,/* suffix of pre-suf style event */ -}; -struct perf_pmu_event_symbol {char *symbol;enum perf_pmu_event_symbol_type type;
@@ -75,9 +68,6 @@ struct evsel *parse_events__add_event(struct parse_events_state *parse_state, const char *name, const char *metric_id, struct perf_pmu *pmu); -enum perf_pmu_event_symbol_type -perf_pmu__parse_check (const char *name); -void print_events (const char *event_glob,bool name_only,bool quiet,bool long_desc,bool details_flag,bool deprecated,const char *pmu_name);
tools/perf/util/parse-events.l +6 -6
@@ -63,12 +63,12 @@ static int str(yyscan_t scanner, int token) return token; } -static int raw(yyscan_t scanner) +static int raw(yyscan_t scanner, struct parse_events_state *parse_state) { YYSTYPE *yylval = parse_events_get_lval(scanner); char *text = parse_events_get_text(scanner); - if (perf_pmu__parse_check(text) == PMU_EVENT_SYMBOL) + if (parse_state->ops->parse_check(text) == PMU_EVENT_SYMBOL) return str(scanner, PE_NAME); return __value(yylval, text + 1, 16, PE_RAW);
@@ -144,7 +144,7 @@ static int pmu_str_check(yyscan_t scanner, struct parse_events_state *parse_stat * parse check can't be trusted so we return PE_PMU_EVENT_FAKE unless * an '!' is present in which case the text can't be a PMU name. */ - switch (perf_pmu__parse_check(text)) { + switch (parse_state->ops->parse_check(text)) { case PMU_EVENT_SYMBOL_PREFIX: return PE_PMU_EVENT_PRE; case PMU_EVENT_SYMBOL_SUFFIX:
@@ -300,8 +300,8 @@ percore { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_PERCORE); } aux-output { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_AUX_OUTPUT); } aux-sample-size { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_AUX_SAMPLE_SIZE); } metric-id { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_METRIC_ID); } -r{num_raw_hex} { return raw(yyscanner); } -r0x{num_raw_hex} { return raw(yyscanner); } +r{num_raw_hex} { return raw(yyscanner, _parse_state); } +r0x{num_raw_hex} { return raw(yyscanner, _parse_state); } , { return ','; } "/" { BEGIN(INITIAL); return '/'; } {name_minus} { return str(yyscanner, PE_NAME); }
@@ -384,7 +384,7 @@ refs|Reference|ops|access | misses|miss { return str(yyscanner, PE_NAME_CACHE_OP_RESULT); } mem: { BEGIN(mem); return PE_PREFIX_MEM; } -r{num_raw_hex} { return raw(yyscanner); } +r{num_raw_hex} { return raw(yyscanner, _parse_state); } {num_dec} { return value(yyscanner, 10); } {num_hex} { return value(yyscanner, 16); }
Signature · 1 line
2.31.1
PATCH 54/59 perf tools: Move PE_* enums in parse_events__scanner
In reply to Jiri OlsaMoving PE_* enums in parse_events__scanner. The function will be moved to libperf in next commit.
--- tools/perf/util/parse-events.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
tools/perf/util/parse-events.c +10 -7
@@ -1914,12 +1914,18 @@ perf_pmu__parse_check(const char *name) }static int parse_events__scanner (const char *str, -struct parse_events_state *parse_state) +struct parse_events_state *parse_state, +bool terms) {YY_BUFFER_STATE buffer;void *scanner;int ret; +if (terms) + parse_state->stoken =PE_START_TERMS ; +else + parse_state->stoken =PE_START_EVENTS ; + ret =parse_events_lex_init_extra (parse_state, &scanner);if (ret)return ret;
@@ -1946,12 +1952,11 @@ int parse_events_terms(struct list_head *terms, const char *str)struct parse_events_state parse_state = { .ops = &parse_state_ops, .terms =NULL , - .stoken =PE_START_TERMS , .guest = perf_guest, };int ret; - ret =parse_events__scanner (str, &parse_state); + ret =parse_events__scanner (str, &parse_state, true);perf_pmu__parse_cleanup ();if (!ret) {
@@ -1970,7 +1975,6 @@ static int parse_events__with_hybrid_pmu(struct parse_events_state *parse_state, {struct parse_events_state ps = { .list =LIST_HEAD_INIT (ps.list), - .stoken =PE_START_EVENTS , .hybrid_pmu_name = pmu_name, .idx = parse_state->idx, .ops = &parse_state_ops,
@@ -1978,7 +1982,7 @@ static int parse_events__with_hybrid_pmu(struct parse_events_state *parse_state, };int ret; - ret =parse_events__scanner (str, &ps); + ret =parse_events__scanner (str, &ps, false);perf_pmu__parse_cleanup ();if (!ret) {
@@ -2001,14 +2005,13 @@ int __parse_events(struct evlist *evlist, const char *str, .idx = evlist->core.nr_entries, .error = err, .evlist = &evlist->core, - .stoken = PE_START_EVENTS, .fake_pmu = fake_pmu, .ops = &parse_state_ops, .guest = perf_guest, };int ret; - ret =parse_events__scanner (str, &parse_state); + ret =parse_events__scanner (str, &parse_state, false);perf_pmu__parse_cleanup ();if (!ret &&list_empty (&parse_state.list)) {
Signature · 1 line
2.31.1
PATCH 55/59 libperf: Move in parse-events flex/bison parser
In reply to Jiri OlsaMoving parse-events flex/bison parser in libperf.
--- tools/lib/perf/Build | 23 + .../lib/perf/include/internal/parse-events.h | 3 + tools/lib/perf/parse-events.c | 38 + tools/lib/perf/parse-events.l | 411 ++++++++ tools/lib/perf/parse-events.y | 992 ++++++++++++++++++ tools/perf/util/Build | 15 - tools/perf/util/parse-events.c | 38 - tools/perf/util/parse-events.l | 411 -------- tools/perf/util/parse-events.y | 992 ------------------ 9 files changed, 1467 insertions(+), 1456 deletions(-) create mode 100644 tools/lib/perf/parse-events.l create mode 100644 tools/lib/perf/parse-events.y delete mode 100644 tools/perf/util/parse-events.l delete mode 100644 tools/perf/util/parse-events.y
tools/lib/perf/Build +23 -0
@@ -12,6 +12,8 @@ libperf-y += pmu-bison.o libperf-y += pmu.o libperf-y += pmu-hybrid.o libperf-y += parse-events.o +libperf-y += parse-events-flex.o +libperf-y += parse-events-bison.o $(OUTPUT)zalloc.o: ../../lib/zalloc.c FORCE $(call rule_mkdir)
@@ -19,6 +21,15 @@ $(OUTPUT)zalloc.o: ../../lib/zalloc.c FORCE tests-y += tests/ +$(OUTPUT)parse-events-flex.c $(OUTPUT)parse-events-flex.h: parse-events.l $(OUTPUT)parse-events-bison.c + $(call rule_mkdir) + $(Q)$(call echo-cmd,flex)$(FLEX) -o $(OUTPUT)parse-events-flex.c \ + --header-file=$(OUTPUT)parse-events-flex.h $(PARSER_DEBUG_FLEX) $< + +$(OUTPUT)parse-events-bison.c $(OUTPUT)parse-events-bison.h: parse-events.y + $(call rule_mkdir) + $(Q)$(call echo-cmd,bison)$(BISON) -v $< -d $(PARSER_DEBUG_BISON) $(BISON_FILE_PREFIX_MAP) \ + -o $(OUTPUT)parse-events-bison.c -p parse_events_ $(OUTPUT)pmu-flex.c $(OUTPUT)pmu-flex.h: pmu.l $(OUTPUT)pmu-bison.c $(call rule_mkdir)
@@ -41,7 +52,19 @@ else flex_flags := -w endif +bison_flags := -DYYENABLE_NLS=0 +BISON_GE_35 := $(shell expr $(shell $(BISON) --version | grep bison | sed -e 's/.\+ \([0-9]\+\).\([0-9]\+\)/\1\2/g') \>\= 35) +ifeq ($(BISON_GE_35),1) + bison_flags += -Wno-unused-parameter -Wno-nested-externs -Wno-implicit-function-declaration -Wno-switch-enum +else + bison_flags += -w +endif + CFLAGS_pmu-flex.o += $(flex_flags) CFLAGS_pmu-bison.o += -DYYLTYPE_IS_TRIVIAL=0 $(bison_flags) +CFLAGS_parse-events-flex.o += $(flex_flags) +CFLAGS_parse-events-bison.o += $(bison_flags) + $(OUTPUT)pmu.o: $(OUTPUT)pmu-flex.c $(OUTPUT)pmu-bison.c +$(OUTPUT)parse-events.o: $(OUTPUT)parse-events-flex.c $(OUTPUT)parse-events-bison.c
tools/lib/perf/include/internal/parse-events.h +3 -0
@@ -194,4 +194,7 @@ void parse_events__handle_error(struct parse_events_error *err, int idx,void parse_events_evlist_error (struct parse_events_state *parse_state,int idx,const char *str);int parse_events_name (struct list_head *list,const char *name); +int parse_events__scanner (const char *str, +struct parse_events_state *parse_state, +bool terms);#endif /* __LIBPERF_PARSE_EVENTS_H */
tools/lib/perf/parse-events.c +38 -0
@@ -13,6 +13,13 @@#include <errno.h> #include <asm/bug.h> #include "internal.h" +#include "parse-events-bison.h" +#define YY_EXTRA_TYPE void* +#include "parse-events-flex.h" + +#ifdef PARSER_DEBUG +extern int parse_events_debug; +#endif struct event_symbol event_symbols_hw[PERF_COUNT_HW_MAX ] = { [PERF_COUNT_HW_CPU_CYCLES ] = {
@@ -592,3 +599,34 @@ int parse_events_name(struct list_head *list, const char *name)return 0 ; } + +int parse_events__scanner (const char *str, +struct parse_events_state *parse_state, +bool terms) +{ +YY_BUFFER_STATE buffer; +void *scanner; +int ret; + +if (terms) + parse_state->stoken =PE_START_TERMS ; +else + parse_state->stoken =PE_START_EVENTS ; + + ret =parse_events_lex_init_extra (parse_state, &scanner); +if (ret) +return ret; + + buffer =parse_events__scan_string (str, scanner); + +#ifdef PARSER_DEBUG + parse_events_debug =1 ; +parse_events_set_debug (1 , scanner); +#endif + ret =parse_events_parse (parse_state, scanner); + +parse_events__flush_buffer (buffer, scanner); +parse_events__delete_buffer (buffer, scanner); +parse_events_lex_destroy (scanner); +return ret; +}
tools/lib/perf/parse-events.l new file +411 -0
411 lines not on this page · raw message
tools/lib/perf/parse-events.y new file +992 -0
992 lines not on this page · raw message
tools/perf/util/Build +0 -15
@@ -66,8 +66,6 @@ perf-y += comm.o perf-y += thread.o perf-y += thread_map.o perf-y += trace-event-parse.o -perf-y += parse-events-flex.o -perf-y += parse-events-bison.o perf-y += pmu.o perf-y += trace-event-read.o perf-y += trace-event-info.o
@@ -209,16 +207,6 @@ CFLAGS_llvm-utils.o += -DPERF_INCLUDE_DIR="BUILD_STR($(perf_include_dir_SQ))" # avoid compiler warnings in 32-bit mode CFLAGS_genelf_debug.o += -Wno-packed -$(OUTPUT)util/parse-events-flex.c $(OUTPUT)util/parse-events-flex.h: util/parse-events.l $(OUTPUT)util/parse-events-bison.c - $(call rule_mkdir) - $(Q)$(call echo-cmd,flex)$(FLEX) -o $(OUTPUT)util/parse-events-flex.c \ - --header-file=$(OUTPUT)util/parse-events-flex.h $(PARSER_DEBUG_FLEX) $< - -$(OUTPUT)util/parse-events-bison.c $(OUTPUT)util/parse-events-bison.h: util/parse-events.y - $(call rule_mkdir) - $(Q)$(call echo-cmd,bison)$(BISON) -v $< -d $(PARSER_DEBUG_BISON) $(BISON_FILE_PREFIX_MAP) \ - -o $(OUTPUT)util/parse-events-bison.c -p parse_events_ - $(OUTPUT)util/expr-flex.c $(OUTPUT)util/expr-flex.h: util/expr.l $(OUTPUT)util/expr-bison.c $(call rule_mkdir) $(Q)$(call echo-cmd,flex)$(FLEX) -o $(OUTPUT)util/expr-flex.c \
@@ -239,7 +227,6 @@ ifeq ($(FLEX_GE_26),1) else flex_flags := -w endif -CFLAGS_parse-events-flex.o += $(flex_flags) CFLAGS_expr-flex.o += $(flex_flags) bison_flags := -DYYENABLE_NLS=0
@@ -249,10 +236,8 @@ ifeq ($(BISON_GE_35),1) else bison_flags += -w endif -CFLAGS_parse-events-bison.o += $(bison_flags) CFLAGS_expr-bison.o += -DYYLTYPE_IS_TRIVIAL=0 $(bison_flags) -$(OUTPUT)util/parse-events.o: $(OUTPUT)util/parse-events-flex.c $(OUTPUT)util/parse-events-bison.c $(OUTPUT)util/expr.o: $(OUTPUT)util/expr-flex.c $(OUTPUT)util/expr-bison.c CFLAGS_bitmap.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"
tools/perf/util/parse-events.c +0 -38
@@ -23,9 +23,6 @@#include "debug.h" #include <api/fs/tracing_path.h> #include <perf/cpumap.h> -#include "parse-events-bison.h" -#define YY_EXTRA_TYPE void* -#include "parse-events-flex.h" #include "pmu.h" #include "thread_map.h" #include "probe-file.h"
@@ -41,10 +38,6 @@#define MAX_NAME_LEN 100 -#ifdef PARSER_DEBUG -extern int parse_events_debug; -#endif -int parse_events_parse (void *parse_state,void *scanner);static int get_config_terms (struct list_head *head_config,struct list_head *head_terms__maybe_unused ); static int parse_events__with_hybrid_pmu(struct parse_events_state *parse_state,
@@ -1913,37 +1906,6 @@ perf_pmu__parse_check(const char *name)return r ? r->type :PMU_EVENT_SYMBOL_ERR ; } -static int parse_events__scanner (const char *str, -struct parse_events_state *parse_state, -bool terms) -{ -YY_BUFFER_STATE buffer; -void *scanner; -int ret; - -if (terms) - parse_state->stoken =PE_START_TERMS ; -else - parse_state->stoken =PE_START_EVENTS ; - - ret =parse_events_lex_init_extra (parse_state, &scanner); -if (ret) -return ret; - - buffer =parse_events__scan_string (str, scanner); - -#ifdef PARSER_DEBUG - parse_events_debug =1 ; -parse_events_set_debug (1 , scanner); -#endif - ret =parse_events_parse (parse_state, scanner); - -parse_events__flush_buffer (buffer, scanner); -parse_events__delete_buffer (buffer, scanner); -parse_events_lex_destroy (scanner); -return ret; -} -/* * parse event config string, return a list of event terms. */
tools/perf/util/parse-events.l deleted +0 -411
411 lines not on this page · raw message
tools/perf/util/parse-events.y deleted +0 -992
992 lines not on this page · raw message
Signature · 1 line
2.31.1
PATCH 56/59 libperf: Move in parse_events_add_breakpoint function
In reply to Jiri OlsaMoving parse_events_add_breakpoint function to libperf.
--- .../lib/perf/include/internal/parse-events.h | 3 + tools/lib/perf/parse-events.c | 72 +++++++++++++++++++ tools/perf/util/parse-events.c | 70 ------------------ 3 files changed, 75 insertions(+), 70 deletions(-)
tools/lib/perf/include/internal/parse-events.h +3 -0
@@ -197,4 +197,7 @@ int parse_events_name(struct list_head *list, const char *name);int parse_events__scanner (const char *str,struct parse_events_state *parse_state,bool terms); +int parse_events_add_breakpoint (struct parse_events_state *parse_state, +struct list_head *list, +u64 addr,char *type,u64 len);#endif /* __LIBPERF_PARSE_EVENTS_H */
tools/lib/perf/parse-events.c +72 -0
81 lines not on this page · raw message
tools/perf/util/parse-events.c +0 -70
76 lines not on this page · raw message
Signature · 1 line
2.31.1
PATCH 57/59 libperf: Move in some lib objects from perf
In reply to Jiri OlsaNew libperf code needs several libapi objects,
moving them from perf in libperf.
--- tools/lib/perf/Build | 24 ++++++++++++++++++++++++ tools/perf/util/Build | 23 ----------------------- 2 files changed, 24 insertions(+), 23 deletions(-)
tools/lib/perf/Build +24 -0
@@ -14,11 +14,35 @@ libperf-y += pmu-hybrid.o libperf-y += parse-events.o libperf-y += parse-events-flex.o libperf-y += parse-events-bison.o +libperf-y += bitmap.o +libperf-y += find_bit.o +libperf-y += vsprintf.o +libperf-y += hweight.o $(OUTPUT)zalloc.o: ../../lib/zalloc.c FORCE $(call rule_mkdir) $(call if_changed_dep,cc_o_c) +$(OUTPUT)bitmap.o: ../../lib/bitmap.c FORCE + $(call rule_mkdir) + $(call if_changed_dep,cc_o_c) + +$(OUTPUT)find_bit.o: ../../lib/find_bit.c FORCE + $(call rule_mkdir) + $(call if_changed_dep,cc_o_c) + +$(OUTPUT)vsprintf.o: ../../lib/vsprintf.c FORCE + $(call rule_mkdir) + $(call if_changed_dep,cc_o_c) + +$(OUTPUT)hweight.o: ../../lib/hweight.c FORCE + $(call rule_mkdir) + $(call if_changed_dep,cc_o_c) + +CFLAGS_bitmap.o += -Wno-unused-parameter +CFLAGS_find_bit.o += -Wno-unused-parameter +CFLAGS_hweight.o += -Wno-unused-parameter + tests-y += tests/ $(OUTPUT)parse-events-flex.c $(OUTPUT)parse-events-flex.h: parse-events.l $(OUTPUT)parse-events-bison.c
tools/perf/util/Build +0 -23
@@ -16,7 +16,6 @@ perf-y += evsel.o perf-y += evsel_fprintf.o perf-y += perf_event_attr_fprintf.o perf-y += evswitch.o -perf-y += find_bit.o perf-y += get_current_dir_name.o perf-y += kallsyms.o perf-y += levenshtein.o
@@ -32,8 +31,6 @@ perf-y += rlimit.o perf-y += argv_split.o perf-y += rbtree.o perf-y += libstring.o -perf-y += bitmap.o -perf-y += hweight.o perf-y += smt.o perf-y += strbuf.o perf-y += string.o
@@ -123,7 +120,6 @@ perf-y += term.o perf-y += help-unknown-cmd.o perf-y += dlfilter.o perf-y += mem-events.o -perf-y += vsprintf.o perf-y += units.o perf-y += time-utils.o perf-y += expr-flex.o
@@ -240,11 +236,8 @@ CFLAGS_expr-bison.o += -DYYLTYPE_IS_TRIVIAL=0 $(bison_flags) $(OUTPUT)util/expr.o: $(OUTPUT)util/expr-flex.c $(OUTPUT)util/expr-bison.c -CFLAGS_bitmap.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))" -CFLAGS_find_bit.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))" CFLAGS_rbtree.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))" CFLAGS_libstring.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))" -CFLAGS_hweight.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))" CFLAGS_parse-events.o += -Wno-redundant-decls CFLAGS_expr.o += -Wno-redundant-decls CFLAGS_header.o += -include $(OUTPUT)PERF-VERSION-FILE
@@ -257,18 +250,10 @@ $(OUTPUT)util/argv_split.o: ../lib/argv_split.c FORCE $(call rule_mkdir) $(call if_changed_dep,cc_o_c) -$(OUTPUT)util/bitmap.o: ../lib/bitmap.c FORCE - $(call rule_mkdir) - $(call if_changed_dep,cc_o_c) - $(OUTPUT)util/ctype.o: ../lib/ctype.c FORCE $(call rule_mkdir) $(call if_changed_dep,cc_o_c) -$(OUTPUT)util/find_bit.o: ../lib/find_bit.c FORCE - $(call rule_mkdir) - $(call if_changed_dep,cc_o_c) - $(OUTPUT)util/rbtree.o: ../lib/rbtree.c FORCE $(call rule_mkdir) $(call if_changed_dep,cc_o_c)
@@ -277,14 +262,6 @@ $(OUTPUT)util/libstring.o: ../lib/string.c FORCE $(call rule_mkdir) $(call if_changed_dep,cc_o_c) -$(OUTPUT)util/hweight.o: ../lib/hweight.c FORCE - $(call rule_mkdir) - $(call if_changed_dep,cc_o_c) - -$(OUTPUT)util/vsprintf.o: ../lib/vsprintf.c FORCE - $(call rule_mkdir) - $(call if_changed_dep,cc_o_c) - $(OUTPUT)util/list_sort.o: ../lib/list_sort.c FORCE $(call rule_mkdir) $(call if_changed_dep,cc_o_c)
Signature · 1 line
2.31.1
PATCH 58/59 libperf: Add libperf_parse_events function
In reply to Jiri OlsaAdding libperf_parse_events function.
--- tools/lib/perf/include/perf/evlist.h | 2 + tools/lib/perf/libperf.map | 1 + tools/lib/perf/parse-events.c | 171 +++++++++++++++++++++++++++ 3 files changed, 174 insertions(+)
tools/lib/perf/include/perf/evlist.h +2 -0
@@ -47,4 +47,6 @@ LIBPERF_API struct perf_mmap *perf_evlist__next_mmap(struct perf_evlist *evlist, (pos) = perf_evlist__next_mmap((evlist), (pos), overwrite)) LIBPERF_API void perf_evlist__set_leader(struct perf_evlist *evlist); + +LIBPERF_API int libperf_parse_events(struct perf_evlist *evlist, const char *str);#endif /* __LIBPERF_EVLIST_H */
tools/lib/perf/libperf.map +1 -0
@@ -50,6 +50,7 @@ LIBPERF_0.0.1 { perf_mmap__read_init; perf_mmap__read_done; perf_mmap__read_event; + libperf_parse_events; local: *; };
tools/lib/perf/parse-events.c +171 -0
180 lines not on this page · raw message
Signature · 1 line
2.31.1
PATCH 59/59 libperf: Add parse-events test
In reply to Jiri OlsaAdding parse-events test.
--- tools/lib/perf/tests/Build | 1 + tools/lib/perf/tests/main.c | 1 + tools/lib/perf/tests/test-evlist.c | 2 ++ tools/lib/perf/tests/test-parse-events.c | 41 ++++++++++++++++++++++++ tools/lib/perf/tests/tests.h | 1 + 5 files changed, 46 insertions(+) create mode 100644 tools/lib/perf/tests/test-parse-events.c
tools/lib/perf/tests/Build +1 -0
@@ -3,3 +3,4 @@ tests-y += test-evsel.o tests-y += test-evlist.o tests-y += test-cpumap.o tests-y += test-threadmap.o +tests-y += test-parse-events.o
tools/lib/perf/tests/main.c +1 -0
@@ -7,6 +7,7 @@ int tests_verbose;int main (int argc,char **argv) { +__T ("test parse_events" , !test_parse_events (argc, argv));__T ("test cpumap" , !test_cpumap (argc, argv));__T ("test threadmap" , !test_threadmap (argc, argv));__T ("test evlist" , !test_evlist (argc, argv));
tools/lib/perf/tests/test-evlist.c +2 -0
@@ -1,5 +1,7 @@// SPDX-License-Identifier: GPL-2.0 +#ifndef _GNU_SOURCE#define _GNU_SOURCE// needed for sched.h to get sched_[gs]etaffinity and CPU_(ZERO,SET) +#endif #include <sched.h> #include <stdio.h> #include <stdarg.h>
tools/lib/perf/tests/test-parse-events.c new file +41 -0
41 lines not on this page · raw message
tools/lib/perf/tests/tests.h +1 -0
@@ -6,5 +6,6 @@ int test_cpumap(int argc, char **argv);int test_threadmap (int argc,char **argv);int test_evlist (int argc,char **argv);int test_evsel (int argc,char **argv); +int test_parse_events (int argc,char **argv);#endif /* TESTS_H */
Signature · 1 line
2.31.1
Ian Rogers
reviewerRe: [PATCH 59/59] libperf: Add parse-events test
Quoted 2 lines · Jiri Olsa
Adding parse-events test.
Fwiw, we fuzz test this code but filter out strings containing .bpf., .o or .c to avoid the fuzzer turning into an LLVM fuzzer. This refactoring will solve some linking issues we have. Perhaps we can set up fuzz testing here?
Thanks,
Ian
Quoted 104 lines
Signed-off-by Jiri Olsa <[email protected]>--- tools/lib/perf/tests/Build | 1 + tools/lib/perf/tests/main.c | 1 + tools/lib/perf/tests/test-evlist.c | 2 ++ tools/lib/perf/tests/test-parse-events.c | 41 ++++++++++++++++++++++++ tools/lib/perf/tests/tests.h | 1 + 5 files changed, 46 insertions(+) create mode 100644 tools/lib/perf/tests/test-parse-events.ctools/lib/perf/tests/Build +1
-0@@ -3,3 +3,4 @@ tests-y += test-evsel.o tests-y += test-evlist.o tests-y += test-cpumap.o tests-y += test-threadmap.o +tests-y += test-parse-events.otools/lib/perf/tests/main.c +1
-0@@ -7,6 +7,7 @@ int tests_verbose;int main (int argc,char **argv) { +__T ("test parse_events" , !test_parse_events (argc, argv));__T ("test cpumap" , !test_cpumap (argc, argv));__T ("test threadmap" , !test_threadmap (argc, argv));__T ("test evlist" , !test_evlist (argc, argv));tools/lib/perf/tests/test-evlist.c +2
-0@@ -1,5 +1,7 @@// SPDX-License-Identifier: GPL-2.0 +#ifndef _GNU_SOURCE#define _GNU_SOURCE// needed for sched.h to get sched_[gs]etaffinity and CPU_(ZERO,SET) +#endif #include <sched.h> #include <stdio.h> #include <stdarg.h> tools/lib/perf/tests/test-parse-events.c new file +41
-0@@ -0,0 +1,41 @@ +#include <stdio.h> +#include <linux/perf_event.h> +#include <linux/hw_breakpoint.h> +#include <perf/evlist.h> +#include <perf/evsel.h> +#include <internal/evlist.h> +#include <internal/tests.h> +#include "tests.h" + +static int libperf_print (enum libperf_print_level level, +const char *fmt,va_list ap) +{ +return vfprintf (stderr, fmt, ap); +} + +int test_parse_events (int argc,char **argv) +{ +struct perf_evlist *evlist; +struct perf_evsel *evsel; +int err; + + __T_START; + +libperf_init (libperf_print); + + evlist =perf_evlist__new (); +__T ("failed to create evlist" , evlist); + + err =libperf_parse_events (evlist,"mem:0:rw" ); +__T ("failed to parse events" , !err); + + evsel =perf_evlist__first (evlist); + +__T ("wrong type" ,PERF_TYPE_BREAKPOINT == evsel->attr.type); +__T ("wrong config" ,0 == evsel->attr.config); +__T ("wrong bp_type" , (HW_BREAKPOINT_R |HW_BREAKPOINT_W ) == evsel->attr.bp_type); +__T ("wrong bp_len" ,HW_BREAKPOINT_LEN_4 == evsel->attr.bp_len); + + __T_END; +return tests_failed ==0 ?0 :-1 ; +}tools/lib/perf/tests/tests.h +1
-1@@ -6,5 +6,6 @@ int test_cpumap(int argc, char **argv);int test_threadmap (int argc,char **argv);int test_evlist (int argc,char **argv);int test_evsel (int argc,char **argv); +int test_parse_events (int argc,char **argv);#endif /* TESTS_H */ --2.31.1
Re: [PATCH 59/59] libperf: Add parse-events test
Quoted 8 lines · Ian Rogers
Quoted 2 lines · Jiri Olsa
Adding parse-events test.
Fwiw, we fuzz test this code but filter out strings containing .bpf., .o or .c to avoid the fuzzer turning into an LLVM fuzzer. This refactoring will solve some linking issues we have. Perhaps we can set up fuzz testing here?
sounds good, also this could change to the kunit style you do for perf test.. and perhaps included in 'perf test' invocation
jirka
Quoted 109 lines
Thanks,
IanQuoted 104 lines
Signed-off-by Jiri Olsa <[email protected]>--- tools/lib/perf/tests/Build | 1 + tools/lib/perf/tests/main.c | 1 + tools/lib/perf/tests/test-evlist.c | 2 ++ tools/lib/perf/tests/test-parse-events.c | 41 ++++++++++++++++++++++++ tools/lib/perf/tests/tests.h | 1 + 5 files changed, 46 insertions(+) create mode 100644 tools/lib/perf/tests/test-parse-events.ctools/lib/perf/tests/Build +1
-0@@ -3,3 +3,4 @@ tests-y += test-evsel.o tests-y += test-evlist.o tests-y += test-cpumap.o tests-y += test-threadmap.o +tests-y += test-parse-events.otools/lib/perf/tests/main.c +1
-0@@ -7,6 +7,7 @@ int tests_verbose;int main (int argc,char **argv) { +__T ("test parse_events" , !test_parse_events (argc, argv));__T ("test cpumap" , !test_cpumap (argc, argv));__T ("test threadmap" , !test_threadmap (argc, argv));__T ("test evlist" , !test_evlist (argc, argv));tools/lib/perf/tests/test-evlist.c +2
-0@@ -1,5 +1,7 @@// SPDX-License-Identifier: GPL-2.0 +#ifndef _GNU_SOURCE#define _GNU_SOURCE// needed for sched.h to get sched_[gs]etaffinity and CPU_(ZERO,SET) +#endif #include <sched.h> #include <stdio.h> #include <stdarg.h> tools/lib/perf/tests/test-parse-events.c new file +41
-0@@ -0,0 +1,41 @@ +#include <stdio.h> +#include <linux/perf_event.h> +#include <linux/hw_breakpoint.h> +#include <perf/evlist.h> +#include <perf/evsel.h> +#include <internal/evlist.h> +#include <internal/tests.h> +#include "tests.h" + +static int libperf_print (enum libperf_print_level level, +const char *fmt,va_list ap) +{ +return vfprintf (stderr, fmt, ap); +} + +int test_parse_events (int argc,char **argv) +{ +struct perf_evlist *evlist; +struct perf_evsel *evsel; +int err; + + __T_START; + +libperf_init (libperf_print); + + evlist =perf_evlist__new (); +__T ("failed to create evlist" , evlist); + + err =libperf_parse_events (evlist,"mem:0:rw" ); +__T ("failed to parse events" , !err); + + evsel =perf_evlist__first (evlist); + +__T ("wrong type" ,PERF_TYPE_BREAKPOINT == evsel->attr.type); +__T ("wrong config" ,0 == evsel->attr.config); +__T ("wrong bp_type" , (HW_BREAKPOINT_R |HW_BREAKPOINT_W ) == evsel->attr.bp_type); +__T ("wrong bp_len" ,HW_BREAKPOINT_LEN_4 == evsel->attr.bp_len); + + __T_END; +return tests_failed ==0 ?0 :-1 ; +}tools/lib/perf/tests/tests.h +1
-1@@ -6,5 +6,6 @@ int test_cpumap(int argc, char **argv);int test_threadmap (int argc,char **argv);int test_evlist (int argc,char **argv);int test_evsel (int argc,char **argv); +int test_parse_events (int argc,char **argv);#endif /* TESTS_H */ --2.31.1
Ian Rogers
reviewerQuoted 33 lines · Jiri Olsa
hi,
this *RFC* patchset moves event parser code to libperf.It keeps the current perf functionality intact (hopefully) and adds new
libperf_parse_eventsAPI to libperf that provides events parsing.At the moment
libperf_parse_eventsfunction supports only breakpoint events, so it can be used to do things like:
(see the new libperf test)evlist = perf_evlist__new(); err = libperf_parse_events(evlist, "mem:0:rw");The other pmus parsing code directly depends on parsing code, so now when the parser is in the libperf, it will be easier to add the rest of pmus support.
I'm curious on any early feedback because it's big change. My primary target is using this interface for bpftool prog profile to allow using all the perf events there.
Also available in here:
git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.git
libperf/parseI'm Cc-ing most of the folks just on the cover email, because it's a lot of changes and most people won't be interested ;-)
Quoted 5 lines
Please check the linux-perf-users mailing list or the git branch above for all the changes.
thanks,
jirka
It is a big change but I'm positive about it. Perhaps bpftool can use libpfm4 in the short-term ;-) There are lots of small cleanups and documentation improvements that can be done. Getting the main move done quickly will help avoid the merge conflicts. I foresee conflicts with my un-merged changes (reviews welcome :-) ):
new literals in metrics and a source_count function:
https://lore.kernel.org/lkml/[email protected]/
kunit style cleanup:
https://lore.kernel.org/lkml/[email protected]/
I would like to see pmu-events cleaned up. Some ideas here are:
1) moving jevents to a python program to simplify its maintenance - 100s of lines of json parsing code would turn into a single import and we'd cease having an out dated for of jsmn
2) the pmu_events_map holds both events and metrics. Moving pmu-events into libperf probably means something for the metrics code, should it move to libperf too?
3) an issue with the existing pmu_events_map is that it is a struct with lots of pointers. Most of the pointers are to .rodata strings. With PIE the strings can end up anywhere in memory and so relocations are needed for what is about 1.5MB worth of data. It'd be nice if perf wasn't relocating all of that every time it starts. A solution would be to turn all the events into a giant string (with deduplication, etc.) and then to do something like leb128 encode offsets into the string (many offsets are 0 and leb128 would encode that as a single byte). As the string offsets, or leb128 encoded offsets, are constant then they can go in .rodata and don't require relocating. We should be able to shave something like 1MB off the binary size while improving startup performance. Adding the logic to jevents.c would be more yucky than in python imo.
Thanks,
Ian
Quoted 943 lines
Cc John Garry <[email protected]>Cc Jin Yao <[email protected]>Cc Andi Kleen <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Ingo Molnar <[email protected]>Cc Mark Rutland <[email protected]>Cc Alexander Shishkin <[email protected]>Cc Michael Petlan <[email protected]>Cc Stephane Eranian <[email protected]>---
Jiri Olsa (59):
libperf: Movepmu-events.hfile to libperf
libperf: Move pmu-events framework to libperf
libperf: Move pmu-events build to libperf
libperf: Moveperf_pmu__format_parseto libperf
tools api fs: Move in the fncache from perf
libperf: Move in the pmu hybrid support
libperf: Move name toperf_evsel
libperf: Moveauto_merge_statstoperf_evsel
libperf: Moveconfig_termstoperf_evsel
libperf: Movemetric_idtoperf_evsel
libperf: Movetool_eventtoperf_evsel
libperf: Move unit toperf_evsel
libperf: Moveexclude_GHtoperf_evsel
libperf: Movesample_readtoperf_evsel
libperf: Moveprecise_maxtoperf_evsel
libperf: Moveweak_grouptoperf_evsel
libperf: Movebpf_countertoperf_evsel
libperf: Movegroup_nametoperf_evsel
perf tools: Fixparse_events_term__numcall
perf tools: Passparse_stateall the way down to__add_eventperf tools: Passparse_stateall the way down toadd_tracepointperf tools: Addevsel__newcallback toparse_state_opsperf tools: Addevsel__new_tpcallback toparse_state_opsperf tools: Addloc_termandloc_valhelpers toparse_events_term__strperf tools: Addloc_termandloc_valhelpers toparse_events_term__num
libperf: Move in the event_symbols_hw/event_symbols_sw
libperf: Move in structparse_events_termcode
perf tools: Addperf_evsel__add_eventfunction
perf tools: Change structparse_events_state::evlisttoperf_evlist
libperf: Move in structparse_events_state
perf tools: Moveevent_attr_initinevsel__new_idxfunction
libperf: Move inperf_pmu__warn_invalid_configfunction
libperf: Move inperf_evsel__add_eventfunction
perf tools: Moveparse_events_update_liststo parser unit
libperf: Addperf_evsel__is_group_leaderfunction
perf tools: Makeparse_events__modifier_eventwork overperf_evselperf tool: Passperf_guestin structparse_events_state
libperf: Move in parse_events__modifier_group/event functions
libperf: Move inparse_events__handle_errorfunction
libperf: Move inparse_events_evlist_errorfunction
perf tools: Addperf_evsel__deletecallback to structparse_events_ops
libperf: Move inparse_events_namefunction
perf tools: Move outparse_events_add_pmufallback from parser code perf tools: Addadd_pmucallback to structparse_events_opsperf tools: Addadd_pmu_multicallback to structparse_events_opsperf tools: Addadd_numericcallback to structparse_events_opsperf tools: Addadd_cachecallback to structparse_events_opsperf tools: Addadd_breakpointcallback to structparse_events_opsperf tools: Addadd_tracepointcallback to structparse_events_opsperf tools: Addadd_bpfcallback to structparse_events_opsperf tools: Addadd_toolcallback to structparse_events_opsperf tools: Addset_leadercallback to structparse_events_opsperf tools: Addparse_checkcallback to structparse_events_opsperf tools: Move PE_* enums inparse_events__scanner
libperf: Move in parse-events flex/bison parser
libperf: Move inparse_events_add_breakpointfunction
libperf: Move in some lib objects from perf
libperf: Addlibperf_parse_eventsfunction
libperf: Add parse-events testtools/lib/api/fs/Build | 1 + tools/{perf/util => lib/api/fs}/fncache.c | 4 +- tools/lib/api/fs/fs.h | 2 + tools/lib/perf/Build | 79 ++ tools/lib/perf/Makefile | 40 +- tools/lib/perf/include/internal/evsel.h | 30 + tools/lib/perf/include/internal/parse-events.h | 203 +++++ .../perf/include/internal}/pmu-hybrid.h | 2 +- tools/lib/perf/include/internal/pmu.h | 59 ++ tools/lib/perf/include/perf/evlist.h | 2 + .../perf/include/perf}/pmu-events.h | 0 tools/lib/perf/libperf.map | 1 + tools/lib/perf/parse-events.c | 875 +++++++++++++++++++ tools/{perf/util => lib/perf}/parse-events.l | 16 +- tools/{perf/util => lib/perf}/parse-events.y | 197 +++-- tools/{ => lib}/perf/pmu-events/Build | 2 +- tools/{ => lib}/perf/pmu-events/README | 0 .../pmu-events/arch/arm64/ampere/emag/branch.json | 0 .../pmu-events/arch/arm64/ampere/emag/bus.json | 0 .../pmu-events/arch/arm64/ampere/emag/cache.json | 0 .../pmu-events/arch/arm64/ampere/emag/clock.json | 0 .../arch/arm64/ampere/emag/exception.json | 0 .../arch/arm64/ampere/emag/instruction.json | 0 .../arch/arm64/ampere/emag/intrinsic.json | 0 .../pmu-events/arch/arm64/ampere/emag/memory.json | 0 .../arch/arm64/ampere/emag/pipeline.json | 0 .../arch/arm64/arm/cortex-a53/branch.json | 0 .../pmu-events/arch/arm64/arm/cortex-a53/bus.json | 0 .../arch/arm64/arm/cortex-a53/cache.json | 0 .../arch/arm64/arm/cortex-a53/memory.json | 0 .../arch/arm64/arm/cortex-a53/other.json | 0 .../arch/arm64/arm/cortex-a53/pipeline.json | 0 .../arm64/arm/cortex-a57-a72/core-imp-def.json | 0 .../arch/arm64/arm/cortex-a76-n1/branch.json | 0 .../arch/arm64/arm/cortex-a76-n1/bus.json | 0 .../arch/arm64/arm/cortex-a76-n1/cache.json | 0 .../arch/arm64/arm/cortex-a76-n1/exception.json | 0 .../arch/arm64/arm/cortex-a76-n1/instruction.json | 0 .../arch/arm64/arm/cortex-a76-n1/memory.json | 0 .../arch/arm64/arm/cortex-a76-n1/other.json | 0 .../arch/arm64/arm/cortex-a76-n1/pipeline.json | 0 .../arch/arm64/arm/neoverse-v1/branch.json | 0 .../pmu-events/arch/arm64/arm/neoverse-v1/bus.json | 0 .../arch/arm64/arm/neoverse-v1/cache.json | 0 .../arch/arm64/arm/neoverse-v1/exception.json | 0 .../arch/arm64/arm/neoverse-v1/instruction.json | 0 .../arch/arm64/arm/neoverse-v1/memory.json | 0 .../arch/arm64/arm/neoverse-v1/other.json | 0 .../arch/arm64/arm/neoverse-v1/pipeline.json | 0 .../arch/arm64/armv8-common-and-microarch.json | 0 .../pmu-events/arch/arm64/armv8-recommended.json | 0 .../arch/arm64/cavium/thunderx2/core-imp-def.json | 0 .../arch/arm64/freescale/imx8mm/sys/ddrc.json | 0 .../arch/arm64/freescale/imx8mm/sys/metrics.json | 0 .../arch/arm64/freescale/imx8mn/sys/ddrc.json | 0 .../arch/arm64/freescale/imx8mn/sys/metrics.json | 0 .../arch/arm64/freescale/imx8mp/sys/ddrc.json | 0 .../arch/arm64/freescale/imx8mp/sys/metrics.json | 0 .../arch/arm64/freescale/imx8mq/sys/ddrc.json | 0 .../arch/arm64/freescale/imx8mq/sys/metrics.json | 0 .../arch/arm64/fujitsu/a64fx/branch.json | 0 .../pmu-events/arch/arm64/fujitsu/a64fx/bus.json | 0 .../pmu-events/arch/arm64/fujitsu/a64fx/cache.json | 0 .../pmu-events/arch/arm64/fujitsu/a64fx/cycle.json | 0 .../arch/arm64/fujitsu/a64fx/exception.json | 0 .../arch/arm64/fujitsu/a64fx/instruction.json | 0 .../arch/arm64/fujitsu/a64fx/memory.json | 0 .../pmu-events/arch/arm64/fujitsu/a64fx/other.json | 0 .../arch/arm64/fujitsu/a64fx/pipeline.json | 0 .../pmu-events/arch/arm64/fujitsu/a64fx/sve.json | 0 .../arch/arm64/hisilicon/hip08/core-imp-def.json | 0 .../arch/arm64/hisilicon/hip08/metrics.json | 0 .../arch/arm64/hisilicon/hip08/uncore-ddrc.json | 0 .../arch/arm64/hisilicon/hip08/uncore-hha.json | 0 .../arch/arm64/hisilicon/hip08/uncore-l3c.json | 0 .../perf/pmu-events/arch/arm64/mapfile.csv | 0 .../perf/pmu-events/arch/nds32/mapfile.csv | 0 .../perf/pmu-events/arch/nds32/n13/atcpmu.json | 0 .../perf/pmu-events/arch/powerpc/mapfile.csv | 0 .../pmu-events/arch/powerpc/power10/cache.json | 0 .../arch/powerpc/power10/floating_point.json | 0 .../pmu-events/arch/powerpc/power10/frontend.json | 0 .../pmu-events/arch/powerpc/power10/locks.json | 0 .../pmu-events/arch/powerpc/power10/marked.json | 0 .../pmu-events/arch/powerpc/power10/memory.json | 0 .../arch/powerpc/power10/nest_metrics.json | 0 .../pmu-events/arch/powerpc/power10/others.json | 0 .../pmu-events/arch/powerpc/power10/pipeline.json | 0 .../perf/pmu-events/arch/powerpc/power10/pmc.json | 0 .../arch/powerpc/power10/translation.json | 0 .../perf/pmu-events/arch/powerpc/power8/cache.json | 0 .../arch/powerpc/power8/floating-point.json | 0 .../pmu-events/arch/powerpc/power8/frontend.json | 0 .../pmu-events/arch/powerpc/power8/marked.json | 0 .../pmu-events/arch/powerpc/power8/memory.json | 0 .../pmu-events/arch/powerpc/power8/metrics.json | 0 .../perf/pmu-events/arch/powerpc/power8/other.json | 0 .../pmu-events/arch/powerpc/power8/pipeline.json | 0 .../perf/pmu-events/arch/powerpc/power8/pmc.json | 0 .../arch/powerpc/power8/translation.json | 0 .../perf/pmu-events/arch/powerpc/power9/cache.json | 0 .../arch/powerpc/power9/floating-point.json | 0 .../pmu-events/arch/powerpc/power9/frontend.json | 0 .../pmu-events/arch/powerpc/power9/marked.json | 0 .../pmu-events/arch/powerpc/power9/memory.json | 0 .../pmu-events/arch/powerpc/power9/metrics.json | 0 .../arch/powerpc/power9/nest_metrics.json | 0 .../perf/pmu-events/arch/powerpc/power9/other.json | 0 .../pmu-events/arch/powerpc/power9/pipeline.json | 0 .../perf/pmu-events/arch/powerpc/power9/pmc.json | 0 .../arch/powerpc/power9/translation.json | 0 .../perf/pmu-events/arch/s390/cf_z10/basic.json | 0 .../perf/pmu-events/arch/s390/cf_z10/crypto.json | 0 .../perf/pmu-events/arch/s390/cf_z10/extended.json | 0 .../perf/pmu-events/arch/s390/cf_z13/basic.json | 0 .../perf/pmu-events/arch/s390/cf_z13/crypto.json | 0 .../perf/pmu-events/arch/s390/cf_z13/extended.json | 0 .../pmu-events/arch/s390/cf_z13/transaction.json | 0 .../perf/pmu-events/arch/s390/cf_z14/basic.json | 0 .../perf/pmu-events/arch/s390/cf_z14/crypto.json | 0 .../perf/pmu-events/arch/s390/cf_z14/extended.json | 0 .../pmu-events/arch/s390/cf_z14/transaction.json | 0 .../perf/pmu-events/arch/s390/cf_z15/basic.json | 0 .../perf/pmu-events/arch/s390/cf_z15/crypto.json | 0 .../perf/pmu-events/arch/s390/cf_z15/crypto6.json | 0 .../perf/pmu-events/arch/s390/cf_z15/extended.json | 0 .../pmu-events/arch/s390/cf_z15/transaction.json | 0 .../perf/pmu-events/arch/s390/cf_z196/basic.json | 0 .../perf/pmu-events/arch/s390/cf_z196/crypto.json | 0 .../pmu-events/arch/s390/cf_z196/extended.json | 0 .../perf/pmu-events/arch/s390/cf_zec12/basic.json | 0 .../perf/pmu-events/arch/s390/cf_zec12/crypto.json | 0 .../pmu-events/arch/s390/cf_zec12/extended.json | 0 .../pmu-events/arch/s390/cf_zec12/transaction.json | 0 .../perf/pmu-events/arch/s390/mapfile.csv | 0 .../perf/pmu-events/arch/test/arch-std-events.json | 0 .../pmu-events/arch/test/test_soc/cpu/branch.json | 0 .../pmu-events/arch/test/test_soc/cpu/cache.json | 0 .../pmu-events/arch/test/test_soc/cpu/other.json | 0 .../pmu-events/arch/test/test_soc/cpu/uncore.json | 0 .../pmu-events/arch/test/test_soc/sys/uncore.json | 0 .../perf/pmu-events/arch/x86/amdzen1/branch.json | 0 .../perf/pmu-events/arch/x86/amdzen1/cache.json | 0 .../perf/pmu-events/arch/x86/amdzen1/core.json | 0 .../pmu-events/arch/x86/amdzen1/data-fabric.json | 0 .../arch/x86/amdzen1/floating-point.json | 0 .../perf/pmu-events/arch/x86/amdzen1/memory.json | 0 .../perf/pmu-events/arch/x86/amdzen1/other.json | 0 .../pmu-events/arch/x86/amdzen1/recommended.json | 0 .../perf/pmu-events/arch/x86/amdzen2/branch.json | 0 .../perf/pmu-events/arch/x86/amdzen2/cache.json | 0 .../perf/pmu-events/arch/x86/amdzen2/core.json | 0 .../pmu-events/arch/x86/amdzen2/data-fabric.json | 0 .../arch/x86/amdzen2/floating-point.json | 0 .../perf/pmu-events/arch/x86/amdzen2/memory.json | 0 .../perf/pmu-events/arch/x86/amdzen2/other.json | 0 .../pmu-events/arch/x86/amdzen2/recommended.json | 0 .../perf/pmu-events/arch/x86/amdzen3/branch.json | 0 .../perf/pmu-events/arch/x86/amdzen3/cache.json | 0 .../perf/pmu-events/arch/x86/amdzen3/core.json | 0 .../pmu-events/arch/x86/amdzen3/data-fabric.json | 0 .../arch/x86/amdzen3/floating-point.json | 0 .../perf/pmu-events/arch/x86/amdzen3/memory.json | 0 .../perf/pmu-events/arch/x86/amdzen3/other.json | 0 .../pmu-events/arch/x86/amdzen3/recommended.json | 0 .../perf/pmu-events/arch/x86/bonnell/cache.json | 0 .../arch/x86/bonnell/floating-point.json | 0 .../perf/pmu-events/arch/x86/bonnell/frontend.json | 0 .../perf/pmu-events/arch/x86/bonnell/memory.json | 0 .../perf/pmu-events/arch/x86/bonnell/other.json | 0 .../perf/pmu-events/arch/x86/bonnell/pipeline.json | 0 .../arch/x86/bonnell/virtual-memory.json | 0 .../pmu-events/arch/x86/broadwell/bdw-metrics.json | 0 .../perf/pmu-events/arch/x86/broadwell/cache.json | 0 .../arch/x86/broadwell/floating-point.json | 0 .../pmu-events/arch/x86/broadwell/frontend.json | 0 .../perf/pmu-events/arch/x86/broadwell/memory.json | 0 .../perf/pmu-events/arch/x86/broadwell/other.json | 0 .../pmu-events/arch/x86/broadwell/pipeline.json | 0 .../perf/pmu-events/arch/x86/broadwell/uncore.json | 0 .../arch/x86/broadwell/virtual-memory.json | 0 .../arch/x86/broadwellde/bdwde-metrics.json | 0 .../pmu-events/arch/x86/broadwellde/cache.json | 0 .../arch/x86/broadwellde/floating-point.json | 0 .../pmu-events/arch/x86/broadwellde/frontend.json | 0 .../pmu-events/arch/x86/broadwellde/memory.json | 0 .../pmu-events/arch/x86/broadwellde/other.json | 0 .../pmu-events/arch/x86/broadwellde/pipeline.json | 0 .../arch/x86/broadwellde/uncore-cache.json | 0 .../arch/x86/broadwellde/uncore-memory.json | 0 .../arch/x86/broadwellde/uncore-power.json | 0 .../arch/x86/broadwellde/virtual-memory.json | 0 .../arch/x86/broadwellx/bdx-metrics.json | 0 .../perf/pmu-events/arch/x86/broadwellx/cache.json | 0 .../arch/x86/broadwellx/floating-point.json | 0 .../pmu-events/arch/x86/broadwellx/frontend.json | 0 .../pmu-events/arch/x86/broadwellx/memory.json | 0 .../perf/pmu-events/arch/x86/broadwellx/other.json | 0 .../pmu-events/arch/x86/broadwellx/pipeline.json | 0 .../arch/x86/broadwellx/uncore-cache.json | 0 .../arch/x86/broadwellx/uncore-interconnect.json | 0 .../arch/x86/broadwellx/uncore-memory.json | 0 .../arch/x86/broadwellx/uncore-power.json | 0 .../arch/x86/broadwellx/virtual-memory.json | 0 .../pmu-events/arch/x86/cascadelakex/cache.json | 0 .../arch/x86/cascadelakex/clx-metrics.json | 0 .../arch/x86/cascadelakex/floating-point.json | 0 .../pmu-events/arch/x86/cascadelakex/frontend.json | 0 .../pmu-events/arch/x86/cascadelakex/memory.json | 0 .../pmu-events/arch/x86/cascadelakex/other.json | 0 .../pmu-events/arch/x86/cascadelakex/pipeline.json | 0 .../arch/x86/cascadelakex/uncore-memory.json | 0 .../arch/x86/cascadelakex/uncore-other.json | 0 .../arch/x86/cascadelakex/virtual-memory.json | 0 .../pmu-events/arch/x86/elkhartlake/cache.json | 0 .../arch/x86/elkhartlake/ehl-metrics.json | 0 .../arch/x86/elkhartlake/floating-point.json | 0 .../pmu-events/arch/x86/elkhartlake/frontend.json | 0 .../pmu-events/arch/x86/elkhartlake/memory.json | 0 .../pmu-events/arch/x86/elkhartlake/other.json | 0 .../pmu-events/arch/x86/elkhartlake/pipeline.json | 0 .../arch/x86/elkhartlake/virtual-memory.json | 0 .../perf/pmu-events/arch/x86/goldmont/cache.json | 0 .../pmu-events/arch/x86/goldmont/frontend.json | 0 .../perf/pmu-events/arch/x86/goldmont/memory.json | 0 .../perf/pmu-events/arch/x86/goldmont/other.json | 0 .../pmu-events/arch/x86/goldmont/pipeline.json | 0 .../arch/x86/goldmont/virtual-memory.json | 0 .../pmu-events/arch/x86/goldmontplus/cache.json | 0 .../pmu-events/arch/x86/goldmontplus/frontend.json | 0 .../pmu-events/arch/x86/goldmontplus/memory.json | 0 .../pmu-events/arch/x86/goldmontplus/other.json | 0 .../pmu-events/arch/x86/goldmontplus/pipeline.json | 0 .../arch/x86/goldmontplus/virtual-memory.json | 0 .../perf/pmu-events/arch/x86/haswell/cache.json | 0 .../arch/x86/haswell/floating-point.json | 0 .../perf/pmu-events/arch/x86/haswell/frontend.json | 0 .../pmu-events/arch/x86/haswell/hsw-metrics.json | 0 .../perf/pmu-events/arch/x86/haswell/memory.json | 0 .../perf/pmu-events/arch/x86/haswell/other.json | 0 .../perf/pmu-events/arch/x86/haswell/pipeline.json | 0 .../perf/pmu-events/arch/x86/haswell/uncore.json | 0 .../arch/x86/haswell/virtual-memory.json | 0 .../perf/pmu-events/arch/x86/haswellx/cache.json | 0 .../arch/x86/haswellx/floating-point.json | 0 .../pmu-events/arch/x86/haswellx/frontend.json | 0 .../pmu-events/arch/x86/haswellx/hsx-metrics.json | 0 .../perf/pmu-events/arch/x86/haswellx/memory.json | 0 .../perf/pmu-events/arch/x86/haswellx/other.json | 0 .../pmu-events/arch/x86/haswellx/pipeline.json | 0 .../pmu-events/arch/x86/haswellx/uncore-cache.json | 0 .../arch/x86/haswellx/uncore-interconnect.json | 0 .../arch/x86/haswellx/uncore-memory.json | 0 .../pmu-events/arch/x86/haswellx/uncore-power.json | 0 .../arch/x86/haswellx/virtual-memory.json | 0 .../perf/pmu-events/arch/x86/icelake/cache.json | 0 .../arch/x86/icelake/floating-point.json | 0 .../perf/pmu-events/arch/x86/icelake/frontend.json | 0 .../pmu-events/arch/x86/icelake/icl-metrics.json | 0 .../perf/pmu-events/arch/x86/icelake/memory.json | 0 .../perf/pmu-events/arch/x86/icelake/other.json | 0 .../perf/pmu-events/arch/x86/icelake/pipeline.json | 0 .../arch/x86/icelake/virtual-memory.json | 0 .../perf/pmu-events/arch/x86/icelakex/cache.json | 0 .../arch/x86/icelakex/floating-point.json | 0 .../pmu-events/arch/x86/icelakex/frontend.json | 0 .../pmu-events/arch/x86/icelakex/icx-metrics.json | 0 .../perf/pmu-events/arch/x86/icelakex/memory.json | 0 .../perf/pmu-events/arch/x86/icelakex/other.json | 0 .../pmu-events/arch/x86/icelakex/pipeline.json | 0 .../arch/x86/icelakex/uncore-memory.json | 0 .../pmu-events/arch/x86/icelakex/uncore-other.json | 0 .../pmu-events/arch/x86/icelakex/uncore-power.json | 0 .../arch/x86/icelakex/virtual-memory.json | 0 .../perf/pmu-events/arch/x86/ivybridge/cache.json | 0 .../arch/x86/ivybridge/floating-point.json | 0 .../pmu-events/arch/x86/ivybridge/frontend.json | 0 .../pmu-events/arch/x86/ivybridge/ivb-metrics.json | 0 .../perf/pmu-events/arch/x86/ivybridge/memory.json | 0 .../perf/pmu-events/arch/x86/ivybridge/other.json | 0 .../pmu-events/arch/x86/ivybridge/pipeline.json | 0 .../perf/pmu-events/arch/x86/ivybridge/uncore.json | 0 .../arch/x86/ivybridge/virtual-memory.json | 0 .../perf/pmu-events/arch/x86/ivytown/cache.json | 0 .../arch/x86/ivytown/floating-point.json | 0 .../perf/pmu-events/arch/x86/ivytown/frontend.json | 0 .../pmu-events/arch/x86/ivytown/ivt-metrics.json | 0 .../perf/pmu-events/arch/x86/ivytown/memory.json | 0 .../perf/pmu-events/arch/x86/ivytown/other.json | 0 .../perf/pmu-events/arch/x86/ivytown/pipeline.json | 0 .../pmu-events/arch/x86/ivytown/uncore-cache.json | 0 .../arch/x86/ivytown/uncore-interconnect.json | 0 .../pmu-events/arch/x86/ivytown/uncore-memory.json | 0 .../pmu-events/arch/x86/ivytown/uncore-power.json | 0 .../arch/x86/ivytown/virtual-memory.json | 0 .../perf/pmu-events/arch/x86/jaketown/cache.json | 0 .../arch/x86/jaketown/floating-point.json | 0 .../pmu-events/arch/x86/jaketown/frontend.json | 0 .../pmu-events/arch/x86/jaketown/jkt-metrics.json | 0 .../perf/pmu-events/arch/x86/jaketown/memory.json | 0 .../perf/pmu-events/arch/x86/jaketown/other.json | 0 .../pmu-events/arch/x86/jaketown/pipeline.json | 0 .../pmu-events/arch/x86/jaketown/uncore-cache.json | 0 .../arch/x86/jaketown/uncore-interconnect.json | 0 .../arch/x86/jaketown/uncore-memory.json | 0 .../pmu-events/arch/x86/jaketown/uncore-power.json | 0 .../arch/x86/jaketown/virtual-memory.json | 0 .../pmu-events/arch/x86/knightslanding/cache.json | 0 .../arch/x86/knightslanding/frontend.json | 0 .../pmu-events/arch/x86/knightslanding/memory.json | 0 .../arch/x86/knightslanding/pipeline.json | 0 .../arch/x86/knightslanding/uncore-memory.json | 0 .../arch/x86/knightslanding/virtual-memory.json | 0 .../{ => lib}/perf/pmu-events/arch/x86/mapfile.csv | 0 .../perf/pmu-events/arch/x86/nehalemep/cache.json | 0 .../arch/x86/nehalemep/floating-point.json | 0 .../pmu-events/arch/x86/nehalemep/frontend.json | 0 .../perf/pmu-events/arch/x86/nehalemep/memory.json | 0 .../perf/pmu-events/arch/x86/nehalemep/other.json | 0 .../pmu-events/arch/x86/nehalemep/pipeline.json | 0 .../arch/x86/nehalemep/virtual-memory.json | 0 .../perf/pmu-events/arch/x86/nehalemex/cache.json | 0 .../arch/x86/nehalemex/floating-point.json | 0 .../pmu-events/arch/x86/nehalemex/frontend.json | 0 .../perf/pmu-events/arch/x86/nehalemex/memory.json | 0 .../perf/pmu-events/arch/x86/nehalemex/other.json | 0 .../pmu-events/arch/x86/nehalemex/pipeline.json | 0 .../arch/x86/nehalemex/virtual-memory.json | 0 .../pmu-events/arch/x86/sandybridge/cache.json | 0 .../arch/x86/sandybridge/floating-point.json | 0 .../pmu-events/arch/x86/sandybridge/frontend.json | 0 .../pmu-events/arch/x86/sandybridge/memory.json | 0 .../pmu-events/arch/x86/sandybridge/other.json | 0 .../pmu-events/arch/x86/sandybridge/pipeline.json | 0 .../arch/x86/sandybridge/snb-metrics.json | 0 .../pmu-events/arch/x86/sandybridge/uncore.json | 0 .../arch/x86/sandybridge/virtual-memory.json | 0 .../perf/pmu-events/arch/x86/silvermont/cache.json | 0 .../pmu-events/arch/x86/silvermont/frontend.json | 0 .../pmu-events/arch/x86/silvermont/memory.json | 0 .../perf/pmu-events/arch/x86/silvermont/other.json | 0 .../pmu-events/arch/x86/silvermont/pipeline.json | 0 .../arch/x86/silvermont/virtual-memory.json | 0 .../perf/pmu-events/arch/x86/skylake/cache.json | 0 .../arch/x86/skylake/floating-point.json | 0 .../perf/pmu-events/arch/x86/skylake/frontend.json | 0 .../perf/pmu-events/arch/x86/skylake/memory.json | 0 .../perf/pmu-events/arch/x86/skylake/other.json | 0 .../perf/pmu-events/arch/x86/skylake/pipeline.json | 0 .../pmu-events/arch/x86/skylake/skl-metrics.json | 0 .../perf/pmu-events/arch/x86/skylake/uncore.json | 0 .../arch/x86/skylake/virtual-memory.json | 0 .../perf/pmu-events/arch/x86/skylakex/cache.json | 0 .../arch/x86/skylakex/floating-point.json | 0 .../pmu-events/arch/x86/skylakex/frontend.json | 0 .../perf/pmu-events/arch/x86/skylakex/memory.json | 0 .../perf/pmu-events/arch/x86/skylakex/other.json | 0 .../pmu-events/arch/x86/skylakex/pipeline.json | 0 .../pmu-events/arch/x86/skylakex/skx-metrics.json | 0 .../arch/x86/skylakex/uncore-memory.json | 0 .../pmu-events/arch/x86/skylakex/uncore-other.json | 0 .../arch/x86/skylakex/virtual-memory.json | 0 .../perf/pmu-events/arch/x86/tigerlake/cache.json | 0 .../arch/x86/tigerlake/floating-point.json | 0 .../pmu-events/arch/x86/tigerlake/frontend.json | 0 .../perf/pmu-events/arch/x86/tigerlake/memory.json | 0 .../perf/pmu-events/arch/x86/tigerlake/other.json | 0 .../pmu-events/arch/x86/tigerlake/pipeline.json | 0 .../pmu-events/arch/x86/tigerlake/tgl-metrics.json | 0 .../arch/x86/tigerlake/virtual-memory.json | 0 .../perf/pmu-events/arch/x86/tremontx/cache.json | 0 .../pmu-events/arch/x86/tremontx/frontend.json | 0 .../perf/pmu-events/arch/x86/tremontx/memory.json | 0 .../perf/pmu-events/arch/x86/tremontx/other.json | 0 .../pmu-events/arch/x86/tremontx/pipeline.json | 0 .../arch/x86/tremontx/uncore-memory.json | 0 .../pmu-events/arch/x86/tremontx/uncore-other.json | 0 .../pmu-events/arch/x86/tremontx/uncore-power.json | 0 .../arch/x86/tremontx/virtual-memory.json | 0 .../pmu-events/arch/x86/westmereep-dp/cache.json | 0 .../arch/x86/westmereep-dp/floating-point.json | 0 .../arch/x86/westmereep-dp/frontend.json | 0 .../pmu-events/arch/x86/westmereep-dp/memory.json | 0 .../pmu-events/arch/x86/westmereep-dp/other.json | 0 .../arch/x86/westmereep-dp/pipeline.json | 0 .../arch/x86/westmereep-dp/virtual-memory.json | 0 .../pmu-events/arch/x86/westmereep-sp/cache.json | 0 .../arch/x86/westmereep-sp/floating-point.json | 0 .../arch/x86/westmereep-sp/frontend.json | 0 .../pmu-events/arch/x86/westmereep-sp/memory.json | 0 .../pmu-events/arch/x86/westmereep-sp/other.json | 0 .../arch/x86/westmereep-sp/pipeline.json | 0 .../arch/x86/westmereep-sp/virtual-memory.json | 0 .../perf/pmu-events/arch/x86/westmereex/cache.json | 0 .../arch/x86/westmereex/floating-point.json | 0 .../pmu-events/arch/x86/westmereex/frontend.json | 0 .../pmu-events/arch/x86/westmereex/memory.json | 0 .../perf/pmu-events/arch/x86/westmereex/other.json | 0 .../pmu-events/arch/x86/westmereex/pipeline.json | 0 .../arch/x86/westmereex/virtual-memory.json | 0 tools/{ => lib}/perf/pmu-events/jevents.c | 6 +- tools/{ => lib}/perf/pmu-events/jsmn.c | 0 tools/{ => lib}/perf/pmu-events/jsmn.h | 0 tools/{ => lib}/perf/pmu-events/json.c | 0 tools/{ => lib}/perf/pmu-events/json.h | 0 tools/{perf/util => lib/perf}/pmu-hybrid.c | 3 +- tools/lib/perf/pmu.c | 117 +++ tools/{perf/util => lib/perf}/pmu.l | 3 +- tools/{perf/util => lib/perf}/pmu.y | 2 +- tools/lib/perf/tests/Build | 1 + tools/lib/perf/tests/main.c | 1 + tools/lib/perf/tests/test-evlist.c | 2 + tools/lib/perf/tests/test-parse-events.c | 43 + tools/lib/perf/tests/tests.h | 1 + tools/perf/Makefile.perf | 22 +- tools/perf/arch/x86/util/kvm-stat.c | 8 +- tools/perf/arch/x86/util/pmu.c | 1 - tools/perf/builtin-c2c.c | 2 +- tools/perf/builtin-kvm.c | 6 +- tools/perf/builtin-list.c | 2 +- tools/perf/builtin-mem.c | 2 +- tools/perf/builtin-record.c | 12 +- tools/perf/builtin-stat.c | 18 +- tools/perf/builtin-top.c | 2 +- tools/perf/builtin-trace.c | 12 +- tools/perf/tests/event_update.c | 2 +- tools/perf/tests/evsel-roundtrip-name.c | 2 +- tools/perf/tests/evsel-tp-sched.c | 6 +- tools/perf/tests/expand-cgroup.c | 8 +- tools/perf/tests/parse-events.c | 87 +- tools/perf/tests/parse-metric.c | 6 +- tools/perf/tests/perf-time-to-tsc.c | 2 +- tools/perf/tests/pmu-events.c | 2 +- tools/perf/util/Build | 55 -- tools/perf/util/amd-sample-raw.c | 2 +- tools/perf/util/arm-spe.c | 6 +- tools/perf/util/auxtrace.c | 6 +- tools/perf/util/bpf_counter.c | 2 +- tools/perf/util/cputopo.c | 2 +- tools/perf/util/evlist-hybrid.c | 5 +- tools/perf/util/evlist.c | 18 +- tools/perf/util/evsel.c | 109 +-- tools/perf/util/evsel.h | 23 +- tools/perf/util/evsel_fprintf.c | 2 +- tools/perf/util/fncache.h | 7 - tools/perf/util/header.c | 32 +- tools/perf/util/intel-pt.c | 6 +- tools/perf/util/mem-events.c | 2 +- tools/perf/util/metricgroup.c | 22 +- tools/perf/util/metricgroup.h | 2 +- tools/perf/util/parse-events-hybrid.c | 26 +- tools/perf/util/parse-events-hybrid.h | 6 +- tools/perf/util/parse-events.c | 971 +++++---------------- tools/perf/util/parse-events.h | 167 +--- tools/perf/util/pmu.c | 113 +-- tools/perf/util/pmu.h | 44 +- tools/perf/util/python-ext-sources | 2 - tools/perf/util/record.c | 4 +- tools/perf/util/s390-sample-raw.c | 2 +- tools/perf/util/sideband_evlist.c | 2 +- tools/perf/util/sort.c | 6 +- tools/perf/util/srccode.c | 10 +- tools/perf/util/stat-display.c | 29 +- tools/perf/util/stat-shadow.c | 14 +- tools/perf/util/synthetic-events.c | 10 +- tools/perf/util/trace-event-info.c | 6 +- 466 files changed, 2051 insertions(+), 1556 deletions(-) rename tools/{perf/util => lib/api/fs}/fncache.c (95%) create mode 100644 tools/lib/perf/include/internal/parse-events.h rename tools/{perf/util => lib/perf/include/internal}/pmu-hybrid.h (96%) create mode 100644 tools/lib/perf/include/internal/pmu.h rename tools/{perf/pmu-events => lib/perf/include/perf}/pmu-events.h (100%) create mode 100644 tools/lib/perf/parse-events.c rename tools/{perf/util => lib/perf}/parse-events.l (96%) rename tools/{perf/util => lib/perf}/parse-events.y (76%) rename tools/{ => lib}/perf/pmu-events/Build (87%) rename tools/{ => lib}/perf/pmu-events/README (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/ampere/emag/branch.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/ampere/emag/bus.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/ampere/emag/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/ampere/emag/clock.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/ampere/emag/exception.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/ampere/emag/instruction.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/ampere/emag/intrinsic.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/ampere/emag/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/ampere/emag/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/cortex-a53/branch.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/cortex-a53/bus.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/cortex-a53/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/cortex-a53/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/cortex-a53/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/cortex-a53/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/cortex-a57-a72/core-imp-def.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/cortex-a76-n1/branch.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/cortex-a76-n1/bus.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/cortex-a76-n1/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/cortex-a76-n1/exception.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/cortex-a76-n1/instruction.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/cortex-a76-n1/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/cortex-a76-n1/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/cortex-a76-n1/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/neoverse-v1/branch.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/neoverse-v1/bus.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/neoverse-v1/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/neoverse-v1/exception.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/neoverse-v1/instruction.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/neoverse-v1/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/neoverse-v1/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/arm/neoverse-v1/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/armv8-common-and-microarch.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/armv8-recommended.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/cavium/thunderx2/core-imp-def.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/freescale/imx8mm/sys/ddrc.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/freescale/imx8mm/sys/metrics.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/freescale/imx8mn/sys/ddrc.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/freescale/imx8mn/sys/metrics.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/freescale/imx8mp/sys/ddrc.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/freescale/imx8mp/sys/metrics.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/freescale/imx8mq/sys/ddrc.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/freescale/imx8mq/sys/metrics.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/fujitsu/a64fx/branch.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/fujitsu/a64fx/bus.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/fujitsu/a64fx/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/fujitsu/a64fx/cycle.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/fujitsu/a64fx/exception.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/fujitsu/a64fx/instruction.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/fujitsu/a64fx/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/fujitsu/a64fx/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/fujitsu/a64fx/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/fujitsu/a64fx/sve.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/hisilicon/hip08/core-imp-def.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/hisilicon/hip08/metrics.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-ddrc.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-hha.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-l3c.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/arm64/mapfile.csv (100%) rename tools/{ => lib}/perf/pmu-events/arch/nds32/mapfile.csv (100%) rename tools/{ => lib}/perf/pmu-events/arch/nds32/n13/atcpmu.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/mapfile.csv (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power10/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power10/floating_point.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power10/frontend.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power10/locks.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power10/marked.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power10/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power10/nest_metrics.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power10/others.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power10/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power10/pmc.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power10/translation.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power8/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power8/floating-point.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power8/frontend.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power8/marked.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power8/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power8/metrics.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power8/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power8/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power8/pmc.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power8/translation.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power9/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power9/floating-point.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power9/frontend.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power9/marked.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power9/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power9/metrics.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power9/nest_metrics.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power9/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power9/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power9/pmc.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/powerpc/power9/translation.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z10/basic.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z10/crypto.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z10/extended.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z13/basic.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z13/crypto.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z13/extended.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z13/transaction.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z14/basic.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z14/crypto.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z14/extended.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z14/transaction.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z15/basic.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z15/crypto.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z15/crypto6.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z15/extended.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z15/transaction.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z196/basic.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z196/crypto.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_z196/extended.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_zec12/basic.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_zec12/crypto.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_zec12/extended.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/s390/cf_zec12/transaction.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/s390/mapfile.csv (100%) rename tools/{ => lib}/perf/pmu-events/arch/test/arch-std-events.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/test/test_soc/cpu/branch.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/test/test_soc/cpu/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/test/test_soc/cpu/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/test/test_soc/cpu/uncore.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/test/test_soc/sys/uncore.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen1/branch.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen1/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen1/core.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen1/data-fabric.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen1/floating-point.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen1/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen1/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen1/recommended.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen2/branch.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen2/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen2/core.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen2/data-fabric.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen2/floating-point.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen2/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen2/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen2/recommended.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen3/branch.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen3/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen3/core.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen3/data-fabric.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen3/floating-point.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen3/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen3/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/amdzen3/recommended.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/bonnell/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/bonnell/floating-point.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/bonnell/frontend.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/bonnell/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/bonnell/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/bonnell/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/bonnell/virtual-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwell/bdw-metrics.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwell/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwell/floating-point.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwell/frontend.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwell/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwell/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwell/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwell/uncore.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwell/virtual-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellde/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellde/floating-point.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellde/frontend.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellde/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellde/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellde/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellde/uncore-cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellde/uncore-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellde/uncore-power.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellde/virtual-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellx/bdx-metrics.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellx/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellx/floating-point.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellx/frontend.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellx/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellx/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellx/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellx/uncore-cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellx/uncore-interconnect.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellx/uncore-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellx/uncore-power.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/broadwellx/virtual-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/cascadelakex/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/cascadelakex/clx-metrics.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/cascadelakex/floating-point.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/cascadelakex/frontend.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/cascadelakex/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/cascadelakex/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/cascadelakex/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/cascadelakex/uncore-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/cascadelakex/uncore-other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/cascadelakex/virtual-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/elkhartlake/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/elkhartlake/ehl-metrics.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/elkhartlake/floating-point.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/elkhartlake/frontend.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/elkhartlake/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/elkhartlake/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/elkhartlake/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/elkhartlake/virtual-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/goldmont/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/goldmont/frontend.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/goldmont/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/goldmont/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/goldmont/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/goldmont/virtual-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/goldmontplus/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/goldmontplus/frontend.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/goldmontplus/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/goldmontplus/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/goldmontplus/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/goldmontplus/virtual-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/haswell/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/haswell/floating-point.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/haswell/frontend.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/haswell/hsw-metrics.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/haswell/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/haswell/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/haswell/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/haswell/uncore.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/haswell/virtual-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/haswellx/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/haswellx/floating-point.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/haswellx/frontend.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/haswellx/hsx-metrics.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/haswellx/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/haswellx/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/haswellx/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/haswellx/uncore-cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/haswellx/uncore-interconnect.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/haswellx/uncore-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/haswellx/uncore-power.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/haswellx/virtual-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/icelake/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/icelake/floating-point.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/icelake/frontend.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/icelake/icl-metrics.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/icelake/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/icelake/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/icelake/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/icelake/virtual-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/icelakex/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/icelakex/floating-point.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/icelakex/frontend.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/icelakex/icx-metrics.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/icelakex/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/icelakex/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/icelakex/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/icelakex/uncore-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/icelakex/uncore-other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/icelakex/uncore-power.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/icelakex/virtual-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/ivybridge/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/ivybridge/floating-point.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/ivybridge/frontend.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/ivybridge/ivb-metrics.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/ivybridge/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/ivybridge/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/ivybridge/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/ivybridge/uncore.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/ivybridge/virtual-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/ivytown/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/ivytown/floating-point.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/ivytown/frontend.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/ivytown/ivt-metrics.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/ivytown/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/ivytown/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/ivytown/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/ivytown/uncore-cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/ivytown/uncore-interconnect.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/ivytown/uncore-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/ivytown/uncore-power.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/ivytown/virtual-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/jaketown/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/jaketown/floating-point.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/jaketown/frontend.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/jaketown/jkt-metrics.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/jaketown/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/jaketown/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/jaketown/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/jaketown/uncore-cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/jaketown/uncore-interconnect.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/jaketown/uncore-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/jaketown/uncore-power.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/jaketown/virtual-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/knightslanding/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/knightslanding/frontend.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/knightslanding/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/knightslanding/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/knightslanding/uncore-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/knightslanding/virtual-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/mapfile.csv (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/nehalemep/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/nehalemep/floating-point.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/nehalemep/frontend.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/nehalemep/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/nehalemep/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/nehalemep/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/nehalemep/virtual-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/nehalemex/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/nehalemex/floating-point.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/nehalemex/frontend.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/nehalemex/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/nehalemex/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/nehalemex/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/nehalemex/virtual-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/sandybridge/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/sandybridge/floating-point.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/sandybridge/frontend.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/sandybridge/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/sandybridge/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/sandybridge/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/sandybridge/snb-metrics.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/sandybridge/uncore.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/sandybridge/virtual-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/silvermont/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/silvermont/frontend.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/silvermont/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/silvermont/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/silvermont/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/silvermont/virtual-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/skylake/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/skylake/floating-point.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/skylake/frontend.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/skylake/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/skylake/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/skylake/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/skylake/skl-metrics.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/skylake/uncore.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/skylake/virtual-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/skylakex/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/skylakex/floating-point.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/skylakex/frontend.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/skylakex/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/skylakex/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/skylakex/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/skylakex/skx-metrics.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/skylakex/uncore-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/skylakex/uncore-other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/skylakex/virtual-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/tigerlake/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/tigerlake/floating-point.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/tigerlake/frontend.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/tigerlake/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/tigerlake/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/tigerlake/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/tigerlake/tgl-metrics.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/tigerlake/virtual-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/tremontx/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/tremontx/frontend.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/tremontx/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/tremontx/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/tremontx/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/tremontx/uncore-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/tremontx/uncore-other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/tremontx/uncore-power.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/tremontx/virtual-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereep-dp/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereep-dp/floating-point.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereep-dp/frontend.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereep-dp/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereep-dp/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereep-dp/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereep-dp/virtual-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereep-sp/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereep-sp/floating-point.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereep-sp/frontend.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereep-sp/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereep-sp/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereep-sp/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereep-sp/virtual-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereex/cache.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereex/floating-point.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereex/frontend.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereex/memory.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereex/other.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereex/pipeline.json (100%) rename tools/{ => lib}/perf/pmu-events/arch/x86/westmereex/virtual-memory.json (100%) rename tools/{ => lib}/perf/pmu-events/jevents.c (99%) rename tools/{ => lib}/perf/pmu-events/jsmn.c (100%) rename tools/{ => lib}/perf/pmu-events/jsmn.h (100%) rename tools/{ => lib}/perf/pmu-events/json.c (100%) rename tools/{ => lib}/perf/pmu-events/json.h (100%) rename tools/{perf/util => lib/perf}/pmu-hybrid.c (97%) create mode 100644 tools/lib/perf/pmu.c rename tools/{perf/util => lib/perf}/pmu.l (91%) rename tools/{perf/util => lib/perf}/pmu.y (98%) create mode 100644 tools/lib/perf/tests/test-parse-events.c delete mode 100644 tools/perf/util/fncache.h