Commit 35d65277 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf vendor events: Update Intel skylake 

Update to v53, 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



to download and generate the latest events and metrics. Manually copy
the skylake files into perf and update mapfile.csv.

Tested on a non-skylake 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

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Caleb Biggers <caleb.biggers@intel.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.garry@huawei.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Kshipra Bopardikar <kshipra.bopardikar@intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Perry Taylor <perry.taylor@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sedat Dilek <sedat.dilek@gmail.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Link: http://lore.kernel.org/lkml/20220727220832.2865794-25-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 89072caf

tools/perf/pmu-events/arch/x86/mapfile.csv

+1 −2
Original line number Diff line number Diff line
@@ -22,8 +22,7 @@ GenuineIntel-6-2E,v3,nehalemex,core 
GenuineIntel-6-2A,v17,sandybridge,core

GenuineIntel-6-8F,v1.04,sapphirerapids,core

GenuineIntel-6-(37|4C|4D),v14,silvermont,core

GenuineIntel-6-[4589]E,v24,skylake,core

GenuineIntel-6-A[56],v24,skylake,core

GenuineIntel-6-(4E|5E|8E|9E|A5|A6),v53,skylake,core

GenuineIntel-6-2C,v2,westmereep-dp,core

GenuineIntel-6-25,v2,westmereep-sp,core

GenuineIntel-6-2F,v2,westmereex,core

tools/perf/pmu-events/arch/x86/skylake/skl-metrics.json

+119 −59

File changed.

Preview size limit exceeded, changes collapsed.

tools/perf/pmu-events/arch/x86/skylake/uncore-cache.json

