perf vendor-events: Fix all remaining invalid JSON files
authorJames Clark <james.clark@arm.com>
Thu, 7 Oct 2021 11:05:40 +0000 (12:05 +0100)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 8 Oct 2021 18:59:21 +0000 (15:59 -0300)
Remove trailing commas. A later commit will make the parser more strict
and these will not be valid anymore.

Reviewed-by: Andi Kleen <ak@linux.intel.com>
Reviewed-by: John Garry <john.garry@huawei.com>
Reviewed-by: Kajol Jain<kjain@linux.ibm.com>
Signed-off-by: James Clark <james.clark@arm.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andrew.Kilroy@arm.com
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Nick.Forrington@arm.com
Cc: Will Deacon <will@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Link: https://lore.kernel.org/r/20211007110543.564963-2-james.clark@arm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
29 files changed:
tools/perf/pmu-events/arch/arm64/ampere/emag/bus.json
tools/perf/pmu-events/arch/arm64/ampere/emag/cache.json
tools/perf/pmu-events/arch/arm64/ampere/emag/clock.json
tools/perf/pmu-events/arch/arm64/ampere/emag/exception.json
tools/perf/pmu-events/arch/arm64/ampere/emag/instruction.json
tools/perf/pmu-events/arch/arm64/ampere/emag/memory.json
tools/perf/pmu-events/arch/arm64/hisilicon/hip08/metrics.json
tools/perf/pmu-events/arch/nds32/n13/atcpmu.json
tools/perf/pmu-events/arch/s390/cf_z10/basic.json
tools/perf/pmu-events/arch/s390/cf_z10/crypto.json
tools/perf/pmu-events/arch/s390/cf_z10/extended.json
tools/perf/pmu-events/arch/s390/cf_z13/basic.json
tools/perf/pmu-events/arch/s390/cf_z13/crypto.json
tools/perf/pmu-events/arch/s390/cf_z13/extended.json
tools/perf/pmu-events/arch/s390/cf_z14/basic.json
tools/perf/pmu-events/arch/s390/cf_z14/crypto.json
tools/perf/pmu-events/arch/s390/cf_z14/extended.json
tools/perf/pmu-events/arch/s390/cf_z15/basic.json
tools/perf/pmu-events/arch/s390/cf_z15/crypto.json
tools/perf/pmu-events/arch/s390/cf_z15/crypto6.json
tools/perf/pmu-events/arch/s390/cf_z15/extended.json
tools/perf/pmu-events/arch/s390/cf_z196/basic.json
tools/perf/pmu-events/arch/s390/cf_z196/crypto.json
tools/perf/pmu-events/arch/s390/cf_z196/extended.json
tools/perf/pmu-events/arch/s390/cf_zec12/basic.json
tools/perf/pmu-events/arch/s390/cf_zec12/crypto.json
tools/perf/pmu-events/arch/s390/cf_zec12/extended.json
tools/perf/pmu-events/arch/test/test_soc/cpu/uncore.json
tools/perf/pmu-events/arch/x86/icelakex/icx-metrics.json

index 9bea1ba1c4d21e20560573e78b8220386958e7c2..cf48d0dfc7599faaeab9c4fca233ef91b996b303 100644 (file)
@@ -18,6 +18,6 @@
         "ArchStdEvent": "BUS_ACCESS_PERIPH"
     },
     {
-        "ArchStdEvent": "BUS_ACCESS",
+        "ArchStdEvent": "BUS_ACCESS"
     }
 ]
