Commit 6910f7ba authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo

perf vendor events intel: Fix uncore topics for haswell

Move events from 'uncore-other' topic classification to cache and
interconnect.
Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Caleb Biggers <caleb.biggers@intel.com>
Cc: Edward Baker <edward.baker@intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Perry Taylor <perry.taylor@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Link: https://lore.kernel.org/r/20230413132949.3487664-10-irogers@google.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent b3eb533c
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"EventName": "UNC_CBO_CACHE_LOOKUP.ANY_ES", "EventName": "UNC_CBO_CACHE_LOOKUP.ANY_ES",
"PerPkg": "1", "PerPkg": "1",
"UMask": "0x86", "UMask": "0x86",
"Unit": "CBO" "Unit": "CBOX"
}, },
{ {
"BriefDescription": "L3 Lookup any request that access cache and found line in I-state.", "BriefDescription": "L3 Lookup any request that access cache and found line in I-state.",
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
"EventName": "UNC_CBO_CACHE_LOOKUP.ANY_I", "EventName": "UNC_CBO_CACHE_LOOKUP.ANY_I",
"PerPkg": "1", "PerPkg": "1",
"UMask": "0x88", "UMask": "0x88",
"Unit": "CBO" "Unit": "CBOX"
}, },
{ {
"BriefDescription": "L3 Lookup any request that access cache and found line in M-state.", "BriefDescription": "L3 Lookup any request that access cache and found line in M-state.",
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
"EventName": "UNC_CBO_CACHE_LOOKUP.ANY_M", "EventName": "UNC_CBO_CACHE_LOOKUP.ANY_M",
"PerPkg": "1", "PerPkg": "1",
"UMask": "0x81", "UMask": "0x81",
"Unit": "CBO" "Unit": "CBOX"
}, },
{ {
"BriefDescription": "L3 Lookup any request that access cache and found line in MESI-state.", "BriefDescription": "L3 Lookup any request that access cache and found line in MESI-state.",
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
"EventName": "UNC_CBO_CACHE_LOOKUP.ANY_MESI", "EventName": "UNC_CBO_CACHE_LOOKUP.ANY_MESI",
"PerPkg": "1", "PerPkg": "1",
"UMask": "0x8f", "UMask": "0x8f",
"Unit": "CBO" "Unit": "CBOX"
}, },
{ {
"BriefDescription": "L3 Lookup external snoop request that access cache and found line in E or S-state.", "BriefDescription": "L3 Lookup external snoop request that access cache and found line in E or S-state.",
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
"EventName": "UNC_CBO_CACHE_LOOKUP.EXTSNP_ES", "EventName": "UNC_CBO_CACHE_LOOKUP.EXTSNP_ES",
"PerPkg": "1", "PerPkg": "1",
"UMask": "0x46", "UMask": "0x46",
"Unit": "CBO" "Unit": "CBOX"
}, },
{ {
"BriefDescription": "L3 Lookup external snoop request that access cache and found line in I-state.", "BriefDescription": "L3 Lookup external snoop request that access cache and found line in I-state.",
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
"EventName": "UNC_CBO_CACHE_LOOKUP.EXTSNP_I", "EventName": "UNC_CBO_CACHE_LOOKUP.EXTSNP_I",
"PerPkg": "1", "PerPkg": "1",
"UMask": "0x48", "UMask": "0x48",
"Unit": "CBO" "Unit": "CBOX"
}, },
{ {
"BriefDescription": "L3 Lookup external snoop request that access cache and found line in M-state.", "BriefDescription": "L3 Lookup external snoop request that access cache and found line in M-state.",
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
"EventName": "UNC_CBO_CACHE_LOOKUP.EXTSNP_M", "EventName": "UNC_CBO_CACHE_LOOKUP.EXTSNP_M",
"PerPkg": "1", "PerPkg": "1",
"UMask": "0x41", "UMask": "0x41",
"Unit": "CBO" "Unit": "CBOX"
}, },
{ {
"BriefDescription": "L3 Lookup external snoop request that access cache and found line in MESI-state.", "BriefDescription": "L3 Lookup external snoop request that access cache and found line in MESI-state.",
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
"EventName": "UNC_CBO_CACHE_LOOKUP.EXTSNP_MESI", "EventName": "UNC_CBO_CACHE_LOOKUP.EXTSNP_MESI",
"PerPkg": "1", "PerPkg": "1",
"UMask": "0x4f", "UMask": "0x4f",
"Unit": "CBO" "Unit": "CBOX"
}, },
{ {
"BriefDescription": "L3 Lookup read request that access cache and found line in E or S-state.", "BriefDescription": "L3 Lookup read request that access cache and found line in E or S-state.",
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
"EventName": "UNC_CBO_CACHE_LOOKUP.READ_ES", "EventName": "UNC_CBO_CACHE_LOOKUP.READ_ES",
"PerPkg": "1", "PerPkg": "1",
"UMask": "0x16", "UMask": "0x16",
"Unit": "CBO" "Unit": "CBOX"
}, },
{ {
"BriefDescription": "L3 Lookup read request that access cache and found line in I-state.", "BriefDescription": "L3 Lookup read request that access cache and found line in I-state.",
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
"EventName": "UNC_CBO_CACHE_LOOKUP.READ_I", "EventName": "UNC_CBO_CACHE_LOOKUP.READ_I",
"PerPkg": "1", "PerPkg": "1",
"UMask": "0x18", "UMask": "0x18",
"Unit": "CBO" "Unit": "CBOX"
}, },
{ {
"BriefDescription": "L3 Lookup read request that access cache and found line in M-state.", "BriefDescription": "L3 Lookup read request that access cache and found line in M-state.",
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
"EventName": "UNC_CBO_CACHE_LOOKUP.READ_M", "EventName": "UNC_CBO_CACHE_LOOKUP.READ_M",
"PerPkg": "1", "PerPkg": "1",
"UMask": "0x11", "UMask": "0x11",
"Unit": "CBO" "Unit": "CBOX"
}, },
{ {
"BriefDescription": "L3 Lookup read request that access cache and found line in any MESI-state.", "BriefDescription": "L3 Lookup read request that access cache and found line in any MESI-state.",
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
"EventName": "UNC_CBO_CACHE_LOOKUP.READ_MESI", "EventName": "UNC_CBO_CACHE_LOOKUP.READ_MESI",
"PerPkg": "1", "PerPkg": "1",
"UMask": "0x1f", "UMask": "0x1f",
"Unit": "CBO" "Unit": "CBOX"
}, },
{ {
"BriefDescription": "L3 Lookup write request that access cache and found line in E or S-state.", "BriefDescription": "L3 Lookup write request that access cache and found line in E or S-state.",
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
"EventName": "UNC_CBO_CACHE_LOOKUP.WRITE_ES", "EventName": "UNC_CBO_CACHE_LOOKUP.WRITE_ES",
"PerPkg": "1", "PerPkg": "1",
"UMask": "0x26", "UMask": "0x26",
"Unit": "CBO" "Unit": "CBOX"
}, },
{ {
"BriefDescription": "L3 Lookup write request that access cache and found line in I-state.", "BriefDescription": "L3 Lookup write request that access cache and found line in I-state.",
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
"EventName": "UNC_CBO_CACHE_LOOKUP.WRITE_I", "EventName": "UNC_CBO_CACHE_LOOKUP.WRITE_I",
"PerPkg": "1", "PerPkg": "1",
"UMask": "0x28", "UMask": "0x28",
"Unit": "CBO" "Unit": "CBOX"
}, },
{ {
"BriefDescription": "L3 Lookup write request that access cache and found line in M-state.", "BriefDescription": "L3 Lookup write request that access cache and found line in M-state.",
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
"EventName": "UNC_CBO_CACHE_LOOKUP.WRITE_M", "EventName": "UNC_CBO_CACHE_LOOKUP.WRITE_M",
"PerPkg": "1", "PerPkg": "1",
"UMask": "0x21", "UMask": "0x21",
"Unit": "CBO" "Unit": "CBOX"
}, },
{ {
"BriefDescription": "L3 Lookup write request that access cache and found line in MESI-state.", "BriefDescription": "L3 Lookup write request that access cache and found line in MESI-state.",
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
"EventName": "UNC_CBO_CACHE_LOOKUP.WRITE_MESI", "EventName": "UNC_CBO_CACHE_LOOKUP.WRITE_MESI",
"PerPkg": "1", "PerPkg": "1",
"UMask": "0x2f", "UMask": "0x2f",
"Unit": "CBO" "Unit": "CBOX"
}, },
{ {
"BriefDescription": "A cross-core snoop resulted from L3 Eviction which hits a modified line in some processor core.", "BriefDescription": "A cross-core snoop resulted from L3 Eviction which hits a modified line in some processor core.",
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
"EventName": "UNC_CBO_XSNP_RESPONSE.HITM_EVICTION", "EventName": "UNC_CBO_XSNP_RESPONSE.HITM_EVICTION",
"PerPkg": "1", "PerPkg": "1",
"UMask": "0x88", "UMask": "0x88",
"Unit": "CBO" "Unit": "CBOX"
}, },
{ {
"BriefDescription": "An external snoop hits a modified line in some processor core.", "BriefDescription": "An external snoop hits a modified line in some processor core.",
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
"EventName": "UNC_CBO_XSNP_RESPONSE.HITM_EXTERNAL", "EventName": "UNC_CBO_XSNP_RESPONSE.HITM_EXTERNAL",
"PerPkg": "1", "PerPkg": "1",
"UMask": "0x28", "UMask": "0x28",
"Unit": "CBO" "Unit": "CBOX"
}, },
{ {
"BriefDescription": "A cross-core snoop initiated by this Cbox due to processor core memory request which hits a modified line in some processor core.", "BriefDescription": "A cross-core snoop initiated by this Cbox due to processor core memory request which hits a modified line in some processor core.",
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
"EventName": "UNC_CBO_XSNP_RESPONSE.HITM_XCORE", "EventName": "UNC_CBO_XSNP_RESPONSE.HITM_XCORE",
"PerPkg": "1", "PerPkg": "1",
"UMask": "0x48", "UMask": "0x48",
"Unit": "CBO" "Unit": "CBOX"
}, },
{ {
"BriefDescription": "A cross-core snoop resulted from L3 Eviction which hits a non-modified line in some processor core.", "BriefDescription": "A cross-core snoop resulted from L3 Eviction which hits a non-modified line in some processor core.",
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
"EventName": "UNC_CBO_XSNP_RESPONSE.HIT_EVICTION", "EventName": "UNC_CBO_XSNP_RESPONSE.HIT_EVICTION",
"PerPkg": "1", "PerPkg": "1",
"UMask": "0x84", "UMask": "0x84",
"Unit": "CBO" "Unit": "CBOX"
}, },
{ {
"BriefDescription": "An external snoop hits a non-modified line in some processor core.", "BriefDescription": "An external snoop hits a non-modified line in some processor core.",
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
"EventName": "UNC_CBO_XSNP_RESPONSE.HIT_EXTERNAL", "EventName": "UNC_CBO_XSNP_RESPONSE.HIT_EXTERNAL",
"PerPkg": "1", "PerPkg": "1",
"UMask": "0x24", "UMask": "0x24",
"Unit": "CBO" "Unit": "CBOX"
}, },
{ {
"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.", "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.",
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
"EventName": "UNC_CBO_XSNP_RESPONSE.HIT_XCORE", "EventName": "UNC_CBO_XSNP_RESPONSE.HIT_XCORE",
"PerPkg": "1", "PerPkg": "1",
"UMask": "0x44", "UMask": "0x44",
"Unit": "CBO" "Unit": "CBOX"
}, },
{ {
"BriefDescription": "A cross-core snoop resulted from L3 Eviction which misses in some processor core.", "BriefDescription": "A cross-core snoop resulted from L3 Eviction which misses in some processor core.",
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
"EventName": "UNC_CBO_XSNP_RESPONSE.MISS_EVICTION", "EventName": "UNC_CBO_XSNP_RESPONSE.MISS_EVICTION",
"PerPkg": "1", "PerPkg": "1",
"UMask": "0x81", "UMask": "0x81",
"Unit": "CBO" "Unit": "CBOX"
}, },
{ {
"BriefDescription": "An external snoop misses in some processor core.", "BriefDescription": "An external snoop misses in some processor core.",
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
"EventName": "UNC_CBO_XSNP_RESPONSE.MISS_EXTERNAL", "EventName": "UNC_CBO_XSNP_RESPONSE.MISS_EXTERNAL",
"PerPkg": "1", "PerPkg": "1",
"UMask": "0x21", "UMask": "0x21",
"Unit": "CBO" "Unit": "CBOX"
}, },
{ {
"BriefDescription": "A cross-core snoop initiated by this Cbox due to processor core memory request which misses in some processor core.", "BriefDescription": "A cross-core snoop initiated by this Cbox due to processor core memory request which misses in some processor core.",
...@@ -197,6 +197,6 @@ ...@@ -197,6 +197,6 @@
"EventName": "UNC_CBO_XSNP_RESPONSE.MISS_XCORE", "EventName": "UNC_CBO_XSNP_RESPONSE.MISS_XCORE",
"PerPkg": "1", "PerPkg": "1",
"UMask": "0x41", "UMask": "0x41",
"Unit": "CBO" "Unit": "CBOX"
} }
] ]
[
{
"BriefDescription": "Each cycle count number of valid entries in Coherency Tracker queue from allocation till deallocation. Aperture requests (snoops) appear as NC decoded internally and become coherent (snoop L3, access memory)",
"EventCode": "0x83",
"EventName": "UNC_ARB_COH_TRK_OCCUPANCY.All",
"PerPkg": "1",
"PublicDescription": "Each cycle count number of valid entries in Coherency Tracker queue from allocation till deallocation. Aperture requests (snoops) appear as NC decoded internally and become coherent (snoop L3, access memory).",
"UMask": "0x1",
"Unit": "ARB"
},
{
"BriefDescription": "Number of entries allocated. Account for Any type: e.g. Snoop, Core aperture, etc.",
"EventCode": "0x84",
"EventName": "UNC_ARB_COH_TRK_REQUESTS.ALL",
"PerPkg": "1",
"UMask": "0x1",
"Unit": "ARB"
},
{
"BriefDescription": "Each cycle counts 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.",
"EventCode": "0x80",
"EventName": "UNC_ARB_TRK_OCCUPANCY.ALL",
"PerPkg": "1",
"UMask": "0x1",
"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",
"UMask": "0x1",
"Unit": "ARB"
},
{
"BriefDescription": "Total number of Core outgoing entries allocated. Accounts for Coherent and non-coherent traffic.",
"EventCode": "0x81",
"EventName": "UNC_ARB_TRK_REQUESTS.ALL",
"PerPkg": "1",
"UMask": "0x1",
"Unit": "ARB"
},
{
"BriefDescription": "Number of Writes allocated - any write transactions: full/partials writes and evictions.",
"EventCode": "0x81",
"EventName": "UNC_ARB_TRK_REQUESTS.WRITES",
"PerPkg": "1",
"UMask": "0x20",
"Unit": "ARB"
}
]
[ [
{
"BriefDescription": "Each cycle count number of valid entries in Coherency Tracker queue from allocation till deallocation. Aperture requests (snoops) appear as NC decoded internally and become coherent (snoop L3, access memory)",
"EventCode": "0x83",
"EventName": "UNC_ARB_COH_TRK_OCCUPANCY.All",
"PerPkg": "1",
"PublicDescription": "Each cycle count number of valid entries in Coherency Tracker queue from allocation till deallocation. Aperture requests (snoops) appear as NC decoded internally and become coherent (snoop L3, access memory).",
"UMask": "0x1",
"Unit": "ARB"
},
{
"BriefDescription": "Number of entries allocated. Account for Any type: e.g. Snoop, Core aperture, etc.",
"EventCode": "0x84",
"EventName": "UNC_ARB_COH_TRK_REQUESTS.ALL",
"PerPkg": "1",
"UMask": "0x1",
"Unit": "ARB"
},
{
"BriefDescription": "Each cycle counts 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.",
"EventCode": "0x80",
"EventName": "UNC_ARB_TRK_OCCUPANCY.ALL",
"PerPkg": "1",
"UMask": "0x1",
"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",
"UMask": "0x1",
"Unit": "ARB"
},
{
"BriefDescription": "Total number of Core outgoing entries allocated. Accounts for Coherent and non-coherent traffic.",
"EventCode": "0x81",
"EventName": "UNC_ARB_TRK_REQUESTS.ALL",
"PerPkg": "1",
"UMask": "0x1",
"Unit": "ARB"
},
{
"BriefDescription": "Number of Writes allocated - any write transactions: full/partials writes and evictions.",
"EventCode": "0x81",
"EventName": "UNC_ARB_TRK_REQUESTS.WRITES",
"PerPkg": "1",
"UMask": "0x20",
"Unit": "ARB"
},
{ {
"BriefDescription": "This 48-bit fixed counter counts the UCLK cycles.", "BriefDescription": "This 48-bit fixed counter counts the UCLK cycles.",
"EventCode": "0xff", "EventCode": "0xff",
......
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