2020-09-12 04:16:54

by Henry Burns

[permalink] [raw]
Subject: [PATCH] perf vendor events amd: remove trailing comma

amdzen2/core.json had a trailing comma on the x_ret_fus_brnch_inst
event. Since that goes against the JSON standard, lets remove it.

Signed-off-by: Henry Burns <[email protected]>
---
tools/perf/pmu-events/arch/x86/amdzen2/core.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/pmu-events/arch/x86/amdzen2/core.json b/tools/perf/pmu-events/arch/x86/amdzen2/core.json
index de89e5a44ff1..4b75183da94a 100644
--- a/tools/perf/pmu-events/arch/x86/amdzen2/core.json
+++ b/tools/perf/pmu-events/arch/x86/amdzen2/core.json
@@ -125,6 +125,6 @@
{
"EventName": "ex_ret_fus_brnch_inst",
"EventCode": "0x1d0",
- "BriefDescription": "Retired Fused Instructions. The number of fuse-branch instructions retired per cycle. The number of events logged per cycle can vary from 0-8.",
+ "BriefDescription": "Retired Fused Instructions. The number of fuse-branch instructions retired per cycle. The number of events logged per cycle can vary from 0-8."
}
]
--
2.25.1


2020-09-14 22:40:25

by Arnaldo Carvalho de Melo

[permalink] [raw]
Subject: Re: [PATCH] perf vendor events amd: remove trailing comma

Em Sat, Sep 12, 2020 at 12:10:56AM -0400, Henry Burns escreveu:
> amdzen2/core.json had a trailing comma on the x_ret_fus_brnch_inst
> event. Since that goes against the JSON standard, lets remove it.

is this the only case in all the .json files we have in
tools/perf/pmu-events/?

- Arnaldo

> Signed-off-by: Henry Burns <[email protected]>
> ---
> tools/perf/pmu-events/arch/x86/amdzen2/core.json | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/pmu-events/arch/x86/amdzen2/core.json b/tools/perf/pmu-events/arch/x86/amdzen2/core.json
> index de89e5a44ff1..4b75183da94a 100644
> --- a/tools/perf/pmu-events/arch/x86/amdzen2/core.json
> +++ b/tools/perf/pmu-events/arch/x86/amdzen2/core.json
> @@ -125,6 +125,6 @@
> {
> "EventName": "ex_ret_fus_brnch_inst",
> "EventCode": "0x1d0",
> - "BriefDescription": "Retired Fused Instructions. The number of fuse-branch instructions retired per cycle. The number of events logged per cycle can vary from 0-8.",
> + "BriefDescription": "Retired Fused Instructions. The number of fuse-branch instructions retired per cycle. The number of events logged per cycle can vary from 0-8."
> }
> ]
> --
> 2.25.1
>

--

- Arnaldo

2020-09-15 00:35:08

by Henry Burns

[permalink] [raw]
Subject: Re: [PATCH] perf vendor events amd: remove trailing comma

> > amdzen2/core.json had a trailing comma on the x_ret_fus_brnch_inst
> > event. Since that goes against the JSON standard, lets remove it.
>
> is this the only case in all the .json files we have in
> tools/perf/pmu-events/?

I just searched the pmu-events/arch/ folder, and found one other instance in
amdzen1. I'll send an updated patch now.
>
> - Arnaldo
>
> > Signed-off-by: Henry Burns <[email protected]>
> > ---
> > tools/perf/pmu-events/arch/x86/amdzen2/core.json | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/tools/perf/pmu-events/arch/x86/amdzen2/core.json b/tools/perf/pmu-events/arch/x86/amdzen2/core.json
> > index de89e5a44ff1..4b75183da94a 100644
> > --- a/tools/perf/pmu-events/arch/x86/amdzen2/core.json
> > +++ b/tools/perf/pmu-events/arch/x86/amdzen2/core.json
> > @@ -125,6 +125,6 @@
> > {
> > "EventName": "ex_ret_fus_brnch_inst",
> > "EventCode": "0x1d0",
> > - "BriefDescription": "Retired Fused Instructions. The number of fuse-branch instructions retired per cycle. The number of events logged per cycle can vary from 0-8.",
> > + "BriefDescription": "Retired Fused Instructions. The number of fuse-branch instructions retired per cycle. The number of events logged per cycle can vary from 0-8."
> > }
> > ]
> > --
> > 2.25.1
> >
>
> --
>
> - Arnaldo

2020-09-15 00:42:40

by Henry Burns

[permalink] [raw]
Subject: [PATCH v2] perf vendor events amd: remove trailing commas

amdzen2/core.json and amdzen/core.json have the occasional trailing
comma. Since that goes against the JSON standard, lets remove it.

