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

PATCH Applied Thomas Richter 3 participants 5 messages Sep 27, 2019 – Oct 7, 2019 perf events

lore

Share & tools

lore

Thomas Richter

author

2019-09-27 08:11 UTC #0 lore raw

PATCH 1/2 perf vendor events s390: Add JSON transaction for machine type 8561

Add s390 transaction counter definition for machine 8561. This is the same file as for the predecessor machine.

Fixes 6e67d77d673d7 ("perf vendor events s390: Add JSON files for machine type 8561")

Signed-off-by Thomas Richter <[email protected]>

---
 tools/perf/pmu-events/arch/s390/cf_m8561/transaction.json | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 tools/perf/pmu-events/arch/s390/cf_m8561/transaction.json

tools/perf/pmu-events/arch/s390/cf_m8561/transaction.json new file +7 -0

new file mode 100644
index 000000000000..1a0034f79f73
@@ -0,0 +1,7 @@
+[
+  {
+    "BriefDescription": "Transaction count",
+    "MetricName": "transaction",
+    "MetricExpr": "TX_C_TEND + TX_NC_TEND + TX_NC_TABORT + TX_C_TABORT_SPECIAL + TX_C_TABORT_NO_SPECIAL"
+  }
+]

Signature · 1 line

2.19.1

Thomas Richter

author

2019-09-27 08:11 UTC #1 lore raw

PATCH 2/2 perf/pmu_events: Use s390 machine name instead of type 8561

In the pmu-events directory for JSON file definitions use the official machine name IBM z15 instead of machine type number 8561. This is consistent with previous machines.

Signed-off-by Thomas Richter <[email protected]>

---
 tools/perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/basic.json | 0
 .../perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/crypto.json  | 0
 .../perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/crypto6.json | 0
 .../pmu-events/arch/s390/{cf_m8561 => cf_z15}/extended.json     | 0
 .../pmu-events/arch/s390/{cf_m8561 => cf_z15}/transaction.json  | 0
 tools/perf/pmu-events/arch/s390/mapfile.csv                     | 2 +-
 6 files changed, 1 insertion(+), 1 deletion(-)
 rename tools/perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/basic.json (100%)
 rename tools/perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/crypto.json (100%)
 rename tools/perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/crypto6.json (100%)
 rename tools/perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/extended.json (100%)
 rename tools/perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/transaction.json (100%)

tools/perf/pmu-events/arch/s390/cf_z15/basic.json renamed from tools/perf/pmu-events/arch/s390/cf_m8561/basic.json +0 -0

similarity index 100%
rename from tools/perf/pmu-events/arch/s390/cf_m8561/basic.json
rename to tools/perf/pmu-events/arch/s390/cf_z15/basic.json

tools/perf/pmu-events/arch/s390/cf_z15/crypto.json renamed from tools/perf/pmu-events/arch/s390/cf_m8561/crypto.json +0 -0

similarity index 100%
rename from tools/perf/pmu-events/arch/s390/cf_m8561/crypto.json
rename to tools/perf/pmu-events/arch/s390/cf_z15/crypto.json

tools/perf/pmu-events/arch/s390/cf_z15/crypto6.json renamed from tools/perf/pmu-events/arch/s390/cf_m8561/crypto6.json +0 -0

similarity index 100%
rename from tools/perf/pmu-events/arch/s390/cf_m8561/crypto6.json
rename to tools/perf/pmu-events/arch/s390/cf_z15/crypto6.json

tools/perf/pmu-events/arch/s390/cf_z15/extended.json renamed from tools/perf/pmu-events/arch/s390/cf_m8561/extended.json +0 -0

similarity index 100%
rename from tools/perf/pmu-events/arch/s390/cf_m8561/extended.json
rename to tools/perf/pmu-events/arch/s390/cf_z15/extended.json

tools/perf/pmu-events/arch/s390/cf_z15/transaction.json renamed from tools/perf/pmu-events/arch/s390/cf_m8561/transaction.json +0 -0

similarity index 100%
rename from tools/perf/pmu-events/arch/s390/cf_m8561/transaction.json
rename to tools/perf/pmu-events/arch/s390/cf_z15/transaction.json

tools/perf/pmu-events/arch/s390/mapfile.csv +1 -1

index bd3fc577139c..61641a3480e0 100644
@@ -4,4 +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
+^IBM.856[12].*3\.6.[[:xdigit:]]+$,3,cf_z15,core

Signature · 1 line

2.19.1

Arnaldo Carvalho de Melo

Applied

2019-09-27 15:51 UTC #2 lore raw

Re: [PATCH 2/2] perf/pmu_events: Use s390 machine name instead of type 8561

Em Fri, Sep 27, 2019 at 10:11:47AM +0200, Thomas Richter escreveu:

Quoted 3 lines

In the pmu-events directory for JSON file definitions use the official machine name IBM z15 instead of machine type number 8561. This is consistent with previous machines.

Thanks, applied both patches.

- Arnaldo

Quoted 47 lines

Signed-off-by Thomas Richter <[email protected]>

