Commit 313b2f38 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo

perf vendor events: Update Intel skylakex

Events remain at v1.28, and the metrics are based on TMA 4.4 full.

Use script at:
https://github.com/intel/event-converter-for-linux-perf/blob/master/download_and_gen.py
with updates at:
https://github.com/captain5050/event-converter-for-linux-perf

Updates include:
 - Removal of ScaleUnit from uncore events by Zhengjun Xing
   <zhengjun.xing@linux.intel.com>.
 - Rename of topdown TMA metrics from Frontend_Bound to tma_frontend_bound.
 - _SMT suffix metrics are dropped as the #SMT_On and #EBS_Mode are
   correctly expanded in the single main metric.
 - Addition of all 6 levels of TMA metrics. Child metrics are placed
   in a group named after their parent allowing children of a metric
   to be easily measured using the metric name with a _group suffix.
 - ## and ##? operators are correctly expanded.
 - The locate-with column is added to the long description describing
   a sampling event.
 - Metrics are written in terms of other metrics to reduce the
   expression size and increase readability.
 - Latest metrics from: https://github.com/intel/perfmon-metrics

Tested on a skylakex manually and with 'perf test':
 10: PMU events                                                      :
 10.1: PMU event table sanity                                        : Ok
 10.2: PMU event map aliases                                         : Ok
 10.3: Parsing of PMU event table metrics                            : Ok
 10.4: Parsing of PMU event table metrics with fake PMUs             : Ok
 93: perf all metricgroups test                                      : Ok
 94: perf all metrics test                                           : Skip
 95: perf all PMU test                                               : Ok
Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Ahmad Yasin <ahmad.yasin@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Caleb Biggers <caleb.biggers@intel.com>
Cc: Florian Fischer <florian.fischer@muhq.space>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.garry@huawei.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Kshipra Bopardikar <kshipra.bopardikar@intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Miaoqian Lin <linmq006@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Perry Taylor <perry.taylor@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Samantha Alt <samantha.alt@intel.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Link: https://lore.kernel.org/r/20221004021612.325521-6-irogers@google.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 8cff7490
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -27,20 +27,19 @@ ...@@ -27,20 +27,19 @@
"Unit": "iMC" "Unit": "iMC"
}, },
{ {
"BriefDescription": "read requests to memory controller. Derived from unc_m_cas_count.rd", "BriefDescription": "All DRAM Read CAS Commands issued (including underfills)",
"Counter": "0,1,2,3", "Counter": "0,1,2,3",
"EventCode": "0x4", "EventCode": "0x4",
"EventName": "LLC_MISSES.MEM_READ", "EventName": "UNC_M_CAS_COUNT.RD",
"PerPkg": "1", "PerPkg": "1",
"ScaleUnit": "64Bytes",
"UMask": "0x3", "UMask": "0x3",
"Unit": "iMC" "Unit": "iMC"
}, },
{ {
"BriefDescription": "read requests to memory controller", "BriefDescription": "read requests to memory controller. Derived from unc_m_cas_count.rd",
"Counter": "0,1,2,3", "Counter": "0,1,2,3",
"EventCode": "0x4", "EventCode": "0x4",
"EventName": "UNC_M_CAS_COUNT.RD", "EventName": "LLC_MISSES.MEM_READ",
"PerPkg": "1", "PerPkg": "1",
"ScaleUnit": "64Bytes", "ScaleUnit": "64Bytes",
"UMask": "0x3", "UMask": "0x3",
...@@ -56,20 +55,19 @@ ...@@ -56,20 +55,19 @@
"Unit": "iMC" "Unit": "iMC"
}, },
{ {
"BriefDescription": "write requests to memory controller. Derived from unc_m_cas_count.wr", "BriefDescription": "All DRAM Write CAS commands issued",
"Counter": "0,1,2,3", "Counter": "0,1,2,3",
"EventCode": "0x4", "EventCode": "0x4",
"EventName": "LLC_MISSES.MEM_WRITE", "EventName": "UNC_M_CAS_COUNT.WR",
"PerPkg": "1", "PerPkg": "1",
"ScaleUnit": "64Bytes",
"UMask": "0xC", "UMask": "0xC",
"Unit": "iMC" "Unit": "iMC"
}, },
{ {
"BriefDescription": "write requests to memory controller", "BriefDescription": "write requests to memory controller. Derived from unc_m_cas_count.wr",
"Counter": "0,1,2,3", "Counter": "0,1,2,3",
"EventCode": "0x4", "EventCode": "0x4",
"EventName": "UNC_M_CAS_COUNT.WR", "EventName": "LLC_MISSES.MEM_WRITE",
"PerPkg": "1", "PerPkg": "1",
"ScaleUnit": "64Bytes", "ScaleUnit": "64Bytes",
"UMask": "0xC", "UMask": "0xC",
......
...@@ -1089,7 +1089,6 @@ ...@@ -1089,7 +1089,6 @@
"FCMask": "0x07", "FCMask": "0x07",
"PerPkg": "1", "PerPkg": "1",
"PortMask": "0x01", "PortMask": "0x01",
"ScaleUnit": "4Bytes",
"UMask": "0x01", "UMask": "0x01",
"Unit": "IIO" "Unit": "IIO"
}, },
...@@ -1101,7 +1100,6 @@ ...@@ -1101,7 +1100,6 @@
"FCMask": "0x07", "FCMask": "0x07",
"PerPkg": "1", "PerPkg": "1",
"PortMask": "0x02", "PortMask": "0x02",
"ScaleUnit": "4Bytes",
"UMask": "0x01", "UMask": "0x01",
"Unit": "IIO" "Unit": "IIO"
}, },
...@@ -1113,7 +1111,6 @@ ...@@ -1113,7 +1111,6 @@
"FCMask": "0x07", "FCMask": "0x07",
"PerPkg": "1", "PerPkg": "1",
"PortMask": "0x04", "PortMask": "0x04",
"ScaleUnit": "4Bytes",
"UMask": "0x01", "UMask": "0x01",
"Unit": "IIO" "Unit": "IIO"
}, },
...@@ -1125,7 +1122,6 @@ ...@@ -1125,7 +1122,6 @@
"FCMask": "0x07", "FCMask": "0x07",
"PerPkg": "1", "PerPkg": "1",
"PortMask": "0x08", "PortMask": "0x08",
"ScaleUnit": "4Bytes",
"UMask": "0x01", "UMask": "0x01",
"Unit": "IIO" "Unit": "IIO"
}, },
...@@ -1196,7 +1192,6 @@ ...@@ -1196,7 +1192,6 @@
"FCMask": "0x07", "FCMask": "0x07",
"PerPkg": "1", "PerPkg": "1",
"PortMask": "0x01", "PortMask": "0x01",
"ScaleUnit": "4Bytes",
"UMask": "0x04", "UMask": "0x04",
"Unit": "IIO" "Unit": "IIO"
}, },
...@@ -1208,7 +1203,6 @@ ...@@ -1208,7 +1203,6 @@
"FCMask": "0x07", "FCMask": "0x07",
"PerPkg": "1", "PerPkg": "1",
"PortMask": "0x02", "PortMask": "0x02",
"ScaleUnit": "4Bytes",
"UMask": "0x04", "UMask": "0x04",
"Unit": "IIO" "Unit": "IIO"
}, },
...@@ -1220,7 +1214,6 @@ ...@@ -1220,7 +1214,6 @@
"FCMask": "0x07", "FCMask": "0x07",
"PerPkg": "1", "PerPkg": "1",
"PortMask": "0x04", "PortMask": "0x04",
"ScaleUnit": "4Bytes",
"UMask": "0x04", "UMask": "0x04",
"Unit": "IIO" "Unit": "IIO"
}, },
...@@ -1232,7 +1225,6 @@ ...@@ -1232,7 +1225,6 @@
"FCMask": "0x07", "FCMask": "0x07",
"PerPkg": "1", "PerPkg": "1",
"PortMask": "0x08", "PortMask": "0x08",
"ScaleUnit": "4Bytes",
"UMask": "0x04", "UMask": "0x04",
"Unit": "IIO" "Unit": "IIO"
}, },
...@@ -1974,20 +1966,19 @@ ...@@ -1974,20 +1966,19 @@
"Unit": "UPI LL" "Unit": "UPI LL"
}, },
{ {
"BriefDescription": "UPI interconnect send bandwidth for payload. Derived from unc_upi_txl_flits.all_data", "BriefDescription": "Valid data FLITs transmitted via any slot",
"Counter": "0,1,2,3", "Counter": "0,1,2,3",
"EventCode": "0x2", "EventCode": "0x2",
"EventName": "UPI_DATA_BANDWIDTH_TX", "EventName": "UNC_UPI_TxL_FLITS.ALL_DATA",
"PerPkg": "1", "PerPkg": "1",
"ScaleUnit": "7.11E-06Bytes", "UMask": "0x0F",
"UMask": "0xf",
"Unit": "UPI LL" "Unit": "UPI LL"
}, },
{ {
"BriefDescription": "UPI interconnect send bandwidth for payload", "BriefDescription": "UPI interconnect send bandwidth for payload. Derived from unc_upi_txl_flits.all_data",
"Counter": "0,1,2,3", "Counter": "0,1,2,3",
"EventCode": "0x2", "EventCode": "0x2",
"EventName": "UNC_UPI_TxL_FLITS.ALL_DATA", "EventName": "UPI_DATA_BANDWIDTH_TX",
"PerPkg": "1", "PerPkg": "1",
"ScaleUnit": "7.11E-06Bytes", "ScaleUnit": "7.11E-06Bytes",
"UMask": "0xf", "UMask": "0xf",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment