Skip to content

Commit d183346

Browse files
Thomas Richteracmel
Thomas Richter
authored and
acmel
committed
perf list: Update event description for IBM z15 to latest level
Update IBM z15 event counter description to the latest level as described in the documents 1. SA23-2260-07: "The Load-Program-Parameter and the CPU-Measurement Facilities." released on May, 2022 for the following counter sets: * Basic counter set * Problem counter set * Crypto counter set 2. SA23-2261-07: "The CPU-Measurement Facility Extended Counters Definition for z10, z196/z114, zEC12/zBC12, z13/z13s, z14, z15 and z16" released on April 29, 2022 for the following counter sets: * Extended counter set * MT-Diagnostic counter set Signed-off-by: Thomas Richter <[email protected]> Acked-by: Sumanth Korikkar <[email protected]> Acked-by: Ian Rogers <[email protected]> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]> Link: https://lore.kernel.org/r/[email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected]
1 parent d786bdf commit d183346

File tree

4 files changed

+182
-184
lines changed

4 files changed

+182
-184
lines changed

‎tools/perf/pmu-events/arch/s390/cf_z15/basic.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,56 +3,56 @@
33
"Unit": "CPU-M-CF",
44
"EventCode": "0",
55
"EventName": "CPU_CYCLES",
6-
"BriefDescription": "CPU Cycles",
7-
"PublicDescription": "Cycle Count"
6+
"BriefDescription": "Cycle Count",
7+
"PublicDescription": "This counter counts the total number of CPU cycles, excluding the number of cycles while the CPU is in the wait state."
88
},
99
{
1010
"Unit": "CPU-M-CF",
1111
"EventCode": "1",
1212
"EventName": "INSTRUCTIONS",
13-
"BriefDescription": "Instructions",
14-
"PublicDescription": "Instruction Count"
13+
"BriefDescription": "Instruction Count",
14+
"PublicDescription": "This counter counts the total number of instructions executed by the CPU."
1515
},
1616
{
1717
"Unit": "CPU-M-CF",
1818
"EventCode": "2",
1919
"EventName": "L1I_DIR_WRITES",
20-
"BriefDescription": "L1I Directory Writes",
21-
"PublicDescription": "Level-1 I-Cache Directory Write Count"
20+
"BriefDescription": "Level-1 I-Cache Directory Write Count",
21+
"PublicDescription": "This counter counts the total number of level-1 instruction-cache or unified-cache directory writes."
2222
},
2323
{
2424
"Unit": "CPU-M-CF",
2525
"EventCode": "3",
2626
"EventName": "L1I_PENALTY_CYCLES",
27-
"BriefDescription": "L1I Penalty Cycles",
28-
"PublicDescription": "Level-1 I-Cache Penalty Cycle Count"
27+
"BriefDescription": "Level-1 I-Cache Penalty Cycle Count",
28+
"PublicDescription": "This counter counts the total number of cache penalty cycles for level-1 instruction cache or unified cache."
2929
},
3030
{
3131
"Unit": "CPU-M-CF",
3232
"EventCode": "4",
3333
"EventName": "L1D_DIR_WRITES",
34-
"BriefDescription": "L1D Directory Writes",
35-
"PublicDescription": "Level-1 D-Cache Directory Write Count"
34+
"BriefDescription": "Level-1 D-Cache Directory Write Count",
35+
"PublicDescription": "This counter counts the total number of level-1 data-cache directory writes."
3636
},
3737
{
3838
"Unit": "CPU-M-CF",
3939
"EventCode": "5",
4040
"EventName": "L1D_PENALTY_CYCLES",
41-
"BriefDescription": "L1D Penalty Cycles",
42-
"PublicDescription": "Level-1 D-Cache Penalty Cycle Count"
41+
"BriefDescription": "Level-1 D-Cache Penalty Cycle Count",
42+
"PublicDescription": "This counter counts the total number of cache penalty cycles for level-1 data cache."
4343
},
4444
{
4545
"Unit": "CPU-M-CF",
4646
"EventCode": "32",
4747
"EventName": "PROBLEM_STATE_CPU_CYCLES",
48-
"BriefDescription": "Problem-State CPU Cycles",
49-
"PublicDescription": "Problem-State Cycle Count"
48+
"BriefDescription": "Problem-State Cycle Count",
49+
"PublicDescription": "This counter counts the total number of CPU cycles when the CPU is in the problem state, excluding the number of cycles while the CPU is in the wait state."
5050
},
5151
{
5252
"Unit": "CPU-M-CF",
5353
"EventCode": "33",
5454
"EventName": "PROBLEM_STATE_INSTRUCTIONS",
55-
"BriefDescription": "Problem-State Instructions",
56-
"PublicDescription": "Problem-State Instruction Count"
55+
"BriefDescription": "Problem-State Instruction Count",
56+
"PublicDescription": "This counter counts the total number of instructions executed by the CPU while in the problem state."
5757
}
5858
]

‎tools/perf/pmu-events/arch/s390/cf_z15/crypto.json

Lines changed: 0 additions & 114 deletions
This file was deleted.

‎tools/perf/pmu-events/arch/s390/cf_z15/crypto6.json

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,116 @@
11
[
2+
{
3+
"Unit": "CPU-M-CF",
4+
"EventCode": "64",
5+
"EventName": "PRNG_FUNCTIONS",
6+
"BriefDescription": "PRNG Function Count",
7+
"PublicDescription": "This counter counts the total number of the pseudorandom-number-generation functions issued by the CPU."
8+
},
9+
{
10+
"Unit": "CPU-M-CF",
11+
"EventCode": "65",
12+
"EventName": "PRNG_CYCLES",
13+
"BriefDescription": "PRNG Cycle Count",
14+
"PublicDescription": "This counter counts the total number of CPU cycles when the DEA/AES/SHA coprocessor is busy performing the pseudorandom- number-generation functions issued by the CPU."
15+
},
16+
{
17+
"Unit": "CPU-M-CF",
18+
"EventCode": "66",
19+
"EventName": "PRNG_BLOCKED_FUNCTIONS",
20+
"BriefDescription": "PRNG Blocked Function Count",
21+
"PublicDescription": "This counter counts the total number of the pseudorandom-number-generation functions that are issued by the CPU and are blocked because the DEA/AES/SHA coprocessor is busy performing a function issued by another CPU."
22+
},
23+
{
24+
"Unit": "CPU-M-CF",
25+
"EventCode": "67",
26+
"EventName": "PRNG_BLOCKED_CYCLES",
27+
"BriefDescription": "PRNG Blocked Cycle Count",
28+
"PublicDescription": "This counter counts the total number of CPU cycles blocked for the pseudorandom-number-generation functions issued by the CPU because the DEA/AES/SHA coprocessor is busy performing a function issued by another CPU."
29+
},
30+
{
31+
"Unit": "CPU-M-CF",
32+
"EventCode": "68",
33+
"EventName": "SHA_FUNCTIONS",
34+
"BriefDescription": "SHA Function Count",
35+
"PublicDescription": "This counter counts the total number of the SHA functions issued by the CPU."
36+
},
37+
{
38+
"Unit": "CPU-M-CF",
39+
"EventCode": "69",
40+
"EventName": "SHA_CYCLES",
41+
"BriefDescription": "SHA Cycle Count",
42+
"PublicDescription": "This counter counts the total number of CPU cycles when the SHA coprocessor is busy performing the SHA functions issued by the CPU."
43+
},
44+
{
45+
"Unit": "CPU-M-CF",
46+
"EventCode": "70",
47+
"EventName": "SHA_BLOCKED_FUNCTIONS",
48+
"BriefDescription": "SHA Blocked Function Count",
49+
"PublicDescription": "This counter counts the total number of the SHA functions that are issued by the CPU and are blocked because the SHA coprocessor is busy performing a function issued by another CPU."
50+
},
51+
{
52+
"Unit": "CPU-M-CF",
53+
"EventCode": "71",
54+
"EventName": "SHA_BLOCKED_CYCLES",
55+
"BriefDescription": "SHA Blocked Cycle Count",
56+
"PublicDescription": "This counter counts the total number of CPU cycles blocked for the SHA functions issued by the CPU because the SHA coprocessor is busy performing a function issued by another CPU."
57+
},
58+
{
59+
"Unit": "CPU-M-CF",
60+
"EventCode": "72",
61+
"EventName": "DEA_FUNCTIONS",
62+
"BriefDescription": "DEA Function Count",
63+
"PublicDescription": "This counter counts the total number of the DEA functions issued by the CPU."
64+
},
65+
{
66+
"Unit": "CPU-M-CF",
67+
"EventCode": "73",
68+
"EventName": "DEA_CYCLES",
69+
"BriefDescription": "DEA Cycle Count",
70+
"PublicDescription": "This counter counts the total number of CPU cycles when the DEA/AES coprocessor is busy performing the DEA functions issued by the CPU."
71+
},
72+
{
73+
"Unit": "CPU-M-CF",
74+
"EventCode": "74",
75+
"EventName": "DEA_BLOCKED_FUNCTIONS",
76+
"BriefDescription": "DEA Blocked Function Count",
77+
"PublicDescription": "This counter counts the total number of the DEA functions that are issued by the CPU and are blocked because the DEA/AES coprocessor is busy performing a function issued by another CPU."
78+
},
79+
{
80+
"Unit": "CPU-M-CF",
81+
"EventCode": "75",
82+
"EventName": "DEA_BLOCKED_CYCLES",
83+
"BriefDescription": "DEA Blocked Cycle Count",
84+
"PublicDescription": "This counter counts the total number of CPU cycles blocked for the DEA functions issued by the CPU because the DEA/AES coprocessor is busy performing a function issued by another CPU."
85+
},
86+
{
87+
"Unit": "CPU-M-CF",
88+
"EventCode": "76",
89+
"EventName": "AES_FUNCTIONS",
90+
"BriefDescription": "AES Function Count",
91+
"PublicDescription": "This counter counts the total number of the AES functions issued by the CPU."
92+
},
93+
{
94+
"Unit": "CPU-M-CF",
95+
"EventCode": "77",
96+
"EventName": "AES_CYCLES",
97+
"BriefDescription": "AES Cycle Count",
98+
"PublicDescription": "This counter counts the total number of CPU cycles when the DEA/AES coprocessor is busy performing the AES functions issued by the CPU."
99+
},
100+
{
101+
"Unit": "CPU-M-CF",
102+
"EventCode": "78",
103+
"EventName": "AES_BLOCKED_FUNCTIONS",
104+
"BriefDescription": "AES Blocked Function Count",
105+
"PublicDescription": "This counter counts the total number of the AES functions that are issued by the CPU and are blocked because the DEA/AES coprocessor is busy performing a function issued by another CPU."
106+
},
107+
{
108+
"Unit": "CPU-M-CF",
109+
"EventCode": "79",
110+
"EventName": "AES_BLOCKED_CYCLES",
111+
"BriefDescription": "AES Blocked Cycle Count",
112+
"PublicDescription": "This counter counts the 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."
113+
},
2114
{
3115
"Unit": "CPU-M-CF",
4116
"EventCode": "80",

0 commit comments

Comments
 (0)