---
 tools/perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/basic.json | 0
 .../perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/crypto.json  | 0
 .../perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/crypto6.json | 0
 .../pmu-events/arch/s390/{cf_m8561 => cf_z15}/extended.json     | 0
 .../pmu-events/arch/s390/{cf_m8561 => cf_z15}/transaction.json  | 0
 tools/perf/pmu-events/arch/s390/mapfile.csv                     | 2 +-
 6 files changed, 1 insertion(+), 1 deletion(-)
 rename tools/perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/basic.json (100%)
 rename tools/perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/crypto.json (100%)
 rename tools/perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/crypto6.json (100%)
 rename tools/perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/extended.json (100%)
 rename tools/perf/pmu-events/arch/s390/{cf_m8561 => cf_z15}/transaction.json (100%)

tools/perf/pmu-events/arch/s390/cf_z15/basic.json renamed from tools/perf/pmu-events/arch/s390/cf_m8561/basic.json +0 -0

similarity index 100%
rename from tools/perf/pmu-events/arch/s390/cf_m8561/basic.json
rename to tools/perf/pmu-events/arch/s390/cf_z15/basic.json

tools/perf/pmu-events/arch/s390/cf_z15/crypto.json renamed from tools/perf/pmu-events/arch/s390/cf_m8561/crypto.json +0 -0

similarity index 100%
rename from tools/perf/pmu-events/arch/s390/cf_m8561/crypto.json
rename to tools/perf/pmu-events/arch/s390/cf_z15/crypto.json

tools/perf/pmu-events/arch/s390/cf_z15/crypto6.json renamed from tools/perf/pmu-events/arch/s390/cf_m8561/crypto6.json +0 -0

similarity index 100%
rename from tools/perf/pmu-events/arch/s390/cf_m8561/crypto6.json
rename to tools/perf/pmu-events/arch/s390/cf_z15/crypto6.json

tools/perf/pmu-events/arch/s390/cf_z15/extended.json renamed from tools/perf/pmu-events/arch/s390/cf_m8561/extended.json +0 -0

similarity index 100%
rename from tools/perf/pmu-events/arch/s390/cf_m8561/extended.json
rename to tools/perf/pmu-events/arch/s390/cf_z15/extended.json

tools/perf/pmu-events/arch/s390/cf_z15/transaction.json renamed from tools/perf/pmu-events/arch/s390/cf_m8561/transaction.json +0 -0

similarity index 100%
rename from tools/perf/pmu-events/arch/s390/cf_m8561/transaction.json
rename to tools/perf/pmu-events/arch/s390/cf_z15/transaction.json

tools/perf/pmu-events/arch/s390/mapfile.csv +1 -1

index bd3fc577139c..61641a3480e0 100644
@@ -4,4 +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
+^IBM.856[12].*3\.6.[[:xdigit:]]+$,3,cf_z15,core

Signature · 1 line

2.19.1

Signature · 1 line

- Arnaldo

tip-bot2 for Thomas Richter

merge bot Applied

2019-10-07 14:49 UTC #3 lore raw

[tip: perf/urgent] perf vendor events s390: Use s390 machine name instead of type 8561

In reply to Thomas Richter

The following commit has been merged into the perf/urgent branch of tip:

Commit-ID:     0d0e5ecec6116db6031829299e74cc71240c9ff3
Gitweb:        https://git.kernel.org/tip/0d0e5ecec6116db6031829299e74cc71240c9ff3
Author:        Thomas Richter <[email protected]>
AuthorDate:    Fri, 27 Sep 2019 10:11:47 +02:00
Committer:     Arnaldo Carvalho de Melo <[email protected]>
CommitterDate: Mon, 30 Sep 2019 17:29:45 -03:00

perf vendor events s390: Use s390 machine name instead of type 8561

In the pmu-events directory for JSON file definitions use the official machine name IBM z15 instead of machine type number 8561. This is consistent with previous machines.

Signed-off-by Thomas Richter <[email protected]>

Cc Heiko Carstens <[email protected]>

Cc Vasily Gorbik <[email protected]>

Link http://lore.kernel.org/lkml/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/perf/pmu-events/arch/s390/cf_m8561/basic.json       |  58 +-
 tools/perf/pmu-events/arch/s390/cf_m8561/crypto.json      | 114 +--
 tools/perf/pmu-events/arch/s390/cf_m8561/crypto6.json     |  30 +-
 tools/perf/pmu-events/arch/s390/cf_m8561/extended.json    | 373 +-------
 tools/perf/pmu-events/arch/s390/cf_m8561/transaction.json |   7 +-
 tools/perf/pmu-events/arch/s390/cf_z15/basic.json         |  58 +-
 tools/perf/pmu-events/arch/s390/cf_z15/crypto.json        | 114 ++-
 tools/perf/pmu-events/arch/s390/cf_z15/crypto6.json       |  30 +-
 tools/perf/pmu-events/arch/s390/cf_z15/extended.json      | 373 +++++++-
 tools/perf/pmu-events/arch/s390/cf_z15/transaction.json   |   7 +-
 tools/perf/pmu-events/arch/s390/mapfile.csv               |   2 +-
 11 files changed, 583 insertions(+), 583 deletions(-)
 delete mode 100644 tools/perf/pmu-events/arch/s390/cf_m8561/basic.json
 delete mode 100644 tools/perf/pmu-events/arch/s390/cf_m8561/crypto.json
 delete mode 100644 tools/perf/pmu-events/arch/s390/cf_m8561/crypto6.json
 delete mode 100644 tools/perf/pmu-events/arch/s390/cf_m8561/extended.json
 delete mode 100644 tools/perf/pmu-events/arch/s390/cf_m8561/transaction.json
 create mode 100644 tools/perf/pmu-events/arch/s390/cf_z15/basic.json
 create mode 100644 tools/perf/pmu-events/arch/s390/cf_z15/crypto.json
 create mode 100644 tools/perf/pmu-events/arch/s390/cf_z15/crypto6.json
 create mode 100644 tools/perf/pmu-events/arch/s390/cf_z15/extended.json
 create mode 100644 tools/perf/pmu-events/arch/s390/cf_z15/transaction.json