Signed-off-by: Henry Burns <[email protected]>
---
tools/perf/pmu-events/arch/x86/amdzen1/core.json | 2 +-
tools/perf/pmu-events/arch/x86/amdzen2/core.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/pmu-events/arch/x86/amdzen1/core.json b/tools/perf/pmu-events/arch/x86/amdzen1/core.json
index 7e1aa8273935..653b11b23399 100644
--- a/tools/perf/pmu-events/arch/x86/amdzen1/core.json
+++ b/tools/perf/pmu-events/arch/x86/amdzen1/core.json
@@ -61,7 +61,7 @@
{
"EventName": "ex_ret_brn_ind_misp",
"EventCode": "0xca",
- "BriefDescription": "Retired Indirect Branch Instructions Mispredicted.",
+ "BriefDescription": "Retired Indirect Branch Instructions Mispredicted."
},
{
"EventName": "ex_ret_mmx_fp_instr.sse_instr",
diff --git a/tools/perf/pmu-events/arch/x86/amdzen2/core.json b/tools/perf/pmu-events/arch/x86/amdzen2/core.json
index de89e5a44ff1..4b75183da94a 100644
--- a/tools/perf/pmu-events/arch/x86/amdzen2/core.json
+++ b/tools/perf/pmu-events/arch/x86/amdzen2/core.json
@@ -125,6 +125,6 @@
{
"EventName": "ex_ret_fus_brnch_inst",
"EventCode": "0x1d0",
- "BriefDescription": "Retired Fused Instructions. The number of fuse-branch instructions retired per cycle. The number of events logged per cycle can vary from 0-8.",
+ "BriefDescription": "Retired Fused Instructions. The number of fuse-branch instructions retired per cycle. The number of events logged per cycle can vary from 0-8."
}
]
--
2.25.1

2020-09-15 02:51:26

by Namhyung Kim

[permalink] [raw]
Subject: Re: [PATCH v2] perf vendor events amd: remove trailing commas

Hello,

On Tue, Sep 15, 2020 at 9:41 AM Henry Burns <[email protected]> wrote:
>
> amdzen2/core.json and amdzen/core.json have the occasional trailing
> comma. Since that goes against the JSON standard, lets remove it.
>
> Signed-off-by: Henry Burns <[email protected]>

Acked-by: Namhyung Kim <[email protected]>

Thanks
Namhyung


> ---
> tools/perf/pmu-events/arch/x86/amdzen1/core.json | 2 +-
> tools/perf/pmu-events/arch/x86/amdzen2/core.json | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tools/perf/pmu-events/arch/x86/amdzen1/core.json b/tools/perf/pmu-events/arch/x86/amdzen1/core.json
> index 7e1aa8273935..653b11b23399 100644
> --- a/tools/perf/pmu-events/arch/x86/amdzen1/core.json
> +++ b/tools/perf/pmu-events/arch/x86/amdzen1/core.json
> @@ -61,7 +61,7 @@
> {
> "EventName": "ex_ret_brn_ind_misp",
> "EventCode": "0xca",
> - "BriefDescription": "Retired Indirect Branch Instructions Mispredicted.",
> + "BriefDescription": "Retired Indirect Branch Instructions Mispredicted."
> },
> {
> "EventName": "ex_ret_mmx_fp_instr.sse_instr",
> diff --git a/tools/perf/pmu-events/arch/x86/amdzen2/core.json b/tools/perf/pmu-events/arch/x86/amdzen2/core.json
> index de89e5a44ff1..4b75183da94a 100644
> --- a/tools/perf/pmu-events/arch/x86/amdzen2/core.json
> +++ b/tools/perf/pmu-events/arch/x86/amdzen2/core.json
> @@ -125,6 +125,6 @@
> {
> "EventName": "ex_ret_fus_brnch_inst",
> "EventCode": "0x1d0",
> - "BriefDescription": "Retired Fused Instructions. The number of fuse-branch instructions retired per cycle. The number of events logged per cycle can vary from 0-8.",
> + "BriefDescription": "Retired Fused Instructions. The number of fuse-branch instructions retired per cycle. The number of events logged per cycle can vary from 0-8."
> }
> ]
> --
> 2.25.1
>

2020-09-15 03:08:53

by Kim Phillips

[permalink] [raw]
Subject: Re: [PATCH v2] perf vendor events amd: remove trailing commas

On 9/14/20 9:49 PM, Namhyung Kim wrote:
> On Tue, Sep 15, 2020 at 9:41 AM Henry Burns <[email protected]> wrote:
>>
>> amdzen2/core.json and amdzen/core.json have the occasional trailing
>> comma. Since that goes against the JSON standard, lets remove it.
>>
>> Signed-off-by: Henry Burns <[email protected]>
>
> Acked-by: Namhyung Kim <[email protected]>

Acked-by: Kim Phillips <[email protected]>

Thanks,

Kim

2020-09-15 12:13:01

by Arnaldo Carvalho de Melo

[permalink] [raw]
Subject: Re: [PATCH v2] perf vendor events amd: remove trailing commas

Em Mon, Sep 14, 2020 at 10:06:28PM -0500, Kim Phillips escreveu:
> On 9/14/20 9:49 PM, Namhyung Kim wrote:
> > On Tue, Sep 15, 2020 at 9:41 AM Henry Burns <[email protected]> wrote:
> >>
> >> amdzen2/core.json and amdzen/core.json have the occasional trailing
> >> comma. Since that goes against the JSON standard, lets remove it.
> >>
> >> Signed-off-by: Henry Burns <[email protected]>
> >
> > Acked-by: Namhyung Kim <[email protected]>
>
> Acked-by: Kim Phillips <[email protected]>

Thanks, applied.

- Arnaldo