From 75d286742ddcd69d4efd526a3143197dcb0f4212 Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Thu, 12 Dec 2019 19:37:10 +0000 Subject: [PATCH] libpmc: convert s390 events data to proper json --- lib/libpmc/pmu-events/arch/s390/cf_z10/basic.json | 2 +- lib/libpmc/pmu-events/arch/s390/cf_z10/crypto.json | 2 +- lib/libpmc/pmu-events/arch/s390/cf_z10/extended.json | 2 +- lib/libpmc/pmu-events/arch/s390/cf_z13/basic.json | 2 +- lib/libpmc/pmu-events/arch/s390/cf_z13/crypto.json | 2 +- lib/libpmc/pmu-events/arch/s390/cf_z13/extended.json | 2 +- lib/libpmc/pmu-events/arch/s390/cf_z14/basic.json | 2 +- lib/libpmc/pmu-events/arch/s390/cf_z14/crypto.json | 2 +- lib/libpmc/pmu-events/arch/s390/cf_z14/extended.json | 2 +- lib/libpmc/pmu-events/arch/s390/cf_z196/basic.json | 2 +- lib/libpmc/pmu-events/arch/s390/cf_z196/crypto.json | 2 +- lib/libpmc/pmu-events/arch/s390/cf_z196/extended.json | 2 +- lib/libpmc/pmu-events/arch/s390/cf_zec12/basic.json | 2 +- lib/libpmc/pmu-events/arch/s390/cf_zec12/crypto.json | 2 +- lib/libpmc/pmu-events/arch/s390/cf_zec12/extended.json | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/libpmc/pmu-events/arch/s390/cf_z10/basic.json b/lib/libpmc/pmu-events/arch/s390/cf_z10/basic.json index 8bf16759ca53..1c2035a96098 100644 --- a/lib/libpmc/pmu-events/arch/s390/cf_z10/basic.json +++ b/lib/libpmc/pmu-events/arch/s390/cf_z10/basic.json @@ -70,5 +70,5 @@ "EventName": "PROBLEM_STATE_L1D_PENALTY_CYCLES", "BriefDescription": "Problem-State L1D Penalty Cycles", "PublicDescription": "Problem-State Level-1 D-Cache Penalty Cycle Count" - }, + } ] diff --git a/lib/libpmc/pmu-events/arch/s390/cf_z10/crypto.json b/lib/libpmc/pmu-events/arch/s390/cf_z10/crypto.json index 7e5b72492141..d7c1d7dea357 100644 --- a/lib/libpmc/pmu-events/arch/s390/cf_z10/crypto.json +++ b/lib/libpmc/pmu-events/arch/s390/cf_z10/crypto.json @@ -94,5 +94,5 @@ "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" - }, + } ] diff --git a/lib/libpmc/pmu-events/arch/s390/cf_z10/extended.json b/lib/libpmc/pmu-events/arch/s390/cf_z10/extended.json index 0feedb40f30f..6a5aca2c539c 100644 --- a/lib/libpmc/pmu-events/arch/s390/cf_z10/extended.json +++ b/lib/libpmc/pmu-events/arch/s390/cf_z10/extended.json @@ -106,5 +106,5 @@ "EventName": "L2C_STORES_SENT", "BriefDescription": "L2C Stores Sent", "PublicDescription": "Incremented by one for every store sent to Level-2 (L1.5) cache" - }, + } ] diff --git a/lib/libpmc/pmu-events/arch/s390/cf_z13/basic.json b/lib/libpmc/pmu-events/arch/s390/cf_z13/basic.json index 8bf16759ca53..1c2035a96098 100644 --- a/lib/libpmc/pmu-events/arch/s390/cf_z13/basic.json +++ b/lib/libpmc/pmu-events/arch/s390/cf_z13/basic.json @@ -70,5 +70,5 @@ "EventName": "PROBLEM_STATE_L1D_PENALTY_CYCLES", "BriefDescription": "Problem-State L1D Penalty Cycles", "PublicDescription": "Problem-State Level-1 D-Cache Penalty Cycle Count" - }, + } ] diff --git a/lib/libpmc/pmu-events/arch/s390/cf_z13/crypto.json b/lib/libpmc/pmu-events/arch/s390/cf_z13/crypto.json index 7e5b72492141..d7c1d7dea357 100644 --- a/lib/libpmc/pmu-events/arch/s390/cf_z13/crypto.json +++ b/lib/libpmc/pmu-events/arch/s390/cf_z13/crypto.json @@ -94,5 +94,5 @@ "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" - }, + } ] diff --git a/lib/libpmc/pmu-events/arch/s390/cf_z13/extended.json b/lib/libpmc/pmu-events/arch/s390/cf_z13/extended.json index 87e957925d01..46c3719759da 100644 --- a/lib/libpmc/pmu-events/arch/s390/cf_z13/extended.json +++ b/lib/libpmc/pmu-events/arch/s390/cf_z13/extended.json @@ -334,5 +334,5 @@ "EventName": "MT_DIAG_CYCLES_TWO_THR_ACTIVE", "BriefDescription": "Cycle count with two threads active", "PublicDescription": "Cycle count with two threads active" - }, + } ] diff --git a/lib/libpmc/pmu-events/arch/s390/cf_z14/basic.json b/lib/libpmc/pmu-events/arch/s390/cf_z14/basic.json index 8f653c9d899d..cd0e508f7957 100644 --- a/lib/libpmc/pmu-events/arch/s390/cf_z14/basic.json +++ b/lib/libpmc/pmu-events/arch/s390/cf_z14/basic.json @@ -46,5 +46,5 @@ "EventName": "PROBLEM_STATE_INSTRUCTIONS", "BriefDescription": "Problem-State Instructions", "PublicDescription": "Problem-State Instruction Count" - }, + } ] diff --git a/lib/libpmc/pmu-events/arch/s390/cf_z14/crypto.json b/lib/libpmc/pmu-events/arch/s390/cf_z14/crypto.json index 7e5b72492141..d7c1d7dea357 100644 --- a/lib/libpmc/pmu-events/arch/s390/cf_z14/crypto.json +++ b/lib/libpmc/pmu-events/arch/s390/cf_z14/crypto.json @@ -94,5 +94,5 @@ "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" - }, + } ] diff --git a/lib/libpmc/pmu-events/arch/s390/cf_z14/extended.json b/lib/libpmc/pmu-events/arch/s390/cf_z14/extended.json index 723ef50e2584..299bd26ec463 100644 --- a/lib/libpmc/pmu-events/arch/s390/cf_z14/extended.json +++ b/lib/libpmc/pmu-events/arch/s390/cf_z14/extended.json @@ -316,5 +316,5 @@ "EventName": "MT_DIAG_CYCLES_TWO_THR_ACTIVE", "BriefDescription": "Cycle count with two threads active", "PublicDescription": "Cycle count with two threads active" - }, + } ] diff --git a/lib/libpmc/pmu-events/arch/s390/cf_z196/basic.json b/lib/libpmc/pmu-events/arch/s390/cf_z196/basic.json index 8bf16759ca53..1c2035a96098 100644 --- a/lib/libpmc/pmu-events/arch/s390/cf_z196/basic.json +++ b/lib/libpmc/pmu-events/arch/s390/cf_z196/basic.json @@ -70,5 +70,5 @@ "EventName": "PROBLEM_STATE_L1D_PENALTY_CYCLES", "BriefDescription": "Problem-State L1D Penalty Cycles", "PublicDescription": "Problem-State Level-1 D-Cache Penalty Cycle Count" - }, + } ] diff --git a/lib/libpmc/pmu-events/arch/s390/cf_z196/crypto.json b/lib/libpmc/pmu-events/arch/s390/cf_z196/crypto.json index 7e5b72492141..d7c1d7dea357 100644 --- a/lib/libpmc/pmu-events/arch/s390/cf_z196/crypto.json +++ b/lib/libpmc/pmu-events/arch/s390/cf_z196/crypto.json @@ -94,5 +94,5 @@ "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" - }, + } ] diff --git a/lib/libpmc/pmu-events/arch/s390/cf_z196/extended.json b/lib/libpmc/pmu-events/arch/s390/cf_z196/extended.json index b6d7fec7c2e7..3018b51d6aef 100644 --- a/lib/libpmc/pmu-events/arch/s390/cf_z196/extended.json +++ b/lib/libpmc/pmu-events/arch/s390/cf_z196/extended.json @@ -142,5 +142,5 @@ "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" - }, + } ] diff --git a/lib/libpmc/pmu-events/arch/s390/cf_zec12/basic.json b/lib/libpmc/pmu-events/arch/s390/cf_zec12/basic.json index 8bf16759ca53..1c2035a96098 100644 --- a/lib/libpmc/pmu-events/arch/s390/cf_zec12/basic.json +++ b/lib/libpmc/pmu-events/arch/s390/cf_zec12/basic.json @@ -70,5 +70,5 @@ "EventName": "PROBLEM_STATE_L1D_PENALTY_CYCLES", "BriefDescription": "Problem-State L1D Penalty Cycles", "PublicDescription": "Problem-State Level-1 D-Cache Penalty Cycle Count" - }, + } ] diff --git a/lib/libpmc/pmu-events/arch/s390/cf_zec12/crypto.json b/lib/libpmc/pmu-events/arch/s390/cf_zec12/crypto.json index 7e5b72492141..d7c1d7dea357 100644 --- a/lib/libpmc/pmu-events/arch/s390/cf_zec12/crypto.json +++ b/lib/libpmc/pmu-events/arch/s390/cf_zec12/crypto.json @@ -94,5 +94,5 @@ "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" - }, + } ] diff --git a/lib/libpmc/pmu-events/arch/s390/cf_zec12/extended.json b/lib/libpmc/pmu-events/arch/s390/cf_zec12/extended.json index 8682126aabb2..d119eb0fcf7b 100644 --- a/lib/libpmc/pmu-events/arch/s390/cf_zec12/extended.json +++ b/lib/libpmc/pmu-events/arch/s390/cf_zec12/extended.json @@ -208,5 +208,5 @@ "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" - }, + } ]