• James Clark's avatar
    perf vendor events power9: Fix commas so PMU event files are valid JSON · da3ef7f6
    James Clark authored
    No functional change.
    
    Remove extra commas in the power9 JSON files so that the files
    can be parsed and validated by other utilities such as Python
    that fail to parse invalid JSON.
    
    Before:
    
      $ diffstat -l -p1 /wb/1.patch | while read filename ; do echo $filename ; cat $filename | json_verify ; done
      tools/perf/pmu-events/arch/powerpc/power9/cache.json
      parse error: invalid object key (must be a string)
                                              [   {,     "EventCode": "0x300
                           (right here) ------^
      JSON is invalid
      tools/perf/pmu-events/arch/powerpc/power9/floating-point.json
      parse error: invalid object key (must be a string)
                                              [   {,     "EventCode": "0x141
                           (right here) ------^
      JSON is invalid
      tools/perf/pmu-events/arch/powerpc/power9/frontend.json
      parse error: invalid object key (must be a string)
                                              [   {,     "EventCode": "0x250
                           (right here) ------^
      JSON is invalid
      tools/perf/pmu-events/arch/powerpc/power9/marked.json
      parse error: invalid object key (must be a string)
                                              [   {,     "EventCode": "0x301
                           (right here) ------^
      JSON is invalid
      tools/perf/pmu-events/arch/powerpc/power9/memory.json
      parse error: invalid object key (must be a string)
                                              [   {,     "EventCode": "0x300
                           (right here) ------^
      JSON is invalid
      tools/perf/pmu-events/arch/powerpc/power9/other.json
      parse error: invalid object key (must be a string)
                                              [   {,     "EventCode": "0x308
                           (right here) ------^
      JSON is invalid
      tools/perf/pmu-events/arch/powerpc/power9/pipeline.json
      parse error: invalid object key (must be a string)
                                              [   {,     "EventCode": "0x4D0
                           (right here) ------^
      JSON is invalid
      tools/perf/pmu-events/arch/powerpc/power9/pmc.json
      parse error: invalid object key (must be a string)
                                              [   {,     "EventCode": "0x200
                           (right here) ------^
      JSON is invalid
      tools/perf/pmu-events/arch/powerpc/power9/translation.json
      parse error: invalid object key (must be a string)
                                              [   {,     "EventCode": "0x1E"
                           (right here) ------^
      JSON is invalid
      $
    
    After:
    
      $ diffstat -l -p1 /wb/1.patch | while read filename ; do echo $filename ; cat $filename | json_verify ; done
      tools/perf/pmu-events/arch/powerpc/power9/cache.json
      JSON is valid
      tools/perf/pmu-events/arch/powerpc/power9/floating-point.json
      JSON is valid
      tools/perf/pmu-events/arch/powerpc/power9/frontend.json
      JSON is valid
      tools/perf/pmu-events/arch/powerpc/power9/marked.json
      JSON is valid
      tools/perf/pmu-events/arch/powerpc/power9/memory.json
      JSON is valid
      tools/perf/pmu-events/arch/powerpc/power9/other.json
      JSON is valid
      tools/perf/pmu-events/arch/powerpc/power9/pipeline.json
      JSON is valid
      tools/perf/pmu-events/arch/powerpc/power9/pmc.json
      JSON is valid
      tools/perf/pmu-events/arch/powerpc/power9/translation.json
      JSON is valid
      $
    Signed-off-by: default avatarJames Clark <james.clark@arm.com>
    Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Kevin Mooney <kevin.mooney@arm.com>
    Cc: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
    Cc: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
    Cc: Mark Rutland <mark.rutland@arm.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
    Cc: nd@arm.com
    Link: http://lore.kernel.org/lkml/20191112160342.26470-3-james.clark@arm.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
    da3ef7f6
pmc.json 4.87 KB