svn commit: r355668 - in head/lib/libpmc/pmu-events/arch/s390: cf_z10 cf_z13 cf_z14 cf_z196 cf_zec12

Ed Maste emaste at FreeBSD.org
Thu Dec 12 19:37:14 UTC 2019 

Author: emaste
Date: Thu Dec 12 19:37:10 2019
New Revision: 355668
URL: https://svnweb.freebsd.org/changeset/base/355668

Log:
  libpmc: convert s390 events data to proper json

Modified:
  head/lib/libpmc/pmu-events/arch/s390/cf_z10/basic.json
  head/lib/libpmc/pmu-events/arch/s390/cf_z10/crypto.json
  head/lib/libpmc/pmu-events/arch/s390/cf_z10/extended.json
  head/lib/libpmc/pmu-events/arch/s390/cf_z13/basic.json
  head/lib/libpmc/pmu-events/arch/s390/cf_z13/crypto.json
  head/lib/libpmc/pmu-events/arch/s390/cf_z13/extended.json
  head/lib/libpmc/pmu-events/arch/s390/cf_z14/basic.json
  head/lib/libpmc/pmu-events/arch/s390/cf_z14/crypto.json
  head/lib/libpmc/pmu-events/arch/s390/cf_z14/extended.json
  head/lib/libpmc/pmu-events/arch/s390/cf_z196/basic.json
  head/lib/libpmc/pmu-events/arch/s390/cf_z196/crypto.json
  head/lib/libpmc/pmu-events/arch/s390/cf_z196/extended.json
  head/lib/libpmc/pmu-events/arch/s390/cf_zec12/basic.json
  head/lib/libpmc/pmu-events/arch/s390/cf_zec12/crypto.json
  head/lib/libpmc/pmu-events/arch/s390/cf_zec12/extended.json

Modified: head/lib/libpmc/pmu-events/arch/s390/cf_z10/basic.json
==============================================================================
--- head/lib/libpmc/pmu-events/arch/s390/cf_z10/basic.json	Thu Dec 12 19:33:16 2019	(r355667)
+++ head/lib/libpmc/pmu-events/arch/s390/cf_z10/basic.json	Thu Dec 12 19:37:10 2019	(r355668)
@@ -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"
-	},
+	}
 ]

Modified: head/lib/libpmc/pmu-events/arch/s390/cf_z10/crypto.json
==============================================================================
--- head/lib/libpmc/pmu-events/arch/s390/cf_z10/crypto.json	Thu Dec 12 19:33:16 2019	(r355667)
+++ head/lib/libpmc/pmu-events/arch/s390/cf_z10/crypto.json	Thu Dec 12 19:37:10 2019	(r355668)
@@ -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"
-	},
+	}
 ]

Modified: head/lib/libpmc/pmu-events/arch/s390/cf_z10/extended.json
==============================================================================
--- head/lib/libpmc/pmu-events/arch/s390/cf_z10/extended.json	Thu Dec 12 19:33:16 2019	(r355667)
+++ head/lib/libpmc/pmu-events/arch/s390/cf_z10/extended.json	Thu Dec 12 19:37:10 2019	(r355668)
@@ -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"
-	},
+	}
 ]

Modified: head/lib/libpmc/pmu-events/arch/s390/cf_z13/basic.json
==============================================================================
--- head/lib/libpmc/pmu-events/arch/s390/cf_z13/basic.json	Thu Dec 12 19:33:16 2019	(r355667)
+++ head/lib/libpmc/pmu-events/arch/s390/cf_z13/basic.json	Thu Dec 12 19:37:10 2019	(r355668)
@@ -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"
-	},
+	}
 ]

Modified: head/lib/libpmc/pmu-events/arch/s390/cf_z13/crypto.json
==============================================================================
--- head/lib/libpmc/pmu-events/arch/s390/cf_z13/crypto.json	Thu Dec 12 19:33:16 2019	(r355667)
+++ head/lib/libpmc/pmu-events/arch/s390/cf_z13/crypto.json	Thu Dec 12 19:37:10 2019	(r355668)
@@ -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"
-	},
+	}
 ]

Modified: head/lib/libpmc/pmu-events/arch/s390/cf_z13/extended.json
==============================================================================
--- head/lib/libpmc/pmu-events/arch/s390/cf_z13/extended.json	Thu Dec 12 19:33:16 2019	(r355667)
+++ head/lib/libpmc/pmu-events/arch/s390/cf_z13/extended.json	Thu Dec 12 19:37:10 2019	(r355668)
@@ -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"
-	},
+	}
 ]

