From: Jean-philippe ROMAIN <jean-philippe.romain@foss.st.com>
To: Ian Rogers <irogers@google.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: "Liang, Kan" <kan.liang@linux.intel.com>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Namhyung Kim <namhyung@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@kernel.org>,
Adrian Hunter <adrian.hunter@intel.com>,
Junhao He <hejunhao3@huawei.com>,
<linux-perf-users@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v1] perf list: Fix topic and pmu_name argument order
Date: Tue, 12 Nov 2024 16:24:17 +0100 [thread overview]
Message-ID: <3ccc6d4d-cfbc-49ba-8d7a-5ef867fa0f37@foss.st.com> (raw)
In-Reply-To: <CAP-5=fXEe+O+pctnO-MhCLrX071uvkLzA-L9AWP=LR81YKYG6Q@mail.gmail.com>
On 11/11/24 19:20, Ian Rogers wrote:
> On Mon, Nov 11, 2024 at 9:35 AM Arnaldo Carvalho de Melo
> <acme@kernel.org> wrote:
>> On Mon, Nov 11, 2024 at 09:48:41AM -0500, Liang, Kan wrote:
>>>
>>> On 2024-11-08 9:58 p.m., Ian Rogers wrote:
>>>> From: Jean-Philippe Romain <jean-philippe.romain@foss.st.com>
>>>>
>>>> Fix function definitions to match header file declaration. Fix two
>>>> callers to pass the arguments in the right order.
>>>>
>>>> On Intel Tigerlake, before:
>>>> ```
>>>> $ perf list -j|grep "\"Topic\""|sort|uniq
>>>> "Topic": "cache",
>>>> "Topic": "cpu",
>>>> "Topic": "floating point",
>>>> "Topic": "frontend",
>>>> "Topic": "memory",
>>>> "Topic": "other",
>>>> "Topic": "pfm icl",
>>>> "Topic": "pfm ix86arch",
>>>> "Topic": "pfm perf_raw",
>>>> "Topic": "pipeline",
>>>> "Topic": "tool",
>>>> "Topic": "uncore interconnect",
>>>> "Topic": "uncore memory",
>>>> "Topic": "uncore other",
>>>> "Topic": "virtual memory",
>>>> $ perf list -j|grep "\"Unit\""|sort|uniq
>>>> "Unit": "cache",
>>>> "Unit": "cpu",
>>>> "Unit": "cstate_core",
>>>> "Unit": "cstate_pkg",
>>>> "Unit": "i915",
>>>> "Unit": "icl",
>>>> "Unit": "intel_bts",
>>>> "Unit": "intel_pt",
>>>> "Unit": "ix86arch",
>>>> "Unit": "msr",
>>>> "Unit": "perf_raw",
>>>> "Unit": "power",
>>>> "Unit": "tool",
>>>> "Unit": "uncore_arb",
>>>> "Unit": "uncore_clock",
>>>> "Unit": "uncore_imc_free_running_0",
>>>> "Unit": "uncore_imc_free_running_1",
>>>> ```
>>>>
>>>> After:
>>>> ```
>>>> $ perf list -j|grep "\"Topic\""|sort|uniq
>>>> "Topic": "cache",
>>>> "Topic": "floating point",
>>>> "Topic": "frontend",
>>>> "Topic": "memory",
>>>> "Topic": "other",
>>>> "Topic": "pfm icl",
>>>> "Topic": "pfm ix86arch",
>>>> "Topic": "pfm perf_raw",
>>>> "Topic": "pipeline",
>>>> "Topic": "tool",
>>>> "Topic": "uncore interconnect",
>>>> "Topic": "uncore memory",
>>>> "Topic": "uncore other",
>>>> "Topic": "virtual memory",
>>>> $ perf list -j|grep "\"Unit\""|sort|uniq
>>>> "Unit": "cpu",
>>>> "Unit": "cstate_core",
>>>> "Unit": "cstate_pkg",
>>>> "Unit": "i915",
>>>> "Unit": "icl",
>>>> "Unit": "intel_bts",
>>>> "Unit": "intel_pt",
>>>> "Unit": "ix86arch",
>>>> "Unit": "msr",
>>>> "Unit": "perf_raw",
>>>> "Unit": "power",
>>>> "Unit": "tool",
>>>> "Unit": "uncore_arb",
>>>> "Unit": "uncore_clock",
>>>> "Unit": "uncore_imc_free_running_0",
>>>> "Unit": "uncore_imc_free_running_1",
>>>> ```
>>>>
>>>> Fixes: e5c6109f4813 ("perf list: Reorganize to use callbacks to allow honouring command line options")
>>>> Signed-off-by: Jean-Philippe Romain <jean-philippe.romain@foss.st.com>
>>>> Tested-by: Ian Rogers <irogers@google.com>
>>> Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
>>>> ---
>>>> Note from Ian, I fixed the two callers and added it to
>>>> Jean-Phillippe's original change.
>> I think that in this case we need:
>>
>> [ I fixed the two callers and added it to Jean-Phillippe's original change. ]
>> Signed-off-by: Ian Rogers <irogers@google.com>
>>
>> Ok?
> Sgtm.
>
> Thanks,
> Ian
>
Reviewed-by: Jean-Philippe Romain <jean-philippe.romain@foss.st.com>
Many thanks,
Jean-Philippe
>>>> ---
>>>> tools/perf/builtin-list.c | 4 ++--
>>>> tools/perf/util/pfm.c | 4 ++--
>>>> tools/perf/util/pmus.c | 2 +-
>>>> 3 files changed, 5 insertions(+), 5 deletions(-)
>>>>
>>>> diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c
>>>> index b8378ba18c28..9e7fdfcdd7ff 100644
>>>> --- a/tools/perf/builtin-list.c
>>>> +++ b/tools/perf/builtin-list.c
>>>> @@ -113,7 +113,7 @@ static void wordwrap(FILE *fp, const char *s, int start, int max, int corr)
>>>> }
>>>> }
>>>>
>>>> -static void default_print_event(void *ps, const char *pmu_name, const char *topic,
>>>> +static void default_print_event(void *ps, const char *topic, const char *pmu_name,
>>>> const char *event_name, const char *event_alias,
>>>> const char *scale_unit __maybe_unused,
>>>> bool deprecated, const char *event_type_desc,
>>>> @@ -354,7 +354,7 @@ static void fix_escape_fprintf(FILE *fp, struct strbuf *buf, const char *fmt, ..
>>>> fputs(buf->buf, fp);
>>>> }
>>>>
>>>> -static void json_print_event(void *ps, const char *pmu_name, const char *topic,
>>>> +static void json_print_event(void *ps, const char *topic, const char *pmu_name,
>>>> const char *event_name, const char *event_alias,
>>>> const char *scale_unit,
>>>> bool deprecated, const char *event_type_desc,
>>>> diff --git a/tools/perf/util/pfm.c b/tools/perf/util/pfm.c
>>>> index 5ccfe4b64cdf..0dacc133ed39 100644
>>>> --- a/tools/perf/util/pfm.c
>>>> +++ b/tools/perf/util/pfm.c
>>>> @@ -233,7 +233,7 @@ print_libpfm_event(const struct print_callbacks *print_cb, void *print_state,
>>>> }
>>>>
>>>> if (is_libpfm_event_supported(name, cpus, threads)) {
>>>> - print_cb->print_event(print_state, pinfo->name, topic,
>>>> + print_cb->print_event(print_state, topic, pinfo->name,
>>>> name, info->equiv,
>>>> /*scale_unit=*/NULL,
>>>> /*deprecated=*/NULL, "PFM event",
>>>> @@ -267,8 +267,8 @@ print_libpfm_event(const struct print_callbacks *print_cb, void *print_state,
>>>> continue;
>>>>
>>>> print_cb->print_event(print_state,
>>>> - pinfo->name,
>>>> topic,
>>>> + pinfo->name,
>>>> name, /*alias=*/NULL,
>>>> /*scale_unit=*/NULL,
>>>> /*deprecated=*/NULL, "PFM event",
>>>> diff --git a/tools/perf/util/pmus.c b/tools/perf/util/pmus.c
>>>> index 107de86c2637..6d4c7c9ecf3a 100644
>>>> --- a/tools/perf/util/pmus.c
>>>> +++ b/tools/perf/util/pmus.c
>>>> @@ -501,8 +501,8 @@ void perf_pmus__print_pmu_events(const struct print_callbacks *print_cb, void *p
>>>> goto free;
>>>>
>>>> print_cb->print_event(print_state,
>>>> - aliases[j].pmu_name,
>>>> aliases[j].topic,
>>>> + aliases[j].pmu_name,
>>>> aliases[j].name,
>>>> aliases[j].alias,
>>>> aliases[j].scale_unit,
prev parent reply other threads:[~2024-11-12 15:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-09 2:58 [PATCH v1] perf list: Fix topic and pmu_name argument order Ian Rogers
2024-11-11 14:48 ` Liang, Kan
2024-11-11 17:34 ` Arnaldo Carvalho de Melo
2024-11-11 18:20 ` Ian Rogers
2024-11-12 15:24 ` Jean-philippe ROMAIN [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3ccc6d4d-cfbc-49ba-8d7a-5ef867fa0f37@foss.st.com \
--to=jean-philippe.romain@foss.st.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=hejunhao3@huawei.com \
--cc=irogers@google.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).