Skip to contentSkip to conversation

perf/json: Add JSON files for s390 machine type 8561

PATCH New Thomas Richter 2 participants 2 messages Jul 12, 2019 – Jul 17, 2019 perf events

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 perf/json: Add JSON files for s390 machine type 8561

Add CPU measurement counter facility event description files (json files) for IBM machine types 8561 and 8562.

---
 .../pmu-events/arch/s390/cf_m8561/basic.json  |  58 +++
 .../pmu-events/arch/s390/cf_m8561/crypto.json | 114 ++++++
 .../arch/s390/cf_m8561/crypto6.json           |  30 ++
 .../arch/s390/cf_m8561/extended.json          | 373 ++++++++++++++++++
 tools/perf/pmu-events/arch/s390/mapfile.csv   |   1 +
 5 files changed, 576 insertions(+)
 create mode 100644 tools/perf/pmu-events/arch/s390/cf_m8561/basic.json
 create mode 100644 tools/perf/pmu-events/arch/s390/cf_m8561/crypto.json
 create mode 100644 tools/perf/pmu-events/arch/s390/cf_m8561/crypto6.json
 create mode 100644 tools/perf/pmu-events/arch/s390/cf_m8561/extended.json
tools/perf/pmu-events/arch/s390/cf_m8561/basic.json new file +58 -0
new file mode 100644
index 000000000000..17fb5241928b
@@ -0,0 +1,58 @@
+[
+	{
+		"Unit": "CPU-M-CF",
+		"EventCode": "0",
+		"EventName": "CPU_CYCLES",
+		"BriefDescription": "CPU Cycles",
+		"PublicDescription": "Cycle Count"
+	},
+	{
+		"Unit": "CPU-M-CF",
+		"EventCode": "1",
+		"EventName": "INSTRUCTIONS",
+		"BriefDescription": "Instructions",
+		"PublicDescription": "Instruction Count"
+	},
+	{
+		"Unit": "CPU-M-CF",
+		"EventCode": "2",
+		"EventName": "L1I_DIR_WRITES",
+		"BriefDescription": "L1I Directory Writes",
+		"PublicDescription": "Level-1 I-Cache Directory Write Count"
+	},
+	{
+		"Unit": "CPU-M-CF",
+		"EventCode": "3",
+		"EventName": "L1I_PENALTY_CYCLES",
+		"BriefDescription": "L1I Penalty Cycles",
+		"PublicDescription": "Level-1 I-Cache Penalty Cycle Count"
+	},
+	{
+		"Unit": "CPU-M-CF",
+		"EventCode": "4",
+		"EventName": "L1D_DIR_WRITES",
+		"BriefDescription": "L1D Directory Writes",
+		"PublicDescription": "Level-1 D-Cache Directory Write Count"
+	},
+	{
+		"Unit": "CPU-M-CF",
+		"EventCode": "5",
+		"EventName": "L1D_PENALTY_CYCLES",
+		"BriefDescription": "L1D Penalty Cycles",
+		"PublicDescription": "Level-1 D-Cache Penalty Cycle Count"
+	},
+	{
+		"Unit": "CPU-M-CF",
+		"EventCode": "32",
+		"EventName": "PROBLEM_STATE_CPU_CYCLES",
+		"BriefDescription": "Problem-State CPU Cycles",
+		"PublicDescription": "Problem-State Cycle Count"
+	},
+	{
+		"Unit": "CPU-M-CF",
+		"EventCode": "33",
+		"EventName": "PROBLEM_STATE_INSTRUCTIONS",
+		"BriefDescription": "Problem-State Instructions",
+		"PublicDescription": "Problem-State Instruction Count"
+	},
+]
tools/perf/pmu-events/arch/s390/cf_m8561/crypto.json new file +114 -0

114 lines not on this page · raw message

tools/perf/pmu-events/arch/s390/cf_m8561/crypto6.json new file +30 -0
new file mode 100644
index 000000000000..5e36bc2468d0
@@ -0,0 +1,30 @@
+[
+	{
+		"Unit": "CPU-M-CF",
+		"EventCode": "80",
+		"EventName": "ECC_FUNCTION_COUNT",
+		"BriefDescription": "ECC Function Count",
+		"PublicDescription": "Long ECC function Count"
+	},
+	{
+		"Unit": "CPU-M-CF",
+		"EventCode": "81",
+		"EventName": "ECC_CYCLES_COUNT",
+		"BriefDescription": "ECC Cycles Count",
+		"PublicDescription": "Long ECC Function cycles count"
+	},
+	{
+		"Unit": "CPU-M-CF",
+		"EventCode": "82",
+		"EventName": "ECC_BLOCKED_FUNCTION_COUNT",
+		"BriefDescription": "Ecc Blocked Function Count",
+		"PublicDescription": "Long ECC blocked function count"
+	},
+	{
+		"Unit": "CPU-M-CF",
+		"EventCode": "83",
+		"EventName": "ECC_BLOCKED_CYCLES_COUNT",
+		"BriefDescription": "ECC Blocked Cycles Count",
+		"PublicDescription": "Long ECC blocked cycles count"
+	},
+]
tools/perf/pmu-events/arch/s390/cf_m8561/extended.json new file +373 -0

373 lines not on this page · raw message