Modified: head/lib/libpmc/pmu-events/arch/s390/cf_z14/basic.json
==============================================================================
--- head/lib/libpmc/pmu-events/arch/s390/cf_z14/basic.json	Thu Dec 12 19:33:16 2019	(r355667)
+++ head/lib/libpmc/pmu-events/arch/s390/cf_z14/basic.json	Thu Dec 12 19:37:10 2019	(r355668)
@@ -46,5 +46,5 @@
 		"EventName": "PROBLEM_STATE_INSTRUCTIONS",
 		"BriefDescription": "Problem-State Instructions",
 		"PublicDescription": "Problem-State Instruction Count"
-	},
+	}
 ]

Modified: head/lib/libpmc/pmu-events/arch/s390/cf_z14/crypto.json
==============================================================================
--- head/lib/libpmc/pmu-events/arch/s390/cf_z14/crypto.json	Thu Dec 12 19:33:16 2019	(r355667)
+++ head/lib/libpmc/pmu-events/arch/s390/cf_z14/crypto.json	Thu Dec 12 19:37:10 2019	(r355668)
@@ -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"
-	},
+	}
 ]

Modified: head/lib/libpmc/pmu-events/arch/s390/cf_z14/extended.json
==============================================================================
--- head/lib/libpmc/pmu-events/arch/s390/cf_z14/extended.json	Thu Dec 12 19:33:16 2019	(r355667)
+++ head/lib/libpmc/pmu-events/arch/s390/cf_z14/extended.json	Thu Dec 12 19:37:10 2019	(r355668)
@@ -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"
-	},
+	}
 ]

Modified: head/lib/libpmc/pmu-events/arch/s390/cf_z196/basic.json
==============================================================================
--- head/lib/libpmc/pmu-events/arch/s390/cf_z196/basic.json	Thu Dec 12 19:33:16 2019	(r355667)
+++ head/lib/libpmc/pmu-events/arch/s390/cf_z196/basic.json	Thu Dec 12 19:37:10 2019	(r355668)
@@ -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"
-	},
+	}
 ]

Modified: head/lib/libpmc/pmu-events/arch/s390/cf_z196/crypto.json
==============================================================================
--- head/lib/libpmc/pmu-events/arch/s390/cf_z196/crypto.json	Thu Dec 12 19:33:16 2019	(r355667)
+++ head/lib/libpmc/pmu-events/arch/s390/cf_z196/crypto.json	Thu Dec 12 19:37:10 2019	(r355668)
@@ -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"
-	},
+	}
 ]

Modified: head/lib/libpmc/pmu-events/arch/s390/cf_z196/extended.json
==============================================================================
--- head/lib/libpmc/pmu-events/arch/s390/cf_z196/extended.json	Thu Dec 12 19:33:16 2019	(r355667)
+++ head/lib/libpmc/pmu-events/arch/s390/cf_z196/extended.json	Thu Dec 12 19:37:10 2019	(r355668)
@@ -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"
-	},
+	}
 ]

Modified: head/lib/libpmc/pmu-events/arch/s390/cf_zec12/basic.json
==============================================================================
--- head/lib/libpmc/pmu-events/arch/s390/cf_zec12/basic.json	Thu Dec 12 19:33:16 2019	(r355667)
+++ head/lib/libpmc/pmu-events/arch/s390/cf_zec12/basic.json	Thu Dec 12 19:37:10 2019	(r355668)
@@ -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"
-	},
+	}
 ]

Modified: head/lib/libpmc/pmu-events/arch/s390/cf_zec12/crypto.json
==============================================================================
--- head/lib/libpmc/pmu-events/arch/s390/cf_zec12/crypto.json	Thu Dec 12 19:33:16 2019	(r355667)
+++ head/lib/libpmc/pmu-events/arch/s390/cf_zec12/crypto.json	Thu Dec 12 19:37:10 2019	(r355668)
@@ -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"
-	},
+	}
 ]

Modified: head/lib/libpmc/pmu-events/arch/s390/cf_zec12/extended.json
==============================================================================
--- head/lib/libpmc/pmu-events/arch/s390/cf_zec12/extended.json	Thu Dec 12 19:33:16 2019	(r355667)
+++ head/lib/libpmc/pmu-events/arch/s390/cf_zec12/extended.json	Thu Dec 12 19:37:10 2019	(r355668)
@@ -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"
-	},
+	}
 ]

More information about the svn-src-head mailing list