[PATCH 4/5] perf test: Add pmu-event test for event described as "config="

[Ian Rogers]

On Thu, Sep 16, 2021 at 5:39 AM John Garry <john.garry at huawei.com> wrote:
>
> Add a new test event for a system event whose event member is in form
> "config=".
>
> Signed-off-by: John Garry <john.garry at huawei.com>

Acked-by: Ian Rogers <irogers at google.com>

Thanks,
Ian

> ---
>  .../arch/test/test_soc/sys/uncore.json        |  7 ++++++
>  tools/perf/tests/pmu-events.c                 | 25 +++++++++++++++++++
>  2 files changed, 32 insertions(+)
>
> diff --git a/tools/perf/pmu-events/arch/test/test_soc/sys/uncore.json b/tools/perf/pmu-events/arch/test/test_soc/sys/uncore.json
> index 0f681a6e10ea..c7e7528db315 100644
> --- a/tools/perf/pmu-events/arch/test/test_soc/sys/uncore.json
> +++ b/tools/perf/pmu-events/arch/test/test_soc/sys/uncore.json
> @@ -6,4 +6,11 @@
>             "Unit": "sys_ddr_pmu",
>             "Compat": "v8"
>     },
> +   {
> +           "BriefDescription": "ccn read-cycles event",
> +           "ConfigCode": "0x2c",
> +           "EventName": "sys_ccn_pmu.read_cycles",
> +           "Unit": "sys_ccn_pmu",
> +           "Compat": "0x01"
> +   }
>  ]
> diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c
> index adfc17f51c7b..f14266a4c513 100644
> --- a/tools/perf/tests/pmu-events.c
> +++ b/tools/perf/tests/pmu-events.c
> @@ -208,8 +208,23 @@ static const struct perf_pmu_test_event sys_ddr_pmu_write_cycles = {
>         .matching_pmu = "uncore_sys_ddr_pmu",
>  };
>
> +static const struct perf_pmu_test_event sys_ccn_pmu_read_cycles = {
> +       .event = {
> +               .name = "sys_ccn_pmu.read_cycles",
> +               .event = "config=0x2c",
> +               .desc = "ccn read-cycles event. Unit: uncore_sys_ccn_pmu ",
> +               .topic = "uncore",
> +               .pmu = "uncore_sys_ccn_pmu",
> +               .compat = "0x01",
> +       },
> +       .alias_str = "config=0x2c",
> +       .alias_long_desc = "ccn read-cycles event. Unit: uncore_sys_ccn_pmu ",
> +       .matching_pmu = "uncore_sys_ccn_pmu",
> +};
> +
>  static const struct perf_pmu_test_event *sys_events[] = {
>         &sys_ddr_pmu_write_cycles,
> +       &sys_ccn_pmu_read_cycles,
>         NULL
>  };
>
> @@ -677,6 +692,16 @@ static struct perf_pmu_test_pmu test_pmus[] = {
>                         &sys_ddr_pmu_write_cycles,
>                 },
>         },
> +       {
> +               .pmu = {
> +                       .name = (char *)"uncore_sys_ccn_pmu4",
> +                       .is_uncore = 1,
> +                       .id = (char *)"0x01",
> +               },
> +               .aliases = {
> +                       &sys_ccn_pmu_read_cycles,
> +               },
> +       },
>  };
>
>  /* Test that aliases generated are as expected */
> --
> 2.26.2
>