Update the cpumf counter (event) definitions. The changes are required to
easily update the defintions in future.
Signed-off-by: Hendrik Brueckner <brueck...@linux.vnet.ibm.com>
---
lib/events/s390x_cpumf_events.h | 176 +++++++++++++++++++--------------------
lib/pfmlib_s390x_cpumf.c | 17 ++--
2 files changed, 96 insertions(+), 97 deletions(-)
diff --git a/lib/events/s390x_cpumf_events.h b/lib/events/s390x_cpumf_events.h
index 9628cee..b1ad8fc 100644
--- a/lib/events/s390x_cpumf_events.h
+++ b/lib/events/s390x_cpumf_events.h
@@ -6,14 +6,14 @@
#define STRINGIFY(x) __stringify(x)
/* CPUMF counter sets */
-#define CPUMF_CTRSET_BASIC 0
-#define CPUMF_CTRSET_PROBLEM_STATE 1
-#define CPUMF_CTRSET_CRYPTO 2
-#define CPUMF_CTRSET_EXTENDED 3
+#define CPUMF_CTRSET_NONE 0
+#define CPUMF_CTRSET_BASIC 2
+#define CPUMF_CTRSET_PROBLEM_STATE 4
+#define CPUMF_CTRSET_CRYPTO 8
+#define CPUMF_CTRSET_EXTENDED 1
-static const pme_cpumf_ctr_t cpumf_generic_ctr[] = {
- /* Basic counter set */
+static const pme_cpumf_ctr_t cpumcf_generic_counters[] = {
{
.ctrnum = 0,
.ctrset = CPUMF_CTRSET_BASIC,
@@ -29,7 +29,7 @@ static const pme_cpumf_ctr_t cpumf_generic_ctr[] = {
{
.ctrnum = 2,
.ctrset = CPUMF_CTRSET_BASIC,
- .name = "L1I_DRCT_WRITES",
+ .name = "L1I_DIR_WRITES",
.desc = "Level-1 I-Cache Directory Write Count",
},
{
@@ -41,7 +41,7 @@ static const pme_cpumf_ctr_t cpumf_generic_ctr[] = {
{
.ctrnum = 4,
.ctrset = CPUMF_CTRSET_BASIC,
- .name = "L1D_DRCT_WRITES",
+ .name = "L1D_DIR_WRITES",
.desc = "Level-1 D-Cache Directory Write Count",
},
{
@@ -50,7 +50,6 @@ static const pme_cpumf_ctr_t cpumf_generic_ctr[] = {
.name = "L1D_PENALTY_CYCLES",
.desc = "Level-1 D-Cache Penalty Cycle Count",
},
- /* Problem-state counter set */
{
.ctrnum = 32,
.ctrset = CPUMF_CTRSET_PROBLEM_STATE,
@@ -66,7 +65,7 @@ static const pme_cpumf_ctr_t cpumf_generic_ctr[] = {
{
.ctrnum = 34,
.ctrset = CPUMF_CTRSET_PROBLEM_STATE,
- .name = "PROBLEM_STATE_L1I_DRCT_WRITES",
+ .name = "PROBLEM_STATE_L1I_DIR_WRITES",
.desc = "Problem-State Level-1 I-Cache Directory Write Count",
},
{
@@ -78,7 +77,7 @@ static const pme_cpumf_ctr_t cpumf_generic_ctr[] = {
{
.ctrnum = 36,
.ctrset = CPUMF_CTRSET_PROBLEM_STATE,
- .name = "PROBLEM_STATE_L1D_DRCT_WRITES",
+ .name = "PROBLEM_STATE_L1D_DIR_WRITES",
.desc = "Problem-State Level-1 D-Cache Directory Write Count",
},
{
@@ -87,38 +86,38 @@ static const pme_cpumf_ctr_t cpumf_generic_ctr[] = {
.name = "PROBLEM_STATE_L1D_PENALTY_CYCLES",
.desc = "Problem-State Level-1 D-Cache Penalty Cycle Count",
},
- /* Crypto-activity counter set */
{
.ctrnum = 64,
.ctrset = CPUMF_CTRSET_CRYPTO,
.name = "PRNG_FUNCTIONS",
- .desc = "Total number of the PRNG functions issued by the CPU",
+ .desc = "Total number of the PRNG functions issued by the"
+ " CPU",
},
{
.ctrnum = 65,
.ctrset = CPUMF_CTRSET_CRYPTO,
.name = "PRNG_CYCLES",
- .desc = "Total number of CPU cycles when the DEA/AES "
- "coprocessor is busy performing PRNG functions "
- "issued by the CPU",
+ .desc = "Total number of CPU cycles when the DEA/AES"
+ " coprocessor is busy performing PRNG functions"
+ " issued by the CPU",
},
{
.ctrnum = 66,
.ctrset = CPUMF_CTRSET_CRYPTO,
.name = "PRNG_BLOCKED_FUNCTIONS",
- .desc = "Total number of the PRNG functions that are issued "
- "by the CPU and are blocked because the DEA/AES "
- "coprocessor is busy performing a function issued "
- "by another CPU",
+ .desc = "Total number of the PRNG functions that are issued"
+ " by the CPU and are blocked because the DEA/AES"
+ " coprocessor is busy performing a function issued by"
+ " another CPU",
},
{
.ctrnum = 67,
.ctrset = CPUMF_CTRSET_CRYPTO,
.name = "PRNG_BLOCKED_CYCLES",
- .desc = "Total number of CPU cycles blocked for the PRNG "
- "functions issued by the CPU because the DEA/AES "
- "coprocessor is busy performing a function issued "
- "by another CPU",
+ .desc = "Total number of CPU cycles blocked for the PRNG"
+ " functions issued by the CPU because the DEA/AES"
+ " coprocessor is busy performing a function issued by"
+ " another CPU",
},
{
.ctrnum = 68,
@@ -130,26 +129,27 @@ static const pme_cpumf_ctr_t cpumf_generic_ctr[] = {
.ctrnum = 69,
.ctrset = CPUMF_CTRSET_CRYPTO,
.name = "SHA_CYCLES",
- .desc = "Total number of CPU cycles when the SHA coprocessor "
- "is busy performing the SHA functions issued by the "
- "CPU",
+ .desc = "Total number of CPU cycles when the SHA coprocessor"
+ " is busy performing the SHA functions issued by the"
+ " CPU",
},
{
.ctrnum = 70,
.ctrset = CPUMF_CTRSET_CRYPTO,
.name = "SHA_BLOCKED_FUNCTIONS",
- .desc = "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",
+ .desc = "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",
},
{
.ctrnum = 71,
.ctrset = CPUMF_CTRSET_CRYPTO,
.name = "SHA_BLOCKED_CYCLES",
- .desc = "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",
+ .desc = "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",
},
{
.ctrnum = 72,
@@ -161,24 +161,27 @@ static const pme_cpumf_ctr_t cpumf_generic_ctr[] = {
.ctrnum = 73,
.ctrset = CPUMF_CTRSET_CRYPTO,
.name = "DEA_CYCLES",
- .desc = "Total number of CPU cycles when the DEA/AES
coprocessor"
- " is busy performing the DEA functions issued by the
CPU",
+ .desc = "Total number of CPU cycles when the DEA/AES"
+ " coprocessor is busy performing the DEA functions"
+ " issued by the CPU",
},
{
.ctrnum = 74,
.ctrset = CPUMF_CTRSET_CRYPTO,
.name = "DEA_BLOCKED_FUNCTIONS",
- .desc = "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",
+ .desc = "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",
},
{
.ctrnum = 75,
.ctrset = CPUMF_CTRSET_CRYPTO,
.name = "DEA_BLOCKED_CYCLES",
- .desc = "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",
+ .desc = "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",
},
{
.ctrnum = 76,
@@ -190,29 +193,31 @@ static const pme_cpumf_ctr_t cpumf_generic_ctr[] = {
.ctrnum = 77,
.ctrset = CPUMF_CTRSET_CRYPTO,
.name = "AES_CYCLES",
- .desc = "Total number of CPU cycles when the DEA/AES
coprocessor"
- " is busy performing the AES functions issued by the
CPU",
+ .desc = "Total number of CPU cycles when the DEA/AES"
+ " coprocessor is busy performing the AES functions"
+ " issued by the CPU",
},
{
.ctrnum = 78,
.ctrset = CPUMF_CTRSET_CRYPTO,
.name = "AES_BLOCKED_FUNCTIONS",
- .desc = "Total number of 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",
+ .desc = "Total number of 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",
},
{
.ctrnum = 79,
.ctrset = CPUMF_CTRSET_CRYPTO,
.name = "AES_BLOCKED_CYCLES",
- .desc = "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",
+ .desc = "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",
},
};
-/* Extended counter set for IBM System z10 */
-static const pme_cpumf_ctr_t cpumf_ctr_set_ext_z10[] = {
+static const pme_cpumf_ctr_t cpumcf_z10_counters[] = {
{
.ctrnum = 128,
.ctrset = CPUMF_CTRSET_EXTENDED,
@@ -243,9 +248,9 @@ static const pme_cpumf_ctr_t cpumf_ctr_set_ext_z10[] = {
.ctrset = CPUMF_CTRSET_EXTENDED,
.name = "L1D_L3_LOCAL_WRITES",
.desc = "A directory write to the Level-1 D-Cache directory"
- " where the installtion cache line was source from the"
- " Level-3 cache that is on the same book as the Data"
- " cache (Local L2 cache)",
+ " where the installtion cache line was source from"
+ " the Level-3 cache that is on the same book as the"
+ " Data cache (Local L2 cache)",
},
{
.ctrnum = 132,
@@ -297,15 +302,15 @@ static const pme_cpumf_ctr_t cpumf_ctr_set_ext_z10[] = {
.ctrset = CPUMF_CTRSET_EXTENDED,
.name = "L1I_CACHELINE_INVALIDATES",
.desc = "A cache line in the Level-1 I-Cache has been"
- " invalidated by a store on the same CPU as the Level-1"
- " I-Cache",
+ " invalidated by a store on the same CPU as the"
+ " Level-1 I-Cache",
},
{
.ctrnum = 138,
.ctrset = CPUMF_CTRSET_EXTENDED,
.name = "ITLB1_WRITES",
- .desc = "A translation entry has been written into the Level-1"
- " Instruction Translation Lookaside Buffer",
+ .desc = "A translation entry has been written into the"
+ " Level-1 Instruction Translation Lookaside Buffer",
},
{
.ctrnum = 139,
@@ -340,27 +345,27 @@ static const pme_cpumf_ctr_t cpumf_ctr_set_ext_z10[] = {
.ctrnum = 145,
.ctrset = CPUMF_CTRSET_EXTENDED,
.name = "ITLB1_MISSES",
- .desc = "Level-1 Instruction TLB miss in progress. Incremented"
- " by one for every cycle an ITLB1 miss is in progress",
+ .desc = "Level-1 Instruction TLB miss in progress."
+ " Incremented by one for every cycle an ITLB1 miss is"
+ " in progress",
},
{
.ctrnum = 146,
.ctrset = CPUMF_CTRSET_EXTENDED,
.name = "DTLB1_MISSES",
- .desc = "Level-1 Data TLB miss in progress. Incremented by one"
- " for every cycle an DTLB1 miss is in progress",
+ .desc = "Level-1 Data TLB miss in progress. Incremented by"
+ " one for every cycle an DTLB1 miss is in progress",
},
{
.ctrnum = 147,
.ctrset = CPUMF_CTRSET_EXTENDED,
.name = "L2C_STORES_SENT",
- .desc = "Incremented by one for every store sent to"
- " Level-2 (L1.5) cache",
+ .desc = "Incremented by one for every store sent to Level-2"
+ " (L1.5) cache",
},
};
-/* Extended counter set for IBM zEnterprise 196 */
-static const pme_cpumf_ctr_t cpumf_ctr_set_ext_z196[] = {
+static const pme_cpumf_ctr_t cpumcf_z196_counters[] = {
{
.ctrnum = 128,
.ctrset = CPUMF_CTRSET_EXTENDED,
@@ -374,29 +379,30 @@ static const pme_cpumf_ctr_t cpumf_ctr_set_ext_z196[] = {
.ctrset = CPUMF_CTRSET_EXTENDED,
.name = "L1I_L2_SOURCED_WRITES",
.desc = "A directory write to the Level-1 I-Cache directory"
- " where the returned cache line was sourced from"
- " the Level-2 cache",
+ " where the returned cache line was sourced from the"
+ " Level-2 cache",
},
{
.ctrnum = 130,
.ctrset = CPUMF_CTRSET_EXTENDED,
.name = "DTLB1_MISSES",
- .desc = "Level-1 Data TLB miss in progress. Incremented by one"
- " for every cycle a DTLB1 miss is in progress.",
+ .desc = "Level-1 Data TLB miss in progress. Incremented by"
+ " one for every cycle a DTLB1 miss is in progress.",
},
{
.ctrnum = 131,
.ctrset = CPUMF_CTRSET_EXTENDED,
.name = "ITLB1_MISSES",
- .desc = "Level-1 Instruction TLB miss in progress. Incremented"
- " by one for every cycle a ITLB1 miss is in progress.",
+ .desc = "Level-1 Instruction TLB miss in progress."
+ " Incremented by one for every cycle a ITLB1 miss is"
+ " in progress.",
},
{
.ctrnum = 133,
.ctrset = CPUMF_CTRSET_EXTENDED,
.name = "L2C_STORES_SENT",
- .desc = "Incremented by one for every store sent to"
- " Level-2 cache",
+ .desc = "Incremented by one for every store sent to Level-2"
+ " cache",
},
{
.ctrnum = 134,
@@ -452,8 +458,8 @@ static const pme_cpumf_ctr_t cpumf_ctr_set_ext_z196[] = {
.ctrset = CPUMF_CTRSET_EXTENDED,
.name = "DTLB1_HPAGE_WRITES",
.desc = "A translation entry has been written to the Level-1"
- " Data Translation Lookaside Buffer for a one-megabyte"
- " page",
+ " Data Translation Lookaside Buffer for a one-"
+ " megabyte page",
},
{
.ctrnum = 141,
@@ -520,7 +526,7 @@ static const pme_cpumf_ctr_t cpumf_ctr_set_ext_z196[] = {
{
.ctrnum = 150,
.ctrset = CPUMF_CTRSET_EXTENDED,
- .name = "L1D_ONCHIP_L3_WRITES",
+ .name = "L1D_ONCHIP_L3_SOURCED_WRITES",
.desc = "A directory write to the Level-1 D-Cache directory"
" where the returned cache line was sourced from an"
" On Chip Level-3 cache",
@@ -528,7 +534,7 @@ static const pme_cpumf_ctr_t cpumf_ctr_set_ext_z196[] = {
{
.ctrnum = 152,
.ctrset = CPUMF_CTRSET_EXTENDED,
- .name = "L1D_OFFCHIP_L3_WRITES",
+ .name = "L1D_OFFCHIP_L3_SOURCED_WRITES",
.desc = "A directory write to the Level-1 D-Cache directory"
" where the returned cache line was sourced from an"
" Off Chip/On Book Level-3 cache",
@@ -536,7 +542,7 @@ static const pme_cpumf_ctr_t cpumf_ctr_set_ext_z196[] = {
{
.ctrnum = 153,
.ctrset = CPUMF_CTRSET_EXTENDED,
- .name = "L1I_ONCHIP_L3_WRITES",
+ .name = "L1I_ONCHIP_L3_SOURCED_WRITES",
.desc = "A directory write to the Level-1 I-Cache directory"
" where the returned cache line was sourced from an"
" On Chip Level-3 cache",
@@ -544,19 +550,11 @@ static const pme_cpumf_ctr_t cpumf_ctr_set_ext_z196[] = {
{
.ctrnum = 155,
.ctrset = CPUMF_CTRSET_EXTENDED,
- .name = "L1I_OFFCHIP_L3_WRITES",
+ .name = "L1I_OFFCHIP_L3_SOURCED_WRITES",
.desc = "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",
},
};
-#if 0
- {
- .ctrnum = ,
- .ctrset = CPUMF_CTRSET_EXTENDED,
- .name = "",
- .desc = "",
- },
-#endif
#endif /* __S390X_CPUMF_EVENTS_H__ */
diff --git a/lib/pfmlib_s390x_cpumf.c b/lib/pfmlib_s390x_cpumf.c
index d424466..e216bd2 100644
--- a/lib/pfmlib_s390x_cpumf.c
+++ b/lib/pfmlib_s390x_cpumf.c
@@ -107,13 +107,13 @@ static int pfm_cpumcf_init(void *this)
switch (get_machine_type()) {
case 2097: /* IBM System z10 EC */
case 2098: /* IBM System z10 BC */
- ext_set = cpumf_ctr_set_ext_z10;
- ext_set_count = LIBPFM_ARRAY_SIZE(cpumf_ctr_set_ext_z10);
+ ext_set = cpumcf_z10_counters,
+ ext_set_count = LIBPFM_ARRAY_SIZE(cpumcf_z10_counters);
break;
case 2817: /* IBM zEnterprise 196 */
case 2818: /* IBM zEnterprise 114 */
- ext_set = cpumf_ctr_set_ext_z196;
- ext_set_count = LIBPFM_ARRAY_SIZE(cpumf_ctr_set_ext_z196);
+ ext_set = cpumcf_z196_counters;
+ ext_set_count = LIBPFM_ARRAY_SIZE(cpumcf_z196_counters);
break;
default:
/* No extended counter set for this machine type or there
@@ -123,13 +123,14 @@ static int pfm_cpumcf_init(void *this)
break;
}
- generic_count = LIBPFM_ARRAY_SIZE(cpumf_generic_ctr);
+ generic_count = LIBPFM_ARRAY_SIZE(cpumcf_generic_counters);
cpumcf_pe = calloc(sizeof(*cpumcf_pe), generic_count + ext_set_count);
if (cpumcf_pe == NULL)
return PFM_ERR_NOMEM;
- memcpy(cpumcf_pe, cpumf_generic_ctr, sizeof(*cpumcf_pe) *
generic_count);
+ memcpy(cpumcf_pe, cpumcf_generic_counters,
+ sizeof(*cpumcf_pe) * generic_count);
if (ext_set_count)
memcpy((void *) (cpumcf_pe + generic_count),
ext_set, sizeof(*cpumcf_pe) * ext_set_count);
@@ -250,8 +251,8 @@ pfmlib_pmu_t s390x_cpum_cf_support = {
.num_fixed_cntrs = CPUMF_COUNTER_MAX, /* fixed counters only */
.max_encoding = 1,
- .pe = cpumf_generic_ctr,
- .pme_count = LIBPFM_ARRAY_SIZE(cpumf_generic_ctr),
+ .pe = cpumcf_generic_counters,
+ .pme_count = LIBPFM_ARRAY_SIZE(cpumcf_generic_counters),
.pmu_detect = pfm_cpumcf_detect,
.pmu_init = pfm_cpumcf_init,
--
1.7.5.4
------------------------------------------------------------------------------
Managing the Performance of Cloud-Based Applications
Take advantage of what the Cloud has to offer - Avoid Common Pitfalls.
Read the Whitepaper.
http://pubads.g.doubleclick.net/gampad/clk?id=121054471&iu=/4140/ostg.clktrk
_______________________________________________
perfmon2-devel mailing list
perfmon2-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/perfmon2-devel
