From d121ffa3f01e08d2cc53140444dfcab830319012 Mon Sep 17 00:00:00 2001 From: Hendrik Brueckner Date: Tue, 10 Oct 2017 10:56:05 +0200 Subject: [PATCH] cpumf/z14: split counter sets according to CFVN/CSVN (part 1/2) With z14, the counters in the problem-state are reduced resulting in an increased first version number of the CPUM CF. To adapt to this change, split the counter sets according to their counter first and second version number. The second version number controls the crypto-activity and extended counter set. Treat the crypto-activity counter set as generic, as the extended counter set is already handled based on hardware models. Signed-off-by: Hendrik Brueckner Signed-off-by: Stefan Haberland --- cpumf/Makefile | 4 +- cpumf/data/cpum-cf-cfvn-1.ctr | 48 +++++++++++++++++++ cpumf/data/cpum-cf-cfvn-3.ctr | 32 +++++++++++++ ...f-generic.ctr => cpum-cf-csvn-generic.ctr} | 48 ------------------- cpumf/data/cpum-cf-hw-counter.map | 15 +++++- 5 files changed, 96 insertions(+), 51 deletions(-) create mode 100644 cpumf/data/cpum-cf-cfvn-1.ctr create mode 100644 cpumf/data/cpum-cf-cfvn-3.ctr rename cpumf/data/{cpum-cf-generic.ctr => cpum-cf-csvn-generic.ctr} (71%) diff --git a/cpumf/Makefile b/cpumf/Makefile index d3cfc7cb..3fc4c0fc 100644 --- a/cpumf/Makefile +++ b/cpumf/Makefile @@ -4,7 +4,9 @@ include ../common.mak CPUMF_DATADIR = $(TOOLS_DATADIR)/cpumf -DATA_FILES = cpum-cf-hw-counter.map cpum-cf-generic.ctr \ +DATA_FILES = cpum-cf-hw-counter.map \ + cpum-cf-cfvn-1.ctr cpum-cf-cfvn-3.ctr \ + cpum-cf-csvn-generic.ctr \ cpum-cf-extended-z10.ctr cpum-cf-extended-z196.ctr \ cpum-cf-extended-zEC12.ctr cpum-sf-modes.ctr \ cpum-cf-extended-z13.ctr cpum-cf-extended-z14.ctr diff --git a/cpumf/data/cpum-cf-cfvn-1.ctr b/cpumf/data/cpum-cf-cfvn-1.ctr new file mode 100644 index 00000000..08baece3 --- /dev/null +++ b/cpumf/data/cpum-cf-cfvn-1.ctr @@ -0,0 +1,48 @@ +Counter: 0 Name:CPU_CYCLES +Description: +Cycle Count +. +Counter: 1 Name:INSTRUCTIONS +Description: +Instruction Count +. +Counter: 2 Name:L1I_DIR_WRITES +Description: +Level-1 I-Cache Directory Write Count +. +Counter: 3 Name:L1I_PENALTY_CYCLES +Description: +Level-1 I-Cache Penalty Cycle Count +. +Counter: 4 Name:L1D_DIR_WRITES +Description: +Level-1 D-Cache Directory Write Count +. +Counter: 5 Name:L1D_PENALTY_CYCLES +Description: +Level-1 D-Cache Penalty Cycle Count +. +Counter: 32 Name:PROBLEM_STATE_CPU_CYCLES +Description: +Problem-State Cycle Count +. +Counter: 33 Name:PROBLEM_STATE_INSTRUCTIONS +Description: +Problem-State Instruction Count +. +Counter: 34 Name:PROBLEM_STATE_L1I_DIR_WRITES +Description: +Problem-State Level-1 I-Cache Directory Write Count +. +Counter: 35 Name:PROBLEM_STATE_L1I_PENALTY_CYCLES +Description: +Problem-State Level-1 I-Cache Penalty Cycle Count +. +Counter: 36 Name:PROBLEM_STATE_L1D_DIR_WRITES +Description: +Problem-State Level-1 D-Cache Directory Write Count +. +Counter: 37 Name:PROBLEM_STATE_L1D_PENALTY_CYCLES +Description: +Problem-State Level-1 D-Cache Penalty Cycle Count +. diff --git a/cpumf/data/cpum-cf-cfvn-3.ctr b/cpumf/data/cpum-cf-cfvn-3.ctr new file mode 100644 index 00000000..8c349884 --- /dev/null +++ b/cpumf/data/cpum-cf-cfvn-3.ctr @@ -0,0 +1,32 @@ +Counter: 0 Name:CPU_CYCLES +Description: +Cycle Count +. +Counter: 1 Name:INSTRUCTIONS +Description: +Instruction Count +. +Counter: 2 Name:L1I_DIR_WRITES +Description: +Level-1 I-Cache Directory Write Count +. +Counter: 3 Name:L1I_PENALTY_CYCLES +Description: +Level-1 I-Cache Penalty Cycle Count +. +Counter: 4 Name:L1D_DIR_WRITES +Description: +Level-1 D-Cache Directory Write Count +. +Counter: 5 Name:L1D_PENALTY_CYCLES +Description: +Level-1 D-Cache Penalty Cycle Count +. +Counter: 32 Name:PROBLEM_STATE_CPU_CYCLES +Description: +Problem-State Cycle Count +. +Counter: 33 Name:PROBLEM_STATE_INSTRUCTIONS +Description: +Problem-State Instruction Count +. diff --git a/cpumf/data/cpum-cf-generic.ctr b/cpumf/data/cpum-cf-csvn-generic.ctr similarity index 71% rename from cpumf/data/cpum-cf-generic.ctr rename to cpumf/data/cpum-cf-csvn-generic.ctr index 4c0e0fd2..5a083fbf 100644 --- a/cpumf/data/cpum-cf-generic.ctr +++ b/cpumf/data/cpum-cf-csvn-generic.ctr @@ -1,51 +1,3 @@ -Counter: 0 Name:CPU_CYCLES -Description: -Cycle Count -. -Counter: 1 Name:INSTRUCTIONS -Description: -Instruction Count -. -Counter: 2 Name:L1I_DIR_WRITES -Description: -Level-1 I-Cache Directory Write Count -. -Counter: 3 Name:L1I_PENALTY_CYCLES -Description: -Level-1 I-Cache Penalty Cycle Count -. -Counter: 4 Name:L1D_DIR_WRITES -Description: -Level-1 D-Cache Directory Write Count -. -Counter: 5 Name:L1D_PENALTY_CYCLES -Description: -Level-1 D-Cache Penalty Cycle Count -. -Counter: 32 Name:PROBLEM_STATE_CPU_CYCLES -Description: -Problem-State Cycle Count -. -Counter: 33 Name:PROBLEM_STATE_INSTRUCTIONS -Description: -Problem-State Instruction Count -. -Counter: 34 Name:PROBLEM_STATE_L1I_DIR_WRITES -Description: -Problem-State Level-1 I-Cache Directory Write Count -. -Counter: 35 Name:PROBLEM_STATE_L1I_PENALTY_CYCLES -Description: -Problem-State Level-1 I-Cache Penalty Cycle Count -. -Counter: 36 Name:PROBLEM_STATE_L1D_DIR_WRITES -Description: -Problem-State Level-1 D-Cache Directory Write Count -. -Counter: 37 Name:PROBLEM_STATE_L1D_PENALTY_CYCLES -Description: -Problem-State Level-1 D-Cache Penalty Cycle Count -. Counter: 64 Name:PRNG_FUNCTIONS Description: Total number of the PRNG functions issued by the CPU diff --git a/cpumf/data/cpum-cf-hw-counter.map b/cpumf/data/cpum-cf-hw-counter.map index 6ecf66dd..7713d2e2 100644 --- a/cpumf/data/cpum-cf-hw-counter.map +++ b/cpumf/data/cpum-cf-hw-counter.map @@ -1,11 +1,22 @@ # CPU-measurement facilities # -# Mapping of IBM System z hardware types to extended counter set defintions +# Mapping of: +# 1. CPU-MF counter first/second version numbers to "generic" counter +# definitions +# 2. IBM z Systems hardware to respective extended counter set definitions # # { # Definition # File name - 0 => 'cpum-cf-generic.ctr', + + # CFVN + 'cfvn-1' => 'cpum-cf-cfvn-1.ctr', + 'cfvn-3' => 'cpum-cf-cfvn-3.ctr', + + # CSVN + 'csvn-generic' => 'cpum-cf-csvn-generic.ctr', + + # Extended counters 2097 => 'cpum-cf-extended-z10.ctr', 2098 => 'cpum-cf-extended-z10.ctr', 2817 => 'cpum-cf-extended-z196.ctr',