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 <tmricht@linux.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Vasily Gorbik <gor@linux.ibm.com> Link: http://lore.kernel.org/lkml/20190927081147.18345-2-tmricht@linux.ibm.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
mariux64 · Sep 30, 2019 · 0d0e5ec · 0d0e5ec
1 parent 02d0847
commit 0d0e5ec
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 1 deletion.
diff --git a/.../pmu-events/arch/s390/cf_m8561/basic.json → ...rf/pmu-events/arch/s390/cf_z15/basic.json b/.../pmu-events/arch/s390/cf_m8561/basic.json → ...rf/pmu-events/arch/s390/cf_z15/basic.json
diff --git a/...pmu-events/arch/s390/cf_m8561/crypto.json → ...f/pmu-events/arch/s390/cf_z15/crypto.json b/...pmu-events/arch/s390/cf_m8561/crypto.json → ...f/pmu-events/arch/s390/cf_z15/crypto.json
diff --git a/...mu-events/arch/s390/cf_m8561/crypto6.json → .../pmu-events/arch/s390/cf_z15/crypto6.json b/...mu-events/arch/s390/cf_m8561/crypto6.json → .../pmu-events/arch/s390/cf_z15/crypto6.json
diff --git a/...u-events/arch/s390/cf_m8561/extended.json → ...pmu-events/arch/s390/cf_z15/extended.json b/...u-events/arch/s390/cf_m8561/extended.json → ...pmu-events/arch/s390/cf_z15/extended.json
diff --git a/...vents/arch/s390/cf_m8561/transaction.json → ...-events/arch/s390/cf_z15/transaction.json b/...vents/arch/s390/cf_m8561/transaction.json → ...-events/arch/s390/cf_z15/transaction.json
diff --git a/tools/perf/pmu-events/arch/s390/mapfile.csv b/tools/perf/pmu-events/arch/s390/mapfile.csv
@@ -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