On Thu, Sep 7, 2023 at 4:58 AM Jing Zhang <renyu.zj@xxxxxxxxxxxxxxxxx> wrote:
>
> The jevent "Compat" is used for uncore PMU alias or metric definitions.
>
> The same PMU driver has different PMU identifiers due to different
> hardware versions and types, but they may have some common PMU event.
> Since a Compat value can only match one identifier, when adding the
> same event alias to PMUs with different identifiers, each identifier
> needs to be defined once, which is not streamlined enough.
>
> So let "Compat" supports matching multiple identifiers for uncore PMU
> alias. For example, the Compat value {43401;436*} can match the PMU
> identifier "43401", that is, CMN600_r0p0, and the PMU identifier with
> the prefix "436", that is, all CMN650, where "*" is a wildcard.
> Tokens in Unit field are delimited by ';' with no spaces.
>
> Signed-off-by: Jing Zhang <renyu.zj@xxxxxxxxxxxxxxxxx>
> Reviewed-by: John Garry <john.g.garry@xxxxxxxxxx>
> ---
> tools/perf/util/pmu.c | 28 ++++++++++++++++++++++++++--
> tools/perf/util/pmu.h | 1 +
> 2 files changed, 27 insertions(+), 2 deletions(-)
>
> diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
> index e215985..c3c3818 100644
> --- a/tools/perf/util/pmu.c
> +++ b/tools/perf/util/pmu.c
> @@ -875,6 +875,30 @@ static bool pmu_uncore_alias_match(const char *pmu_name, const char *name)
> return res;
> }
>
> +bool pmu_uncore_identifier_match(const char *id, const char *compat)
> +{
> + char *tmp = NULL, *tok, *str;
> + bool res = false;
> +
> + /*
> + * The strdup() call is necessary here because "compat" is a const str*
> + * type and cannot be used as an argument to strtok_r().
> + */
> + str = strdup(compat);
> + if (!str)
> + return false;
> +
> + tok = strtok_r(str, ";", &tmp);
Did the comma vs semicolon difference get explained? It seems to add
inconsistency to use a semicolon.
Thanks,
Ian
> + for (; tok; tok = strtok_r(NULL, ";", &tmp)) {
> + if (!fnmatch(tok, id, FNM_CASEFOLD)) {
> + res = true;
> + break;
> + }
> + }
> + free(str);
> + return res;
> +}
> +
> static int pmu_add_cpu_aliases_map_callback(const struct pmu_event *pe,
> const struct pmu_events_table *table __maybe_unused,
> void *vdata)
> @@ -915,8 +939,8 @@ static int pmu_add_sys_aliases_iter_fn(const struct pmu_event *pe,
> if (!pe->compat || !pe->pmu)
> return 0;
>
> - if (!strcmp(pmu->id, pe->compat) &&
> - pmu_uncore_alias_match(pe->pmu, pmu->name)) {
> + if (pmu_uncore_alias_match(pe->pmu, pmu->name) &&
> + pmu_uncore_identifier_match(pmu->id, pe->compat)) {
> perf_pmu__new_alias(pmu,
> pe->name,
> pe->desc,
> diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
> index bd5d804..1bf5cf1 100644
> --- a/tools/perf/util/pmu.h
> +++ b/tools/perf/util/pmu.h
> @@ -240,6 +240,7 @@ void pmu_add_cpu_aliases_table(struct perf_pmu *pmu,
> char *perf_pmu__getcpuid(struct perf_pmu *pmu);
> const struct pmu_events_table *pmu_events_table__find(void);
> const struct pmu_metrics_table *pmu_metrics_table__find(void);
> +bool pmu_uncore_identifier_match(const char *id, const char *compat);
>
> int perf_pmu__convert_scale(const char *scale, char **end, double *sval);
>
> --
> 1.8.3.1
>
