All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] perf vendor events amd: remove trailing comma
@ 2020-09-12  4:10 Henry Burns
  2020-09-14 22:37 ` Arnaldo Carvalho de Melo
  2020-09-15  0:40 ` [PATCH v2] perf vendor events amd: remove trailing commas Henry Burns
  0 siblings, 2 replies; 7+ messages in thread
From: Henry Burns @ 2020-09-12  4:10 UTC (permalink / raw)
  To: henrywolfeburns
  Cc: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
	Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim,
	Kim Phillips, Vijay Thakkar, Andi Kleen, linux-kernel

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 <henrywolfeburns@gmail.com>
---
 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


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH] perf vendor events amd: remove trailing comma
  2020-09-12  4:10 [PATCH] perf vendor events amd: remove trailing comma Henry Burns
@ 2020-09-14 22:37 ` Arnaldo Carvalho de Melo
  2020-09-15  0:33   ` Henry Burns
  2020-09-15  0:40 ` [PATCH v2] perf vendor events amd: remove trailing commas Henry Burns
  1 sibling, 1 reply; 7+ messages in thread
From: Arnaldo Carvalho de Melo @ 2020-09-14 22:37 UTC (permalink / raw)
  To: Henry Burns
  Cc: Peter Zijlstra, Ingo Molnar, Mark Rutland, Alexander Shishkin,
	Jiri Olsa, Namhyung Kim, Kim Phillips, Vijay Thakkar, Andi Kleen,
	linux-kernel

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 <henrywolfeburns@gmail.com>
> ---
>  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

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] perf vendor events amd: remove trailing comma
  2020-09-14 22:37 ` Arnaldo Carvalho de Melo
@ 2020-09-15  0:33   ` Henry Burns
  0 siblings, 0 replies; 7+ messages in thread
From: Henry Burns @ 2020-09-15  0:33 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo
  Cc: Peter Zijlstra, Ingo Molnar, Mark Rutland, Alexander Shishkin,
	Jiri Olsa, Namhyung Kim, Kim Phillips, Vijay Thakkar, Andi Kleen,
	linux-kernel

> > 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 <henrywolfeburns@gmail.com>
> > ---
> >  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

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH v2] perf vendor events amd: remove trailing commas
  2020-09-12  4:10 [PATCH] perf vendor events amd: remove trailing comma Henry Burns
  2020-09-14 22:37 ` Arnaldo Carvalho de Melo
@ 2020-09-15  0:40 ` Henry Burns
  2020-09-15  2:49   ` Namhyung Kim
  1 sibling, 1 reply; 7+ messages in thread
From: Henry Burns @ 2020-09-15  0:40 UTC (permalink / raw)
  To: henrywolfeburns
  Cc: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
	Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim,
	Kim Phillips, Vijay Thakkar, Andi Kleen, linux-kernel

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 <henrywolfeburns@gmail.com>
---
 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


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH v2] perf vendor events amd: remove trailing commas
  2020-09-15  0:40 ` [PATCH v2] perf vendor events amd: remove trailing commas Henry Burns
@ 2020-09-15  2:49   ` Namhyung Kim
  2020-09-15  3:06     ` Kim Phillips
  0 siblings, 1 reply; 7+ messages in thread
From: Namhyung Kim @ 2020-09-15  2:49 UTC (permalink / raw)
  To: Henry Burns
  Cc: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
	Mark Rutland, Alexander Shishkin, Jiri Olsa, Kim Phillips,
	Vijay Thakkar, Andi Kleen, linux-kernel

Hello,

On Tue, Sep 15, 2020 at 9:41 AM Henry Burns <henrywolfeburns@gmail.com> 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 <henrywolfeburns@gmail.com>

Acked-by: Namhyung Kim <namhyung@kernel.org>

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
>

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH v2] perf vendor events amd: remove trailing commas
  2020-09-15  2:49   ` Namhyung Kim
@ 2020-09-15  3:06     ` Kim Phillips
  2020-09-15 11:55       ` Arnaldo Carvalho de Melo
  0 siblings, 1 reply; 7+ messages in thread
From: Kim Phillips @ 2020-09-15  3:06 UTC (permalink / raw)
  To: Namhyung Kim, Henry Burns
  Cc: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
	Mark Rutland, Alexander Shishkin, Jiri Olsa, Vijay Thakkar,
	Andi Kleen, linux-kernel

On 9/14/20 9:49 PM, Namhyung Kim wrote:
> On Tue, Sep 15, 2020 at 9:41 AM Henry Burns <henrywolfeburns@gmail.com> 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 <henrywolfeburns@gmail.com>
> 
> Acked-by: Namhyung Kim <namhyung@kernel.org>

Acked-by: Kim Phillips <kim.phillips@amd.com>

Thanks,

Kim

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH v2] perf vendor events amd: remove trailing commas
  2020-09-15  3:06     ` Kim Phillips
@ 2020-09-15 11:55       ` Arnaldo Carvalho de Melo
  0 siblings, 0 replies; 7+ messages in thread
From: Arnaldo Carvalho de Melo @ 2020-09-15 11:55 UTC (permalink / raw)
  To: Kim Phillips
  Cc: Namhyung Kim, Henry Burns, Peter Zijlstra, Ingo Molnar,
	Mark Rutland, Alexander Shishkin, Jiri Olsa, Vijay Thakkar,
	Andi Kleen, linux-kernel

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 <henrywolfeburns@gmail.com> 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 <henrywolfeburns@gmail.com>
> > 
> > Acked-by: Namhyung Kim <namhyung@kernel.org>
> 
> Acked-by: Kim Phillips <kim.phillips@amd.com>

Thanks, applied.

- Arnaldo

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2020-09-15 12:10 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-12  4:10 [PATCH] perf vendor events amd: remove trailing comma Henry Burns
2020-09-14 22:37 ` Arnaldo Carvalho de Melo
2020-09-15  0:33   ` Henry Burns
2020-09-15  0:40 ` [PATCH v2] perf vendor events amd: remove trailing commas Henry Burns
2020-09-15  2:49   ` Namhyung Kim
2020-09-15  3:06     ` Kim Phillips
2020-09-15 11:55       ` Arnaldo Carvalho de Melo

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.