Commit-ID: 6e67d77d673d785631b0c52314b60d3c68ebe809 Gitweb: https://git.kernel.org/tip/6e67d77d673d785631b0c52314b60d3c68ebe809 Author: Thomas Richter <tmri...@linux.ibm.com> AuthorDate: Fri, 12 Jul 2019 14:31:13 +0200 Committer: Arnaldo Carvalho de Melo <a...@redhat.com> 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. Signed-off-by: Thomas Richter <tmri...@linux.ibm.com> Reviewed-by: Vasily Gorbik <g...@linux.ibm.com> Cc: Heiko Carstens <heiko.carst...@de.ibm.com> Cc: Hendrik Brueckner <brueck...@linux.ibm.com> Link: http://lkml.kernel.org/r/20190712123113.100882-1-tmri...@linux.ibm.com Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> --- .../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(-) diff --git a/tools/perf/pmu-events/arch/s390/cf_z14/basic.json b/tools/perf/pmu-events/arch/s390/cf_m8561/basic.json 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 diff --git a/tools/perf/pmu-events/arch/s390/cf_z10/crypto.json b/tools/perf/pmu-events/arch/s390/cf_m8561/crypto.json 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 diff --git a/tools/perf/pmu-events/arch/s390/cf_m8561/crypto6.json b/tools/perf/pmu-events/arch/s390/cf_m8561/crypto6.json new file mode 100644 index 000000000000..5e36bc2468d0 --- /dev/null +++ b/tools/perf/pmu-events/arch/s390/cf_m8561/crypto6.json @@ -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" + }, +] diff --git a/tools/perf/pmu-events/arch/s390/cf_z14/extended.json b/tools/perf/pmu-events/arch/s390/cf_m8561/extended.json 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 --- a/tools/perf/pmu-events/arch/s390/cf_z14/extended.json +++ b/tools/perf/pmu-events/arch/s390/cf_m8561/extended.json @@ -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", diff --git a/tools/perf/pmu-events/arch/s390/mapfile.csv b/tools/perf/pmu-events/arch/s390/mapfile.csv index 78bcf7f8e206..bd3fc577139c 100644 --- a/tools/perf/pmu-events/arch/s390/mapfile.csv +++ b/tools/perf/pmu-events/arch/s390/mapfile.csv @@ -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
