perf vendor events amd: remove trailing comma
PATCH 1/1 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.
--- tools/perf/pmu-events/arch/x86/amdzen2/core.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/pmu-events/arch/x86/amdzen2/core.json +1 -1
@@ -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." } ]
Signature · 1 line
2.25.1
Arnaldo Carvalho de Melo
maintainerEm Sat, Sep 12, 2020 at 12:10:56AM -0400, Henry Burns escreveu:
Quoted 2 lines
amdzen2/core.jsonhad a trailing comma on thex_ret_fus_brnch_instevent. 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
Quoted 20 lines
Signed-off-by Henry Burns <[email protected]>--- tools/perf/pmu-events/arch/x86/amdzen2/core.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/perf/pmu-events/arch/x86/amdzen2/core.json +1
-1@@ -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." } ]Signature · 1 line
2.25.1
Signature · 1 line
- Arnaldo
Quoted 5 lines
Quoted 2 lines
amdzen2/core.jsonhad a trailing comma on thex_ret_fus_brnch_instevent. 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.
Quoted 27 lines
- Arnaldo
Quoted 18 lines
Signed-off-by Henry Burns <[email protected]>--- tools/perf/pmu-events/arch/x86/amdzen2/core.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/perf/pmu-events/arch/x86/amdzen2/core.json +1
-2@@ -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." } ] --Quoted 2 lines
2.25.1
--
- Arnaldo
PATCH v2 1/1 perf vendor events amd: remove trailing commas
In reply to Henry Burnsamdzen2/core.json and amdzen/core.json have the occasional trailing comma. Since that goes against the JSON standard, lets remove it.
--- 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(-)
tools/perf/pmu-events/arch/x86/amdzen1/core.json +1 -1
@@ -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",
tools/perf/pmu-events/arch/x86/amdzen2/core.json +1 -1
@@ -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." } ]
Signature · 1 line
2.25.1
Re: [PATCH v2] perf vendor events amd: remove trailing commas
Hello,
Quoted 5 lines · Henry Burns
amdzen2/core.jsonandamdzen/core.jsonhave the occasional trailing comma. Since that goes against the JSON standard, lets remove it.Signed-off-by Henry Burns <[email protected]>
Thanks
Namhyung
Quoted 33 lines
--- 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(-)tools/perf/pmu-events/arch/x86/amdzen1/core.json +1
-1@@ -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",tools/perf/pmu-events/arch/x86/amdzen2/core.json +1
-2@@ -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
Kim Phillips
Acked-byRe: [PATCH v2] perf vendor events amd: remove trailing commas
Quoted 8 lines · Namhyung Kim
Quoted 5 lines · Henry Burns
amdzen2/core.jsonandamdzen/core.jsonhave 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,
Kim
Re: [PATCH v2] perf vendor events amd: remove trailing commas
Em Mon, Sep 14, 2020 at 10:06:28PM -0500, Kim Phillips escreveu:
Quoted 11 lines · Namhyung Kim
Quoted 8 lines · Henry Burns
Quoted 5 lines
amdzen2/core.jsonandamdzen/core.jsonhave 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