0 → 100644
+142 −0
Original line number Diff line number Diff line 
[

    {

        "BriefDescription": "L3 Lookup any request that access cache and found line in E or S-state",

        "Counter": "0,1",

        "EventCode": "0x34",

        "EventName": "UNC_CBO_CACHE_LOOKUP.ANY_ES",

        "PerPkg": "1",

        "PublicDescription": "L3 Lookup any request that access cache and found line in E or S-state.",

        "UMask": "0x86",

        "Unit": "CBO"

    },

    {

        "BriefDescription": "L3 Lookup any request that access cache and found line in I-state",

        "Counter": "0,1",

        "EventCode": "0x34",

        "EventName": "UNC_CBO_CACHE_LOOKUP.ANY_I",

        "PerPkg": "1",

        "PublicDescription": "L3 Lookup any request that access cache and found line in I-state.",

        "UMask": "0x88",

        "Unit": "CBO"

    },

    {

        "BriefDescription": "L3 Lookup any request that access cache and found line in M-state",

        "Counter": "0,1",

        "EventCode": "0x34",

        "EventName": "UNC_CBO_CACHE_LOOKUP.ANY_M",

        "PerPkg": "1",

        "PublicDescription": "L3 Lookup any request that access cache and found line in M-state.",

        "UMask": "0x81",

        "Unit": "CBO"

    },

    {

        "BriefDescription": "L3 Lookup any request that access cache and found line in MESI-state",

        "Counter": "0,1",

        "EventCode": "0x34",

        "EventName": "UNC_CBO_CACHE_LOOKUP.ANY_MESI",

        "PerPkg": "1",

        "PublicDescription": "L3 Lookup any request that access cache and found line in MESI-state.",

        "UMask": "0x8f",

        "Unit": "CBO"

    },

    {

        "BriefDescription": "L3 Lookup read request that access cache and found line in E or S-state",

        "Counter": "0,1",

        "EventCode": "0x34",

        "EventName": "UNC_CBO_CACHE_LOOKUP.READ_ES",

        "PerPkg": "1",

        "PublicDescription": "L3 Lookup read request that access cache and found line in E or S-state.",

        "UMask": "0x16",

        "Unit": "CBO"

    },

    {

        "BriefDescription": "L3 Lookup read request that access cache and found line in I-state",

        "Counter": "0,1",

        "EventCode": "0x34",

        "EventName": "UNC_CBO_CACHE_LOOKUP.READ_I",

        "PerPkg": "1",

        "PublicDescription": "L3 Lookup read request that access cache and found line in I-state.",

        "UMask": "0x18",

        "Unit": "CBO"

    },

    {

        "BriefDescription": "L3 Lookup read request that access cache and found line in any MESI-state",

        "Counter": "0,1",

        "EventCode": "0x34",

        "EventName": "UNC_CBO_CACHE_LOOKUP.READ_MESI",

        "PerPkg": "1",

        "PublicDescription": "L3 Lookup read request that access cache and found line in any MESI-state.",

        "UMask": "0x1f",

        "Unit": "CBO"

    },

    {

        "BriefDescription": "L3 Lookup write request that access cache and found line in E or S-state",

        "Counter": "0,1",

        "EventCode": "0x34",

        "EventName": "UNC_CBO_CACHE_LOOKUP.WRITE_ES",

        "PerPkg": "1",

        "PublicDescription": "L3 Lookup write request that access cache and found line in E or S-state.",

        "UMask": "0x26",

        "Unit": "CBO"

    },

    {

        "BriefDescription": "L3 Lookup write request that access cache and found line in M-state",

        "Counter": "0,1",

        "EventCode": "0x34",

        "EventName": "UNC_CBO_CACHE_LOOKUP.WRITE_M",

        "PerPkg": "1",

        "PublicDescription": "L3 Lookup write request that access cache and found line in M-state.",

        "UMask": "0x21",

        "Unit": "CBO"

    },

    {

        "BriefDescription": "L3 Lookup write request that access cache and found line in MESI-state",

        "Counter": "0,1",

        "EventCode": "0x34",

        "EventName": "UNC_CBO_CACHE_LOOKUP.WRITE_MESI",

        "PerPkg": "1",

        "PublicDescription": "L3 Lookup write request that access cache and found line in MESI-state.",

        "UMask": "0x2f",

        "Unit": "CBO"

    },

    {

        "BriefDescription": "A cross-core snoop initiated by this Cbox due to processor core memory request which hits a modified line in some processor core.",

        "Counter": "0,1",

        "EventCode": "0x22",

        "EventName": "UNC_CBO_XSNP_RESPONSE.HITM_XCORE",

        "PerPkg": "1",

        "PublicDescription": "A cross-core snoop initiated by this Cbox due to processor core memory request which hits a modified line in some processor core.",

        "UMask": "0x48",

        "Unit": "CBO"

    },

    {

        "BriefDescription": "A cross-core snoop initiated by this Cbox due to processor core memory request which hits a non-modified line in some processor core.",

        "Counter": "0,1",

        "EventCode": "0x22",

        "EventName": "UNC_CBO_XSNP_RESPONSE.HIT_XCORE",

        "PerPkg": "1",

        "PublicDescription": "A cross-core snoop initiated by this Cbox due to processor core memory request which hits a non-modified line in some processor core.",

        "UMask": "0x44",

        "Unit": "CBO"

    },

    {

        "BriefDescription": "A cross-core snoop resulted from L3 Eviction which misses in some processor core.",

        "Counter": "0,1",

        "EventCode": "0x22",

        "EventName": "UNC_CBO_XSNP_RESPONSE.MISS_EVICTION",

        "PerPkg": "1",

        "PublicDescription": "A cross-core snoop resulted from L3 Eviction which misses in some processor core.",

        "UMask": "0x81",

        "Unit": "CBO"

    },

    {

        "BriefDescription": "A cross-core snoop initiated by this Cbox due to processor core memory request which misses in some processor core.",

        "Counter": "0,1",

        "EventCode": "0x22",

        "EventName": "UNC_CBO_XSNP_RESPONSE.MISS_XCORE",

        "PerPkg": "1",

        "PublicDescription": "A cross-core snoop initiated by this Cbox due to processor core memory request which misses in some processor core.",

        "UMask": "0x41",

        "Unit": "CBO"

    }

]

tools/perf/pmu-events/arch/x86/skylake/uncore-other.json

