Re: [PATCH] perf vendor events power9: Remove UTF-8 characters from json files

[Ian Rogers]

On Tue, Mar 28, 2023 at 4:30 AM Kajol Jain <kjain@xxxxxxxxxxxxx> wrote:
>
> Commit 3c22ba524304 ("perf vendor events powerpc: Update POWER9 events")
> added and updated power9 pmu json events. However some of the json
> events which are part of other.json and pipeline.json files,
> contains UTF-8 characters in their brief description.
> Having UTF-8 character could brakes the perf build on some distros.

nit: s/bakes/break/

> Fix this issue by removing the UTF-8 characters from other.json and
> pipeline.json files.
>
> Result without the fix patch:
> [command]# file -i pmu-events/arch/powerpc/power9/*
> pmu-events/arch/powerpc/power9/cache.json:          application/json; charset=us-ascii
> pmu-events/arch/powerpc/power9/floating-point.json: application/json; charset=us-ascii
> pmu-events/arch/powerpc/power9/frontend.json:       application/json; charset=us-ascii
> pmu-events/arch/powerpc/power9/marked.json:         application/json; charset=us-ascii
> pmu-events/arch/powerpc/power9/memory.json:         application/json; charset=us-ascii
> pmu-events/arch/powerpc/power9/metrics.json:        application/json; charset=us-ascii
> pmu-events/arch/powerpc/power9/nest_metrics.json:   application/json; charset=us-ascii
> pmu-events/arch/powerpc/power9/other.json:          application/json; charset=utf-8
> pmu-events/arch/powerpc/power9/pipeline.json:       application/json; charset=utf-8
> pmu-events/arch/powerpc/power9/pmc.json:            application/json; charset=us-ascii
> pmu-events/arch/powerpc/power9/translation.json:    application/json; charset=us-ascii
>
> Result with the fix patch:
>
> [command]# file -i pmu-events/arch/powerpc/power9/*
> pmu-events/arch/powerpc/power9/cache.json:          application/json; charset=us-ascii
> pmu-events/arch/powerpc/power9/floating-point.json: application/json; charset=us-ascii
> pmu-events/arch/powerpc/power9/frontend.json:       application/json; charset=us-ascii
> pmu-events/arch/powerpc/power9/marked.json:         application/json; charset=us-ascii
> pmu-events/arch/powerpc/power9/memory.json:         application/json; charset=us-ascii
> pmu-events/arch/powerpc/power9/metrics.json:        application/json; charset=us-ascii
> pmu-events/arch/powerpc/power9/nest_metrics.json:   application/json; charset=us-ascii
> pmu-events/arch/powerpc/power9/other.json:          application/json; charset=us-ascii
> pmu-events/arch/powerpc/power9/pipeline.json:       application/json; charset=us-ascii
> pmu-events/arch/powerpc/power9/pmc.json:            application/json; charset=us-ascii
> pmu-events/arch/powerpc/power9/translation.json:    application/json; charset=us-ascii
>
> Fixes: 3c22ba524304 ("perf vendor events powerpc: Update POWER9 events")
> Reported-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
> Link: https://lore.kernel.org/lkml/ZBxP77deq7ikTxwG@xxxxxxxxxx/
> Signed-off-by: Kajol Jain <kjain@xxxxxxxxxxxxx>

Acked-by: Ian Rogers <irogers@xxxxxxxxxx>

Thanks,
Ian

> ---
>  tools/perf/pmu-events/arch/powerpc/power9/other.json    | 4 ++--
>  tools/perf/pmu-events/arch/powerpc/power9/pipeline.json | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/tools/perf/pmu-events/arch/powerpc/power9/other.json b/tools/perf/pmu-events/arch/powerpc/power9/other.json
> index 3f69422c21f9..f10bd554521a 100644
> --- a/tools/perf/pmu-events/arch/powerpc/power9/other.json
> +++ b/tools/perf/pmu-events/arch/powerpc/power9/other.json
> @@ -1417,7 +1417,7 @@
>    {
>      "EventCode": "0x45054",
>      "EventName": "PM_FMA_CMPL",
> -    "BriefDescription": "two flops operation completed (fmadd, fnmadd, fmsub, fnmsub) Scalar instructions only. "
> +    "BriefDescription": "two flops operation completed (fmadd, fnmadd, fmsub, fnmsub) Scalar instructions only."
>    },
>    {
>      "EventCode": "0x201E8",
> @@ -2017,7 +2017,7 @@
>    {
>      "EventCode": "0xC0BC",
>      "EventName": "PM_LSU_FLUSH_OTHER",
> -    "BriefDescription": "Other LSU flushes including: Sync (sync ack from L2 caused search of LRQ for oldest snooped load, This will either signal a Precise Flush of the oldest snooped loa or a Flush Next PPC); Data Valid Flush Next (several cases of this, one example is store and reload are lined up such that a store-hit-reload scenario exists and the CDF has already launched and has gotten bad/stale data); Bad Data Valid Flush Next (might be a few cases of this, one example is a larxa (D$ hit) return data and dval but can't allocate to LMQ (LMQ full or other reason). Already gave dval but can't watch it for snoop_hit_larx. Need to take the “bad dval” back and flush all younger ops)"
> +    "BriefDescription": "Other LSU flushes including: Sync (sync ack from L2 caused search of LRQ for oldest snooped load, This will either signal a Precise Flush of the oldest snooped loa or a Flush Next PPC); Data Valid Flush Next (several cases of this, one example is store and reload are lined up such that a store-hit-reload scenario exists and the CDF has already launched and has gotten bad/stale data); Bad Data Valid Flush Next (might be a few cases of this, one example is a larxa (D$ hit) return data and dval but can't allocate to LMQ (LMQ full or other reason). Already gave dval but can't watch it for snoop_hit_larx. Need to take the 'bad dval' back and flush all younger ops)"
>    },
>    {
>      "EventCode": "0x5094",
> diff --git a/tools/perf/pmu-events/arch/powerpc/power9/pipeline.json b/tools/perf/pmu-events/arch/powerpc/power9/pipeline.json
> index d0265f255de2..723bffa41c44 100644
> --- a/tools/perf/pmu-events/arch/powerpc/power9/pipeline.json
> +++ b/tools/perf/pmu-events/arch/powerpc/power9/pipeline.json
> @@ -442,7 +442,7 @@
>    {
>      "EventCode": "0x4D052",
>      "EventName": "PM_2FLOP_CMPL",
> -    "BriefDescription": "DP vector version of fmul, fsub, fcmp, fsel, fabs, fnabs, fres ,fsqrte, fneg "
> +    "BriefDescription": "DP vector version of fmul, fsub, fcmp, fsel, fabs, fnabs, fres ,fsqrte, fneg"
>    },
>    {
>      "EventCode": "0x1F142",
> --
> 2.39.1
>