index 1e25f2ae4ae0d4952ba6997c1b55e52687ec93e7..4cc50b7da52648fcad190980235b5a0074ec1dd4 100644 (file)
         "ArchStdEvent": "L2D_CACHE_INVAL"
     },
     {
-        "ArchStdEvent": "L1I_CACHE_REFILL",
+        "ArchStdEvent": "L1I_CACHE_REFILL"
     },
     {
-        "ArchStdEvent": "L1I_TLB_REFILL",
+        "ArchStdEvent": "L1I_TLB_REFILL"
     },
     {
-        "ArchStdEvent": "L1D_CACHE_REFILL",
+        "ArchStdEvent": "L1D_CACHE_REFILL"
     },
     {
-        "ArchStdEvent": "L1D_CACHE",
+        "ArchStdEvent": "L1D_CACHE"
     },
     {
-        "ArchStdEvent": "L1D_TLB_REFILL",
+        "ArchStdEvent": "L1D_TLB_REFILL"
     },
     {
-        "ArchStdEvent": "L1I_CACHE",
+        "ArchStdEvent": "L1I_CACHE"
     },
     {
-        "ArchStdEvent": "L2D_CACHE",
+        "ArchStdEvent": "L2D_CACHE"
     },
     {
-        "ArchStdEvent": "L2D_CACHE_REFILL",
+        "ArchStdEvent": "L2D_CACHE_REFILL"
     },
     {
-        "ArchStdEvent": "L2D_CACHE_WB",
+        "ArchStdEvent": "L2D_CACHE_WB"
     },
     {
         "PublicDescription": "This event counts any load or store operation which accesses the data L1 TLB",
@@ -72,7 +72,7 @@
     },
     {
         "PublicDescription": "This event counts any instruction fetch which accesses the instruction L1 TLB",
-        "ArchStdEvent": "L1I_TLB",
+        "ArchStdEvent": "L1I_TLB"
     },
     {
         "PublicDescription": "Level 2 access to data TLB that caused a page table walk. This event counts on any data access which causes L2D_TLB_REFILL to count",
index 9076ca2daf9e4d64399b303035cc741e8def2379..927a6f629a03de79462c1b0d472823f5b1f9a011 100644 (file)
@@ -1,7 +1,7 @@
 [
     {
         "PublicDescription": "The number of core clock cycles",
-        "ArchStdEvent": "CPU_CYCLES",
+        "ArchStdEvent": "CPU_CYCLES"
     },
     {
         "PublicDescription": "FSU clocking gated off cycle",
index 9761433ad32963204079df666a2ece08936547ab..ada052e19632e99d1b4aa218f458a3232eae9b14 100644 (file)
@@ -36,9 +36,9 @@
         "ArchStdEvent": "EXC_TRAP_FIQ"
     },
     {
-        "ArchStdEvent": "EXC_TAKEN",
+        "ArchStdEvent": "EXC_TAKEN"
     },
     {
-        "ArchStdEvent": "EXC_RETURN",
+        "ArchStdEvent": "EXC_RETURN"
     }
 ]
index 482aa3f19e580064968d92c2b5ba3a450cbc2bb6..62f6276e3016354f4149479d43988cb916ed325e 100644 (file)
         "BriefDescription": "Software increment"
     },
     {
-        "ArchStdEvent": "INST_RETIRED",
+        "ArchStdEvent": "INST_RETIRED"
     },
     {
         "ArchStdEvent": "CID_WRITE_RETIRED",
         "BriefDescription": "Write to CONTEXTIDR"
     },
     {
-        "ArchStdEvent": "INST_SPEC",
+        "ArchStdEvent": "INST_SPEC"
     },
     {
-        "ArchStdEvent": "TTBR_WRITE_RETIRED",
+        "ArchStdEvent": "TTBR_WRITE_RETIRED"
     },
     {
         "PublicDescription": "This event counts all branches, taken or not. This excludes exception entries, debug entries and CCFAIL branches",
-        "ArchStdEvent": "BR_RETIRED",
+        "ArchStdEvent": "BR_RETIRED"
     },
     {
         "PublicDescription": "This event counts any branch counted by BR_RETIRED which is not correctly predicted and causes a pipeline flush",
-        "ArchStdEvent": "BR_MIS_PRED_RETIRED",
+        "ArchStdEvent": "BR_MIS_PRED_RETIRED"
     },
     {
         "PublicDescription": "Operation speculatively executed, NOP",
index 2e7555696caf2f83058fc3170c3851e4fa854bf6..50157e8c2005f80e7fbaff01e774af50a5d2188f 100644 (file)
         "ArchStdEvent": "UNALIGNED_LDST_SPEC"
     },
     {
-        "ArchStdEvent": "MEM_ACCESS",
+        "ArchStdEvent": "MEM_ACCESS"
     },
     {
         "PublicDescription": "This event counts any correctable or uncorrectable memory error (ECC or parity) in the protected core RAMs",
-        "ArchStdEvent": "MEMORY_ERROR",
+        "ArchStdEvent": "MEMORY_ERROR"
     }
 ]
index dda8e59149d22ac669086dff6d227b5255942670..6970203cb247019c68b2625884ae6c10aacc4942 100644 (file)
         "BriefDescription": "Store bound L3 topdown metric",
         "MetricGroup": "TopDownL3",
         "MetricName": "store_bound"
-    },
+    }
 ]
index 5347350c360cdc614ad806a8cb219c0cae1b6c32..3e7ac409d894e7d308688412d0b4c54a11f5252a 100644 (file)
     "EventCode": "0x21e",
     "EventName": "pop25_inst",
     "BriefDescription": "V3 POP25 instructions"
-  },
+  }
 ]