0 → 100644
+79 −0
Original line number Diff line number Diff line 
[

    {

        "BriefDescription": "Number of entries allocated. Account for Any type: e.g. Snoop, Core aperture, etc.",

        "Counter": "0,1",

        "EventCode": "0x84",

        "EventName": "UNC_ARB_COH_TRK_REQUESTS.ALL",

        "PerPkg": "1",

        "PublicDescription": "Number of entries allocated. Account for Any type: e.g. Snoop, Core aperture, etc.",

        "UMask": "0x01",

        "Unit": "ARB"

    },

    {

        "BriefDescription": "Number of all Core entries outstanding for the memory controller. The outstanding interval starts after LLC miss till return of first data chunk. Accounts for Coherent and non-coherent traffic.",

        "EventCode": "0x80",

        "EventName": "UNC_ARB_TRK_OCCUPANCY.ALL",

        "PerPkg": "1",

        "PublicDescription": "Number of all Core entries outstanding for the memory controller. The outstanding interval starts after LLC miss till return of first data chunk. Accounts for Coherent and non-coherent traffic.",

        "UMask": "0x01",

        "Unit": "ARB"

    },

    {

        "BriefDescription": "Cycles with at least one request outstanding is waiting for data return from memory controller. Account for coherent and non-coherent requests initiated by IA Cores, Processor Graphics Unit, or LLC.",

        "CounterMask": "1",

        "EventCode": "0x80",

        "EventName": "UNC_ARB_TRK_OCCUPANCY.CYCLES_WITH_ANY_REQUEST",

        "PerPkg": "1",

        "PublicDescription": "Cycles with at least one request outstanding is waiting for data return from memory controller. Account for coherent and non-coherent requests initiated by IA Cores, Processor Graphics Unit, or LLC.",

        "UMask": "0x01",

        "Unit": "ARB"

    },

    {

        "BriefDescription": "Number of Core Data Read entries outstanding for the memory controller. The outstanding interval starts after LLC miss till return of first data chunk.",

        "EventCode": "0x80",

        "EventName": "UNC_ARB_TRK_OCCUPANCY.DATA_READ",

        "PerPkg": "1",

        "PublicDescription": "Number of Core Data Read entries outstanding for the memory controller. The outstanding interval starts after LLC miss till return of first data chunk.",

        "UMask": "0x02",

        "Unit": "ARB"

    },

    {

        "BriefDescription": "Number of Core coherent Data Read requests sent to memory controller whose data is returned directly to requesting agent.",

        "Counter": "0,1",

        "EventCode": "0x81",

        "EventName": "UNC_ARB_TRK_REQUESTS.DATA_READ",

        "PerPkg": "1",

        "PublicDescription": "Number of Core coherent Data Read requests sent to memory controller whose data is returned directly to requesting agent.",

        "UMask": "0x02",

        "Unit": "ARB"

    },

    {

        "BriefDescription": "Number of Core coherent Data Read requests sent to memory controller whose data is returned directly to requesting agent.",

        "Counter": "0,1",

        "EventCode": "0x81",

        "EventName": "UNC_ARB_TRK_REQUESTS.DRD_DIRECT",

        "PerPkg": "1",

        "PublicDescription": "Number of Core coherent Data Read requests sent to memory controller whose data is returned directly to requesting agent.",

        "UMask": "0x02",

        "Unit": "ARB"

    },

    {

        "BriefDescription": "Number of Writes allocated - any write transactions: full/partials writes and evictions.",

        "Counter": "0,1",

        "EventCode": "0x81",

        "EventName": "UNC_ARB_TRK_REQUESTS.WRITES",

        "PerPkg": "1",

        "PublicDescription": "Number of Writes allocated - any write transactions: full/partials writes and evictions.",

        "UMask": "0x20",

        "Unit": "ARB"

    },

    {

        "BriefDescription": "This 48-bit fixed counter counts the UCLK cycles",

        "Counter": "FIXED",

        "EventCode": "0xff",

        "EventName": "UNC_CLOCK.SOCKET",

        "PerPkg": "1",

        "PublicDescription": "This 48-bit fixed counter counts the UCLK cycles.",

        "Unit": "CLOCK"

    }

]

