Re: [PATCH] perf vendor events power9: Remove UTF-8 characters from json files
On 3/29/23 18:54, Arnaldo Carvalho de Melo wrote:
> Em Tue, Mar 28, 2023 at 09:21:49AM -0700, Ian Rogers escreveu:
>> On Tue, Mar 28, 2023 at 4:30 AM Kajol Jain 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/
>
> I'll fix that later, thans.
>
>>> Fix this issue by removing the UTF-8 characters from other.json and
>>> pipeline.json files.
>>>
>>> Result without the fix patch:
>
> [perfbuilder@five ~]$ cat dm.log/summary
>123.25 ubuntu:18.04-x-powerpc: Ok powerpc-linux-gnu-gcc
> (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0
>224.56 ubuntu:18.04-x-powerpc64 : Ok powerpc64-linux-gnu-gcc
> (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0
>325.06 ubuntu:18.04-x-powerpc64el: Ok powerpc64le-linux-gnu-gcc
> (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0
> BUILD_TARBALL_HEAD=9da5ab1d38cd17fb47cbe5a1f95bca63e6ca9796
>
Thanks Ian and Arnaldo for reviewing it.
Thanks,
Kajol Jain
>>> [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
>>> Link: https://lore.kernel.org/lkml/zbxp77deq7ikt...@kernel.org/
>>> Signed-off-by: Kajol Jain
>>
>> Acked-by: Ian Rogers
>>
>> 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
Re: [PATCH] perf vendor events power9: Remove UTF-8 characters from json files
Em Tue, Mar 28, 2023 at 09:21:49AM -0700, Ian Rogers escreveu:
> On Tue, Mar 28, 2023 at 4:30 AM Kajol Jain 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/
I'll fix that later, thans.
> > Fix this issue by removing the UTF-8 characters from other.json and
> > pipeline.json files.
> >
> > Result without the fix patch:
[perfbuilder@five ~]$ cat dm.log/summary
123.25 ubuntu:18.04-x-powerpc: Ok powerpc-linux-gnu-gcc
(Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0
224.56 ubuntu:18.04-x-powerpc64 : Ok powerpc64-linux-gnu-gcc
(Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0
325.06 ubuntu:18.04-x-powerpc64el: Ok powerpc64le-linux-gnu-gcc
(Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0
BUILD_TARBALL_HEAD=9da5ab1d38cd17fb47cbe5a1f95bca63e6ca9796
> > [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
> > Link: https://lore.kernel.org/lkml/zbxp77deq7ikt...@kernel.org/
> > Signed-off-by: Kajol Jain
>
> Acked-by: Ian Rogers
>
> 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
Re: [PATCH] perf vendor events power9: Remove UTF-8 characters from json files
On Tue, Mar 28, 2023 at 4:30 AM Kajol Jain 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
> Link: https://lore.kernel.org/lkml/zbxp77deq7ikt...@kernel.org/
> Signed-off-by: Kajol Jain
Acked-by: Ian Rogers
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
[PATCH] perf vendor events power9: Remove UTF-8 characters from json files
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.
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
Link: https://lore.kernel.org/lkml/zbxp77deq7ikt...@kernel.org/
Signed-off-by: Kajol Jain
---
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