index 2dd8dafff2efd94f9fb981179ad96680b06ff51b..783de7f1aeaaa941824b6557a010f38dadd4e973 100644 (file)
@@ -82,5 +82,5 @@
                "EventName": "PROBLEM_STATE_L1D_PENALTY_CYCLES",
                "BriefDescription": "Problem-State L1D Penalty Cycles",
                "PublicDescription": "Problem-State Level-1 D-Cache Penalty Cycle Count"
-       },
+       }
 ]
index db286f19e7b60576fb0937b5d3c89bf482b8cfda..3f28007d38929490dbce85623c79b5e63cddba4b 100644 (file)
                "EventName": "AES_BLOCKED_CYCLES",
                "BriefDescription": "AES Blocked Cycles",
                "PublicDescription": "Total number of CPU cycles blocked for the AES functions issued by the CPU because the DEA/AES coprocessor is busy performing a function issued by another CPU"
-       },
+       }
 ]
index b6b7f29ca831c6463920887c64ad589cbd41ffca..86bd8ba9391df9f6a466036ce685980a67d48cbe 100644 (file)
                "EventName": "L2C_STORES_SENT",
                "BriefDescription": "L2C Stores Sent",
                "PublicDescription": "Incremented by one for every store sent to Level-2 (L1.5) cache"
-       },
+       }
 ]
index 2dd8dafff2efd94f9fb981179ad96680b06ff51b..783de7f1aeaaa941824b6557a010f38dadd4e973 100644 (file)
@@ -82,5 +82,5 @@
                "EventName": "PROBLEM_STATE_L1D_PENALTY_CYCLES",
                "BriefDescription": "Problem-State L1D Penalty Cycles",
                "PublicDescription": "Problem-State Level-1 D-Cache Penalty Cycle Count"
-       },
+       }
 ]
index db286f19e7b60576fb0937b5d3c89bf482b8cfda..3f28007d38929490dbce85623c79b5e63cddba4b 100644 (file)
                "EventName": "AES_BLOCKED_CYCLES",
                "BriefDescription": "AES Blocked Cycles",
                "PublicDescription": "Total number of CPU cycles blocked for the AES functions issued by the CPU because the DEA/AES coprocessor is busy performing a function issued by another CPU"
-       },
+       }
 ]
index 5da8296b667e753a032d9c7eed7fd974f1ea7a9b..1a5e4f89c57efb3fd947a7deea4bea6cdbebef5f 100644 (file)
                "EventName": "MT_DIAG_CYCLES_TWO_THR_ACTIVE",
                "BriefDescription": "Cycle count with two threads active",
                "PublicDescription": "Cycle count with two threads active"
-       },
+       }
 ]
index 17fb5241928be2dc9061d28364a3eb0413e8f491..fc762e9f1d6e391fb6aaa3557cadd8f7aa0c1063 100644 (file)
@@ -54,5 +54,5 @@
                "EventName": "PROBLEM_STATE_INSTRUCTIONS",
                "BriefDescription": "Problem-State Instructions",
                "PublicDescription": "Problem-State Instruction Count"
-       },
+       }
 ]
index db286f19e7b60576fb0937b5d3c89bf482b8cfda..3f28007d38929490dbce85623c79b5e63cddba4b 100644 (file)
                "EventName": "AES_BLOCKED_CYCLES",
                "BriefDescription": "AES Blocked Cycles",
                "PublicDescription": "Total number of CPU cycles blocked for the AES functions issued by the CPU because the DEA/AES coprocessor is busy performing a function issued by another CPU"
-       },
+       }
 ]
index 89e070727e1bd388bc057d99c4a998c7dc6a701d..4942b20a1ea1135b0f979f8004a95db678d4df06 100644 (file)
                "EventName": "MT_DIAG_CYCLES_TWO_THR_ACTIVE",
                "BriefDescription": "Cycle count with two threads active",
                "PublicDescription": "Cycle count with two threads active"
-       },
+       }
 ]
index 17fb5241928be2dc9061d28364a3eb0413e8f491..fc762e9f1d6e391fb6aaa3557cadd8f7aa0c1063 100644 (file)
@@ -54,5 +54,5 @@
                "EventName": "PROBLEM_STATE_INSTRUCTIONS",
                "BriefDescription": "Problem-State Instructions",
                "PublicDescription": "Problem-State Instruction Count"
-       },
+       }
 ]
index db286f19e7b60576fb0937b5d3c89bf482b8cfda..3f28007d38929490dbce85623c79b5e63cddba4b 100644 (file)
                "EventName": "AES_BLOCKED_CYCLES",
                "BriefDescription": "AES Blocked Cycles",
                "PublicDescription": "Total number of CPU cycles blocked for the AES functions issued by the CPU because the DEA/AES coprocessor is busy performing a function issued by another CPU"
