From: Ian Rogers <irogers@google.com>
To: John Garry <john.garry@huawei.com>
Cc: will@kernel.org, mathieu.poirier@linaro.org, leo.yan@linaro.org,
peterz@infradead.org, mingo@redhat.com, acme@kernel.org,
mark.rutland@arm.com, alexander.shishkin@linux.intel.com,
jolsa@redhat.com, namhyung@kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org,
linuxarm@huawei.com, zhangshaokun@hisilicon.com,
liuqi115@huawei.com
Subject: Re: [PATCH 1/5] perf parse-events: Set numeric term config
Date: Tue, 28 Sep 2021 10:59:42 -0700 [thread overview]
Message-ID: <CAP-5=fVG3_p3Xf3s6FnpSRFwt3+CxitPZwRK0fMbz2t8WZaSEw@mail.gmail.com> (raw)
In-Reply-To: <1631795665-240946-2-git-send-email-john.garry@huawei.com>
On Thu, Sep 16, 2021 at 5:39 AM John Garry <john.garry@huawei.com> wrote:
>
> For numeric terms, the config field may be NULL as it is not set from the
> l+y parsing.
>
> Fix by setting the term config from the term type name.
>
> Also fix up the pmu-events test to set the alias strings to set the period
> term properly, and fix up parse-events test to check the term config
> string.
>
> Signed-off-by: John Garry <john.garry@huawei.com>
Acked-by: Ian Rogers <irogers@google.com>
Having this would be very useful with an issue I'm looking into.
Thanks,
Ian
> ---
> tools/perf/tests/parse-events.c | 8 ++++----
> tools/perf/tests/pmu-events.c | 6 +++---
> tools/perf/util/parse-events.c | 2 +-
> 3 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c
> index fd3556cc9ad4..8875e388563e 100644
> --- a/tools/perf/tests/parse-events.c
> +++ b/tools/perf/tests/parse-events.c
> @@ -605,7 +605,7 @@ static int test__checkterms_simple(struct list_head *terms)
> TEST_ASSERT_VAL("wrong type val",
> term->type_val == PARSE_EVENTS__TERM_TYPE_NUM);
> TEST_ASSERT_VAL("wrong val", term->val.num == 10);
> - TEST_ASSERT_VAL("wrong config", !term->config);
> + TEST_ASSERT_VAL("wrong config", !strcmp(term->config, "config"));
>
> /* config1 */
> term = list_entry(term->list.next, struct parse_events_term, list);
> @@ -614,7 +614,7 @@ static int test__checkterms_simple(struct list_head *terms)
> TEST_ASSERT_VAL("wrong type val",
> term->type_val == PARSE_EVENTS__TERM_TYPE_NUM);
> TEST_ASSERT_VAL("wrong val", term->val.num == 1);
> - TEST_ASSERT_VAL("wrong config", !term->config);
> + TEST_ASSERT_VAL("wrong config", !strcmp(term->config, "config1"));
>
> /* config2=3 */
> term = list_entry(term->list.next, struct parse_events_term, list);
> @@ -623,7 +623,7 @@ static int test__checkterms_simple(struct list_head *terms)
> TEST_ASSERT_VAL("wrong type val",
> term->type_val == PARSE_EVENTS__TERM_TYPE_NUM);
> TEST_ASSERT_VAL("wrong val", term->val.num == 3);
> - TEST_ASSERT_VAL("wrong config", !term->config);
> + TEST_ASSERT_VAL("wrong config", !strcmp(term->config, "config2"));
>
> /* umask=1*/
> term = list_entry(term->list.next, struct parse_events_term, list);
> @@ -661,7 +661,7 @@ static int test__checkterms_simple(struct list_head *terms)
> TEST_ASSERT_VAL("wrong type val",
> term->type_val == PARSE_EVENTS__TERM_TYPE_NUM);
> TEST_ASSERT_VAL("wrong val", term->val.num == 0xead);
> - TEST_ASSERT_VAL("wrong config", !term->config);
> + TEST_ASSERT_VAL("wrong config", !strcmp(term->config, "config"));
> return 0;
> }
>
> diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c
> index 43743cf719ef..8c5a6ba1cb14 100644
> --- a/tools/perf/tests/pmu-events.c
> +++ b/tools/perf/tests/pmu-events.c
> @@ -67,7 +67,7 @@ static const struct perf_pmu_test_event segment_reg_loads_any = {
> .desc = "Number of segment register loads",
> .topic = "other",
> },
> - .alias_str = "umask=0x80,(null)=0x30d40,event=0x6",
> + .alias_str = "umask=0x80,period=0x30d40,event=0x6",
> .alias_long_desc = "Number of segment register loads",
> };
>
> @@ -78,7 +78,7 @@ static const struct perf_pmu_test_event dispatch_blocked_any = {
> .desc = "Memory cluster signals to block micro-op dispatch for any reason",
> .topic = "other",
> },
> - .alias_str = "umask=0x20,(null)=0x30d40,event=0x9",
> + .alias_str = "umask=0x20,period=0x30d40,event=0x9",
> .alias_long_desc = "Memory cluster signals to block micro-op dispatch for any reason",
> };
>
> @@ -89,7 +89,7 @@ static const struct perf_pmu_test_event eist_trans = {
> .desc = "Number of Enhanced Intel SpeedStep(R) Technology (EIST) transitions",
> .topic = "other",
> },
> - .alias_str = "umask=0,(null)=0x30d40,event=0x3a",
> + .alias_str = "umask=0,period=0x30d40,event=0x3a",
> .alias_long_desc = "Number of Enhanced Intel SpeedStep(R) Technology (EIST) transitions",
> };
>
> diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
> index 51a2219df601..e10243454e8b 100644
> --- a/tools/perf/util/parse-events.c
> +++ b/tools/perf/util/parse-events.c
> @@ -3083,7 +3083,7 @@ int parse_events_term__num(struct parse_events_term **term,
> struct parse_events_term temp = {
> .type_val = PARSE_EVENTS__TERM_TYPE_NUM,
> .type_term = type_term,
> - .config = config,
> + .config = config ? : strdup(config_term_names[type_term]),
> .no_value = no_value,
> .err_term = loc_term ? loc_term->first_column : 0,
> .err_val = loc_val ? loc_val->first_column : 0,
> --
> 2.26.2
>
next prev parent reply other threads:[~2021-09-28 17:59 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-16 12:34 [PATCH 0/5] Improve perf list support for hisi uncore PMUs John Garry
2021-09-16 12:34 ` [PATCH 1/5] perf parse-events: Set numeric term config John Garry
2021-09-28 17:59 ` Ian Rogers [this message]
2021-09-28 19:16 ` Arnaldo Carvalho de Melo
2021-09-16 12:34 ` [PATCH 2/5] perf jevents: Support ConfigCode John Garry
2021-09-28 18:00 ` Ian Rogers
2021-09-16 12:34 ` [PATCH 3/5] perf test: Verify more event members in pmu-events test John Garry
2021-09-28 18:02 ` Ian Rogers
2021-09-16 12:34 ` [PATCH 4/5] perf test: Add pmu-event test for event described as "config=" John Garry
2021-09-28 18:03 ` Ian Rogers
2021-09-16 12:34 ` [PATCH 5/5] perf vendor events arm64: Revise hip08 uncore events John Garry
2021-09-28 18:04 ` Ian Rogers
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='CAP-5=fVG3_p3Xf3s6FnpSRFwt3+CxitPZwRK0fMbz2t8WZaSEw@mail.gmail.com' \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=john.garry@huawei.com \
--cc=jolsa@redhat.com \
--cc=leo.yan@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=liuqi115@huawei.com \
--cc=mark.rutland@arm.com \
--cc=mathieu.poirier@linaro.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=will@kernel.org \
--cc=zhangshaokun@hisilicon.com \
/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).