tools/perf/pmu-events/arch/s390/mapfile.csv +1 -0
index 78bcf7f8e206..bd3fc577139c 100644
@@ -4,3 +4,4 @@ Family-model,Version,Filename,EventType
 ^IBM.282[78].*[13]\.[1-5].[[:xdigit:]]+$,1,cf_zec12,core
 ^IBM.296[45].*[13]\.[1-5].[[:xdigit:]]+$,1,cf_z13,core
 ^IBM.390[67].*[13]\.[1-5].[[:xdigit:]]+$,3,cf_z14,core
+^IBM.856[12].*3\.6.[[:xdigit:]]+$,3,cf_m8561,core
Signature · 1 line
2.19.1
#1 lore raw

[tip:perf/urgent] perf vendor events s390: Add JSON files for machine type 8561

perf vendor events s390: Add JSON files for machine type 8561
Commit-ID:  6e67d77d673d785631b0c52314b60d3c68ebe809
Gitweb:     https://git.kernel.org/tip/6e67d77d673d785631b0c52314b60d3c68ebe809
Author:     Thomas Richter <[email protected]>
AuthorDate: Fri, 12 Jul 2019 14:31:13 +0200
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Fri, 12 Jul 2019 13:51:59 -0300

perf vendor events s390: Add JSON files for machine type 8561

Add CPU measurement counter facility event description files (JSON) for IBM machine types 8561 and 8562.

---
 .../arch/s390/{cf_z14 => cf_m8561}/basic.json      |  0
 .../arch/s390/{cf_z10 => cf_m8561}/crypto.json     |  0
 .../pmu-events/arch/s390/cf_m8561/crypto6.json     | 30 ++++++++++++++++++++++
 .../arch/s390/{cf_z14 => cf_m8561}/extended.json   |  2 +-
 tools/perf/pmu-events/arch/s390/mapfile.csv        |  1 +
 5 files changed, 32 insertions(+), 1 deletion(-)
tools/perf/pmu-events/arch/s390/cf_m8561/basic.json renamed from tools/perf/pmu-events/arch/s390/cf_z14/basic.json +0 -0
similarity index 100%
copy from tools/perf/pmu-events/arch/s390/cf_z14/basic.json
copy to tools/perf/pmu-events/arch/s390/cf_m8561/basic.json
tools/perf/pmu-events/arch/s390/cf_m8561/crypto.json renamed from tools/perf/pmu-events/arch/s390/cf_z10/crypto.json +0 -0
similarity index 100%
copy from tools/perf/pmu-events/arch/s390/cf_z10/crypto.json
copy to tools/perf/pmu-events/arch/s390/cf_m8561/crypto.json
tools/perf/pmu-events/arch/s390/cf_m8561/crypto6.json new file +30 -0
new file mode 100644
index 000000000000..5e36bc2468d0
@@ -0,0 +1,30 @@
+[
+	{
+		"Unit": "CPU-M-CF",
+		"EventCode": "80",
+		"EventName": "ECC_FUNCTION_COUNT",
+		"BriefDescription": "ECC Function Count",
+		"PublicDescription": "Long ECC function Count"
+	},
+	{
+		"Unit": "CPU-M-CF",
+		"EventCode": "81",
+		"EventName": "ECC_CYCLES_COUNT",
+		"BriefDescription": "ECC Cycles Count",
+		"PublicDescription": "Long ECC Function cycles count"
+	},
+	{
+		"Unit": "CPU-M-CF",
+		"EventCode": "82",
+		"EventName": "ECC_BLOCKED_FUNCTION_COUNT",
+		"BriefDescription": "Ecc Blocked Function Count",
+		"PublicDescription": "Long ECC blocked function count"
+	},
+	{
+		"Unit": "CPU-M-CF",
+		"EventCode": "83",
+		"EventName": "ECC_BLOCKED_CYCLES_COUNT",
+		"BriefDescription": "ECC Blocked Cycles Count",
+		"PublicDescription": "Long ECC blocked cycles count"
+	},
+]
tools/perf/pmu-events/arch/s390/cf_m8561/extended.json renamed from tools/perf/pmu-events/arch/s390/cf_z14/extended.json +1 -1
similarity index 98%
copy from tools/perf/pmu-events/arch/s390/cf_z14/extended.json
copy to tools/perf/pmu-events/arch/s390/cf_m8561/extended.json
index 68618152ea2c..89e070727e1b 100644
@@ -4,7 +4,7 @@
 		"EventCode": "128",
 		"EventName": "L1D_RO_EXCL_WRITES",
 		"BriefDescription": "L1D Read-only Exclusive Writes",
-		"PublicDescription": "L1D_RO_EXCL_WRITES A directory write to the Level-1 Data cache where the line was originally in a Read-Only state in the cache but has been updated to be in the Exclusive state that allows stores to the cache line"
+		"PublicDescription": "A directory write to the Level-1 Data cache where the line was originally in a Read-Only state in the cache but has been updated to be in the Exclusive state that allows stores to the cache line"
 	},
 	{
 		"Unit": "CPU-M-CF",
tools/perf/pmu-events/arch/s390/mapfile.csv +1 -0
index 78bcf7f8e206..bd3fc577139c 100644
@@ -4,3 +4,4 @@ Family-model,Version,Filename,EventType
 ^IBM.282[78].*[13]\.[1-5].[[:xdigit:]]+$,1,cf_zec12,core
 ^IBM.296[45].*[13]\.[1-5].[[:xdigit:]]+$,1,cf_z13,core
 ^IBM.390[67].*[13]\.[1-5].[[:xdigit:]]+$,3,cf_z14,core
+^IBM.856[12].*3\.6.[[:xdigit:]]+$,3,cf_m8561,core