| Message ID | 20230524221831.1741381-1-irogers@google.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | PMU refactoring and improvements | expand |
On Wed, May 24, 2023 at 3:21 PM Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com> wrote: > > > > On Wed, May 24, 2023, 7:18 PM Ian Rogers <irogers@google.com> wrote: >> >> Separate the code in pmu.[ch] into the set/list of PMUs and the code >> for a particular PMU. Move the set/list of PMUs code into >> pmus.[ch]. Clean up hybrid code and remove hybrid PMU list, it is >> sufficient to scan PMUs looking for core ones. Add core PMU list and >> perf_pmus__scan_core that just reads core PMUs. Switch code that skips >> non-core PMUs during a perf_pmus__scan, to use the >> perf_pmus__scan_core variant. Don't scan sysfs for PMUs if all such >> PMUs have been previously scanned/loaded. Scanning just core PMUs, for >> the cases it is applicable, can improve the sysfs reading time by more >> than 4 fold on my laptop, as servers generally have many more uncore >> PMUs the improvement there should be larger: >> >> ``` >> $ perf bench internals pmu-scan -i 1000 >> Computing performance of sysfs PMU event scan for 1000 times >> Average core PMU scanning took: 989.231 usec (+- 1.535 usec) >> Average PMU scanning took: 4309.425 usec (+- 74.322 usec) >> ``` >> >> The patch "perf pmu: Separate pmu and pmus" moves and renames a lot of >> functions, and is consequently large. The changes are trivial, but >> kept together to keep the overall number of patches more reasonable. >> >> v3. Address fixing hybrid user specified CPU maps by doing it in >> propagate maps. Remove nearly all references to cpu_core/cpu_atom >> in particular by removing is_pmu_hybrid - hybrid is now >1 core >> PMU. Addresses comments by Kan and Namhyung. >> v2. Address Kan's review comments wrt "cycles" -> "cycles:P" and >> "uncore_pmus" -> "other_pmus". > > > Is this series bisectable wrt 'perf test'? Yep, I wrote it running 'perf test' at each commit. It is somewhat laborious for me to test on hybrid, so I didn't test smaller things on that, but I'm guessing that's not a concern anyway. I hope to follow up with adding an ability to have a non-sysfs directory containing fake PMUs for testing. Thanks, Ian > - Arnaldo >> >> >> Ian Rogers (35): >> perf cpumap: Add intersect function >> perf tests: Organize cpu_map tests into a single suite >> perf cpumap: Add equal function >> libperf cpumap: Add "any CPU"/dummy test function >> perf pmu: Detect ARM and hybrid PMUs with sysfs >> perf pmu: Add is_core to pmu >> perf evsel: Add is_pmu_core inorder to interpret own_cpus >> perf pmu: Add CPU map for "cpu" PMUs >> perf evlist: Propagate user CPU maps intersecting core PMU maps >> perf evlist: Allow has_user_cpus to be set on hybrid >> perf target: Remove unused hybrid value >> perf tools: Warn if no user requested CPUs match PMU's CPUs >> perf evlist: Remove evlist__warn_hybrid_group >> perf evlist: Remove __evlist__add_default >> perf evlist: Reduce scope of evlist__has_hybrid >> perf pmu: Remove perf_pmu__hybrid_mounted >> perf pmu: Rewrite perf_pmu__has_hybrid to avoid list >> perf x86: Iterate hybrid PMUs as core PMUs >> perf topology: Avoid hybrid list for hybrid topology >> perf evsel: Compute is_hybrid from PMU being core >> perf header: Avoid hybrid PMU list in write_pmu_caps >> perf metrics: Remove perf_pmu__is_hybrid use >> perf stat: Avoid hybrid PMU list >> perf mem: Avoid hybrid PMU list >> perf pmu: Remove perf_pmu__hybrid_pmus list >> perf pmus: Prefer perf_pmu__scan over perf_pmus__for_each_pmu >> perf x86 mem: minor refactor to is_mem_loads_aux_event >> perf pmu: Separate pmu and pmus >> perf pmus: Split pmus list into core and other >> perf pmus: Allow just core PMU scanning >> perf pmus: Avoid repeated sysfs scanning >> perf pmus: Ensure all PMUs are read for find_by_type >> perf pmus: Add function to return count of core PMUs >> perf pmus: Remove perf_pmus__has_hybrid >> perf pmu: Remove is_pmu_hybrid >> >> tools/lib/perf/cpumap.c | 61 +++ >> tools/lib/perf/evlist.c | 25 +- >> tools/lib/perf/include/internal/evsel.h | 9 + >> tools/lib/perf/include/perf/cpumap.h | 14 + >> tools/perf/arch/arm/util/auxtrace.c | 7 +- >> tools/perf/arch/arm/util/cs-etm.c | 4 +- >> tools/perf/arch/arm64/util/pmu.c | 6 +- >> tools/perf/arch/x86/tests/hybrid.c | 7 +- >> tools/perf/arch/x86/util/auxtrace.c | 5 +- >> tools/perf/arch/x86/util/evlist.c | 25 +- >> tools/perf/arch/x86/util/evsel.c | 27 +- >> tools/perf/arch/x86/util/intel-bts.c | 4 +- >> tools/perf/arch/x86/util/intel-pt.c | 4 +- >> tools/perf/arch/x86/util/mem-events.c | 17 +- >> tools/perf/arch/x86/util/perf_regs.c | 15 +- >> tools/perf/arch/x86/util/topdown.c | 5 +- >> tools/perf/bench/pmu-scan.c | 60 +-- >> tools/perf/builtin-c2c.c | 9 +- >> tools/perf/builtin-list.c | 4 +- >> tools/perf/builtin-mem.c | 9 +- >> tools/perf/builtin-record.c | 29 +- >> tools/perf/builtin-stat.c | 14 +- >> tools/perf/builtin-top.c | 10 +- >> tools/perf/tests/attr.c | 11 +- >> tools/perf/tests/builtin-test.c | 4 +- >> tools/perf/tests/cpumap.c | 92 ++++- >> tools/perf/tests/event_groups.c | 7 +- >> tools/perf/tests/parse-events.c | 15 +- >> tools/perf/tests/parse-metric.c | 9 +- >> tools/perf/tests/pmu-events.c | 6 +- >> tools/perf/tests/switch-tracking.c | 14 +- >> tools/perf/tests/tests.h | 4 +- >> tools/perf/tests/topology.c | 16 +- >> tools/perf/util/Build | 2 - >> tools/perf/util/cpumap.c | 4 +- >> tools/perf/util/cpumap.h | 4 +- >> tools/perf/util/cputopo.c | 12 +- >> tools/perf/util/env.c | 5 +- >> tools/perf/util/evlist-hybrid.c | 162 -------- >> tools/perf/util/evlist-hybrid.h | 15 - >> tools/perf/util/evlist.c | 64 +++- >> tools/perf/util/evlist.h | 9 +- >> tools/perf/util/evsel.c | 60 +-- >> tools/perf/util/evsel.h | 3 - >> tools/perf/util/header.c | 27 +- >> tools/perf/util/mem-events.c | 25 +- >> tools/perf/util/metricgroup.c | 9 +- >> tools/perf/util/parse-events.c | 25 +- >> tools/perf/util/parse-events.y | 3 +- >> tools/perf/util/pfm.c | 6 +- >> tools/perf/util/pmu-hybrid.c | 52 --- >> tools/perf/util/pmu-hybrid.h | 32 -- >> tools/perf/util/pmu.c | 483 ++---------------------- >> tools/perf/util/pmu.h | 25 +- >> tools/perf/util/pmus.c | 465 ++++++++++++++++++++++- >> tools/perf/util/pmus.h | 15 +- >> tools/perf/util/print-events.c | 15 +- >> tools/perf/util/python-ext-sources | 1 - >> tools/perf/util/stat-display.c | 19 +- >> tools/perf/util/target.h | 1 - >> 60 files changed, 1002 insertions(+), 1089 deletions(-) >> delete mode 100644 tools/perf/util/evlist-hybrid.c >> delete mode 100644 tools/perf/util/evlist-hybrid.h >> delete mode 100644 tools/perf/util/pmu-hybrid.c >> delete mode 100644 tools/perf/util/pmu-hybrid.h >> >> -- >> 2.40.1.698.g37aff9b760-goog >>
On 2023-05-24 6:17 p.m., Ian Rogers wrote: > Separate the code in pmu.[ch] into the set/list of PMUs and the code > for a particular PMU. Move the set/list of PMUs code into > pmus.[ch]. Clean up hybrid code and remove hybrid PMU list, it is > sufficient to scan PMUs looking for core ones. Add core PMU list and > perf_pmus__scan_core that just reads core PMUs. Switch code that skips > non-core PMUs during a perf_pmus__scan, to use the > perf_pmus__scan_core variant. Don't scan sysfs for PMUs if all such > PMUs have been previously scanned/loaded. Scanning just core PMUs, for > the cases it is applicable, can improve the sysfs reading time by more > than 4 fold on my laptop, as servers generally have many more uncore > PMUs the improvement there should be larger: > > ``` > $ perf bench internals pmu-scan -i 1000 > Computing performance of sysfs PMU event scan for 1000 times > Average core PMU scanning took: 989.231 usec (+- 1.535 usec) > Average PMU scanning took: 4309.425 usec (+- 74.322 usec) > ``` > > The patch "perf pmu: Separate pmu and pmus" moves and renames a lot of > functions, and is consequently large. The changes are trivial, but > kept together to keep the overall number of patches more reasonable. > Other than the small suggestion in patch 16, the patch set looks good to me. Thanks Ian! Reviewed-by: Kan Liang <kan.liang@linux.intel.com> Thanks, Kan > v3. Address fixing hybrid user specified CPU maps by doing it in > propagate maps. Remove nearly all references to cpu_core/cpu_atom > in particular by removing is_pmu_hybrid - hybrid is now >1 core > PMU. Addresses comments by Kan and Namhyung. > v2. Address Kan's review comments wrt "cycles" -> "cycles:P" and > "uncore_pmus" -> "other_pmus". > > Ian Rogers (35): > perf cpumap: Add intersect function > perf tests: Organize cpu_map tests into a single suite > perf cpumap: Add equal function > libperf cpumap: Add "any CPU"/dummy test function > perf pmu: Detect ARM and hybrid PMUs with sysfs > perf pmu: Add is_core to pmu > perf evsel: Add is_pmu_core inorder to interpret own_cpus > perf pmu: Add CPU map for "cpu" PMUs > perf evlist: Propagate user CPU maps intersecting core PMU maps > perf evlist: Allow has_user_cpus to be set on hybrid > perf target: Remove unused hybrid value > perf tools: Warn if no user requested CPUs match PMU's CPUs > perf evlist: Remove evlist__warn_hybrid_group > perf evlist: Remove __evlist__add_default > perf evlist: Reduce scope of evlist__has_hybrid > perf pmu: Remove perf_pmu__hybrid_mounted > perf pmu: Rewrite perf_pmu__has_hybrid to avoid list > perf x86: Iterate hybrid PMUs as core PMUs > perf topology: Avoid hybrid list for hybrid topology > perf evsel: Compute is_hybrid from PMU being core > perf header: Avoid hybrid PMU list in write_pmu_caps > perf metrics: Remove perf_pmu__is_hybrid use > perf stat: Avoid hybrid PMU list > perf mem: Avoid hybrid PMU list > perf pmu: Remove perf_pmu__hybrid_pmus list > perf pmus: Prefer perf_pmu__scan over perf_pmus__for_each_pmu > perf x86 mem: minor refactor to is_mem_loads_aux_event > perf pmu: Separate pmu and pmus > perf pmus: Split pmus list into core and other > perf pmus: Allow just core PMU scanning > perf pmus: Avoid repeated sysfs scanning > perf pmus: Ensure all PMUs are read for find_by_type > perf pmus: Add function to return count of core PMUs > perf pmus: Remove perf_pmus__has_hybrid > perf pmu: Remove is_pmu_hybrid > > tools/lib/perf/cpumap.c | 61 +++ > tools/lib/perf/evlist.c | 25 +- > tools/lib/perf/include/internal/evsel.h | 9 + > tools/lib/perf/include/perf/cpumap.h | 14 + > tools/perf/arch/arm/util/auxtrace.c | 7 +- > tools/perf/arch/arm/util/cs-etm.c | 4 +- > tools/perf/arch/arm64/util/pmu.c | 6 +- > tools/perf/arch/x86/tests/hybrid.c | 7 +- > tools/perf/arch/x86/util/auxtrace.c | 5 +- > tools/perf/arch/x86/util/evlist.c | 25 +- > tools/perf/arch/x86/util/evsel.c | 27 +- > tools/perf/arch/x86/util/intel-bts.c | 4 +- > tools/perf/arch/x86/util/intel-pt.c | 4 +- > tools/perf/arch/x86/util/mem-events.c | 17 +- > tools/perf/arch/x86/util/perf_regs.c | 15 +- > tools/perf/arch/x86/util/topdown.c | 5 +- > tools/perf/bench/pmu-scan.c | 60 +-- > tools/perf/builtin-c2c.c | 9 +- > tools/perf/builtin-list.c | 4 +- > tools/perf/builtin-mem.c | 9 +- > tools/perf/builtin-record.c | 29 +- > tools/perf/builtin-stat.c | 14 +- > tools/perf/builtin-top.c | 10 +- > tools/perf/tests/attr.c | 11 +- > tools/perf/tests/builtin-test.c | 4 +- > tools/perf/tests/cpumap.c | 92 ++++- > tools/perf/tests/event_groups.c | 7 +- > tools/perf/tests/parse-events.c | 15 +- > tools/perf/tests/parse-metric.c | 9 +- > tools/perf/tests/pmu-events.c | 6 +- > tools/perf/tests/switch-tracking.c | 14 +- > tools/perf/tests/tests.h | 4 +- > tools/perf/tests/topology.c | 16 +- > tools/perf/util/Build | 2 - > tools/perf/util/cpumap.c | 4 +- > tools/perf/util/cpumap.h | 4 +- > tools/perf/util/cputopo.c | 12 +- > tools/perf/util/env.c | 5 +- > tools/perf/util/evlist-hybrid.c | 162 -------- > tools/perf/util/evlist-hybrid.h | 15 - > tools/perf/util/evlist.c | 64 +++- > tools/perf/util/evlist.h | 9 +- > tools/perf/util/evsel.c | 60 +-- > tools/perf/util/evsel.h | 3 - > tools/perf/util/header.c | 27 +- > tools/perf/util/mem-events.c | 25 +- > tools/perf/util/metricgroup.c | 9 +- > tools/perf/util/parse-events.c | 25 +- > tools/perf/util/parse-events.y | 3 +- > tools/perf/util/pfm.c | 6 +- > tools/perf/util/pmu-hybrid.c | 52 --- > tools/perf/util/pmu-hybrid.h | 32 -- > tools/perf/util/pmu.c | 483 ++---------------------- > tools/perf/util/pmu.h | 25 +- > tools/perf/util/pmus.c | 465 ++++++++++++++++++++++- > tools/perf/util/pmus.h | 15 +- > tools/perf/util/print-events.c | 15 +- > tools/perf/util/python-ext-sources | 1 - > tools/perf/util/stat-display.c | 19 +- > tools/perf/util/target.h | 1 - > 60 files changed, 1002 insertions(+), 1089 deletions(-) > delete mode 100644 tools/perf/util/evlist-hybrid.c > delete mode 100644 tools/perf/util/evlist-hybrid.h > delete mode 100644 tools/perf/util/pmu-hybrid.c > delete mode 100644 tools/perf/util/pmu-hybrid.h >
Separate the code in pmu.[ch] into the set/list of PMUs and the code for a particular PMU. Move the set/list of PMUs code into pmus.[ch]. Clean up hybrid code and remove hybrid PMU list, it is sufficient to scan PMUs looking for core ones. Add core PMU list and perf_pmus__scan_core that just reads core PMUs. Switch code that skips non-core PMUs during a perf_pmus__scan, to use the perf_pmus__scan_core variant. Don't scan sysfs for PMUs if all such PMUs have been previously scanned/loaded. Scanning just core PMUs, for the cases it is applicable, can improve the sysfs reading time by more than 4 fold on my laptop, as servers generally have many more uncore PMUs the improvement there should be larger: ``` $ perf bench internals pmu-scan -i 1000 Computing performance of sysfs PMU event scan for 1000 times Average core PMU scanning took: 989.231 usec (+- 1.535 usec) Average PMU scanning took: 4309.425 usec (+- 74.322 usec) ``` The patch "perf pmu: Separate pmu and pmus" moves and renames a lot of functions, and is consequently large. The changes are trivial, but kept together to keep the overall number of patches more reasonable. v3. Address fixing hybrid user specified CPU maps by doing it in propagate maps. Remove nearly all references to cpu_core/cpu_atom in particular by removing is_pmu_hybrid - hybrid is now >1 core PMU. Addresses comments by Kan and Namhyung. v2. Address Kan's review comments wrt "cycles" -> "cycles:P" and "uncore_pmus" -> "other_pmus". Ian Rogers (35): perf cpumap: Add intersect function perf tests: Organize cpu_map tests into a single suite perf cpumap: Add equal function libperf cpumap: Add "any CPU"/dummy test function perf pmu: Detect ARM and hybrid PMUs with sysfs perf pmu: Add is_core to pmu perf evsel: Add is_pmu_core inorder to interpret own_cpus perf pmu: Add CPU map for "cpu" PMUs perf evlist: Propagate user CPU maps intersecting core PMU maps perf evlist: Allow has_user_cpus to be set on hybrid perf target: Remove unused hybrid value perf tools: Warn if no user requested CPUs match PMU's CPUs perf evlist: Remove evlist__warn_hybrid_group perf evlist: Remove __evlist__add_default perf evlist: Reduce scope of evlist__has_hybrid perf pmu: Remove perf_pmu__hybrid_mounted perf pmu: Rewrite perf_pmu__has_hybrid to avoid list perf x86: Iterate hybrid PMUs as core PMUs perf topology: Avoid hybrid list for hybrid topology perf evsel: Compute is_hybrid from PMU being core perf header: Avoid hybrid PMU list in write_pmu_caps perf metrics: Remove perf_pmu__is_hybrid use perf stat: Avoid hybrid PMU list perf mem: Avoid hybrid PMU list perf pmu: Remove perf_pmu__hybrid_pmus list perf pmus: Prefer perf_pmu__scan over perf_pmus__for_each_pmu perf x86 mem: minor refactor to is_mem_loads_aux_event perf pmu: Separate pmu and pmus perf pmus: Split pmus list into core and other perf pmus: Allow just core PMU scanning perf pmus: Avoid repeated sysfs scanning perf pmus: Ensure all PMUs are read for find_by_type perf pmus: Add function to return count of core PMUs perf pmus: Remove perf_pmus__has_hybrid perf pmu: Remove is_pmu_hybrid tools/lib/perf/cpumap.c | 61 +++ tools/lib/perf/evlist.c | 25 +- tools/lib/perf/include/internal/evsel.h | 9 + tools/lib/perf/include/perf/cpumap.h | 14 + tools/perf/arch/arm/util/auxtrace.c | 7 +- tools/perf/arch/arm/util/cs-etm.c | 4 +- tools/perf/arch/arm64/util/pmu.c | 6 +- tools/perf/arch/x86/tests/hybrid.c | 7 +- tools/perf/arch/x86/util/auxtrace.c | 5 +- tools/perf/arch/x86/util/evlist.c | 25 +- tools/perf/arch/x86/util/evsel.c | 27 +- tools/perf/arch/x86/util/intel-bts.c | 4 +- tools/perf/arch/x86/util/intel-pt.c | 4 +- tools/perf/arch/x86/util/mem-events.c | 17 +- tools/perf/arch/x86/util/perf_regs.c | 15 +- tools/perf/arch/x86/util/topdown.c | 5 +- tools/perf/bench/pmu-scan.c | 60 +-- tools/perf/builtin-c2c.c | 9 +- tools/perf/builtin-list.c | 4 +- tools/perf/builtin-mem.c | 9 +- tools/perf/builtin-record.c | 29 +- tools/perf/builtin-stat.c | 14 +- tools/perf/builtin-top.c | 10 +- tools/perf/tests/attr.c | 11 +- tools/perf/tests/builtin-test.c | 4 +- tools/perf/tests/cpumap.c | 92 ++++- tools/perf/tests/event_groups.c | 7 +- tools/perf/tests/parse-events.c | 15 +- tools/perf/tests/parse-metric.c | 9 +- tools/perf/tests/pmu-events.c | 6 +- tools/perf/tests/switch-tracking.c | 14 +- tools/perf/tests/tests.h | 4 +- tools/perf/tests/topology.c | 16 +- tools/perf/util/Build | 2 - tools/perf/util/cpumap.c | 4 +- tools/perf/util/cpumap.h | 4 +- tools/perf/util/cputopo.c | 12 +- tools/perf/util/env.c | 5 +- tools/perf/util/evlist-hybrid.c | 162 -------- tools/perf/util/evlist-hybrid.h | 15 - tools/perf/util/evlist.c | 64 +++- tools/perf/util/evlist.h | 9 +- tools/perf/util/evsel.c | 60 +-- tools/perf/util/evsel.h | 3 - tools/perf/util/header.c | 27 +- tools/perf/util/mem-events.c | 25 +- tools/perf/util/metricgroup.c | 9 +- tools/perf/util/parse-events.c | 25 +- tools/perf/util/parse-events.y | 3 +- tools/perf/util/pfm.c | 6 +- tools/perf/util/pmu-hybrid.c | 52 --- tools/perf/util/pmu-hybrid.h | 32 -- tools/perf/util/pmu.c | 483 ++---------------------- tools/perf/util/pmu.h | 25 +- tools/perf/util/pmus.c | 465 ++++++++++++++++++++++- tools/perf/util/pmus.h | 15 +- tools/perf/util/print-events.c | 15 +- tools/perf/util/python-ext-sources | 1 - tools/perf/util/stat-display.c | 19 +- tools/perf/util/target.h | 1 - 60 files changed, 1002 insertions(+), 1089 deletions(-) delete mode 100644 tools/perf/util/evlist-hybrid.c delete mode 100644 tools/perf/util/evlist-hybrid.h delete mode 100644 tools/perf/util/pmu-hybrid.c delete mode 100644 tools/perf/util/pmu-hybrid.h