tools/perf/pmu-events/arch/x86/skylake/uncore.json

deleted100644 → 0
+0 −254
Original line number Diff line number Diff line 
[

  {

    "Unit": "CBO",

    "EventCode": "0x22",

    "UMask": "0x41",

    "EventName": "UNC_CBO_XSNP_RESPONSE.MISS_XCORE",

    "BriefDescription": "A cross-core snoop initiated by this Cbox due to processor core memory request which misses in some processor core.",

    "PublicDescription": "A cross-core snoop initiated by this Cbox due to processor core memory request which misses in some processor core.",

    "Counter": "0,1",

    "CounterMask": "0",

    "Invert": "0",

    "EdgeDetect": "0"

  },

  {

    "Unit": "CBO",

    "EventCode": "0x22",

    "UMask": "0x81",

    "EventName": "UNC_CBO_XSNP_RESPONSE.MISS_EVICTION",

    "BriefDescription": "A cross-core snoop resulted from L3 Eviction which misses in some processor core.",

    "PublicDescription": "A cross-core snoop resulted from L3 Eviction which misses in some processor core.",

    "Counter": "0,1",

    "CounterMask": "0",

    "Invert": "0",

    "EdgeDetect": "0"

  },

  {

    "Unit": "CBO",

    "EventCode": "0x22",

    "UMask": "0x44",

    "EventName": "UNC_CBO_XSNP_RESPONSE.HIT_XCORE",

    "BriefDescription": "A cross-core snoop initiated by this Cbox due to processor core memory request which hits a non-modified line in some processor core.",

    "PublicDescription": "A cross-core snoop initiated by this Cbox due to processor core memory request which hits a non-modified line in some processor core.",

    "Counter": "0,1",

    "CounterMask": "0",

    "Invert": "0",

    "EdgeDetect": "0"

  },

  {

    "Unit": "CBO",

    "EventCode": "0x22",

    "UMask": "0x48",

    "EventName": "UNC_CBO_XSNP_RESPONSE.HITM_XCORE",

    "BriefDescription": "A cross-core snoop initiated by this Cbox due to processor core memory request which hits a modified line in some processor core.",

    "PublicDescription": "A cross-core snoop initiated by this Cbox due to processor core memory request which hits a modified line in some processor core.",

    "Counter": "0,1",

    "CounterMask": "0",

    "Invert": "0",

    "EdgeDetect": "0"

  },

  {

    "Unit": "CBO",

    "EventCode": "0x34",

    "UMask": "0x21",

    "EventName": "UNC_CBO_CACHE_LOOKUP.WRITE_M",

    "BriefDescription": "L3 Lookup write request that access cache and found line in M-state",

    "PublicDescription": "L3 Lookup write request that access cache and found line in M-state.",

    "Counter": "0,1",

    "CounterMask": "0",

    "Invert": "0",

    "EdgeDetect": "0"

  },

  {

    "Unit": "CBO",

    "EventCode": "0x34",

    "UMask": "0x81",

    "EventName": "UNC_CBO_CACHE_LOOKUP.ANY_M",

    "BriefDescription": "L3 Lookup any request that access cache and found line in M-state",

    "PublicDescription": "L3 Lookup any request that access cache and found line in M-state.",

    "Counter": "0,1",

    "CounterMask": "0",

    "Invert": "0",

    "EdgeDetect": "0"

  },

  {

    "Unit": "CBO",

    "EventCode": "0x34",

    "UMask": "0x18",

    "EventName": "UNC_CBO_CACHE_LOOKUP.READ_I",

    "BriefDescription": "L3 Lookup read request that access cache and found line in I-state",

    "PublicDescription": "L3 Lookup read request that access cache and found line in I-state.",

    "Counter": "0,1",

    "CounterMask": "0",

    "Invert": "0",

    "EdgeDetect": "0"

  },

  {

    "Unit": "CBO",

    "EventCode": "0x34",

    "UMask": "0x88",

    "EventName": "UNC_CBO_CACHE_LOOKUP.ANY_I",

    "BriefDescription": "L3 Lookup any request that access cache and found line in I-state",

    "PublicDescription": "L3 Lookup any request that access cache and found line in I-state.",

    "Counter": "0,1",

    "CounterMask": "0",

    "Invert": "0",

    "EdgeDetect": "0"

  },

  {

    "Unit": "CBO",

    "EventCode": "0x34",

    "UMask": "0x1f",

    "EventName": "UNC_CBO_CACHE_LOOKUP.READ_MESI",

    "BriefDescription": "L3 Lookup read request that access cache and found line in any MESI-state",

    "PublicDescription": "L3 Lookup read request that access cache and found line in any MESI-state.",

    "Counter": "0,1",

    "CounterMask": "0",

    "Invert": "0",

    "EdgeDetect": "0"

  },

  {

    "Unit": "CBO",

    "EventCode": "0x34",

    "UMask": "0x2f",

    "EventName": "UNC_CBO_CACHE_LOOKUP.WRITE_MESI",

    "BriefDescription": "L3 Lookup write request that access cache and found line in MESI-state",

    "PublicDescription": "L3 Lookup write request that access cache and found line in MESI-state.",

    "Counter": "0,1",

    "CounterMask": "0",

    "Invert": "0",

    "EdgeDetect": "0"

  },

  {

    "Unit": "CBO",

    "EventCode": "0x34",

    "UMask": "0x8f",

    "EventName": "UNC_CBO_CACHE_LOOKUP.ANY_MESI",

    "BriefDescription": "L3 Lookup any request that access cache and found line in MESI-state",

    "PublicDescription": "L3 Lookup any request that access cache and found line in MESI-state.",

    "Counter": "0,1",

    "CounterMask": "0",

    "Invert": "0",

    "EdgeDetect": "0"

  },

  {

    "Unit": "CBO",

    "EventCode": "0x34",

    "UMask": "0x86",

    "EventName": "UNC_CBO_CACHE_LOOKUP.ANY_ES",

    "BriefDescription": "L3 Lookup any request that access cache and found line in E or S-state",

    "PublicDescription": "L3 Lookup any request that access cache and found line in E or S-state.",

    "Counter": "0,1",

    "CounterMask": "0",

    "Invert": "0",

    "EdgeDetect": "0"

  },

  {

    "Unit": "CBO",

    "EventCode": "0x34",

    "UMask": "0x16",

    "EventName": "UNC_CBO_CACHE_LOOKUP.READ_ES",

    "BriefDescription": "L3 Lookup read request that access cache and found line in E or S-state",

    "PublicDescription": "L3 Lookup read request that access cache and found line in E or S-state.",

    "Counter": "0,1",

    "CounterMask": "0",

    "Invert": "0",

    "EdgeDetect": "0"

  },

  {

    "Unit": "CBO",

    "EventCode": "0x34",

    "UMask": "0x26",

    "EventName": "UNC_CBO_CACHE_LOOKUP.WRITE_ES",

    "BriefDescription": "L3 Lookup write request that access cache and found line in E or S-state",

    "PublicDescription": "L3 Lookup write request that access cache and found line in E or S-state.",

    "Counter": "0,1",

    "CounterMask": "0",

    "Invert": "0",

    "EdgeDetect": "0"

  },

  {

    "Unit": "iMPH-U",

    "EventCode": "0x80",

    "UMask": "0x01",

    "EventName": "UNC_ARB_TRK_OCCUPANCY.ALL",

    "BriefDescription": "Each cycle count number of all Core outgoing valid entries. Such entry is defined as valid from its allocation till first of IDI0 or DRS0 messages is sent out. Accounts for Coherent and non-coherent traffic.",

    "PublicDescription": "Each cycle count number of all Core outgoing valid entries. Such entry is defined as valid from its allocation till first of IDI0 or DRS0 messages is sent out. Accounts for Coherent and non-coherent traffic.",

    "Counter": "0",

    "CounterMask": "0",

    "Invert": "0",

    "EdgeDetect": "0"

  },

  {

    "Unit": "iMPH-U",

    "EventCode": "0x81",

    "UMask": "0x01",

    "EventName": "UNC_ARB_TRK_REQUESTS.ALL",

    "BriefDescription": "Total number of Core outgoing entries allocated. Accounts for Coherent and non-coherent traffic.",

    "PublicDescription": "Total number of Core outgoing entries allocated. Accounts for Coherent and non-coherent traffic.",

    "Counter": "0,1",

    "CounterMask": "0",

    "Invert": "0",

    "EdgeDetect": "0"

  },

  {

    "Unit": "iMPH-U",

    "EventCode": "0x81",

    "UMask": "0x02",

    "EventName": "UNC_ARB_TRK_REQUESTS.DRD_DIRECT",

    "BriefDescription": "Number of Core coherent Data Read entries allocated in DirectData mode",

    "PublicDescription": "Number of Core coherent Data Read entries allocated in DirectData mode.",

    "Counter": "0,1",

    "CounterMask": "0",

    "Invert": "0",

    "EdgeDetect": "0"

  },

  {

    "Unit": "iMPH-U",

    "EventCode": "0x81",

    "UMask": "0x20",

    "EventName": "UNC_ARB_TRK_REQUESTS.WRITES",

    "BriefDescription": "Number of Writes allocated - any write transactions: full/partials writes and evictions.",

    "PublicDescription": "Number of Writes allocated - any write transactions: full/partials writes and evictions.",

    "Counter": "0,1",

    "CounterMask": "0",

    "Invert": "0",

    "EdgeDetect": "0"

  },

  {

    "Unit": "iMPH-U",

    "EventCode": "0x84",

    "UMask": "0x01",

    "EventName": "UNC_ARB_COH_TRK_REQUESTS.ALL",

    "BriefDescription": "Number of entries allocated. Account for Any type: e.g. Snoop, Core aperture, etc.",

    "PublicDescription": "Number of entries allocated. Account for Any type: e.g. Snoop, Core aperture, etc.",

    "Counter": "0,1",

    "CounterMask": "0",

    "Invert": "0",

    "EdgeDetect": "0"

  },

  {

    "Unit": "iMPH-U",

    "EventCode": "0x80",

    "UMask": "0x01",

    "EventName": "UNC_ARB_TRK_OCCUPANCY.CYCLES_WITH_ANY_REQUEST",

    "BriefDescription": "Cycles with at least one request outstanding is waiting for data return from memory controller. Account for coherent and non-coherent requests initiated by IA Cores, Processor Graphics Unit, or LLC.;",

    "PublicDescription": "Cycles with at least one request outstanding is waiting for data return from memory controller. Account for coherent and non-coherent requests initiated by IA Cores, Processor Graphics Unit, or LLC.",

    "Counter": "0",

    "CounterMask": "1",

    "Invert": "0",

    "EdgeDetect": "0"

  },

  {

    "Unit": "NCU",

    "EventCode": "0x0",

    "UMask": "0x01",

    "EventName": "UNC_CLOCK.SOCKET",

    "BriefDescription": "This 48-bit fixed counter counts the UCLK cycles",

    "PublicDescription": "This 48-bit fixed counter counts the UCLK cycles.",

    "Counter": "FIXED",

    "CounterMask": "0",

    "Invert": "0",

    "EdgeDetect": "0"

  }

]
 
 No newline at end of file

tools/perf/pmu-events/arch/x86/skylake/floating-point.json

+1 −1

File changed.

Contains only whitespace changes.

tools/perf/pmu-events/arch/x86/skylake/other.json

+1 −1

File changed.

Contains only whitespace changes.

tools/perf/pmu-events/arch/x86/skylake/frontend.json

+1 −1

File changed.

Contains only whitespace changes.

tools/perf/pmu-events/arch/x86/skylake/virtual-memory.json

+1 −1

File changed.

Contains only whitespace changes.