libperf: Add perf_cpu_map__default_new()
PATCH v2 1/3 libperf: Add perf_cpu_map__default_new()
The libperf already has a static function 'cpu_map__default_new()'. Add a new API perf_cpu_map__default_new() to export the function.
--- tools/lib/perf/cpumap.c | 5 +++++ tools/lib/perf/include/perf/cpumap.h | 1 + 2 files changed, 6 insertions(+)
tools/lib/perf/cpumap.c +5 -0
@@ -68,6 +68,11 @@ static struct perf_cpu_map *cpu_map__default_new(void)return cpus; } +struct perf_cpu_map *perf_cpu_map__default_new (void ) +{ +return cpu_map__default_new (); +} +static int cmp_int (const void *a,const void *b) {return *(const int *)a - *(const int *)b;
tools/lib/perf/include/perf/cpumap.h +1 -0
@@ -9,6 +9,7 @@struct perf_cpu_map ; LIBPERF_API struct perf_cpu_map *perf_cpu_map__dummy_new(void); +LIBPERF_API struct perf_cpu_map *perf_cpu_map__default_new(void); LIBPERF_API struct perf_cpu_map *perf_cpu_map__new(const char *cpu_list); LIBPERF_API struct perf_cpu_map *perf_cpu_map__read(FILE *file); LIBPERF_API struct perf_cpu_map *perf_cpu_map__get(struct perf_cpu_map *map);
Signature · 1 line
2.17.1
PATCH v2 2/3 perf tools: Create hybrid flag in target
User may count or collect only on a cpu list via '-C/--cpus' option. Previously cpus for evsel was retrieved from pmu sysfs. But if the target cpu list is defined, the retrieved cpus are not kept and the target cpu list is used instead.
But for hybrid system, we can't directly use target cpu list. The cpu list may not available on hybrid pmu (e.g. cpu_core or cpu_atom). So we should not set 'has_user_cpus' flag for hybrid system.
The difficulity is that we can't call perf_pmu__has_hybrid() in evlist.c to check hybrid system otherwise 'perf test python' would be failed (undefined symbol for perf_pmu__has_hybrid). If we add pmu.c to python-ext-sources, too many symbol dependencies are hard to resolve.
We use an alternative method by using a new 'hybrid' flag in target for hybrid system checking.
--- tools/perf/util/evlist.c | 2 +- tools/perf/util/target.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
tools/perf/util/evlist.c +1 -1
@@ -1021,7 +1021,7 @@ int evlist__create_maps(struct evlist *evlist, struct target *target)if (!cpus) goto out_delete_threads; - evlist->core.has_user_cpus = !!target->cpu_list; + evlist->core.has_user_cpus = !!target->cpu_list && !target->hybrid;perf_evlist__set_maps (&evlist->core, cpus, threads);
tools/perf/util/target.h +1 -0
@@ -17,6 +17,7 @@ struct target {bool default_per_cpu;bool per_thread;bool use_bpf; +bool hybrid;const char *attr_map; };
Signature · 1 line
2.17.1
PATCH v2 3/3 perf tools: Enable on a list of CPUs for hybrid
In reply to Jin YaoThe perf-record and perf-stat have supported the option '-C/--cpus' to count or collect only on the list of CPUs provided. This option needs to be supported for hybrid as well.
For hybrid support, it needs to check that the CPUs are available on hybrid PMU. One example for AlderLake, cpu0-7 is 'cpu_core', cpu8-11 is 'cpu_atom'.
Before:
# perf stat -e cpu_core/cycles/ -C11 -- sleep 1
Performance counter stats for 'CPU(s) 11':
<not supported> cpu_core/cycles/
1.006179431 seconds time elapsed
The perf-stat silently returned "<not supported>" without any helpful information. It should error out that cpu11 was not 'cpu_core'.
After:
# perf stat -e cpu_core/cycles/ -C11 -- sleep 1 WARNING: 11 isn't a 'cpu_core', please use a CPU list in the 'cpu_core' range (0-7) failed to use cpu list 11
We also need to support the events without pmu prefix specified.
# perf stat -e cycles -C11 -- sleep 1 WARNING: 11 isn't a 'cpu_core', please use a CPU list in the 'cpu_core' range (0-7)
Performance counter stats for 'CPU(s) 11':
1,067,373 cpu_atom/cycles/
1.005544738 seconds time elapsedThe perf tool creates two cycles events automatically, cpu_core/cycles/ and cpu_atom/cycles/. It checks that cpu11 is not 'cpu_core', then shows a warning for cpu_core/cycles/ and only count the cpu_atom/cycles/.
If part of cpus are 'cpu_core' and part of cpus are 'cpu_atom', the example,
# perf stat -e cycles -C0,11 -- sleep 1 WARNING: use 0 in 'cpu_core' for 'cycles', skip other cpus in list. WARNING: use 11 in 'cpu_atom' for 'cycles', skip other cpus in list.
Performance counter stats for 'CPU(s) 0,11':
1,914,704 cpu_core/cycles/
2,036,983 cpu_atom/cycles/
1.005815641 seconds time elapsedIt now automatically selects cpu0 for cpu_core/cycles/, selects cpu11 for cpu_atom/cycles/, and output with some warnings.
Some more complex examples,
# perf stat -e cycles,instructions -C0,11 -- sleep 1 WARNING: use 0 in 'cpu_core' for 'cycles', skip other cpus in list. WARNING: use 11 in 'cpu_atom' for 'cycles', skip other cpus in list. WARNING: use 0 in 'cpu_core' for 'instructions', skip other cpus in list. WARNING: use 11 in 'cpu_atom' for 'instructions', skip other cpus in list.
Performance counter stats for 'CPU(s) 0,11':
2,780,387 cpu_core/cycles/
1,583,432 cpu_atom/cycles/
3,957,277 cpu_core/instructions/
1,167,089 cpu_atom/instructions/1.006005124 seconds time elapsed
# perf stat -e cycles,cpu_atom/instructions/ -C0,11 -- sleep 1 WARNING: use 0 in 'cpu_core' for 'cycles', skip other cpus in list. WARNING: use 11 in 'cpu_atom' for 'cycles', skip other cpus in list. WARNING: use 11 in 'cpu_atom' for 'cpu_atom/instructions/', skip other cpus in list.
Performance counter stats for 'CPU(s) 0,11':
3,290,301 cpu_core/cycles/
1,953,073 cpu_atom/cycles/
1,407,869 cpu_atom/instructions/1.006260912 seconds time elapsed
--- tools/perf/builtin-record.c | 7 ++++ tools/perf/builtin-stat.c | 6 +++ tools/perf/util/evlist-hybrid.c | 65 +++++++++++++++++++++++++++++++++ tools/perf/util/evlist-hybrid.h | 1 + tools/perf/util/evlist.c | 1 + tools/perf/util/pmu.c | 35 ++++++++++++++++++ tools/perf/util/pmu.h | 4 ++ 7 files changed, 119 insertions(+)
tools/perf/builtin-record.c +7 -0
@@ -2877,6 +2877,13 @@ int cmd_record(int argc, const char **argv)/* Enable ignoring missing threads when -u/-p option is defined. */ rec->opts.ignore_missing_thread = rec->opts.target.uid !=UINT_MAX || rec->opts.target.pid; +if (evlist__use_cpu_list (rec->evlist, rec->opts.target.cpu_list)) { +pr_err ("failed to use cpu list %s\n" , + rec->opts.target.cpu_list); + goto out; + } + + rec->opts.target.hybrid =perf_pmu__has_hybrid (); err = -ENOMEM ;if (evlist__create_maps (rec->evlist, &rec->opts.target) <0 )usage_with_options (record_usage, record_options);
tools/perf/builtin-stat.c +6 -0
@@ -2427,6 +2427,12 @@ int cmd_stat(int argc, const char **argv)if ((stat_config.aggr_mode ==AGGR_THREAD ) && (target.system_wide)) target.per_thread = true; +if (evlist__use_cpu_list (evsel_list, target.cpu_list)) { +pr_err ("failed to use cpu list %s\n" , target.cpu_list); + goto out; + } + + target.hybrid =perf_pmu__has_hybrid ();if (evlist__create_maps (evsel_list, &target) <0 ) {if (target__has_task (&target)) {pr_err ("Problems finding threads of monitor\n" );
tools/perf/util/evlist-hybrid.c +65 -0
68 lines not on this page · raw message
tools/perf/util/evlist-hybrid.h +1 -0
@@ -10,5 +10,6 @@int evlist__add_default_hybrid (struct evlist *evlist,bool precise);void evlist__warn_hybrid_group (struct evlist *evlist);bool evlist__has_hybrid (struct evlist *evlist); +int evlist__use_cpu_list (struct evlist *evlist,const char *cpu_list);#endif /* __PERF_EVLIST_HYBRID_H */
tools/perf/util/evlist.c +1 -0
@@ -27,6 +27,7 @@#include "util/perf_api_probe.h" #include "util/evsel_fprintf.h" #include "util/evlist-hybrid.h" +#include "util/pmu.h" #include <signal.h> #include <unistd.h> #include <sched.h>
tools/perf/util/pmu.c +35 -0
@@ -1872,3 +1872,38 @@ bool perf_pmu__has_hybrid(void)return !list_empty (&perf_pmu__hybrid_pmus); } + +int perf_pmu__cpus_match (struct perf_pmu *pmu,struct perf_cpu_map *cpus, +struct perf_cpu_map **mcpus_ptr, +struct perf_cpu_map **ucpus_ptr) +{ +struct perf_cpu_map *pmu_cpus = pmu->cpus; +struct perf_cpu_map *matched_cpus, *unmatched_cpus; +int matched_nr =0 , unmatched_nr =0 ; + + matched_cpus =perf_cpu_map__default_new (); +if (!matched_cpus) +return -1 ; + + unmatched_cpus =perf_cpu_map__default_new (); +if (!unmatched_cpus) { +perf_cpu_map__put (matched_cpus); +return -1 ; + } + +for (int i =0 ; i < cpus->nr; i++) { +int cpu; + + cpu =perf_cpu_map__idx (pmu_cpus, cpus->map[i]); +if (cpu ==-1 ) + unmatched_cpus->map[unmatched_nr++] = cpus->map[i]; +else + matched_cpus->map[matched_nr++] = cpus->map[i]; + } + + unmatched_cpus->nr = unmatched_nr; + matched_cpus->nr = matched_nr; + *mcpus_ptr = matched_cpus; + *ucpus_ptr = unmatched_cpus; +return 0 ; +}
tools/perf/util/pmu.h +4 -0
@@ -11,6 +11,7 @@#include "pmu-events/pmu-events.h" struct evsel_config_term ; +struct perf_cpu_map ;enum {PERF_PMU_FORMAT_VALUE_CONFIG ,
@@ -134,4 +135,7 @@ void perf_pmu__warn_invalid_config(struct perf_pmu *pmu, __u64 config,bool perf_pmu__has_hybrid (void ); +int perf_pmu__cpus_match (struct perf_pmu *pmu,struct perf_cpu_map *cpus, +struct perf_cpu_map **mcpus_ptr, +struct perf_cpu_map **ucpus_ptr);#endif /* __PMU_H */
Signature · 1 line
2.17.1
Hi Arnaldo,
Any comments for v2 series of cpulist hybrid support? :)
Thanks
Jin Yao
Quoted 38 lines · Jin Yao
The libperf already has a static function '
cpu_map__default_new()'. Add a new APIperf_cpu_map__default_new()to export the function.Signed-off-by Jin Yao <[email protected]>--- tools/lib/perf/cpumap.c | 5 +++++ tools/lib/perf/include/perf/cpumap.h | 1 + 2 files changed, 6 insertions(+)tools/lib/perf/cpumap.c +5
-0@@ -68,6 +68,11 @@ static struct perf_cpu_map *cpu_map__default_new(void)return cpus; } +struct perf_cpu_map *perf_cpu_map__default_new (void ) +{ +return cpu_map__default_new (); +} +static int cmp_int (const void *a,const void *b) {return *(const int *)a - *(const int *)b;tools/lib/perf/include/perf/cpumap.h +1
-0@@ -9,6 +9,7 @@struct perf_cpu_map ; LIBPERF_API struct perf_cpu_map *perf_cpu_map__dummy_new(void); +LIBPERF_API struct perf_cpu_map *perf_cpu_map__default_new(void); LIBPERF_API struct perf_cpu_map *perf_cpu_map__new(const char *cpu_list); LIBPERF_API struct perf_cpu_map *perf_cpu_map__read(FILE *file); LIBPERF_API struct perf_cpu_map *perf_cpu_map__get(struct perf_cpu_map *map);