Re: [PATCH 19/22] perf cpumap: Move 'has' function to libperf

From: Mathieu Poirier
Date: Wed Dec 08 2021 - 12:59:57 EST

Next message: Ariel D'Alessandro: "Re: [PATCH v2 3/5] arm64: dts: imx8mn-bsh-smm-s2/pro: Add iMX8MN BSH SMM S2 boards"
Previous message: kernel test robot: "[tobetter:odroid-5.16.y 20/75] drivers/char/exynos-gpiomem.c:121:22: error: incompatible types when assigning to type 'pgprot_t' {aka 'struct <anonymous>'} from type 'int'"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

On Tue, Dec 07, 2021 at 06:46:04PM -0800, Ian Rogers wrote:
> Make the cpu map argument const for consistency with the rest of the
> API. Modify cpu_map__idx accordingly.
>
> Signed-off-by: Ian Rogers <irogers@xxxxxxxxxx>
> ---
> tools/lib/perf/cpumap.c | 7 ++++++-
> tools/lib/perf/include/internal/cpumap.h | 2 +-
> tools/lib/perf/include/perf/cpumap.h | 1 +
> tools/perf/arch/arm/util/cs-etm.c | 16 ++++++++--------

For the coresight part:

Reviewed-by: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx>

> tools/perf/builtin-sched.c | 6 +++---
> tools/perf/tests/topology.c | 2 +-
> tools/perf/util/cpumap.c | 5 -----
> tools/perf/util/cpumap.h | 2 --
> tools/perf/util/cputopo.c | 2 +-
> 9 files changed, 21 insertions(+), 22 deletions(-)
>
> diff --git a/tools/lib/perf/cpumap.c b/tools/lib/perf/cpumap.c
> index adaad3dddf6e..3c36a06771af 100644
> --- a/tools/lib/perf/cpumap.c
> +++ b/tools/lib/perf/cpumap.c
> @@ -268,7 +268,7 @@ bool perf_cpu_map__empty(const struct perf_cpu_map *map)
> return map ? map->map[0] == -1 : true;
> }
>
> -int perf_cpu_map__idx(struct perf_cpu_map *cpus, int cpu)
> +int perf_cpu_map__idx(const struct perf_cpu_map *cpus, int cpu)
> {
> int low = 0, high = cpus->nr;
>
> @@ -288,6 +288,11 @@ int perf_cpu_map__idx(struct perf_cpu_map *cpus, int cpu)
> return -1;
> }
>
> +bool perf_cpu_map__has(const struct perf_cpu_map *cpus, int cpu)
> +{
> + return perf_cpu_map__idx(cpus, cpu) != -1;
> +}
> +
> int perf_cpu_map__max(struct perf_cpu_map *map)
> {
> // cpu_map__trim_new() qsort()s it, cpu_map__default_new() sorts it as well.
> diff --git a/tools/lib/perf/include/internal/cpumap.h b/tools/lib/perf/include/internal/cpumap.h
> index 1c1726f4a04e..6a0ff0abcbc4 100644
> --- a/tools/lib/perf/include/internal/cpumap.h
> +++ b/tools/lib/perf/include/internal/cpumap.h
> @@ -21,6 +21,6 @@ struct perf_cpu_map {
> #define MAX_NR_CPUS 2048
> #endif
>
> -int perf_cpu_map__idx(struct perf_cpu_map *cpus, int cpu);
> +int perf_cpu_map__idx(const struct perf_cpu_map *cpus, int cpu);
>
> #endif /* __LIBPERF_INTERNAL_CPUMAP_H */
> diff --git a/tools/lib/perf/include/perf/cpumap.h b/tools/lib/perf/include/perf/cpumap.h
> index 7c27766ea0bf..3f1c0afa3ccd 100644
> --- a/tools/lib/perf/include/perf/cpumap.h
> +++ b/tools/lib/perf/include/perf/cpumap.h
> @@ -20,6 +20,7 @@ LIBPERF_API int perf_cpu_map__cpu(const struct perf_cpu_map *cpus, int idx);
> LIBPERF_API int perf_cpu_map__nr(const struct perf_cpu_map *cpus);
> LIBPERF_API bool perf_cpu_map__empty(const struct perf_cpu_map *map);
> LIBPERF_API int perf_cpu_map__max(struct perf_cpu_map *map);
> +LIBPERF_API bool perf_cpu_map__has(const struct perf_cpu_map *map, int cpu);
>
> #define perf_cpu_map__for_each_cpu(cpu, idx, cpus) \
> for ((idx) = 0, (cpu) = perf_cpu_map__cpu(cpus, idx); \
> diff --git a/tools/perf/arch/arm/util/cs-etm.c b/tools/perf/arch/arm/util/cs-etm.c
> index 293a23bf8be3..76c66780617c 100644
> --- a/tools/perf/arch/arm/util/cs-etm.c
> +++ b/tools/perf/arch/arm/util/cs-etm.c
> @@ -204,8 +204,8 @@ static int cs_etm_set_option(struct auxtrace_record *itr,
>
> /* Set option of each CPU we have */
> for (i = 0; i < cpu__max_cpu(); i++) {
> - if (!cpu_map__has(event_cpus, i) ||
> - !cpu_map__has(online_cpus, i))
> + if (!perf_cpu_map__has(event_cpus, i) ||
> + !perf_cpu_map__has(online_cpus, i))
> continue;
>
> if (option & BIT(ETM_OPT_CTXTID)) {
> @@ -542,8 +542,8 @@ cs_etm_info_priv_size(struct auxtrace_record *itr __maybe_unused,
> /* cpu map is not empty, we have specific CPUs to work with */
> if (!perf_cpu_map__empty(event_cpus)) {
> for (i = 0; i < cpu__max_cpu(); i++) {
> - if (!cpu_map__has(event_cpus, i) ||
> - !cpu_map__has(online_cpus, i))
> + if (!perf_cpu_map__has(event_cpus, i) ||
> + !perf_cpu_map__has(online_cpus, i))
> continue;
>
> if (cs_etm_is_ete(itr, i))
> @@ -556,7 +556,7 @@ cs_etm_info_priv_size(struct auxtrace_record *itr __maybe_unused,
> } else {
> /* get configuration for all CPUs in the system */
> for (i = 0; i < cpu__max_cpu(); i++) {
> - if (!cpu_map__has(online_cpus, i))
> + if (!perf_cpu_map__has(online_cpus, i))
> continue;
>
> if (cs_etm_is_ete(itr, i))
> @@ -741,8 +741,8 @@ static int cs_etm_info_fill(struct auxtrace_record *itr,
> } else {
> /* Make sure all specified CPUs are online */
> for (i = 0; i < perf_cpu_map__nr(event_cpus); i++) {
> - if (cpu_map__has(event_cpus, i) &&
> - !cpu_map__has(online_cpus, i))
> + if (perf_cpu_map__has(event_cpus, i) &&
> + !perf_cpu_map__has(online_cpus, i))
> return -EINVAL;
> }
>
> @@ -763,7 +763,7 @@ static int cs_etm_info_fill(struct auxtrace_record *itr,
> offset = CS_ETM_SNAPSHOT + 1;
>
> for (i = 0; i < cpu__max_cpu() && offset < priv_size; i++)
> - if (cpu_map__has(cpu_map, i))
> + if (perf_cpu_map__has(cpu_map, i))
> cs_etm_get_metadata(i, &offset, itr, info);
>
> perf_cpu_map__put(online_cpus);
> diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
> index 4527f632ebe4..9da1da4749c9 100644
> --- a/tools/perf/builtin-sched.c
> +++ b/tools/perf/builtin-sched.c
> @@ -1617,10 +1617,10 @@ static int map_switch_event(struct perf_sched *sched, struct evsel *evsel,
> if (curr_thread && thread__has_color(curr_thread))
> pid_color = COLOR_PIDS;
>
> - if (sched->map.cpus && !cpu_map__has(sched->map.cpus, cpu))
> + if (sched->map.cpus && !perf_cpu_map__has(sched->map.cpus, cpu))
> continue;
>
> - if (sched->map.color_cpus && cpu_map__has(sched->map.color_cpus, cpu))
> + if (sched->map.color_cpus && perf_cpu_map__has(sched->map.color_cpus, cpu))
> cpu_color = COLOR_CPUS;
>
> if (cpu != this_cpu)
> @@ -1639,7 +1639,7 @@ static int map_switch_event(struct perf_sched *sched, struct evsel *evsel,
> color_fprintf(stdout, color, " ");
> }
>
> - if (sched->map.cpus && !cpu_map__has(sched->map.cpus, this_cpu))
> + if (sched->map.cpus && !perf_cpu_map__has(sched->map.cpus, this_cpu))
> goto out;
>
> timestamp__scnprintf_usec(timestamp, stimestamp, sizeof(stimestamp));
> diff --git a/tools/perf/tests/topology.c b/tools/perf/tests/topology.c
> index 0cb7b015b4b9..cb29ea7ec409 100644
> --- a/tools/perf/tests/topology.c
> +++ b/tools/perf/tests/topology.c
> @@ -112,7 +112,7 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map)
> TEST_ASSERT_VAL("Session header CPU map not set", session->header.env.cpu);
>
> for (i = 0; i < session->header.env.nr_cpus_avail; i++) {
> - if (!cpu_map__has(map, i))
> + if (!perf_cpu_map__has(map, i))
> continue;
> pr_debug("CPU %d, core %d, socket %d\n", i,
> session->header.env.cpu[i].core_id,
> diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c
> index 0e325559c33c..8a72ee996722 100644
> --- a/tools/perf/util/cpumap.c
> +++ b/tools/perf/util/cpumap.c
> @@ -463,11 +463,6 @@ int cpu__setup_cpunode_map(void)
> return 0;
> }
>
> -bool cpu_map__has(struct perf_cpu_map *cpus, int cpu)
> -{
> - return perf_cpu_map__idx(cpus, cpu) != -1;
> -}
> -
> size_t cpu_map__snprint(struct perf_cpu_map *map, char *buf, size_t size)
> {
> int i, cpu, start = -1;
> diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h
> index 15043e764fa6..832fc53f3c11 100644
> --- a/tools/perf/util/cpumap.h
> +++ b/tools/perf/util/cpumap.h
> @@ -78,8 +78,6 @@ struct cpu_aggr_map *cpu_aggr_map__new(const struct perf_cpu_map *cpus,
> aggr_cpu_id_get_t f,
> void *data);
>
> -bool cpu_map__has(struct perf_cpu_map *cpus, int cpu);
> -
> bool aggr_cpu_id__equal(const struct aggr_cpu_id *a, const struct aggr_cpu_id *b);
> bool aggr_cpu_id__is_empty(const struct aggr_cpu_id *a);
> struct aggr_cpu_id aggr_cpu_id__empty(void);
> diff --git a/tools/perf/util/cputopo.c b/tools/perf/util/cputopo.c
> index 51b429c86f98..8affb37d90e7 100644
> --- a/tools/perf/util/cputopo.c
> +++ b/tools/perf/util/cputopo.c
> @@ -218,7 +218,7 @@ struct cpu_topology *cpu_topology__new(void)
> tp->core_cpus_list = addr;
>
> for (i = 0; i < nr; i++) {
> - if (!cpu_map__has(map, i))
> + if (!perf_cpu_map__has(map, i))
> continue;
>
> ret = build_cpu_topology(tp, i);
> --
> 2.34.1.400.ga245620fadb-goog
>

Next message: Ariel D'Alessandro: "Re: [PATCH v2 3/5] arm64: dts: imx8mn-bsh-smm-s2/pro: Add iMX8MN BSH SMM S2 boards"
Previous message: kernel test robot: "[tobetter:odroid-5.16.y 20/75] drivers/char/exynos-gpiomem.c:121:22: error: incompatible types when assigning to type 'pgprot_t' {aka 'struct <anonymous>'} from type 'int'"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]