| Message ID | 1631795665-240946-2-git-send-email-john.garry@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Improve perf list support for hisi uncore PMUs | expand |
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 >
Em Tue, Sep 28, 2021 at 10:59:42AM -0700, Ian Rogers escreveu: > 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, applied the series. - Arnaldo
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,
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> --- 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(-)