tools/perf/pmu-events/arch/s390/cf_m8561/basic.json deleted +0 ~~-58~~

deleted file mode 100644
index 17fb524..0000000
@@ -1,58 +0,0 @@
-[
-	{
-		"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 deleted +0 ~~-114~~

114 lines not on this page · raw message

tools/perf/pmu-events/arch/s390/cf_m8561/crypto6.json deleted +0 ~~-30~~

deleted file mode 100644
index 5e36bc2..0000000
@@ -1,30 +0,0 @@
-[
-	{
-		"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 deleted +0 ~~-373~~

373 lines not on this page · raw message

tools/perf/pmu-events/arch/s390/cf_m8561/transaction.json deleted +0 -7

deleted file mode 100644
index 1a0034f..0000000
@@ -1,7 +0,0 @@
-[
-  {
-    "BriefDescription": "Transaction count",
-    "MetricName": "transaction",
-    "MetricExpr": "TX_C_TEND + TX_NC_TEND + TX_NC_TABORT + TX_C_TABORT_SPECIAL + TX_C_TABORT_NO_SPECIAL"
-  }
-]

tools/perf/pmu-events/arch/s390/cf_z15/basic.json new file +58 -0

58 lines not on this page · raw message

tools/perf/pmu-events/arch/s390/cf_z15/crypto.json new file +114 -0

114 lines not on this page · raw message

tools/perf/pmu-events/arch/s390/cf_z15/crypto6.json new file +30 -0

new file mode 100644
index 0000000..5e36bc2
@@ -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_z15/extended.json new file +373 -0

373 lines not on this page · raw message

tools/perf/pmu-events/arch/s390/cf_z15/transaction.json new file +7 -0

new file mode 100644
index 0000000..1a0034f
@@ -0,0 +1,7 @@
+[
+  {
+    "BriefDescription": "Transaction count",
+    "MetricName": "transaction",
+    "MetricExpr": "TX_C_TEND + TX_NC_TEND + TX_NC_TABORT + TX_C_TABORT_SPECIAL + TX_C_TABORT_NO_SPECIAL"
+  }
+]

tools/perf/pmu-events/arch/s390/mapfile.csv +1 -1

index bd3fc57..61641a3 100644
@@ -4,4 +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
+^IBM.856[12].*3\.6.[[:xdigit:]]+$,3,cf_z15,core

tip-bot2 for Thomas Richter

merge bot Applied

2019-10-07 14:51 UTC #4 lore raw

In reply to Thomas Richter

The following commit has been merged into the perf/urgent branch of tip:

Commit-ID:     02d084792273e8a5f1813dcad988229a45be96ea
Gitweb:        https://git.kernel.org/tip/02d084792273e8a5f1813dcad988229a45be96ea
Author:        Thomas Richter <[email protected]>
AuthorDate:    Fri, 27 Sep 2019 10:11:46 +02:00
Committer:     Arnaldo Carvalho de Melo <[email protected]>
CommitterDate: Mon, 30 Sep 2019 17:29:42 -03:00

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

Add s390 transaction counter definition for machine 8561. This is the same file as for the predecessor machine.

Fixes 6e67d77d673d ("perf vendor events s390: Add JSON files for machine type 8561")

Signed-off-by Thomas Richter <[email protected]>

Cc Heiko Carstens <[email protected]>

Cc Vasily Gorbik <[email protected]>

Link http://lore.kernel.org/lkml/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/perf/pmu-events/arch/s390/cf_m8561/transaction.json | 7 +++++++-
 1 file changed, 7 insertions(+)
 create mode 100644 tools/perf/pmu-events/arch/s390/cf_m8561/transaction.json

tools/perf/pmu-events/arch/s390/cf_m8561/transaction.json new file +7 -0

new file mode 100644
index 0000000..1a0034f
@@ -0,0 +1,7 @@
+[
+  {
+    "BriefDescription": "Transaction count",
+    "MetricName": "transaction",
+    "MetricExpr": "TX_C_TEND + TX_NC_TEND + TX_NC_TABORT + TX_C_TABORT_SPECIAL + TX_C_TABORT_NO_SPECIAL"
+  }
+]