Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A8599C433EF for ; Wed, 8 Dec 2021 17:59:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238412AbhLHSD2 (ORCPT ); Wed, 8 Dec 2021 13:03:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232082AbhLHSD1 (ORCPT ); Wed, 8 Dec 2021 13:03:27 -0500 Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B9139C0617A1 for ; Wed, 8 Dec 2021 09:59:55 -0800 (PST) Received: by mail-pl1-x631.google.com with SMTP id n8so2040180plf.4 for ; Wed, 08 Dec 2021 09:59:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=7X4QxM5eZBOBfTltQHomvxDmSjwApX37KVlPQxq63Wc=; b=XV/7I04H0oxJ5eBURppuGHX8/4sXRO2IK76Xtcd6nxygBEjhDzvtfcRnFdeKNScToN so15Iq/mT7piILb14uIXpS+vrDcafuG7/7vpR2PbciHtOTzkIDGpV3AL3MthOodo7SsQ 4HgS+wM65pL1C9B85OAPVY27MWJJPlx9c0zdvbc4s9POZIoXwxb6ToN899jCa1iJXz/C 1UpoBKI4F4HryOgGresGxzox2IHH9yD5YllmGBKOld0dRaeviYPSx7vqP3aSHK2REgky lNXZp8BoX11N+LqujcrLHEk6cy67yM+DP1+aXCO8P3Qg7MpV0NkFqaL6lA6vJQuTlEgt djnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=7X4QxM5eZBOBfTltQHomvxDmSjwApX37KVlPQxq63Wc=; b=b+zCba0D3gAMX5iQatNTMOqkDAFX93Qb1VuZnSlgdywxyasOi44D+ugF/FNZHwdNdl 6lxDclH/hMcscsYaYhWm47LJ8lNQq4AnD35HfkDbK9tpb48m4s+EpCJOEfIrfFTDVOWM eecPOFZmwea10itGSbnIqt7N6BP1RUXNO5waMkCMWSzgq/GZP+dXpuawQiPyJVPg43Cl ZtdXGQAmSOSATYxO1ST+UxhNTW43gpJOjVFF3Liafw35CWb6+32Gc9DarRW2Csp1UE7m 5wrA11ZI2kUEj+PSwTynZgxLBjOXZVuBqGGLfWJi1P+nb9xKsiTnUj4sJkxoSe0qDWKp y1zQ== X-Gm-Message-State: AOAM531F0aZWM1SUJUKdoY6Y3kdfmhJyWVDYHLzbU8asRr28aGg5i1bX wEhW7TZ0Uuu1Kvc9zInKORykHw== X-Google-Smtp-Source: ABdhPJz4NlOR5DDr6qvXAjUpPC+cU+lOTWHotu3acc/H1FzOk7jRNPaSmMz//pmwPoS7dKiVfalfRQ== X-Received: by 2002:a17:90a:be0f:: with SMTP id a15mr8844408pjs.243.1638986395129; Wed, 08 Dec 2021 09:59:55 -0800 (PST) Received: from p14s (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id ip5sm3684424pjb.5.2021.12.08.09.59.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Dec 2021 09:59:54 -0800 (PST) Date: Wed, 8 Dec 2021 10:59:50 -0700 From: Mathieu Poirier To: Ian Rogers Cc: Andi Kleen , Jiri Olsa , Namhyung Kim , John Garry , Kajol Jain , "Paul A . Clarke" , Arnaldo Carvalho de Melo , Riccardo Mancini , Kan Liang , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Vineet Singh , James Clark , Suzuki K Poulose , Mike Leach , Leo Yan , coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, eranian@google.com Subject: Re: [PATCH 19/22] perf cpumap: Move 'has' function to libperf Message-ID: <20211208175950.GA1141224@p14s> References: <20211208024607.1784932-1-irogers@google.com> <20211208024607.1784932-20-irogers@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211208024607.1784932-20-irogers@google.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > 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 > 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 >