-       },
+       }
 ]
index c998e4f1d1d23adeb393ec341402bc906a498700..ad79189050a083e6664cd6c74c13d37202b40032 100644 (file)
@@ -26,5 +26,5 @@
                "EventName": "ECC_BLOCKED_CYCLES_COUNT",
                "BriefDescription": "ECC Blocked Cycles Count",
                "PublicDescription": "This counter counts the total number of CPU cycles blocked for the elliptic-curve cryptography (ECC) functions issued by the CPU because the ECC coprocessor is busy performing a function issued by another CPU."
-       },
+       }
 ]
index 24c4ba2a9ae54dc38f4b9df12ad38183c16cd9ba..8ac61f8f286babc7d545b09c2186d5f4134d35a2 100644 (file)
                "EventName": "MT_DIAG_CYCLES_TWO_THR_ACTIVE",
                "BriefDescription": "Cycle count with two threads active",
                "PublicDescription": "Cycle count with two threads active"
-       },
+       }
 ]
index 2dd8dafff2efd94f9fb981179ad96680b06ff51b..783de7f1aeaaa941824b6557a010f38dadd4e973 100644 (file)
@@ -82,5 +82,5 @@
                "EventName": "PROBLEM_STATE_L1D_PENALTY_CYCLES",
                "BriefDescription": "Problem-State L1D Penalty Cycles",
                "PublicDescription": "Problem-State Level-1 D-Cache Penalty Cycle Count"
-       },
+       }
 ]
index db286f19e7b60576fb0937b5d3c89bf482b8cfda..3f28007d38929490dbce85623c79b5e63cddba4b 100644 (file)
                "EventName": "AES_BLOCKED_CYCLES",
                "BriefDescription": "AES Blocked Cycles",
                "PublicDescription": "Total number of CPU cycles blocked for the AES functions issued by the CPU because the DEA/AES coprocessor is busy performing a function issued by another CPU"
-       },
+       }
 ]
index b7b42a870bb0c65a6a9bd54a7f3f9f63740db4e2..86b29fd181cf0c947eb2174130f5e34c202678cf 100644 (file)
                "EventName": "L1I_OFFCHIP_L3_SOURCED_WRITES",
                "BriefDescription": "L1I Off-Chip L3 Sourced Writes",
                "PublicDescription": "A directory write to the Level-1 I-Cache directory where the returned cache line was sourced from an Off Chip/On Book Level-3 cache"
-       },
+       }
 ]
index 2dd8dafff2efd94f9fb981179ad96680b06ff51b..783de7f1aeaaa941824b6557a010f38dadd4e973 100644 (file)
@@ -82,5 +82,5 @@
                "EventName": "PROBLEM_STATE_L1D_PENALTY_CYCLES",
                "BriefDescription": "Problem-State L1D Penalty Cycles",
                "PublicDescription": "Problem-State Level-1 D-Cache Penalty Cycle Count"
-       },
+       }
 ]
index db286f19e7b60576fb0937b5d3c89bf482b8cfda..3f28007d38929490dbce85623c79b5e63cddba4b 100644 (file)
                "EventName": "AES_BLOCKED_CYCLES",
                "BriefDescription": "AES Blocked Cycles",
                "PublicDescription": "Total number of CPU cycles blocked for the AES functions issued by the CPU because the DEA/AES coprocessor is busy performing a function issued by another CPU"
-       },
+       }
 ]
index 162251037219841a360e05149709d44e39239953..f40cbed8941811eea423428a7e7eba32d9007349 100644 (file)
                "EventName": "TX_C_TABORT_SPECIAL",
                "BriefDescription": "Aborted transactions in constrained TX mode using special completion logic",
                "PublicDescription": "A transaction abort has occurred in a constrained transactional-execution mode and the CPU is using special logic to allow the transaction to complete"
-       },
+       }
 ]
index 788766f45dbc05b549793008834b9bdd7018d32e..73089c682f8032ae31ede885ca2bf1c4656ed256 100644 (file)
@@ -38,5 +38,5 @@
            "BriefDescription": "Total cache hits",
            "PublicDescription": "Total cache hits",
            "Unit": "imc"
-  },
+  }
 ]
index 57ddbb9f9b31ca43ee9d67ad40834fb1339ef669..14b9a8ab15b9f7acb695d326dafaef11fb270e1b 100644 (file)
         "MetricExpr": "(cstate_pkg@c6\\-residency@ / msr@tsc@) * 100",
         "MetricGroup": "Power",
         "MetricName": "C6_Pkg_Residency"
-    },
+    }
 ]