* [PATCH v3 0/5] powerpc/perf: Add json file support for hv_24x7 core level events
@ 2020-07-16 9:42 Kajol Jain
2020-07-16 9:42 ` [PATCH v3 1/5] perf/pmu-events/jevents: Add enum to store aggregation like PerPkg Kajol Jain
` (5 more replies)
0 siblings, 6 replies; 11+ messages in thread
From: Kajol Jain @ 2020-07-16 9:42 UTC (permalink / raw)
To: acme
Cc: peterz, mingo, mark.rutland, alexander.shishkin, pc, jolsa,
namhyung, ak, yao.jin, linux-kernel, linux-perf-users, irogers,
maddy, ravi.bangoria, anju, kan.liang, nasastry, kjain
Patchset enhance current runtime parameter support. It introduces new
fields like "PerChip" and "PerCore" similar to the field "PerPkg" which is
used to specify perpkg events.
The "PerCore" and "PerChip" specifies whether its core or chip events.
Based on which we can decide which runtime parameter user want to
access. Now character '?' can refers different parameter based on user
requirement.
Initially, every time we want to add new terms like chip, core, thread
etc, we need to create corrsponding fields in pmu_events and event
struct.
This patchset adds an enum called 'aggr_mode_class' which store all these
aggregation like perpkg/percore. It also adds new field 'AggregationMode'
to capture these terms.
Now, if user wants to add any new term, they just need to add it in
the enum defined. I try to test it with my current setup.
I also need to replace PerPkg field to AggregationMode in all the
x86 uncore json files. It will great if Andi and team can test it
and let me know if they have any concerns.
Changelog:
v2 -> v3:
- Did some nits changes suggested by Jiri include correction of
indentation, and making PerCore/PerChip values forward after
PerPkg as 1 in the enum.
- Rebase the patchset on Arnaldo's tmp.perf/core branch.
- Change RFC tag
v1 -> v2:
- Rather then adding new field as PerCore/PerChip, created a new enum
to get these fields. And new field as "AggregationMode" which can
be used to capture these fields from json file.
- Suggested By Ian Rogers
Kajol Jain (5):
perf/pmu-events/jevents: Add enum to store aggregation like PerPkg
pmu-events/x86/uncore: Replace PerPkg field to AggregationMode in x86
json files
perf jevents: Add support for parsing perchip/percore events
perf/tools: Pass pmu_event structure as a parameter for
arch_get_runtimeparam
perf/tools/pmu_events/powerpc: Add hv_24x7 core level metric events
tools/perf/arch/powerpc/util/header.c | 7 +-
.../arch/powerpc/power9/nest_metrics.json | 27 +-
.../arch/x86/broadwellde/uncore-cache.json | 62 ++--
.../arch/x86/broadwellde/uncore-memory.json | 18 +-
.../arch/x86/broadwellde/uncore-power.json | 18 +-
.../arch/x86/broadwellx/uncore-cache.json | 62 ++--
.../x86/broadwellx/uncore-interconnect.json | 6 +-
.../arch/x86/broadwellx/uncore-memory.json | 18 +-
.../arch/x86/broadwellx/uncore-power.json | 18 +-
.../arch/x86/cascadelakex/uncore-memory.json | 64 ++--
.../arch/x86/cascadelakex/uncore-other.json | 332 +++++++++---------
.../arch/x86/haswellx/uncore-cache.json | 62 ++--
.../x86/haswellx/uncore-interconnect.json | 6 +-
.../arch/x86/haswellx/uncore-memory.json | 18 +-
.../arch/x86/haswellx/uncore-power.json | 18 +-
.../arch/x86/ivytown/uncore-cache.json | 62 ++--
.../arch/x86/ivytown/uncore-interconnect.json | 10 +-
.../arch/x86/ivytown/uncore-memory.json | 16 +-
.../arch/x86/ivytown/uncore-power.json | 52 +--
.../arch/x86/jaketown/uncore-cache.json | 40 +--
.../x86/jaketown/uncore-interconnect.json | 10 +-
.../arch/x86/jaketown/uncore-memory.json | 18 +-
.../arch/x86/jaketown/uncore-power.json | 52 +--
.../x86/knightslanding/uncore-memory.json | 8 +-
.../arch/x86/skylakex/uncore-memory.json | 36 +-
.../arch/x86/skylakex/uncore-other.json | 220 ++++++------
.../arch/x86/tremontx/uncore-memory.json | 14 +-
.../arch/x86/tremontx/uncore-other.json | 70 ++--
.../arch/x86/tremontx/uncore-power.json | 2 +-
tools/perf/pmu-events/jevents.c | 45 ++-
tools/perf/pmu-events/jevents.h | 2 +-
tools/perf/pmu-events/pmu-events.h | 8 +-
tools/perf/tests/pmu-events.c | 8 +-
tools/perf/util/metricgroup.c | 5 +-
tools/perf/util/metricgroup.h | 3 +-
tools/perf/util/pmu.c | 6 +-
36 files changed, 729 insertions(+), 694 deletions(-)
--
2.26.2
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v3 1/5] perf/pmu-events/jevents: Add enum to store aggregation like PerPkg
2020-07-16 9:42 [PATCH v3 0/5] powerpc/perf: Add json file support for hv_24x7 core level events Kajol Jain
@ 2020-07-16 9:42 ` Kajol Jain
2020-07-17 8:53 ` Jiri Olsa
2020-07-16 9:42 ` [PATCH v3 2/5] pmu-events/x86/uncore: Replace PerPkg field to AggregationMode in x86 json files Kajol Jain
` (4 subsequent siblings)
5 siblings, 1 reply; 11+ messages in thread
From: Kajol Jain @ 2020-07-16 9:42 UTC (permalink / raw)
To: acme
Cc: peterz, mingo, mark.rutland, alexander.shishkin, pc, jolsa,
namhyung, ak, yao.jin, linux-kernel, linux-perf-users, irogers,
maddy, ravi.bangoria, anju, kan.liang, nasastry, kjain
Initially, every time we want to add new terms like chip, core thread etc,
we need to create corrsponding fields in pmu_events and event struct.
This patch adds an enum called 'aggr_mode_class' which store all these
aggregation like perpkg/percore. It also adds new field 'aggr_mode'
to capture these terms.
Now, if user wants to add any new term, they just need to add it in
the enum defined.
Signed-off-by: Kajol Jain <kjain@linux.ibm.com>
---
tools/perf/pmu-events/jevents.c | 39 +++++++++++++++++++-----------
tools/perf/pmu-events/jevents.h | 2 +-
tools/perf/pmu-events/pmu-events.h | 6 ++++-
tools/perf/tests/pmu-events.c | 8 +++---
tools/perf/util/pmu.c | 6 ++---
5 files changed, 38 insertions(+), 23 deletions(-)
diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
index fa86c5f997cc..b2f59f0af63d 100644
--- a/tools/perf/pmu-events/jevents.c
+++ b/tools/perf/pmu-events/jevents.c
@@ -53,6 +53,17 @@
int verbose;
char *prog;
+enum aggr_mode_class {
+ PerPkg = 1
+};
+
+enum aggr_mode_class convert(const char *aggr_mode)
+{
+ if (!strcmp(aggr_mode, "PerPkg"))
+ return PerPkg;
+ return -1;
+}
+
int eprintf(int level, int var, const char *fmt, ...)
{
@@ -320,7 +331,7 @@ static void print_events_table_prefix(FILE *fp, const char *tblname)
static int print_events_table_entry(void *data, char *name, char *event,
char *desc, char *long_desc,
- char *pmu, char *unit, char *perpkg,
+ char *pmu, char *unit, char *aggr_mode,
char *metric_expr,
char *metric_name, char *metric_group,
char *deprecated, char *metric_constraint)
@@ -345,10 +356,10 @@ static int print_events_table_entry(void *data, char *name, char *event,
fprintf(outfp, "\t.long_desc = \"%s\",\n", long_desc);
if (pmu)
fprintf(outfp, "\t.pmu = \"%s\",\n", pmu);
+ if (aggr_mode)
+ fprintf(outfp, "\t.aggr_mode = \"%d\",\n", convert(aggr_mode));
if (unit)
fprintf(outfp, "\t.unit = \"%s\",\n", unit);
- if (perpkg)
- fprintf(outfp, "\t.perpkg = \"%s\",\n", perpkg);
if (metric_expr)
fprintf(outfp, "\t.metric_expr = \"%s\",\n", metric_expr);
if (metric_name)
@@ -372,7 +383,7 @@ struct event_struct {
char *long_desc;
char *pmu;
char *unit;
- char *perpkg;
+ char *aggr_mode;
char *metric_expr;
char *metric_name;
char *metric_group;
@@ -401,7 +412,7 @@ struct event_struct {
op(long_desc); \
op(pmu); \
op(unit); \
- op(perpkg); \
+ op(aggr_mode); \
op(metric_expr); \
op(metric_name); \
op(metric_group); \
@@ -423,7 +434,7 @@ static void free_arch_std_events(void)
static int save_arch_std_events(void *data, char *name, char *event,
char *desc, char *long_desc, char *pmu,
- char *unit, char *perpkg, char *metric_expr,
+ char *unit, char *aggr_mode, char *metric_expr,
char *metric_name, char *metric_group,
char *deprecated, char *metric_constraint)
{
@@ -487,7 +498,7 @@ static char *real_event(const char *name, char *event)
static int
try_fixup(const char *fn, char *arch_std, char **event, char **desc,
char **name, char **long_desc, char **pmu, char **filter,
- char **perpkg, char **unit, char **metric_expr, char **metric_name,
+ char **aggr_mode, char **unit, char **metric_expr, char **metric_name,
char **metric_group, unsigned long long eventcode,
char **deprecated, char **metric_constraint)
{
@@ -515,7 +526,7 @@ try_fixup(const char *fn, char *arch_std, char **event, char **desc,
int json_events(const char *fn,
int (*func)(void *data, char *name, char *event, char *desc,
char *long_desc,
- char *pmu, char *unit, char *perpkg,
+ char *pmu, char *unit, char *aggr_mode,
char *metric_expr,
char *metric_name, char *metric_group,
char *deprecated, char *metric_constraint),
@@ -542,7 +553,7 @@ int json_events(const char *fn,
char *extra_desc = NULL;
char *pmu = NULL;
char *filter = NULL;
- char *perpkg = NULL;
+ char *aggr_mode = NULL;
char *unit = NULL;
char *metric_expr = NULL;
char *metric_name = NULL;
@@ -625,8 +636,8 @@ int json_events(const char *fn,
addfield(map, &filter, "", "", val);
} else if (json_streq(map, field, "ScaleUnit")) {
addfield(map, &unit, "", "", val);
- } else if (json_streq(map, field, "PerPkg")) {
- addfield(map, &perpkg, "", "", val);
+ } else if (json_streq(map, field, "AggregationMode")) {
+ addfield(map, &aggr_mode, "", "", val);
} else if (json_streq(map, field, "Deprecated")) {
addfield(map, &deprecated, "", "", val);
} else if (json_streq(map, field, "MetricName")) {
@@ -673,7 +684,7 @@ int json_events(const char *fn,
* fixup any unassigned values.
*/
err = try_fixup(fn, arch_std, &event, &desc, &name,
- &long_desc, &pmu, &filter, &perpkg,
+ &long_desc, &pmu, &filter, &aggr_mode,
&unit, &metric_expr, &metric_name,
&metric_group, eventcode,
&deprecated, &metric_constraint);
@@ -681,7 +692,7 @@ int json_events(const char *fn,
goto free_strings;
}
err = func(data, name, real_event(name, event), desc, long_desc,
- pmu, unit, perpkg, metric_expr, metric_name,
+ pmu, unit, aggr_mode, metric_expr, metric_name,
metric_group, deprecated, metric_constraint);
free_strings:
free(event);
@@ -691,7 +702,7 @@ int json_events(const char *fn,
free(extra_desc);
free(pmu);
free(filter);
- free(perpkg);
+ free(aggr_mode);
free(deprecated);
free(unit);
free(metric_expr);
diff --git a/tools/perf/pmu-events/jevents.h b/tools/perf/pmu-events/jevents.h
index 2afc8304529e..63e72c0c312f 100644
--- a/tools/perf/pmu-events/jevents.h
+++ b/tools/perf/pmu-events/jevents.h
@@ -6,7 +6,7 @@ int json_events(const char *fn,
int (*func)(void *data, char *name, char *event, char *desc,
char *long_desc,
char *pmu,
- char *unit, char *perpkg, char *metric_expr,
+ char *unit, char *aggr_mode, char *metric_expr,
char *metric_name, char *metric_group,
char *deprecated, char *metric_constraint),
void *data);
diff --git a/tools/perf/pmu-events/pmu-events.h b/tools/perf/pmu-events/pmu-events.h
index c8f306b572f4..71b7aa6278d0 100644
--- a/tools/perf/pmu-events/pmu-events.h
+++ b/tools/perf/pmu-events/pmu-events.h
@@ -2,6 +2,10 @@
#ifndef PMU_EVENTS_H
#define PMU_EVENTS_H
+enum aggr_mode_class {
+ PerPkg = 1
+};
+
/*
* Describe each PMU event. Each CPU has a table of PMU events.
*/
@@ -13,7 +17,7 @@ struct pmu_event {
const char *long_desc;
const char *pmu;
const char *unit;
- const char *perpkg;
+ const char *aggr_mode;
const char *metric_expr;
const char *metric_name;
const char *metric_group;
diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c
index b66b021476ec..377211d4c849 100644
--- a/tools/perf/tests/pmu-events.c
+++ b/tools/perf/tests/pmu-events.c
@@ -206,10 +206,10 @@ static int test_pmu_event_table(void)
return -1;
}
- if (!is_same(table->perpkg, te->perpkg)) {
- pr_debug2("testing event table %s: mismatched perpkg, %s vs %s\n",
- table->name, table->perpkg,
- te->perpkg);
+ if (!is_same(table->aggr_mode, te->aggr_mode)) {
+ pr_debug2("testing event table %s: mismatched aggr_mode, %s vs %s\n",
+ table->name, table->aggr_mode,
+ te->aggr_mode);
return -1;
}
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index f1688e1f6ed7..a0e3ea75a3c6 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -308,7 +308,7 @@ static bool perf_pmu_merge_alias(struct perf_pmu_alias *newalias,
static int __perf_pmu__new_alias(struct list_head *list, char *dir, char *name,
char *desc, char *val,
char *long_desc, char *topic,
- char *unit, char *perpkg,
+ char *unit, char *aggr_mode,
char *metric_expr,
char *metric_name,
char *deprecated)
@@ -380,7 +380,7 @@ static int __perf_pmu__new_alias(struct list_head *list, char *dir, char *name,
return -1;
snprintf(alias->unit, sizeof(alias->unit), "%s", unit);
}
- alias->per_pkg = perpkg && sscanf(perpkg, "%d", &num) == 1 && num == 1;
+ alias->per_pkg = aggr_mode && sscanf(aggr_mode, "%d", &num) == 1 && num == PerPkg;
alias->str = strdup(newval);
if (deprecated)
@@ -778,7 +778,7 @@ void pmu_add_cpu_aliases_map(struct list_head *head, struct perf_pmu *pmu,
__perf_pmu__new_alias(head, NULL, (char *)pe->name,
(char *)pe->desc, (char *)pe->event,
(char *)pe->long_desc, (char *)pe->topic,
- (char *)pe->unit, (char *)pe->perpkg,
+ (char *)pe->unit, (char *)pe->aggr_mode,
(char *)pe->metric_expr,
(char *)pe->metric_name,
(char *)pe->deprecated);
--
2.26.2
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v3 2/5] pmu-events/x86/uncore: Replace PerPkg field to AggregationMode in x86 json files
2020-07-16 9:42 [PATCH v3 0/5] powerpc/perf: Add json file support for hv_24x7 core level events Kajol Jain
2020-07-16 9:42 ` [PATCH v3 1/5] perf/pmu-events/jevents: Add enum to store aggregation like PerPkg Kajol Jain
@ 2020-07-16 9:42 ` Kajol Jain
2020-07-16 9:42 ` [PATCH v3 3/5] perf jevents: Add support for parsing perchip/percore events Kajol Jain
` (3 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: Kajol Jain @ 2020-07-16 9:42 UTC (permalink / raw)
To: acme
Cc: peterz, mingo, mark.rutland, alexander.shishkin, pc, jolsa,
namhyung, ak, yao.jin, linux-kernel, linux-perf-users, irogers,
maddy, ravi.bangoria, anju, kan.liang, nasastry, kjain
This patch replace PerPkg field to AggregationMode for all the x86 uncore
json files.
Signed-off-by: Kajol Jain <kjain@linux.ibm.com>
---
.../arch/x86/broadwellde/uncore-cache.json | 62 ++--
.../arch/x86/broadwellde/uncore-memory.json | 18 +-
.../arch/x86/broadwellde/uncore-power.json | 18 +-
.../arch/x86/broadwellx/uncore-cache.json | 62 ++--
.../x86/broadwellx/uncore-interconnect.json | 6 +-
.../arch/x86/broadwellx/uncore-memory.json | 18 +-
.../arch/x86/broadwellx/uncore-power.json | 18 +-
.../arch/x86/cascadelakex/uncore-memory.json | 64 ++--
.../arch/x86/cascadelakex/uncore-other.json | 332 +++++++++---------
.../arch/x86/haswellx/uncore-cache.json | 62 ++--
.../x86/haswellx/uncore-interconnect.json | 6 +-
.../arch/x86/haswellx/uncore-memory.json | 18 +-
.../arch/x86/haswellx/uncore-power.json | 18 +-
.../arch/x86/ivytown/uncore-cache.json | 62 ++--
.../arch/x86/ivytown/uncore-interconnect.json | 10 +-
.../arch/x86/ivytown/uncore-memory.json | 16 +-
.../arch/x86/ivytown/uncore-power.json | 52 +--
.../arch/x86/jaketown/uncore-cache.json | 40 +--
.../x86/jaketown/uncore-interconnect.json | 10 +-
.../arch/x86/jaketown/uncore-memory.json | 18 +-
.../arch/x86/jaketown/uncore-power.json | 52 +--
.../x86/knightslanding/uncore-memory.json | 8 +-
.../arch/x86/skylakex/uncore-memory.json | 36 +-
.../arch/x86/skylakex/uncore-other.json | 220 ++++++------
.../arch/x86/tremontx/uncore-memory.json | 14 +-
.../arch/x86/tremontx/uncore-other.json | 70 ++--
.../arch/x86/tremontx/uncore-power.json | 2 +-
27 files changed, 656 insertions(+), 656 deletions(-)
diff --git a/tools/perf/pmu-events/arch/x86/broadwellde/uncore-cache.json b/tools/perf/pmu-events/arch/x86/broadwellde/uncore-cache.json
index 58ed6d33d1f4..60b8e34de513 100644
--- a/tools/perf/pmu-events/arch/x86/broadwellde/uncore-cache.json
+++ b/tools/perf/pmu-events/arch/x86/broadwellde/uncore-cache.json
@@ -3,7 +3,7 @@
"BriefDescription": "Uncore cache clock ticks",
"Counter": "0,1,2,3",
"EventName": "UNC_C_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "CBO"
},
{
@@ -12,7 +12,7 @@
"EventCode": "0x34",
"EventName": "UNC_C_LLC_LOOKUP.ANY",
"Filter": "filter_state=0x1",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x11",
"Unit": "CBO"
@@ -22,7 +22,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x37",
"EventName": "UNC_C_LLC_VICTIMS.M_STATE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -33,7 +33,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.DATA_READ",
"Filter": "filter_opc=0x182",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -44,7 +44,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.UNCACHEABLE",
"Filter": "filter_opc=0x187",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -55,7 +55,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.MMIO_READ",
"Filter": "filter_opc=0x187,filter_nc=1",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -66,7 +66,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.MMIO_WRITE",
"Filter": "filter_opc=0x18f,filter_nc=1",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -77,7 +77,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.RFO_LLC_PREFETCH",
"Filter": "filter_opc=0x190",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -88,7 +88,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.CODE_LLC_PREFETCH",
"Filter": "filter_opc=0x191",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -99,7 +99,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.DATA_LLC_PREFETCH",
"Filter": "filter_opc=0x192",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -110,7 +110,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.PCIE_READ",
"Filter": "filter_opc=0x19e",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -121,7 +121,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.PCIE_WRITE",
"Filter": "filter_opc=0x1c8",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -132,7 +132,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.PCIE_NON_SNOOP_WRITE",
"Filter": "filter_opc=0x1c8,filter_tid=0x3e",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -143,7 +143,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.PCIE_NS_PARTIAL_WRITE",
"Filter": "filter_opc=0x180,filter_tid=0x3e",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x1",
"Unit": "CBO"
},
@@ -153,7 +153,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.CODE_LLC_PREFETCH",
"Filter": "filter_opc=0x181",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -164,7 +164,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.STREAMING_FULL",
"Filter": "filter_opc=0x18c",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -175,7 +175,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.STREAMING_PARTIAL",
"Filter": "filter_opc=0x18d",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -186,7 +186,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.PCIE_READ",
"Filter": "filter_opc=0x19e",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -197,7 +197,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.PCIE_WRITE",
"Filter": "filter_opc=0x1c8,filter_tid=0x3e",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -207,7 +207,7 @@
"EventCode": "0x36",
"EventName": "UNC_C_TOR_OCCUPANCY.LLC_DATA_READ",
"Filter": "filter_opc=0x182",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x3",
"Unit": "CBO"
},
@@ -216,7 +216,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_H_REQUESTS.READS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x3",
"Unit": "HA"
},
@@ -225,7 +225,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_H_REQUESTS.READS_LOCAL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x1",
"Unit": "HA"
},
@@ -234,7 +234,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_H_REQUESTS.READS_REMOTE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x2",
"Unit": "HA"
},
@@ -243,7 +243,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_H_REQUESTS.WRITES",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0xC",
"Unit": "HA"
},
@@ -252,7 +252,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_H_REQUESTS.WRITES_LOCAL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x4",
"Unit": "HA"
},
@@ -261,7 +261,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_H_REQUESTS.WRITES_REMOTE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x8",
"Unit": "HA"
},
@@ -270,7 +270,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x21",
"EventName": "UNC_H_SNOOP_RESP.RSPCNFLCT",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x40",
"Unit": "HA"
},
@@ -279,7 +279,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x21",
"EventName": "UNC_H_SNOOP_RESP.RSP_FWD_WB",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x20",
"Unit": "HA"
@@ -289,7 +289,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x21",
"EventName": "UNC_H_SNOOP_RESP.RSPIFWD",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x4",
"Unit": "HA"
@@ -299,7 +299,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x21",
"EventName": "UNC_H_SNOOP_RESP.RSPS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x2",
"Unit": "HA"
@@ -309,7 +309,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x21",
"EventName": "UNC_H_SNOOP_RESP.RSPSFWD",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x8",
"Unit": "HA"
diff --git a/tools/perf/pmu-events/arch/x86/broadwellde/uncore-memory.json b/tools/perf/pmu-events/arch/x86/broadwellde/uncore-memory.json
index f4b0745cdbbf..2bfbafa00a15 100644
--- a/tools/perf/pmu-events/arch/x86/broadwellde/uncore-memory.json
+++ b/tools/perf/pmu-events/arch/x86/broadwellde/uncore-memory.json
@@ -4,7 +4,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x4",
"EventName": "LLC_MISSES.MEM_READ",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "iMC"
@@ -14,7 +14,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x4",
"EventName": "LLC_MISSES.MEM_WRITE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0xC",
"Unit": "iMC"
@@ -23,7 +23,7 @@
"BriefDescription": "Memory controller clock ticks",
"Counter": "0,1,2,3",
"EventName": "UNC_M_DCLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "iMC"
},
{
@@ -33,7 +33,7 @@
"EventName": "UNC_M_POWER_CHANNEL_PPD",
"MetricExpr": "(UNC_M_POWER_CHANNEL_PPD / UNC_M_DCLOCKTICKS) * 100.",
"MetricName": "power_channel_ppd %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "iMC"
},
{
@@ -43,7 +43,7 @@
"EventName": "UNC_M_POWER_CRITICAL_THROTTLE_CYCLES",
"MetricExpr": "(UNC_M_POWER_CRITICAL_THROTTLE_CYCLES / UNC_M_DCLOCKTICKS) * 100.",
"MetricName": "power_critical_throttle_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "iMC"
},
{
@@ -53,7 +53,7 @@
"EventName": "UNC_M_POWER_SELF_REFRESH",
"MetricExpr": "(UNC_M_POWER_SELF_REFRESH / UNC_M_DCLOCKTICKS) * 100.",
"MetricName": "power_self_refresh %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "iMC"
},
{
@@ -61,7 +61,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2",
"EventName": "UNC_M_PRE_COUNT.PAGE_MISS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x1",
"Unit": "iMC"
},
@@ -70,7 +70,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2",
"EventName": "UNC_M_PRE_COUNT.RD",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x4",
"Unit": "iMC"
},
@@ -79,7 +79,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2",
"EventName": "UNC_M_PRE_COUNT.WR",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x8",
"Unit": "iMC"
}
diff --git a/tools/perf/pmu-events/arch/x86/broadwellde/uncore-power.json b/tools/perf/pmu-events/arch/x86/broadwellde/uncore-power.json
index dd1b95655d1d..598678aaf67e 100644
--- a/tools/perf/pmu-events/arch/x86/broadwellde/uncore-power.json
+++ b/tools/perf/pmu-events/arch/x86/broadwellde/uncore-power.json
@@ -3,7 +3,7 @@
"BriefDescription": "PCU clock ticks. Use to get percentages of PCU cycles events",
"Counter": "0,1,2,3",
"EventName": "UNC_P_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -14,7 +14,7 @@
"Filter": "occ_sel=1",
"MetricExpr": "(UNC_P_POWER_STATE_OCCUPANCY.CORES_C0 / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "power_state_occupancy.cores_c0 %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -25,7 +25,7 @@
"Filter": "occ_sel=2",
"MetricExpr": "(UNC_P_POWER_STATE_OCCUPANCY.CORES_C3 / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "power_state_occupancy.cores_c3 %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -36,7 +36,7 @@
"Filter": "occ_sel=3",
"MetricExpr": "(UNC_P_POWER_STATE_OCCUPANCY.CORES_C6 / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "power_state_occupancy.cores_c6 %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -46,7 +46,7 @@
"EventName": "UNC_P_PROCHOT_EXTERNAL_CYCLES",
"MetricExpr": "(UNC_P_PROCHOT_EXTERNAL_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "prochot_external_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -56,7 +56,7 @@
"EventName": "UNC_P_FREQ_MAX_LIMIT_THERMAL_CYCLES",
"MetricExpr": "(UNC_P_FREQ_MAX_LIMIT_THERMAL_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_max_limit_thermal_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -66,7 +66,7 @@
"EventName": "UNC_P_FREQ_MAX_OS_CYCLES",
"MetricExpr": "(UNC_P_FREQ_MAX_OS_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_max_os_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -76,7 +76,7 @@
"EventName": "UNC_P_FREQ_MAX_POWER_CYCLES",
"MetricExpr": "(UNC_P_FREQ_MAX_POWER_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_max_power_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -86,7 +86,7 @@
"EventName": "UNC_P_FREQ_TRANS_CYCLES",
"MetricExpr": "(UNC_P_FREQ_TRANS_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_trans_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
}
]
diff --git a/tools/perf/pmu-events/arch/x86/broadwellx/uncore-cache.json b/tools/perf/pmu-events/arch/x86/broadwellx/uncore-cache.json
index 58ed6d33d1f4..60b8e34de513 100644
--- a/tools/perf/pmu-events/arch/x86/broadwellx/uncore-cache.json
+++ b/tools/perf/pmu-events/arch/x86/broadwellx/uncore-cache.json
@@ -3,7 +3,7 @@
"BriefDescription": "Uncore cache clock ticks",
"Counter": "0,1,2,3",
"EventName": "UNC_C_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "CBO"
},
{
@@ -12,7 +12,7 @@
"EventCode": "0x34",
"EventName": "UNC_C_LLC_LOOKUP.ANY",
"Filter": "filter_state=0x1",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x11",
"Unit": "CBO"
@@ -22,7 +22,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x37",
"EventName": "UNC_C_LLC_VICTIMS.M_STATE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -33,7 +33,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.DATA_READ",
"Filter": "filter_opc=0x182",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -44,7 +44,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.UNCACHEABLE",
"Filter": "filter_opc=0x187",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -55,7 +55,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.MMIO_READ",
"Filter": "filter_opc=0x187,filter_nc=1",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -66,7 +66,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.MMIO_WRITE",
"Filter": "filter_opc=0x18f,filter_nc=1",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -77,7 +77,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.RFO_LLC_PREFETCH",
"Filter": "filter_opc=0x190",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -88,7 +88,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.CODE_LLC_PREFETCH",
"Filter": "filter_opc=0x191",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -99,7 +99,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.DATA_LLC_PREFETCH",
"Filter": "filter_opc=0x192",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -110,7 +110,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.PCIE_READ",
"Filter": "filter_opc=0x19e",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -121,7 +121,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.PCIE_WRITE",
"Filter": "filter_opc=0x1c8",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -132,7 +132,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.PCIE_NON_SNOOP_WRITE",
"Filter": "filter_opc=0x1c8,filter_tid=0x3e",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -143,7 +143,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.PCIE_NS_PARTIAL_WRITE",
"Filter": "filter_opc=0x180,filter_tid=0x3e",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x1",
"Unit": "CBO"
},
@@ -153,7 +153,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.CODE_LLC_PREFETCH",
"Filter": "filter_opc=0x181",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -164,7 +164,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.STREAMING_FULL",
"Filter": "filter_opc=0x18c",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -175,7 +175,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.STREAMING_PARTIAL",
"Filter": "filter_opc=0x18d",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -186,7 +186,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.PCIE_READ",
"Filter": "filter_opc=0x19e",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -197,7 +197,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.PCIE_WRITE",
"Filter": "filter_opc=0x1c8,filter_tid=0x3e",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -207,7 +207,7 @@
"EventCode": "0x36",
"EventName": "UNC_C_TOR_OCCUPANCY.LLC_DATA_READ",
"Filter": "filter_opc=0x182",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x3",
"Unit": "CBO"
},
@@ -216,7 +216,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_H_REQUESTS.READS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x3",
"Unit": "HA"
},
@@ -225,7 +225,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_H_REQUESTS.READS_LOCAL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x1",
"Unit": "HA"
},
@@ -234,7 +234,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_H_REQUESTS.READS_REMOTE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x2",
"Unit": "HA"
},
@@ -243,7 +243,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_H_REQUESTS.WRITES",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0xC",
"Unit": "HA"
},
@@ -252,7 +252,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_H_REQUESTS.WRITES_LOCAL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x4",
"Unit": "HA"
},
@@ -261,7 +261,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_H_REQUESTS.WRITES_REMOTE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x8",
"Unit": "HA"
},
@@ -270,7 +270,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x21",
"EventName": "UNC_H_SNOOP_RESP.RSPCNFLCT",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x40",
"Unit": "HA"
},
@@ -279,7 +279,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x21",
"EventName": "UNC_H_SNOOP_RESP.RSP_FWD_WB",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x20",
"Unit": "HA"
@@ -289,7 +289,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x21",
"EventName": "UNC_H_SNOOP_RESP.RSPIFWD",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x4",
"Unit": "HA"
@@ -299,7 +299,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x21",
"EventName": "UNC_H_SNOOP_RESP.RSPS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x2",
"Unit": "HA"
@@ -309,7 +309,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x21",
"EventName": "UNC_H_SNOOP_RESP.RSPSFWD",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x8",
"Unit": "HA"
diff --git a/tools/perf/pmu-events/arch/x86/broadwellx/uncore-interconnect.json b/tools/perf/pmu-events/arch/x86/broadwellx/uncore-interconnect.json
index 824961318c1e..5b2df265e712 100644
--- a/tools/perf/pmu-events/arch/x86/broadwellx/uncore-interconnect.json
+++ b/tools/perf/pmu-events/arch/x86/broadwellx/uncore-interconnect.json
@@ -4,14 +4,14 @@
"Counter": "0,1,2,3",
"EventCode": "0x14",
"EventName": "UNC_Q_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "QPI LL"
},
{
"BriefDescription": "Number of data flits transmitted . Derived from unc_q_txl_flits_g0.data",
"Counter": "0,1,2,3",
"EventName": "QPI_DATA_BANDWIDTH_TX",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "8Bytes",
"UMask": "0x2",
"Unit": "QPI LL"
@@ -20,7 +20,7 @@
"BriefDescription": "Number of non data (control) flits transmitted . Derived from unc_q_txl_flits_g0.non_data",
"Counter": "0,1,2,3",
"EventName": "QPI_CTL_BANDWIDTH_TX",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "8Bytes",
"UMask": "0x4",
"Unit": "QPI LL"
diff --git a/tools/perf/pmu-events/arch/x86/broadwellx/uncore-memory.json b/tools/perf/pmu-events/arch/x86/broadwellx/uncore-memory.json
index 66eed399724c..7415eef71559 100644
--- a/tools/perf/pmu-events/arch/x86/broadwellx/uncore-memory.json
+++ b/tools/perf/pmu-events/arch/x86/broadwellx/uncore-memory.json
@@ -4,7 +4,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x4",
"EventName": "LLC_MISSES.MEM_READ",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "iMC"
@@ -14,7 +14,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x4",
"EventName": "LLC_MISSES.MEM_WRITE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0xC",
"Unit": "iMC"
@@ -23,7 +23,7 @@
"BriefDescription": "Memory controller clock ticks",
"Counter": "0,1,2,3",
"EventName": "UNC_M_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "iMC"
},
{
@@ -33,7 +33,7 @@
"EventName": "UNC_M_POWER_CHANNEL_PPD",
"MetricExpr": "(UNC_M_POWER_CHANNEL_PPD / UNC_M_CLOCKTICKS) * 100.",
"MetricName": "power_channel_ppd %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "iMC"
},
{
@@ -43,7 +43,7 @@
"EventName": "UNC_M_POWER_CRITICAL_THROTTLE_CYCLES",
"MetricExpr": "(UNC_M_POWER_CRITICAL_THROTTLE_CYCLES / UNC_M_CLOCKTICKS) * 100.",
"MetricName": "power_critical_throttle_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "iMC"
},
{
@@ -53,7 +53,7 @@
"EventName": "UNC_M_POWER_SELF_REFRESH",
"MetricExpr": "(UNC_M_POWER_SELF_REFRESH / UNC_M_CLOCKTICKS) * 100.",
"MetricName": "power_self_refresh %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "iMC"
},
{
@@ -61,7 +61,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2",
"EventName": "UNC_M_PRE_COUNT.PAGE_MISS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x1",
"Unit": "iMC"
},
@@ -70,7 +70,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2",
"EventName": "UNC_M_PRE_COUNT.RD",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x4",
"Unit": "iMC"
},
@@ -79,7 +79,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2",
"EventName": "UNC_M_PRE_COUNT.WR",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x8",
"Unit": "iMC"
}
diff --git a/tools/perf/pmu-events/arch/x86/broadwellx/uncore-power.json b/tools/perf/pmu-events/arch/x86/broadwellx/uncore-power.json
index dd1b95655d1d..598678aaf67e 100644
--- a/tools/perf/pmu-events/arch/x86/broadwellx/uncore-power.json
+++ b/tools/perf/pmu-events/arch/x86/broadwellx/uncore-power.json
@@ -3,7 +3,7 @@
"BriefDescription": "PCU clock ticks. Use to get percentages of PCU cycles events",
"Counter": "0,1,2,3",
"EventName": "UNC_P_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -14,7 +14,7 @@
"Filter": "occ_sel=1",
"MetricExpr": "(UNC_P_POWER_STATE_OCCUPANCY.CORES_C0 / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "power_state_occupancy.cores_c0 %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -25,7 +25,7 @@
"Filter": "occ_sel=2",
"MetricExpr": "(UNC_P_POWER_STATE_OCCUPANCY.CORES_C3 / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "power_state_occupancy.cores_c3 %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -36,7 +36,7 @@
"Filter": "occ_sel=3",
"MetricExpr": "(UNC_P_POWER_STATE_OCCUPANCY.CORES_C6 / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "power_state_occupancy.cores_c6 %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -46,7 +46,7 @@
"EventName": "UNC_P_PROCHOT_EXTERNAL_CYCLES",
"MetricExpr": "(UNC_P_PROCHOT_EXTERNAL_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "prochot_external_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -56,7 +56,7 @@
"EventName": "UNC_P_FREQ_MAX_LIMIT_THERMAL_CYCLES",
"MetricExpr": "(UNC_P_FREQ_MAX_LIMIT_THERMAL_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_max_limit_thermal_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -66,7 +66,7 @@
"EventName": "UNC_P_FREQ_MAX_OS_CYCLES",
"MetricExpr": "(UNC_P_FREQ_MAX_OS_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_max_os_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -76,7 +76,7 @@
"EventName": "UNC_P_FREQ_MAX_POWER_CYCLES",
"MetricExpr": "(UNC_P_FREQ_MAX_POWER_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_max_power_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -86,7 +86,7 @@
"EventName": "UNC_P_FREQ_TRANS_CYCLES",
"MetricExpr": "(UNC_P_FREQ_TRANS_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_trans_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
}
]
diff --git a/tools/perf/pmu-events/arch/x86/cascadelakex/uncore-memory.json b/tools/perf/pmu-events/arch/x86/cascadelakex/uncore-memory.json
index 3fb5cdce842f..814e0a96ceb8 100644
--- a/tools/perf/pmu-events/arch/x86/cascadelakex/uncore-memory.json
+++ b/tools/perf/pmu-events/arch/x86/cascadelakex/uncore-memory.json
@@ -4,7 +4,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x4",
"EventName": "LLC_MISSES.MEM_READ",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "iMC"
@@ -14,7 +14,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x4",
"EventName": "LLC_MISSES.MEM_WRITE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0xC",
"Unit": "iMC"
@@ -23,7 +23,7 @@
"BriefDescription": "Memory controller clock ticks",
"Counter": "0,1,2,3",
"EventName": "UNC_M_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "iMC"
},
{
@@ -33,7 +33,7 @@
"EventName": "UNC_M_POWER_CHANNEL_PPD",
"MetricExpr": "(UNC_M_POWER_CHANNEL_PPD / UNC_M_CLOCKTICKS) * 100.",
"MetricName": "power_channel_ppd %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "iMC"
},
{
@@ -43,7 +43,7 @@
"EventName": "UNC_M_POWER_SELF_REFRESH",
"MetricExpr": "(UNC_M_POWER_SELF_REFRESH / UNC_M_CLOCKTICKS) * 100.",
"MetricName": "power_self_refresh %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "iMC"
},
{
@@ -51,7 +51,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2",
"EventName": "UNC_M_PRE_COUNT.PAGE_MISS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x1",
"Unit": "iMC"
},
@@ -60,7 +60,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2",
"EventName": "UNC_M_PRE_COUNT.RD",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x4",
"Unit": "iMC"
},
@@ -69,7 +69,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2",
"EventName": "UNC_M_PRE_COUNT.WR",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x8",
"Unit": "iMC"
},
@@ -78,7 +78,7 @@
"Counter": "0,1,2,3",
"EventCode": "0xE3",
"EventName": "UNC_M_PMM_RPQ_INSERTS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "iMC"
},
{
@@ -86,7 +86,7 @@
"Counter": "0,1,2,3",
"EventCode": "0xE7",
"EventName": "UNC_M_PMM_WPQ_INSERTS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "iMC"
},
{
@@ -94,7 +94,7 @@
"Counter": "0,1,2,3",
"EventCode": "0xE3",
"EventName": "UNC_M_PMM_BANDWIDTH.READ",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "6.103515625E-5MB/sec",
"Unit": "iMC"
},
@@ -103,7 +103,7 @@
"Counter": "0,1,2,3",
"EventCode": "0xE7",
"EventName": "UNC_M_PMM_BANDWIDTH.WRITE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "6.103515625E-5MB/sec",
"Unit": "iMC"
},
@@ -114,7 +114,7 @@
"EventName": "UNC_M_PMM_BANDWIDTH.TOTAL",
"MetricExpr": "UNC_M_PMM_RPQ_INSERTS + UNC_M_PMM_WPQ_INSERTS",
"MetricName": "UNC_M_PMM_BANDWIDTH.TOTAL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "6.103515625E-5MB/sec",
"Unit": "iMC"
},
@@ -123,7 +123,7 @@
"Counter": "0,1,2,3",
"EventCode": "0xE0",
"EventName": "UNC_M_PMM_RPQ_OCCUPANCY.ALL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x1",
"Unit": "iMC"
},
@@ -134,7 +134,7 @@
"EventName": "UNC_M_PMM_READ_LATENCY",
"MetricExpr": "UNC_M_PMM_RPQ_OCCUPANCY.ALL / UNC_M_PMM_RPQ_INSERTS / UNC_M_CLOCKTICKS",
"MetricName": "UNC_M_PMM_READ_LATENCY",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "6000000000ns",
"UMask": "0x1",
"Unit": "iMC"
@@ -144,7 +144,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_M_ACT_COUNT.WR",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts DRAM Page Activate commands sent on this channel due to a write request to the iMC (Memory Controller). Activate commands are issued to open up a page on the DRAM devices so that it can be read or written to with a CAS (Column Access Select) command.",
"UMask": "0x2",
"Unit": "iMC"
@@ -154,7 +154,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x4",
"EventName": "UNC_M_CAS_COUNT.ALL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts all CAS (Column Address Select) commands issued to DRAM per memory channel. CAS commands are issued to specify the address to read or write on DRAM, so this event increments for every read and write. This event counts whether AutoPrecharge (which closes the DRAM Page automatically after a read/write) is enabled or not.",
"UMask": "0xF",
"Unit": "iMC"
@@ -164,7 +164,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x4",
"EventName": "UNC_M_CAS_COUNT.RD_REG",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts CAS (Column Access Select) regular read commands issued to DRAM on a per channel basis. CAS commands are issued to specify the address to read or write on DRAM, and this event increments for every regular read. This event only counts regular reads and does not includes underfill reads due to partial write requests. This event counts whether AutoPrecharge (which closes the DRAM Page automatically after a read/write) is enabled or not.",
"UMask": "0x1",
"Unit": "iMC"
@@ -174,7 +174,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x4",
"EventName": "UNC_M_CAS_COUNT.RD_UNDERFILL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts CAS (Column Access Select) underfill read commands issued to DRAM due to a partial write, on a per channel basis. CAS commands are issued to specify the address to read or write on DRAM, and this command counts underfill reads. Partial writes must be completed by first reading in the underfill from DRAM and then merging in the partial write data before writing the full line back to DRAM. This event will generally count about the same as the number of partial writes, but may be slightly less because of partials hitting in the WPQ (due to a previous write request).",
"UMask": "0x2",
"Unit": "iMC"
@@ -184,7 +184,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x4",
"EventName": "UNC_M_CAS_COUNT.WR_WMM",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts the total number or DRAM Write CAS commands issued on this channel while in Write-Major-Mode.",
"UMask": "0x4",
"Unit": "iMC"
@@ -194,7 +194,7 @@
"Counter": "0,1,2,3",
"EventCode": "0xEA",
"EventName": "UNC_M_PMM_CMD1.ALL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "All commands for Intel Optane DC persistent memory",
"UMask": "0x1",
"Unit": "iMC"
@@ -204,7 +204,7 @@
"Counter": "0,1,2,3",
"EventCode": "0xEA",
"EventName": "UNC_M_PMM_CMD1.RD",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "All Reads - RPQ or Ufill",
"UMask": "0x2",
"Unit": "iMC"
@@ -214,7 +214,7 @@
"Counter": "0,1,2,3",
"EventCode": "0xEA",
"EventName": "UNC_M_PMM_CMD1.UFILL_RD",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Underfill reads",
"UMask": "0x8",
"Unit": "iMC"
@@ -224,7 +224,7 @@
"Counter": "0,1,2,3",
"EventCode": "0xEA",
"EventName": "UNC_M_PMM_CMD1.WR",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Writes",
"UMask": "0x4",
"Unit": "iMC"
@@ -234,7 +234,7 @@
"Counter": "0,1,2,3",
"EventCode": "0xE4",
"EventName": "UNC_M_PMM_WPQ_OCCUPANCY.ALL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Write Pending Queue Occupancy of all write requests for Intel Optane DC persistent memory",
"UMask": "0x1",
"Unit": "iMC"
@@ -244,7 +244,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x10",
"EventName": "UNC_M_RPQ_INSERTS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts the number of read requests allocated into the Read Pending Queue (RPQ). This queue is used to schedule reads out to the memory controller and to track the requests. Requests allocate into the RPQ soon after they enter the memory controller, and need credits for an entry in this buffer before being sent from the CHA to the iMC. The requests deallocate after the read CAS command has been issued to DRAM. This event counts both Isochronous and non-Isochronous requests which were issued to the RPQ.",
"Unit": "iMC"
},
@@ -253,7 +253,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x80",
"EventName": "UNC_M_RPQ_OCCUPANCY",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts the number of entries in the Read Pending Queue (RPQ) at each cycle. This can then be used to calculate both the average occupancy of the queue (in conjunction with the number of cycles not empty) and the average latency in the queue (in conjunction with the number of allocations). The RPQ is used to schedule reads out to the memory controller and to track the requests. Requests allocate into the RPQ soon after they enter the memory controller, and need credits for an entry in this buffer before being sent from the CHA to the iMC. They deallocate from the RPQ after the CAS command has been issued to memory.",
"Unit": "iMC"
},
@@ -262,7 +262,7 @@
"Counter": "0,1,2,3",
"EventCode": "0xD3",
"EventName": "UNC_M_TAGCHK.HIT",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Tag Check; Hit",
"UMask": "0x1",
"Unit": "iMC"
@@ -272,7 +272,7 @@
"Counter": "0,1,2,3",
"EventCode": "0xD3",
"EventName": "UNC_M_TAGCHK.MISS_CLEAN",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Tag Check; Clean",
"UMask": "0x2",
"Unit": "iMC"
@@ -282,7 +282,7 @@
"Counter": "0,1,2,3",
"EventCode": "0xD3",
"EventName": "UNC_M_TAGCHK.MISS_DIRTY",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Tag Check; Dirty",
"UMask": "0x4",
"Unit": "iMC"
@@ -292,7 +292,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x20",
"EventName": "UNC_M_WPQ_INSERTS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts the number of writes requests allocated into the Write Pending Queue (WPQ). The WPQ is used to schedule writes out to the memory controller and to track the requests. Requests allocate into the WPQ soon after they enter the memory controller, and need credits for an entry in this buffer before being sent from the CHA to the iMC (Memory Controller). The write requests deallocate after being issued to DRAM. Write requests themselves are able to complete (from the perspective of the rest of the system) as soon they have 'posted' to the iMC.",
"Unit": "iMC"
},
@@ -301,7 +301,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x81",
"EventName": "UNC_M_WPQ_OCCUPANCY",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts the number of entries in the Write Pending Queue (WPQ) at each cycle. This can then be used to calculate both the average queue occupancy (in conjunction with the number of cycles not empty) and the average latency (in conjunction with the number of allocations). The WPQ is used to schedule writes out to the memory controller and to track the requests. Requests allocate into the WPQ soon after they enter the memory controller, and need credits for an entry in this buffer before being sent from the CHA to the iMC (memory controller). They deallocate after being issued to DRAM. Write requests themselves are able to complete (from the perspective of the rest of the system) as soon they have 'posted' to the iMC. This is not to be confused with actually performing the write to DRAM. Therefore, the average latency for this queue is actually not useful for deconstruction intermediate write latencies. So, we provide filtering based on if the request has posted or not. By using the 'not posted' filter, we can track how long writes spent in the iMC before completions were sent to the HA. The 'posted' filter, on the other hand, provides information about how much queueing is actually happenning in the iMC for writes before they are actually issued to memory. High average occupancies will generally coincide with high write major mode counts. Is there a filter of sorts???",
"Unit": "iMC"
}
diff --git a/tools/perf/pmu-events/arch/x86/cascadelakex/uncore-other.json b/tools/perf/pmu-events/arch/x86/cascadelakex/uncore-other.json
index df355ba7acc8..5bde08eb9776 100644
--- a/tools/perf/pmu-events/arch/x86/cascadelakex/uncore-other.json
+++ b/tools/perf/pmu-events/arch/x86/cascadelakex/uncore-other.json
@@ -3,7 +3,7 @@
"BriefDescription": "Uncore cache clock ticks",
"Counter": "0,1,2,3",
"EventName": "UNC_CHA_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "CHA"
},
{
@@ -12,7 +12,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.UNCACHEABLE",
"Filter": "config1=0x40e33",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x21",
"Unit": "CHA"
},
@@ -22,7 +22,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.MMIO_READ",
"Filter": "config1=0x40040e33",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x21",
"Unit": "CHA"
},
@@ -32,7 +32,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.MMIO_WRITE",
"Filter": "config1=0x40041e33",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x21",
"Unit": "CHA"
},
@@ -42,7 +42,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.STREAMING_FULL",
"Filter": "config1=0x41833",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x21",
"Unit": "CHA"
@@ -53,7 +53,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.STREAMING_PARTIAL",
"Filter": "config1=0x41a33",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x21",
"Unit": "CHA"
@@ -63,7 +63,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x50",
"EventName": "UNC_CHA_REQUESTS.READS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x03",
"Unit": "CHA"
},
@@ -72,7 +72,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x50",
"EventName": "UNC_CHA_REQUESTS.READS_LOCAL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x01",
"Unit": "CHA"
},
@@ -81,7 +81,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x50",
"EventName": "UNC_CHA_REQUESTS.READS_REMOTE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x02",
"Unit": "CHA"
},
@@ -90,7 +90,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x50",
"EventName": "UNC_CHA_REQUESTS.WRITES",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x0C",
"Unit": "CHA"
},
@@ -99,7 +99,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x50",
"EventName": "UNC_CHA_REQUESTS.WRITES_LOCAL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x04",
"Unit": "CHA"
},
@@ -108,7 +108,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x50",
"EventName": "UNC_CHA_REQUESTS.WRITES_REMOTE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x08",
"Unit": "CHA"
},
@@ -117,7 +117,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2",
"EventName": "UPI_DATA_BANDWIDTH_TX",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "7.11E-06Bytes",
"UMask": "0xf",
"Unit": "UPI LL"
@@ -128,7 +128,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART0",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x01",
"ScaleUnit": "4Bytes",
"UMask": "0x01",
@@ -140,7 +140,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART1",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x02",
"ScaleUnit": "4Bytes",
"UMask": "0x01",
@@ -152,7 +152,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART2",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x04",
"ScaleUnit": "4Bytes",
"UMask": "0x01",
@@ -164,7 +164,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART3",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x08",
"ScaleUnit": "4Bytes",
"UMask": "0x01",
@@ -179,7 +179,7 @@
"Filter": "ch_mask=0x1f",
"MetricExpr": "UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART0 + UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART1 + UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART2 + UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART3",
"MetricName": "LLC_MISSES.PCIE_WRITE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x01",
"ScaleUnit": "4Bytes",
"UMask": "0x01",
@@ -191,7 +191,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART0",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x01",
"ScaleUnit": "4Bytes",
"UMask": "0x04",
@@ -203,7 +203,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART1",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x02",
"ScaleUnit": "4Bytes",
"UMask": "0x04",
@@ -215,7 +215,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART2",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x04",
"ScaleUnit": "4Bytes",
"UMask": "0x04",
@@ -227,7 +227,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART3",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x08",
"ScaleUnit": "4Bytes",
"UMask": "0x04",
@@ -242,7 +242,7 @@
"Filter": "ch_mask=0x1f",
"MetricExpr": "UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART0 + UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART1 + UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART2 + UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART3",
"MetricName": "LLC_MISSES.PCIE_READ",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x01",
"ScaleUnit": "4Bytes",
"UMask": "0x04",
@@ -253,7 +253,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x33",
"EventName": "UNC_CHA_CORE_SNP.CORE_GTONE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts the number of transactions that trigger a configurable number of cross snoops. Cores are snooped if the transaction looks up the cache and determines that it is necessary based on the operation type and what CoreValid bits are set. For example, if 2 CV bits are set on a data read, the cores must have the data in S state so it is not necessary to snoop them. However, if only 1 CV bit is set the core my have modified the data. If the transaction was an RFO, it would need to invalidate the lines. This event can be filtered based on who triggered the initial snoop(s).",
"UMask": "0x42",
"Unit": "CHA"
@@ -263,7 +263,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x33",
"EventName": "UNC_CHA_CORE_SNP.EVICT_GTONE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts the number of transactions that trigger a configurable number of cross snoops. Cores are snooped if the transaction looks up the cache and determines that it is necessary based on the operation type and what CoreValid bits are set. For example, if 2 CV bits are set on a data read, the cores must have the data in S state so it is not necessary to snoop them. However, if only 1 CV bit is set the core my have modified the data. If the transaction was an RFO, it would need to invalidate the lines. This event can be filtered based on who triggered the initial snoop(s).",
"UMask": "0x82",
"Unit": "CHA"
@@ -273,7 +273,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x53",
"EventName": "UNC_CHA_DIR_LOOKUP.NO_SNP",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts transactions that looked into the multi-socket cacheline Directory state, and therefore did not send a snoop because the Directory indicated it was not needed",
"UMask": "0x02",
"Unit": "CHA"
@@ -283,7 +283,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x53",
"EventName": "UNC_CHA_DIR_LOOKUP.SNP",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts transactions that looked into the multi-socket cacheline Directory state, and sent one or more snoops, because the Directory indicated it was needed",
"UMask": "0x01",
"Unit": "CHA"
@@ -293,7 +293,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x54",
"EventName": "UNC_CHA_DIR_UPDATE.HA",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts only multi-socket cacheline Directory state updates memory writes issued from the HA pipe. This does not include memory write requests which are for I (Invalid) or E (Exclusive) cachelines.",
"UMask": "0x01",
"Unit": "CHA"
@@ -303,7 +303,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x54",
"EventName": "UNC_CHA_DIR_UPDATE.TOR",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts only multi-socket cacheline Directory state updates due to memory writes issued from the TOR pipe which are the result of remote transaction hitting the SF/LLC and returning data Core2Core. This does not include memory write requests which are for I (Invalid) or E (Exclusive) cachelines.",
"UMask": "0x02",
"Unit": "CHA"
@@ -313,7 +313,7 @@
"Counter": "0,1,2,3",
"EventCode": "0xA5",
"EventName": "UNC_CHA_FAST_ASSERTED.HORZ",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts the number of cycles either the local or incoming distress signals are asserted. Incoming distress includes up, dn and across.",
"UMask": "0x02",
"Unit": "CHA"
@@ -323,7 +323,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x5F",
"EventName": "UNC_CHA_HITME_HIT.EX_RDS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts read requests from a remote socket which hit in the HitME cache (used to cache the multi-socket Directory state) to a line in the E(Exclusive) state. This includes the following read opcodes (RdCode, RdData, RdDataMigratory, RdCur, RdInv*, Inv*)",
"UMask": "0x01",
"Unit": "CHA"
@@ -333,7 +333,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x59",
"EventName": "UNC_CHA_IMC_READS_COUNT.NORMAL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when a normal (Non-Isochronous) read is issued to any of the memory controller channels from the CHA.",
"UMask": "0x01",
"Unit": "CHA"
@@ -343,7 +343,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x5B",
"EventName": "UNC_CHA_IMC_WRITES_COUNT.FULL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when a normal (Non-Isochronous) full line write is issued from the CHA to the any of the memory controller channels.",
"UMask": "0x01",
"Unit": "CHA"
@@ -353,7 +353,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x37",
"EventName": "UNC_CHA_LLC_VICTIMS.TOTAL_E",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts the number of lines that were victimized on a fill. This can be filtered by the state that the line was in.",
"UMask": "0x02",
"Unit": "CHA"
@@ -363,7 +363,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x37",
"EventName": "UNC_CHA_LLC_VICTIMS.TOTAL_F",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts the number of lines that were victimized on a fill. This can be filtered by the state that the line was in.",
"UMask": "0x08",
"Unit": "CHA"
@@ -373,7 +373,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x37",
"EventName": "UNC_CHA_LLC_VICTIMS.TOTAL_M",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts the number of lines that were victimized on a fill. This can be filtered by the state that the line was in.",
"UMask": "0x01",
"Unit": "CHA"
@@ -383,7 +383,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x37",
"EventName": "UNC_CHA_LLC_VICTIMS.TOTAL_S",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts the number of lines that were victimized on a fill. This can be filtered by the state that the line was in.",
"UMask": "0x04",
"Unit": "CHA"
@@ -393,7 +393,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x39",
"EventName": "UNC_CHA_MISC.RFO_HIT_S",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when a RFO (the Read for Ownership issued before a write) request hit a cacheline in the S (Shared) state.",
"UMask": "0x08",
"Unit": "CHA"
@@ -403,7 +403,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x50",
"EventName": "UNC_CHA_REQUESTS.INVITOE_LOCAL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts the total number of requests coming from a unit on this socket for exclusive ownership of a cache line without receiving data (INVITOE) to the CHA.",
"UMask": "0x10",
"Unit": "CHA"
@@ -413,7 +413,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x50",
"EventName": "UNC_CHA_REQUESTS.INVITOE_REMOTE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts the total number of requests coming from a remote socket for exclusive ownership of a cache line without receiving data (INVITOE) to the CHA.",
"UMask": "0x20",
"Unit": "CHA"
@@ -423,7 +423,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x13",
"EventName": "UNC_CHA_RxC_INSERTS.IRQ",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts number of allocations per cycle into the specified Ingress queue.",
"UMask": "0x01",
"Unit": "CHA"
@@ -433,7 +433,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x19",
"EventName": "UNC_CHA_RxC_IRQ1_REJECT.PA_MATCH",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Ingress (from CMS) Request Queue Rejects; PhyAddr Match",
"UMask": "0x80",
"Unit": "CHA"
@@ -442,7 +442,7 @@
"BriefDescription": "Ingress (from CMS) Occupancy; IRQ",
"EventCode": "0x11",
"EventName": "UNC_CHA_RxC_OCCUPANCY.IRQ",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts number of entries in the specified Ingress queue in each cycle.",
"UMask": "0x01",
"Unit": "CHA"
@@ -452,7 +452,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x3D",
"EventName": "UNC_CHA_SF_EVICTION.E_STATE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts snoop filter capacity evictions for entries tracking exclusive lines in the cores cache. Snoop filter capacity evictions occur when the snoop filter is full and evicts an existing entry to track a new entry. Does not count clean evictions such as when a cores cache replaces a tracked cacheline with a new cacheline.",
"UMask": "0x02",
"Unit": "CHA"
@@ -462,7 +462,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x3D",
"EventName": "UNC_CHA_SF_EVICTION.M_STATE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts snoop filter capacity evictions for entries tracking modified lines in the cores cache. Snoop filter capacity evictions occur when the snoop filter is full and evicts an existing entry to track a new entry. Does not count clean evictions such as when a cores cache replaces a tracked cacheline with a new cacheline.",
"UMask": "0x01",
"Unit": "CHA"
@@ -472,7 +472,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x3D",
"EventName": "UNC_CHA_SF_EVICTION.S_STATE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts snoop filter capacity evictions for entries tracking shared lines in the cores cache. Snoop filter capacity evictions occur when the snoop filter is full and evicts an existing entry to track a new entry. Does not count clean evictions such as when a cores cache replaces a tracked cacheline with a new cacheline.",
"UMask": "0x04",
"Unit": "CHA"
@@ -482,7 +482,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x5C",
"EventName": "UNC_CHA_SNOOP_RESP.RSPCNFLCTS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when a a transaction with the opcode type RspCnflct* Snoop Response was received. This is returned when a snoop finds an existing outstanding transaction in a remote caching agent. This triggers conflict resolution hardware. This covers both the opcode RspCnflct and RspCnflctWbI.",
"UMask": "0x40",
"Unit": "CHA"
@@ -492,7 +492,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x5C",
"EventName": "UNC_CHA_SNOOP_RESP.RSPI",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when a transaction with the opcode type RspI Snoop Response was received which indicates the remote cache does not have the data, or when the remote cache silently evicts data (such as when an RFO: the Read for Ownership issued before a write hits non-modified data).",
"UMask": "0x01",
"Unit": "CHA"
@@ -502,7 +502,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x5C",
"EventName": "UNC_CHA_SNOOP_RESP.RSPIFWD",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when a a transaction with the opcode type RspIFwd Snoop Response was received which indicates a remote caching agent forwarded the data and the requesting agent is able to acquire the data in E (Exclusive) or M (modified) states. This is commonly returned with RFO (the Read for Ownership issued before a write) transactions. The snoop could have either been to a cacheline in the M,E,F (Modified, Exclusive or Forward) states.",
"UMask": "0x04",
"Unit": "CHA"
@@ -512,7 +512,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x5C",
"EventName": "UNC_CHA_SNOOP_RESP.RSPSFWD",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when a a transaction with the opcode type RspSFwd Snoop Response was received which indicates a remote caching agent forwarded the data but held on to its current copy. This is common for data and code reads that hit in a remote socket in E (Exclusive) or F (Forward) state.",
"UMask": "0x08",
"Unit": "CHA"
@@ -522,7 +522,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x5C",
"EventName": "UNC_CHA_SNOOP_RESP.RSP_FWD_WB",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when a transaction with the opcode type Rsp*Fwd*WB Snoop Response was received which indicates the data was written back to it's home socket, and the cacheline was forwarded to the requestor socket. This snoop response is only used in >= 4 socket systems. It is used when a snoop HITM's in a remote caching agent and it directly forwards data to a requestor, and simultaneously returns data to it's home socket to be written back to memory.",
"UMask": "0x20",
"Unit": "CHA"
@@ -532,7 +532,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x5C",
"EventName": "UNC_CHA_SNOOP_RESP.RSP_WBWB",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when a transaction with the opcode type Rsp*WB Snoop Response was received which indicates which indicates the data was written back to it's home. This is returned when a non-RFO request hits a cacheline in the Modified state. The Cache can either downgrade the cacheline to a S (Shared) or I (Invalid) state depending on how the system has been configured. This reponse will also be sent when a cache requests E (Exclusive) ownership of a cache line without receiving data, because the cache must acquire ownership.",
"UMask": "0x10",
"Unit": "CHA"
@@ -542,7 +542,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_IIO_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts clockticks of the 1GHz trafiic controller clock in the IIO unit.",
"Unit": "IIO"
},
@@ -552,7 +552,7 @@
"EventCode": "0xC0",
"EventName": "UNC_IIO_DATA_REQ_BY_CPU.MEM_READ.PART0",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x01",
"PublicDescription": "Counts every read request for 4 bytes of data made by a unit on the main die (generally a core) or by another IIO unit to the MMIO space of a card on IIO Part0. In the general case, Part0 refers to a standard PCIe card of any size (x16,x8,x4) that is plugged directly into one of the PCIe slots. Part0 could also refer to any device plugged into the first slot of a PCIe riser card or to a device attached to the IIO unit which starts its use of the bus using lane 0 of the 16 lanes supported by the bus.",
"UMask": "0x04",
@@ -564,7 +564,7 @@
"EventCode": "0xC0",
"EventName": "UNC_IIO_DATA_REQ_BY_CPU.MEM_READ.PART1",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x02",
"PublicDescription": "Counts every read request for 4 bytes of data made by a unit on the main die (generally a core) or by another IIO unit to the MMIO space of a card on IIO Part1. In the general case, Part1 refers to a x4 PCIe card plugged into the second slot of a PCIe riser card, but it could refer to any x4 device attached to the IIO unit using lanes starting at lane 4 of the 16 lanes supported by the bus.",
"UMask": "0x04",
@@ -576,7 +576,7 @@
"EventCode": "0xC0",
"EventName": "UNC_IIO_DATA_REQ_BY_CPU.MEM_READ.PART2",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x04",
"PublicDescription": "Counts every read request for 4 bytes of data made by a unit on the main die (generally a core) or by another IIO unit to the MMIO space of a card on IIO Part2. In the general case, Part2 refers to a x4 or x8 PCIe card plugged into the third slot of a PCIe riser card, but it could refer to any x4 or x8 device attached to the IIO unit and using lanes starting at lane 8 of the 16 lanes supported by the bus.",
"UMask": "0x04",
@@ -588,7 +588,7 @@
"EventCode": "0xC0",
"EventName": "UNC_IIO_DATA_REQ_BY_CPU.MEM_READ.PART3",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x08",
"PublicDescription": "Counts every read request for 4 bytes of data made by a unit on the main die (generally a core) or by another IIO unit to the MMIO space of a card on IIO Part3. In the general case, Part3 refers to a x4 PCIe card plugged into the fourth slot of a PCIe riser card, but it could brefer to any device attached to the IIO unit using the lanes starting at lane 12 of the 16 lanes supported by the bus.",
"UMask": "0x04",
@@ -600,7 +600,7 @@
"EventCode": "0xC0",
"EventName": "UNC_IIO_DATA_REQ_BY_CPU.MEM_WRITE.PART0",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x01",
"PublicDescription": "Counts every write request of 4 bytes of data made to the MMIO space of a card on IIO Part0 by a unit on the main die (generally a core) or by another IIO unit. In the general case, Part0 refers to a standard PCIe card of any size (x16,x8,x4) that is plugged directly into one of the PCIe slots. Part0 could also refer to any device plugged into the first slot of a PCIe riser card or to a device attached to the IIO unit which starts its use of the bus using lane 0 of the 16 lanes supported by the bus.",
"UMask": "0x01",
@@ -612,7 +612,7 @@
"EventCode": "0xC0",
"EventName": "UNC_IIO_DATA_REQ_BY_CPU.MEM_WRITE.PART1",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x02",
"PublicDescription": "Counts every write request of 4 bytes of data made to the MMIO space of a card on IIO Part1 by a unit on the main die (generally a core) or by another IIO unit. In the general case, Part1 refers to a x4 PCIe card plugged into the second slot of a PCIe riser card, but it could refer to any x4 device attached to the IIO unit using lanes starting at lane 4 of the 16 lanes supported by the bus.",
"UMask": "0x01",
@@ -624,7 +624,7 @@
"EventCode": "0xC0",
"EventName": "UNC_IIO_DATA_REQ_BY_CPU.MEM_WRITE.PART2",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x04",
"PublicDescription": "Counts every write request of 4 bytes of data made to the MMIO space of a card on IIO Part2 by a unit on the main die (generally a core) or by another IIO unit. In the general case, Part2 refers to a x4 or x8 PCIe card plugged into the third slot of a PCIe riser card, but it could refer to any x4 or x8 device attached to the IIO unit and using lanes starting at lane 8 of the 16 lanes supported by the bus.",
"UMask": "0x01",
@@ -636,7 +636,7 @@
"EventCode": "0xC0",
"EventName": "UNC_IIO_DATA_REQ_BY_CPU.MEM_WRITE.PART3",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x08",
"PublicDescription": "Counts every write request of 4 bytes of data made to the MMIO space of a card on IIO Part3 by a unit on the main die (generally a core) or by another IIO unit. In the general case, Part3 refers to a x4 PCIe card plugged into the fourth slot of a PCIe riser card, but it could brefer to any device attached to the IIO unit using the lanes starting at lane 12 of the 16 lanes supported by the bus.",
"UMask": "0x01",
@@ -648,7 +648,7 @@
"EventCode": "0xC0",
"EventName": "UNC_IIO_DATA_REQ_BY_CPU.PEER_READ.PART0",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x01",
"PublicDescription": "Counts ever peer to peer read request for 4 bytes of data made by a different IIO unit to the MMIO space of a card on IIO Part0. Does not include requests made by the same IIO unit. In the general case, Part0 refers to a standard PCIe card of any size (x16,x8,x4) that is plugged directly into one of the PCIe slots. Part0 could also refer to any device plugged into the first slot of a PCIe riser card or to a device attached to the IIO unit which starts its use of the bus using lane 0 of the 16 lanes supported by the bus.",
"UMask": "0x08",
@@ -660,7 +660,7 @@
"EventCode": "0xC0",
"EventName": "UNC_IIO_DATA_REQ_BY_CPU.PEER_READ.PART1",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x02",
"PublicDescription": "Counts ever peer to peer read request for 4 bytes of data made by a different IIO unit to the MMIO space of a card on IIO Part1. Does not include requests made by the same IIO unit. In the general case, Part1 refers to a x4 PCIe card plugged into the second slot of a PCIe riser card, but it could refer to any x4 device attached to the IIO unit using lanes starting at lane 4 of the 16 lanes supported by the bus.",
"UMask": "0x08",
@@ -672,7 +672,7 @@
"EventCode": "0xC0",
"EventName": "UNC_IIO_DATA_REQ_BY_CPU.PEER_READ.PART2",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x04",
"PublicDescription": "Counts ever peer to peer read request for 4 bytes of data made by a different IIO unit to the MMIO space of a card on IIO Part2. Does not include requests made by the same IIO unit. In the general case, Part2 refers to a x4 or x8 PCIe card plugged into the third slot of a PCIe riser card, but it could refer to any x4 or x8 device attached to the IIO unit and using lanes starting at lane 8 of the 16 lanes supported by the bus.",
"UMask": "0x08",
@@ -684,7 +684,7 @@
"EventCode": "0xC0",
"EventName": "UNC_IIO_DATA_REQ_BY_CPU.PEER_READ.PART3",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x08",
"PublicDescription": "Counts ever peer to peer read request for 4 bytes of data made by a different IIO unit to the MMIO space of a card on IIO Part3. Does not include requests made by the same IIO unit. In the general case, Part3 refers to a x4 PCIe card plugged into the fourth slot of a PCIe riser card, but it could brefer to any device attached to the IIO unit using the lanes starting at lane 12 of the 16 lanes supported by the bus.",
"UMask": "0x08",
@@ -696,7 +696,7 @@
"EventCode": "0xC0",
"EventName": "UNC_IIO_DATA_REQ_BY_CPU.PEER_WRITE.PART0",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x01",
"PublicDescription": "Counts every peer to peer write request of 4 bytes of data made to the MMIO space of a card on IIO Part0 by a different IIO unit. Does not include requests made by the same IIO unit. In the general case, Part0 refers to a standard PCIe card of any size (x16,x8,x4) that is plugged directly into one of the PCIe slots. Part0 could also refer to any device plugged into the first slot of a PCIe riser card or to a device attached to the IIO unit which starts its use of the bus using lane 0 of the 16 lanes supported by the bus.",
"UMask": "0x02",
@@ -708,7 +708,7 @@
"EventCode": "0xC0",
"EventName": "UNC_IIO_DATA_REQ_BY_CPU.PEER_WRITE.PART1",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x02",
"PublicDescription": "Counts every peer to peer write request of 4 bytes of data made to the MMIO space of a card on IIO Part1 by a different IIO unit. Does not include requests made by the same IIO unit. In the general case, Part1 refers to a x4 PCIe card plugged into the second slot of a PCIe riser card, but it could refer to any x4 device attached to the IIO unit using lanes starting at lane 4 of the 16 lanes supported by the bus.",
"UMask": "0x02",
@@ -720,7 +720,7 @@
"EventCode": "0xC0",
"EventName": "UNC_IIO_DATA_REQ_BY_CPU.PEER_WRITE.PART2",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x04",
"PublicDescription": "Counts every peer to peer write request of 4 bytes of data made to the MMIO space of a card on IIO Part2 by a different IIO unit. Does not include requests made by the same IIO unit. In the general case, Part2 refers to a x4 or x8 PCIe card plugged into the third slot of a PCIe riser card, but it could refer to any x4 or x8 device attached to the IIO unit and using lanes starting at lane 8 of the 16 lanes supported by the bus.",
"UMask": "0x02",
@@ -732,7 +732,7 @@
"EventCode": "0xC0",
"EventName": "UNC_IIO_DATA_REQ_BY_CPU.PEER_WRITE.PART3",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x08",
"PublicDescription": "Counts every peer to peer write request of 4 bytes of data made to the MMIO space of a card on IIO Part3 by a different IIO unit. Does not include requests made by the same IIO unit. In the general case, Part3 refers to a x4 PCIe card plugged into the fourth slot of a PCIe riser card, but it could brefer to any device attached to the IIO unit using the lanes starting at lane 12 of the 16 lanes supported by the bus.",
"UMask": "0x02",
@@ -744,7 +744,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.PEER_READ.PART0",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x01",
"PublicDescription": "Counts every peer to peer read request for 4 bytes of data made by IIO Part0 to the MMIO space of an IIO target. In the general case, Part0 refers to a standard PCIe card of any size (x16,x8,x4) that is plugged directly into one of the PCIe slots. Part0 could also refer to any device plugged into the first slot of a PCIe riser card or to a device attached to the IIO unit which starts its use of the bus using lane 0 of the 16 lanes supported by the bus.",
"UMask": "0x08",
@@ -756,7 +756,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.PEER_READ.PART1",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x02",
"PublicDescription": "Counts every peer to peer read request for 4 bytes of data made by IIO Part1 to the MMIO space of an IIO target. In the general case, Part1 refers to a x4 PCIe card plugged into the second slot of a PCIe riser card, but it could refer to any x4 device attached to the IIO unit using lanes starting at lane 4 of the 16 lanes supported by the bus.",
"UMask": "0x08",
@@ -768,7 +768,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.PEER_READ.PART2",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x04",
"PublicDescription": "Counts every peer to peer read request for 4 bytes of data made by IIO Part2 to the MMIO space of an IIO target. In the general case, Part2 refers to a x4 or x8 PCIe card plugged into the third slot of a PCIe riser card, but it could refer to any x4 or x8 device attached to the IIO unit and using lanes starting at lane 8 of the 16 lanes supported by the bus.",
"UMask": "0x08",
@@ -780,7 +780,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.PEER_READ.PART3",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x08",
"PublicDescription": "Counts every peer to peer read request for 4 bytes of data made by IIO Part3 to the MMIO space of an IIO target. In the general case, Part3 refers to a x4 PCIe card plugged into the fourth slot of a PCIe riser card, but it could brefer to any device attached to the IIO unit using the lanes starting at lane 12 of the 16 lanes supported by the bus.",
"UMask": "0x08",
@@ -792,7 +792,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.PEER_WRITE.PART0",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x01",
"PublicDescription": "Counts every peer to peer write request of 4 bytes of data made by IIO Part0 to the MMIO space of an IIO target. In the general case, Part0 refers to a standard PCIe card of any size (x16,x8,x4) that is plugged directly into one of the PCIe slots. Part0 could also refer to any device plugged into the first slot of a PCIe riser card or to a device attached to the IIO unit which starts its use of the bus using lane 0 of the 16 lanes supported by the bus.",
"UMask": "0x02",
@@ -804,7 +804,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.PEER_WRITE.PART1",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x02",
"PublicDescription": "Counts every peer to peer write request of 4 bytes of data made by IIO Part1 to the MMIO space of an IIO target. In the general case, Part1 refers to a x4 PCIe card plugged into the second slot of a PCIe riser card, but it could refer to any x4 device attached to the IIO unit using lanes starting at lane 4 of the 16 lanes supported by the bus.",
"UMask": "0x02",
@@ -816,7 +816,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.PEER_WRITE.PART2",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x04",
"PublicDescription": "Counts every peer to peer write request of 4 bytes of data made by IIO Part2 to the MMIO space of an IIO target. In the general case, Part2 refers to a x4 or x8 PCIe card plugged into the third slot of a PCIe riser card, but it could refer to any x4 or x8 device attached to the IIO unit and using lanes starting at lane 8 of the 16 lanes supported by the bus.",
"UMask": "0x02",
@@ -828,7 +828,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.PEER_WRITE.PART3",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x08",
"PublicDescription": "Counts every peer to peer write request of 4 bytes of data made by IIO Part3 to the MMIO space of an IIO target. In the general case, Part3 refers to a x4 PCIe card plugged into the fourth slot of a PCIe riser card, but it could brefer to any device attached to the IIO unit using the lanes starting at lane 12 of the 16 lanes supported by the bus.",
"UMask": "0x02",
@@ -840,7 +840,7 @@
"EventCode": "0xC1",
"EventName": "UNC_IIO_TXN_REQ_BY_CPU.MEM_READ.PART0",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x01",
"PublicDescription": "Counts every read request for up to a 64 byte transaction of data made by a unit on the main die (generally a core) or by another IIO unit to the MMIO space of a card on IIO Part0. In the general case, part0 refers to a standard PCIe card of any size (x16,x8,x4) that is plugged directly into one of the PCIe slots. Part0 could also refer to any device plugged into the first slot of a PCIe riser card or to a device attached to the IIO unit which starts its use of the bus using lane 0 of the 16 lanes supported by the bus.",
"UMask": "0x04",
@@ -852,7 +852,7 @@
"EventCode": "0xC1",
"EventName": "UNC_IIO_TXN_REQ_BY_CPU.MEM_READ.PART1",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x02",
"PublicDescription": "Counts every read request for up to a 64 byte transaction of data made by a unit on the main die (generally a core) or by another IIO unit to the MMIO space of a card on IIO Part1. In the general case, Part1 refers to a x4 PCIe card plugged into the second slot of a PCIe riser card, but it could refer to any x4 device attached to the IIO unit using lanes starting at lane 4 of the 16 lanes supported by the bus.",
"UMask": "0x04",
@@ -864,7 +864,7 @@
"EventCode": "0xC1",
"EventName": "UNC_IIO_TXN_REQ_BY_CPU.MEM_READ.PART2",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x04",
"PublicDescription": "Counts every read request for up to a 64 byte transaction of data made by a unit on the main die (generally a core) or by another IIO unit to the MMIO space of a card on IIO Part2. In the general case, Part2 refers to a x4 or x8 PCIe card plugged into the third slot of a PCIe riser card, but it could refer to any x4 or x8 device attached to the IIO unit and using lanes starting at lane 8 of the 16 lanes supported by the bus.",
"UMask": "0x04",
@@ -876,7 +876,7 @@
"EventCode": "0xC1",
"EventName": "UNC_IIO_TXN_REQ_BY_CPU.MEM_READ.PART3",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x08",
"PublicDescription": "Counts every read request for up to a 64 byte transaction of data made by a unit on the main die (generally a core) or by another IIO unit to the MMIO space of a card on IIO Part3. In the general case, Part3 refers to a x4 PCIe card plugged into the fourth slot of a PCIe riser card, but it could brefer to any device attached to the IIO unit using the lanes starting at lane 12 of the 16 lanes supported by the bus.",
"UMask": "0x04",
@@ -888,7 +888,7 @@
"EventCode": "0xC1",
"EventName": "UNC_IIO_TXN_REQ_BY_CPU.MEM_WRITE.PART0",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x01",
"PublicDescription": "Counts every write request of up to a 64 byte transaction of data made to the MMIO space of a card on IIO Part0 by a unit on the main die (generally a core) or by another IIO unit. In the general case, Part0 refers to a standard PCIe card of any size (x16,x8,x4) that is plugged directly into one of the PCIe slots. Part0 could also refer to any device plugged into the first slot of a PCIe riser card or to a device attached to the IIO unit which starts its use of the bus using lane 0 of the 16 lanes supported by the bus.",
"UMask": "0x01",
@@ -900,7 +900,7 @@
"EventCode": "0xC1",
"EventName": "UNC_IIO_TXN_REQ_BY_CPU.MEM_WRITE.PART1",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x02",
"PublicDescription": "Counts every write request of up to a 64 byte transaction of data made to the MMIO space of a card on IIO Part1 by a unit on the main die (generally a core) or by another IIO unit. In the general case, Part1 refers to a x4 PCIe card plugged into the second slot of a PCIe riser card, but it could refer to any x4 device attached to the IIO unit using lanes starting at lane 4 of the 16 lanes supported by the bus.",
"UMask": "0x01",
@@ -912,7 +912,7 @@
"EventCode": "0xC1",
"EventName": "UNC_IIO_TXN_REQ_BY_CPU.MEM_WRITE.PART2",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x04",
"PublicDescription": "Counts every write request of up to a 64 byte transaction of data made to the MMIO space of a card on IIO Part2 by a unit on the main die (generally a core) or by another IIO unit. In the general case, Part2 refers to a x4 or x8 PCIe card plugged into the third slot of a PCIe riser card, but it could refer to any x4 or x8 device attached to the IIO unit and using lanes starting at lane 8 of the 16 lanes supported by the bus.",
"UMask": "0x01",
@@ -924,7 +924,7 @@
"EventCode": "0xC1",
"EventName": "UNC_IIO_TXN_REQ_BY_CPU.MEM_WRITE.PART3",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x08",
"PublicDescription": "Counts every write request of up to a 64 byte transaction of data made to the MMIO space of a card on IIO Part3 by a unit on the main die (generally a core) or by another IIO unit. In the general case, Part3 refers to a x4 PCIe card plugged into the fourth slot of a PCIe riser card, but it could brefer to any device attached to the IIO unit using the lanes starting at lane 12 of the 16 lanes supported by the bus.",
"UMask": "0x01",
@@ -936,7 +936,7 @@
"EventCode": "0xC1",
"EventName": "UNC_IIO_TXN_REQ_BY_CPU.PEER_READ.PART0",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x01",
"PublicDescription": "Counts every peer to peer read request for up to a 64 byte transaction of data made by a different IIO unit to the MMIO space of a card on IIO Part0. Does not include requests made by the same IIO unit. In the general case, part0 refers to a standard PCIe card of any size (x16,x8,x4) that is plugged directly into one of the PCIe slots. Part0 could also refer to any device plugged into the first slot of a PCIe riser card or to a device attached to the IIO unit which starts its use of the bus using lane 0 of the 16 lanes supported by the bus.",
"UMask": "0x08",
@@ -948,7 +948,7 @@
"EventCode": "0xC1",
"EventName": "UNC_IIO_TXN_REQ_BY_CPU.PEER_READ.PART1",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x02",
"PublicDescription": "Counts every peer to peer read request for up to a 64 byte transaction of data made by a different IIO unit to the MMIO space of a card on IIO Part1. Does not include requests made by the same IIO unit. In the general case, Part1 refers to a x4 PCIe card plugged into the second slot of a PCIe riser card, but it could refer to any x4 device attached to the IIO unit using lanes starting at lane 4 of the 16 lanes supported by the bus.",
"UMask": "0x08",
@@ -960,7 +960,7 @@
"EventCode": "0xC1",
"EventName": "UNC_IIO_TXN_REQ_BY_CPU.PEER_READ.PART2",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x04",
"PublicDescription": "Counts every peer to peer read request for up to a 64 byte transaction of data made by a different IIO unit to the MMIO space of a card on IIO Part2. Does not include requests made by the same IIO unit. In the general case, Part2 refers to a x4 or x8 PCIe card plugged into the third slot of a PCIe riser card, but it could refer to any x4 or x8 device attached to the IIO unit and using lanes starting at lane 8 of the 16 lanes supported by the bus.",
"UMask": "0x08",
@@ -972,7 +972,7 @@
"EventCode": "0xC1",
"EventName": "UNC_IIO_TXN_REQ_BY_CPU.PEER_READ.PART3",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x08",
"PublicDescription": "Counts every peer to peer read request for up to a 64 byte transaction of data made by a different IIO unit to the MMIO space of a card on IIO Part3. Does not include requests made by the same IIO unit. In the general case, Part3 refers to a x4 PCIe card plugged into the fourth slot of a PCIe riser card, but it could brefer to any device attached to the IIO unit using the lanes starting at lane 12 of the 16 lanes supported by the bus.",
"UMask": "0x08",
@@ -984,7 +984,7 @@
"EventCode": "0xC1",
"EventName": "UNC_IIO_TXN_REQ_BY_CPU.PEER_WRITE.PART0",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x01",
"PublicDescription": "Counts every peer to peer write request of up to a 64 byte transaction of data made to the MMIO space of a card on IIO Part0 by a different IIO unit. Does not include requests made by the same IIO unit. In the general case, Part0 refers to a standard PCIe card of any size (x16,x8,x4) that is plugged directly into one of the PCIe slots. Part0 could also refer to any device plugged into the first slot of a PCIe riser card or to a device attached to the IIO unit which starts its use of the bus using lane 0 of the 16 lanes supported by the bus.",
"UMask": "0x02",
@@ -996,7 +996,7 @@
"EventCode": "0xC1",
"EventName": "UNC_IIO_TXN_REQ_BY_CPU.PEER_WRITE.PART1",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x02",
"PublicDescription": "Counts every peer to peer write request of up to a 64 byte transaction of data made to the MMIO space of a card on IIO Part1 by a different IIO unit. Does not include requests made by the same IIO unit. In the general case, Part1 refers to a x4 PCIe card plugged into the second slot of a PCIe riser card, but it could refer to any x4 device attached to the IIO unit using lanes starting at lane 4 of the 16 lanes supported by the bus.",
"UMask": "0x02",
@@ -1008,7 +1008,7 @@
"EventCode": "0xC1",
"EventName": "UNC_IIO_TXN_REQ_BY_CPU.PEER_WRITE.PART2",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x04",
"PublicDescription": "Counts every peer to peer write request of up to a 64 byte transaction of data made to the MMIO space of a card on IIO Part2 by a different IIO unit. Does not include requests made by the same IIO unit. In the general case, Part2 refers to a x4 or x8 PCIe card plugged into the third slot of a PCIe riser card, but it could refer to any x4 or x8 device attached to the IIO unit and using lanes starting at lane 8 of the 16 lanes supported by the bus.",
"UMask": "0x02",
@@ -1020,7 +1020,7 @@
"EventCode": "0xC1",
"EventName": "UNC_IIO_TXN_REQ_BY_CPU.PEER_WRITE.PART3",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x08",
"PublicDescription": "Counts every peer to peer write request of up to a 64 byte transaction of data made to the MMIO space of a card on IIO Part3 by a different IIO unit. Does not include requests made by the same IIO unit. In the general case, Part3 refers to a x4 PCIe card plugged into the fourth slot of a PCIe riser card, but it could brefer to any device attached to the IIO unit using the lanes starting at lane 12 of the 16 lanes supported by the bus.",
"UMask": "0x02",
@@ -1032,7 +1032,7 @@
"EventCode": "0x84",
"EventName": "UNC_IIO_TXN_REQ_OF_CPU.MEM_READ.PART0",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x01",
"PublicDescription": "Counts every read request for up to a 64 byte transaction of data made by IIO Part0 to a unit on the main die (generally memory). In the general case, Part0 refers to a standard PCIe card of any size (x16,x8,x4) that is plugged directly into one of the PCIe slots. Part0 could also refer to any device plugged into the first slot of a PCIe riser card or to a device attached to the IIO unit which starts its use of the bus using lane 0 of the 16 lanes supported by the bus.",
"UMask": "0x04",
@@ -1044,7 +1044,7 @@
"EventCode": "0x84",
"EventName": "UNC_IIO_TXN_REQ_OF_CPU.MEM_READ.PART1",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x02",
"PublicDescription": "Counts every read request for up to a 64 byte transaction of data made by IIO Part1 to a unit on the main die (generally memory). In the general case, Part1 refers to a x4 PCIe card plugged into the second slot of a PCIe riser card, but it could refer to any x4 device attached to the IIO unit using lanes starting at lane 4 of the 16 lanes supported by the bus.",
"UMask": "0x04",
@@ -1056,7 +1056,7 @@
"EventCode": "0x84",
"EventName": "UNC_IIO_TXN_REQ_OF_CPU.MEM_READ.PART2",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x04",
"PublicDescription": "Counts every read request for up to a 64 byte transaction of data made by IIO Part2 to a unit on the main die (generally memory). In the general case, Part2 refers to a x4 or x8 PCIe card plugged into the third slot of a PCIe riser card, but it could refer to any x4 or x8 device attached to the IIO unit and using lanes starting at lane 8 of the 16 lanes supported by the bus.",
"UMask": "0x04",
@@ -1068,7 +1068,7 @@
"EventCode": "0x84",
"EventName": "UNC_IIO_TXN_REQ_OF_CPU.MEM_READ.PART3",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x08",
"PublicDescription": "Counts every read request for up to a 64 byte transaction of data made by IIO Part3 to a unit on the main die (generally memory). In the general case, Part3 refers to a x4 PCIe card plugged into the fourth slot of a PCIe riser card, but it could brefer to any device attached to the IIO unit using the lanes starting at lane 12 of the 16 lanes supported by the bus.",
"UMask": "0x04",
@@ -1080,7 +1080,7 @@
"EventCode": "0x84",
"EventName": "UNC_IIO_TXN_REQ_OF_CPU.MEM_WRITE.PART0",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x01",
"PublicDescription": "Counts every write request of up to a 64 byte transaction of data made by IIO Part0 to a unit on the main die (generally memory). In the general case, Part0 refers to a standard PCIe card of any size (x16,x8,x4) that is plugged directly into one of the PCIe slots. Part0 could also refer to any device plugged into the first slot of a PCIe riser card or to a device attached to the IIO unit which starts its use of the bus using lane 0 of the 16 lanes supported by the bus.",
"UMask": "0x01",
@@ -1092,7 +1092,7 @@
"EventCode": "0x84",
"EventName": "UNC_IIO_TXN_REQ_OF_CPU.MEM_WRITE.PART1",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x02",
"PublicDescription": "Counts every write request of up to a 64 byte transaction of data made by IIO Part1 to a unit on the main die (generally memory). In the general case, Part1 refers to a x4 PCIe card plugged into the second slot of a PCIe riser card, but it could refer to any x4 device attached to the IIO unit using lanes starting at lane 4 of the 16 lanes supported by the bus.",
"UMask": "0x01",
@@ -1104,7 +1104,7 @@
"EventCode": "0x84",
"EventName": "UNC_IIO_TXN_REQ_OF_CPU.MEM_WRITE.PART2",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x04",
"PublicDescription": "Counts every write request of up to a 64 byte transaction of data made by IIO Part2 to a unit on the main die (generally memory). In the general case, Part2 refers to a x4 or x8 PCIe card plugged into the third slot of a PCIe riser card, but it could refer to any x4 or x8 device attached to the IIO unit and using lanes starting at lane 8 of the 16 lanes supported by the bus.",
"UMask": "0x01",
@@ -1116,7 +1116,7 @@
"EventCode": "0x84",
"EventName": "UNC_IIO_TXN_REQ_OF_CPU.MEM_WRITE.PART3",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x08",
"PublicDescription": "Counts every write request of up to a 64 byte transaction of data made by IIO Part3 to a unit on the main die (generally memory). In the general case, Part3 refers to a x4 PCIe card plugged into the fourth slot of a PCIe riser card, but it could brefer to any device attached to the IIO unit using the lanes starting at lane 12 of the 16 lanes supported by the bus.",
"UMask": "0x01",
@@ -1128,7 +1128,7 @@
"EventCode": "0x84",
"EventName": "UNC_IIO_TXN_REQ_OF_CPU.PEER_READ.PART0",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x01",
"PublicDescription": "Counts every peer to peer read request of up to a 64 byte transaction made by IIO Part0 to the MMIO space of an IIO target. In the general case, Part0 refers to a standard PCIe card of any size (x16,x8,x4) that is plugged directly into one of the PCIe slots. Part0 could also refer to any device plugged into the first slot of a PCIe riser card or to a device attached to the IIO unit which starts its use of the bus using lane 0 of the 16 lanes supported by the bus.",
"UMask": "0x08",
@@ -1140,7 +1140,7 @@
"EventCode": "0x84",
"EventName": "UNC_IIO_TXN_REQ_OF_CPU.PEER_READ.PART1",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x02",
"PublicDescription": "Counts every peer to peer read request of up to a 64 byte transaction made by IIO Part1 to the MMIO space of an IIO target. In the general case, Part1 refers to a x4 PCIe card plugged into the second slot of a PCIe riser card, but it could refer to any x4 device attached to the IIO unit using lanes starting at lane 4 of the 16 lanes supported by the bus.",
"UMask": "0x08",
@@ -1152,7 +1152,7 @@
"EventCode": "0x84",
"EventName": "UNC_IIO_TXN_REQ_OF_CPU.PEER_READ.PART2",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x04",
"PublicDescription": "Counts every peer to peer read request of up to a 64 byte transaction made by IIO Part2 to the MMIO space of an IIO target. In the general case, Part2 refers to a x4 or x8 PCIe card plugged into the third slot of a PCIe riser card, but it could refer to any x4 or x8 device attached to the IIO unit and using lanes starting at lane 8 of the 16 lanes supported by the bus.",
"UMask": "0x08",
@@ -1164,7 +1164,7 @@
"EventCode": "0x84",
"EventName": "UNC_IIO_TXN_REQ_OF_CPU.PEER_READ.PART3",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x08",
"PublicDescription": "Counts every peer to peer read request of up to a 64 byte transaction made by IIO Part3 to the MMIO space of an IIO target. In the general case, Part3 refers to a x4 PCIe card plugged into the fourth slot of a PCIe riser card, but it could brefer to any device attached to the IIO unit using the lanes starting at lane 12 of the 16 lanes supported by the bus.",
"UMask": "0x08",
@@ -1176,7 +1176,7 @@
"EventCode": "0x84",
"EventName": "UNC_IIO_TXN_REQ_OF_CPU.PEER_WRITE.PART0",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x01",
"PublicDescription": "Counts every peer to peer write request of up to a 64 byte transaction of data made by IIO Part0 to the MMIO space of an IIO target. In the general case, Part0 refers to a standard PCIe card of any size (x16,x8,x4) that is plugged directly into one of the PCIe slots. Part0 could also refer to any device plugged into the first slot of a PCIe riser card or to a device attached to the IIO unit which starts its use of the bus using lane 0 of the 16 lanes supported by the bus.",
"UMask": "0x02",
@@ -1188,7 +1188,7 @@
"EventCode": "0x84",
"EventName": "UNC_IIO_TXN_REQ_OF_CPU.PEER_WRITE.PART1",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x02",
"PublicDescription": "Counts every peer to peer write request of up to a 64 byte transaction of data made by IIO Part1 to the MMIO space of an IIO target.In the general case, Part1 refers to a x4 PCIe card plugged into the second slot of a PCIe riser card, but it could refer to any x4 device attached to the IIO unit using lanes starting at lane 4 of the 16 lanes supported by the bus.",
"UMask": "0x02",
@@ -1200,7 +1200,7 @@
"EventCode": "0x84",
"EventName": "UNC_IIO_TXN_REQ_OF_CPU.PEER_WRITE.PART2",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x04",
"PublicDescription": "Counts every peer to peer write request of up to a 64 byte transaction of data made by IIO Part2 to the MMIO space of an IIO target. In the general case, Part2 refers to a x4 or x8 PCIe card plugged into the third slot of a PCIe riser card, but it could refer to any x4 or x8 device attached to the IIO unit and using lanes starting at lane 8 of the 16 lanes supported by the bus.",
"UMask": "0x02",
@@ -1212,7 +1212,7 @@
"EventCode": "0x84",
"EventName": "UNC_IIO_TXN_REQ_OF_CPU.PEER_WRITE.PART3",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x08",
"PublicDescription": "Counts every peer to peer write request of up to a 64 byte transaction of data made by IIO Part3 to the MMIO space of an IIO target. In the general case, Part3 refers to a x4 PCIe card plugged into the fourth slot of a PCIe riser card, but it could brefer to any device attached to the IIO unit using the lanes starting at lane 12 of the 16 lanes supported by the bus.",
"UMask": "0x02",
@@ -1223,7 +1223,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x22",
"EventName": "UNC_M2M_BYPASS_M2M_Egress.NOT_TAKEN",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts traffic in which the M2M (Mesh to Memory) to iMC (Memory Controller) bypass was not taken",
"UMask": "0x2",
"Unit": "M2M"
@@ -1233,7 +1233,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x24",
"EventName": "UNC_M2M_DIRECT2CORE_NOT_TAKEN_DIRSTATE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts cycles when direct to core mode (which bypasses the CHA) was disabled",
"Unit": "M2M"
},
@@ -1242,7 +1242,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x23",
"EventName": "UNC_M2M_DIRECT2CORE_TAKEN",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when messages were sent direct to core (bypassing the CHA)",
"Unit": "M2M"
},
@@ -1251,7 +1251,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x25",
"EventName": "UNC_M2M_DIRECT2CORE_TXN_OVERRIDE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts reads in which direct to core transactions (which would have bypassed the CHA) were overridden",
"Unit": "M2M"
},
@@ -1260,7 +1260,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x28",
"EventName": "UNC_M2M_DIRECT2UPI_NOT_TAKEN_CREDITS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts reads in which direct to Intel Ultra Path Interconnect (UPI) transactions (which would have bypassed the CHA) were overridden",
"Unit": "M2M"
},
@@ -1269,7 +1269,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x27",
"EventName": "UNC_M2M_DIRECT2UPI_NOT_TAKEN_DIRSTATE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts cycles when the ability to send messages direct to the Intel Ultra Path Interconnect (bypassing the CHA) was disabled",
"Unit": "M2M"
},
@@ -1278,7 +1278,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x26",
"EventName": "UNC_M2M_DIRECT2UPI_TAKEN",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when messages were sent direct to the Intel Ultra Path Interconnect (bypassing the CHA)",
"Unit": "M2M"
},
@@ -1287,7 +1287,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x29",
"EventName": "UNC_M2M_DIRECT2UPI_TXN_OVERRIDE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when a read message that was sent direct to the Intel Ultra Path Interconnect (bypassing the CHA) was overridden",
"Unit": "M2M"
},
@@ -1296,7 +1296,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2D",
"EventName": "UNC_M2M_DIRECTORY_LOOKUP.ANY",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) looks into the multi-socket cacheline Directory state, and found the cacheline marked in Any State (A, I, S or unused)",
"UMask": "0x1",
"Unit": "M2M"
@@ -1306,7 +1306,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2D",
"EventName": "UNC_M2M_DIRECTORY_LOOKUP.STATE_A",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) looks into the multi-socket cacheline Directory state, and found the cacheline marked in the A (SnoopAll) state, indicating the cacheline is stored in another socket in any state, and we must snoop the other sockets to make sure we get the latest data. The data may be stored in any state in the local socket.",
"UMask": "0x8",
"Unit": "M2M"
@@ -1316,7 +1316,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2D",
"EventName": "UNC_M2M_DIRECTORY_LOOKUP.STATE_I",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) looks into the multi-socket cacheline Directory state , and found the cacheline marked in the I (Invalid) state indicating the cacheline is not stored in another socket, and so there is no need to snoop the other sockets for the latest data. The data may be stored in any state in the local socket.",
"UMask": "0x2",
"Unit": "M2M"
@@ -1326,7 +1326,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2D",
"EventName": "UNC_M2M_DIRECTORY_LOOKUP.STATE_S",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) looks into the multi-socket cacheline Directory state , and found the cacheline marked in the S (Shared) state indicating the cacheline is either stored in another socket in the S(hared) state , and so there is no need to snoop the other sockets for the latest data. The data may be stored in any state in the local socket.",
"UMask": "0x4",
"Unit": "M2M"
@@ -1336,7 +1336,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2E",
"EventName": "UNC_M2M_DIRECTORY_UPDATE.A2I",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from from A (SnoopAll) to I (Invalid)",
"UMask": "0x20",
"Unit": "M2M"
@@ -1346,7 +1346,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2E",
"EventName": "UNC_M2M_DIRECTORY_UPDATE.A2S",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from from A (SnoopAll) to S (Shared)",
"UMask": "0x40",
"Unit": "M2M"
@@ -1356,7 +1356,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2E",
"EventName": "UNC_M2M_DIRECTORY_UPDATE.ANY",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory to a new state",
"UMask": "0x1",
"Unit": "M2M"
@@ -1366,7 +1366,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2E",
"EventName": "UNC_M2M_DIRECTORY_UPDATE.I2A",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from from I (Invalid) to A (SnoopAll)",
"UMask": "0x4",
"Unit": "M2M"
@@ -1376,7 +1376,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2E",
"EventName": "UNC_M2M_DIRECTORY_UPDATE.I2S",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from from I (Invalid) to S (Shared)",
"UMask": "0x2",
"Unit": "M2M"
@@ -1386,7 +1386,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2E",
"EventName": "UNC_M2M_DIRECTORY_UPDATE.S2A",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from from S (Shared) to A (SnoopAll)",
"UMask": "0x10",
"Unit": "M2M"
@@ -1396,7 +1396,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2E",
"EventName": "UNC_M2M_DIRECTORY_UPDATE.S2I",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from from S (Shared) to I (Invalid)",
"UMask": "0x8",
"Unit": "M2M"
@@ -1406,7 +1406,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x37",
"EventName": "UNC_M2M_IMC_READS.ALL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) issues reads to the iMC (Memory Controller).",
"UMask": "0x4",
"Unit": "M2M"
@@ -1416,7 +1416,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x37",
"EventName": "UNC_M2M_IMC_READS.NORMAL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) issues reads to the iMC (Memory Controller). It only counts normal priority non-isochronous reads.",
"UMask": "0x1",
"Unit": "M2M"
@@ -1426,7 +1426,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x37",
"EventName": "UNC_M2M_IMC_READS.TO_PMM",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "M2M Reads Issued to iMC; All, regardless of priority.",
"UMask": "0x8",
"Unit": "M2M"
@@ -1436,7 +1436,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x38",
"EventName": "UNC_M2M_IMC_WRITES.ALL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) issues writes to the iMC (Memory Controller).",
"UMask": "0x10",
"Unit": "M2M"
@@ -1446,7 +1446,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x38",
"EventName": "UNC_M2M_IMC_WRITES.NI",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "M2M Writes Issued to iMC; All, regardless of priority.",
"UMask": "0x80",
"Unit": "M2M"
@@ -1456,7 +1456,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x38",
"EventName": "UNC_M2M_IMC_WRITES.PARTIAL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) issues partial writes to the iMC (Memory Controller). It only counts normal priority non-isochronous writes.",
"UMask": "0x2",
"Unit": "M2M"
@@ -1466,7 +1466,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x38",
"EventName": "UNC_M2M_IMC_WRITES.TO_PMM",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "M2M Writes Issued to iMC; All, regardless of priority.",
"UMask": "0x20",
"Unit": "M2M"
@@ -1476,7 +1476,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x56",
"EventName": "UNC_M2M_PREFCAM_DEMAND_PROMOTIONS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) promotes a outstanding request in the prefetch queue due to a subsequent demand read request that entered the M2M with the same address. Explanatory Side Note: The Prefecth queue is made of CAM (Content Addressable Memory)",
"Unit": "M2M"
},
@@ -1485,7 +1485,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x57",
"EventName": "UNC_M2M_PREFCAM_INSERTS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) recieves a prefetch request and inserts it into its outstanding prefetch queue. Explanatory Side Note: the prefect queue is made from CAM: Content Addressable Memory",
"Unit": "M2M"
},
@@ -1494,7 +1494,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_M2M_RxC_AD_INSERTS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the a new entry is Received(RxC) and then added to the AD (Address Ring) Ingress Queue from the CMS (Common Mesh Stop). This is generally used for reads, and",
"Unit": "M2M"
},
@@ -1503,7 +1503,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2",
"EventName": "UNC_M2M_RxC_AD_OCCUPANCY",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "AD Ingress (from CMS) Occupancy",
"Unit": "M2M"
},
@@ -1512,7 +1512,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x5",
"EventName": "UNC_M2M_RxC_BL_INSERTS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "BL Ingress (from CMS) Allocations",
"Unit": "M2M"
},
@@ -1521,7 +1521,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x6",
"EventName": "UNC_M2M_RxC_BL_OCCUPANCY",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "BL Ingress (from CMS) Occupancy",
"Unit": "M2M"
},
@@ -1530,7 +1530,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2C",
"EventName": "UNC_M2M_TAG_HIT.NM_RD_HIT_DIRTY",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Tag Hit; Read Hit from NearMem, Dirty Line",
"UMask": "0x02",
"Unit": "M2M"
@@ -1540,7 +1540,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2C",
"EventName": "UNC_M2M_TAG_HIT.NM_UFILL_HIT_CLEAN",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Tag Hit; Underfill Rd Hit from NearMem, Clean Line",
"UMask": "0x04",
"Unit": "M2M"
@@ -1550,7 +1550,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2C",
"EventName": "UNC_M2M_TAG_HIT.NM_UFILL_HIT_DIRTY",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Tag Hit; Underfill Rd Hit from NearMem, Dirty Line",
"UMask": "0x08",
"Unit": "M2M"
@@ -1560,7 +1560,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x9",
"EventName": "UNC_M2M_TxC_AD_INSERTS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "AD Egress (to CMS) Allocations",
"Unit": "M2M"
},
@@ -1569,7 +1569,7 @@
"Counter": "0,1,2,3",
"EventCode": "0xA",
"EventName": "UNC_M2M_TxC_AD_OCCUPANCY",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "AD Egress (to CMS) Occupancy",
"Unit": "M2M"
},
@@ -1578,7 +1578,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x15",
"EventName": "UNC_M2M_TxC_BL_INSERTS.ALL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "BL Egress (to CMS) Allocations; All",
"UMask": "0x03",
"Unit": "M2M"
@@ -1588,7 +1588,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x16",
"EventName": "UNC_M2M_TxC_BL_OCCUPANCY.ALL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "BL Egress (to CMS) Occupancy; All",
"UMask": "0x03",
"Unit": "M2M"
@@ -1598,7 +1598,7 @@
"Counter": "0,1,2",
"EventCode": "0x29",
"EventName": "UNC_M3UPI_UPI_PREFETCH_SPAWN",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Count cases where flow control queue that sits between the Intel Ultra Path Interconnect (UPI) and the mesh spawns a prefetch to the iMC (Memory Controller)",
"Unit": "M3UPI"
},
@@ -1607,7 +1607,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_UPI_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts clockticks of the fixed frequency clock controlling the Intel Ultra Path Interconnect (UPI). This clock runs at1/8th the 'GT/s' speed of the UPI link. For example, a 9.6GT/s link will have a fixed Frequency of 1.2 Ghz.",
"Unit": "UPI LL"
},
@@ -1616,7 +1616,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x12",
"EventName": "UNC_UPI_DIRECT_ATTEMPTS.D2C",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts Data Response (DRS) packets that attempted to go direct to core bypassing the CHA.",
"UMask": "0x1",
"Unit": "UPI LL"
@@ -1626,7 +1626,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x12",
"EventName": "UNC_UPI_DIRECT_ATTEMPTS.D2U",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts Data Response (DRS) packets that attempted to go direct to Intel Ultra Path Interconnect (UPI) bypassing the CHA .",
"UMask": "0x2",
"Unit": "UPI LL"
@@ -1636,7 +1636,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x21",
"EventName": "UNC_UPI_L1_POWER_CYCLES",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts cycles when the Intel Ultra Path Interconnect (UPI) is in L1 power mode. L1 is a mode that totally shuts down the UPI link. Link power states are per link and per direction, so for example the Tx direction could be in one state while Rx was in another, this event only coutns when both links are shutdown.",
"Unit": "UPI LL"
},
@@ -1645,7 +1645,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x25",
"EventName": "UNC_UPI_RxL0P_POWER_CYCLES",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts cycles when the the receive side (Rx) of the Intel Ultra Path Interconnect(UPI) is in L0p power mode. L0p is a mode where we disable 60% of the UPI lanes, decreasing our bandwidth in order to save power.",
"Unit": "UPI LL"
},
@@ -1654,7 +1654,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x31",
"EventName": "UNC_UPI_RxL_BYPASSED.SLOT0",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts incoming FLITs (FLow control unITs) which bypassed the slot0 RxQ buffer (Receive Queue) and passed directly to the Egress. This is a latency optimization, and should generally be the common case. If this value is less than the number of FLITs transfered, it implies that there was queueing getting onto the ring, and thus the transactions saw higher latency.",
"UMask": "0x1",
"Unit": "UPI LL"
@@ -1664,7 +1664,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x31",
"EventName": "UNC_UPI_RxL_BYPASSED.SLOT1",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts incoming FLITs (FLow control unITs) which bypassed the slot1 RxQ buffer (Receive Queue) and passed directly across the BGF and into the Egress. This is a latency optimization, and should generally be the common case. If this value is less than the number of FLITs transfered, it implies that there was queueing getting onto the ring, and thus the transactions saw higher latency.",
"UMask": "0x2",
"Unit": "UPI LL"
@@ -1674,7 +1674,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x31",
"EventName": "UNC_UPI_RxL_BYPASSED.SLOT2",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts incoming FLITs (FLow control unITs) whcih bypassed the slot2 RxQ buffer (Receive Queue) and passed directly to the Egress. This is a latency optimization, and should generally be the common case. If this value is less than the number of FLITs transfered, it implies that there was queueing getting onto the ring, and thus the transactions saw higher latency.",
"UMask": "0x4",
"Unit": "UPI LL"
@@ -1684,7 +1684,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x3",
"EventName": "UNC_UPI_RxL_FLITS.ALL_DATA",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts valid data FLITs (80 bit FLow control unITs: 64bits of data) received from any of the 3 Intel Ultra Path Interconnect (UPI) Receive Queue slots on this UPI unit.",
"UMask": "0x0F",
"Unit": "UPI LL"
@@ -1694,7 +1694,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x3",
"EventName": "UNC_UPI_RxL_FLITS.ALL_NULL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts null FLITs (80 bit FLow control unITs) received from any of the 3 Intel Ultra Path Interconnect (UPI) Receive Queue slots on this UPI unit.",
"UMask": "0x27",
"Unit": "UPI LL"
@@ -1704,7 +1704,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x3",
"EventName": "UNC_UPI_RxL_FLITS.NON_DATA",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts protocol header and credit FLITs (80 bit FLow control unITs) received from any of the 3 UPI slots on this UPI unit.",
"UMask": "0x97",
"Unit": "UPI LL"
@@ -1714,7 +1714,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x27",
"EventName": "UNC_UPI_TxL0P_POWER_CYCLES",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts cycles when the transmit side (Tx) of the Intel Ultra Path Interconnect(UPI) is in L0p power mode. L0p is a mode where we disable 60% of the UPI lanes, decreasing our bandwidth in order to save power.",
"Unit": "UPI LL"
},
@@ -1723,7 +1723,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x41",
"EventName": "UNC_UPI_TxL_BYPASSED",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts incoming FLITs (FLow control unITs) which bypassed the TxL(transmit) FLIT buffer and pass directly out the UPI Link. Generally, when data is transmitted across the Intel Ultra Path Interconnect (UPI), it will bypass the TxQ and pass directly to the link. However, the TxQ will be used in L0p (Low Power) mode and (Link Layer Retry) LLR mode, increasing latency to transfer out to the link.",
"Unit": "UPI LL"
},
@@ -1732,7 +1732,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2",
"EventName": "UNC_UPI_TxL_FLITS.ALL_NULL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts null FLITs (80 bit FLow control unITs) transmitted via any of the 3 Intel Ulra Path Interconnect (UPI) slots on this UPI unit.",
"UMask": "0x27",
"Unit": "UPI LL"
@@ -1742,7 +1742,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2",
"EventName": "UNC_UPI_TxL_FLITS.DATA",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Shows legal flit time (hides impact of L0p and L0c).; Count Data Flits (which consume all slots), but how much to count is based on Slot0-2 mask, so count can be 0-3 depending on which slots are enabled for counting..",
"UMask": "0x8",
"Unit": "UPI LL"
@@ -1752,7 +1752,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2",
"EventName": "UNC_UPI_TxL_FLITS.IDLE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the Intel Ultra Path Interconnect(UPI) transmits an idle FLIT(80 bit FLow control unITs). Every UPI cycle must be sending either data FLITs, protocol/credit FLITs or idle FLITs.",
"UMask": "0x47",
"Unit": "UPI LL"
@@ -1762,7 +1762,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2",
"EventName": "UNC_UPI_TxL_FLITS.NON_DATA",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts protocol header and credit FLITs (80 bit FLow control unITs) transmitted across any of the 3 UPI (Ultra Path Interconnect) slots on this UPI unit.",
"UMask": "0x97",
"Unit": "UPI LL"
diff --git a/tools/perf/pmu-events/arch/x86/haswellx/uncore-cache.json b/tools/perf/pmu-events/arch/x86/haswellx/uncore-cache.json
index 58ed6d33d1f4..60b8e34de513 100644
--- a/tools/perf/pmu-events/arch/x86/haswellx/uncore-cache.json
+++ b/tools/perf/pmu-events/arch/x86/haswellx/uncore-cache.json
@@ -3,7 +3,7 @@
"BriefDescription": "Uncore cache clock ticks",
"Counter": "0,1,2,3",
"EventName": "UNC_C_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "CBO"
},
{
@@ -12,7 +12,7 @@
"EventCode": "0x34",
"EventName": "UNC_C_LLC_LOOKUP.ANY",
"Filter": "filter_state=0x1",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x11",
"Unit": "CBO"
@@ -22,7 +22,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x37",
"EventName": "UNC_C_LLC_VICTIMS.M_STATE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -33,7 +33,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.DATA_READ",
"Filter": "filter_opc=0x182",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -44,7 +44,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.UNCACHEABLE",
"Filter": "filter_opc=0x187",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -55,7 +55,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.MMIO_READ",
"Filter": "filter_opc=0x187,filter_nc=1",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -66,7 +66,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.MMIO_WRITE",
"Filter": "filter_opc=0x18f,filter_nc=1",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -77,7 +77,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.RFO_LLC_PREFETCH",
"Filter": "filter_opc=0x190",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -88,7 +88,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.CODE_LLC_PREFETCH",
"Filter": "filter_opc=0x191",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -99,7 +99,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.DATA_LLC_PREFETCH",
"Filter": "filter_opc=0x192",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -110,7 +110,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.PCIE_READ",
"Filter": "filter_opc=0x19e",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -121,7 +121,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.PCIE_WRITE",
"Filter": "filter_opc=0x1c8",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -132,7 +132,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.PCIE_NON_SNOOP_WRITE",
"Filter": "filter_opc=0x1c8,filter_tid=0x3e",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -143,7 +143,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.PCIE_NS_PARTIAL_WRITE",
"Filter": "filter_opc=0x180,filter_tid=0x3e",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x1",
"Unit": "CBO"
},
@@ -153,7 +153,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.CODE_LLC_PREFETCH",
"Filter": "filter_opc=0x181",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -164,7 +164,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.STREAMING_FULL",
"Filter": "filter_opc=0x18c",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -175,7 +175,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.STREAMING_PARTIAL",
"Filter": "filter_opc=0x18d",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -186,7 +186,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.PCIE_READ",
"Filter": "filter_opc=0x19e",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -197,7 +197,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.PCIE_WRITE",
"Filter": "filter_opc=0x1c8,filter_tid=0x3e",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -207,7 +207,7 @@
"EventCode": "0x36",
"EventName": "UNC_C_TOR_OCCUPANCY.LLC_DATA_READ",
"Filter": "filter_opc=0x182",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x3",
"Unit": "CBO"
},
@@ -216,7 +216,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_H_REQUESTS.READS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x3",
"Unit": "HA"
},
@@ -225,7 +225,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_H_REQUESTS.READS_LOCAL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x1",
"Unit": "HA"
},
@@ -234,7 +234,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_H_REQUESTS.READS_REMOTE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x2",
"Unit": "HA"
},
@@ -243,7 +243,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_H_REQUESTS.WRITES",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0xC",
"Unit": "HA"
},
@@ -252,7 +252,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_H_REQUESTS.WRITES_LOCAL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x4",
"Unit": "HA"
},
@@ -261,7 +261,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_H_REQUESTS.WRITES_REMOTE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x8",
"Unit": "HA"
},
@@ -270,7 +270,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x21",
"EventName": "UNC_H_SNOOP_RESP.RSPCNFLCT",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x40",
"Unit": "HA"
},
@@ -279,7 +279,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x21",
"EventName": "UNC_H_SNOOP_RESP.RSP_FWD_WB",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x20",
"Unit": "HA"
@@ -289,7 +289,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x21",
"EventName": "UNC_H_SNOOP_RESP.RSPIFWD",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x4",
"Unit": "HA"
@@ -299,7 +299,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x21",
"EventName": "UNC_H_SNOOP_RESP.RSPS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x2",
"Unit": "HA"
@@ -309,7 +309,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x21",
"EventName": "UNC_H_SNOOP_RESP.RSPSFWD",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x8",
"Unit": "HA"
diff --git a/tools/perf/pmu-events/arch/x86/haswellx/uncore-interconnect.json b/tools/perf/pmu-events/arch/x86/haswellx/uncore-interconnect.json
index 824961318c1e..5b2df265e712 100644
--- a/tools/perf/pmu-events/arch/x86/haswellx/uncore-interconnect.json
+++ b/tools/perf/pmu-events/arch/x86/haswellx/uncore-interconnect.json
@@ -4,14 +4,14 @@
"Counter": "0,1,2,3",
"EventCode": "0x14",
"EventName": "UNC_Q_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "QPI LL"
},
{
"BriefDescription": "Number of data flits transmitted . Derived from unc_q_txl_flits_g0.data",
"Counter": "0,1,2,3",
"EventName": "QPI_DATA_BANDWIDTH_TX",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "8Bytes",
"UMask": "0x2",
"Unit": "QPI LL"
@@ -20,7 +20,7 @@
"BriefDescription": "Number of non data (control) flits transmitted . Derived from unc_q_txl_flits_g0.non_data",
"Counter": "0,1,2,3",
"EventName": "QPI_CTL_BANDWIDTH_TX",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "8Bytes",
"UMask": "0x4",
"Unit": "QPI LL"
diff --git a/tools/perf/pmu-events/arch/x86/haswellx/uncore-memory.json b/tools/perf/pmu-events/arch/x86/haswellx/uncore-memory.json
index 66eed399724c..7415eef71559 100644
--- a/tools/perf/pmu-events/arch/x86/haswellx/uncore-memory.json
+++ b/tools/perf/pmu-events/arch/x86/haswellx/uncore-memory.json
@@ -4,7 +4,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x4",
"EventName": "LLC_MISSES.MEM_READ",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "iMC"
@@ -14,7 +14,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x4",
"EventName": "LLC_MISSES.MEM_WRITE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0xC",
"Unit": "iMC"
@@ -23,7 +23,7 @@
"BriefDescription": "Memory controller clock ticks",
"Counter": "0,1,2,3",
"EventName": "UNC_M_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "iMC"
},
{
@@ -33,7 +33,7 @@
"EventName": "UNC_M_POWER_CHANNEL_PPD",
"MetricExpr": "(UNC_M_POWER_CHANNEL_PPD / UNC_M_CLOCKTICKS) * 100.",
"MetricName": "power_channel_ppd %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "iMC"
},
{
@@ -43,7 +43,7 @@
"EventName": "UNC_M_POWER_CRITICAL_THROTTLE_CYCLES",
"MetricExpr": "(UNC_M_POWER_CRITICAL_THROTTLE_CYCLES / UNC_M_CLOCKTICKS) * 100.",
"MetricName": "power_critical_throttle_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "iMC"
},
{
@@ -53,7 +53,7 @@
"EventName": "UNC_M_POWER_SELF_REFRESH",
"MetricExpr": "(UNC_M_POWER_SELF_REFRESH / UNC_M_CLOCKTICKS) * 100.",
"MetricName": "power_self_refresh %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "iMC"
},
{
@@ -61,7 +61,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2",
"EventName": "UNC_M_PRE_COUNT.PAGE_MISS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x1",
"Unit": "iMC"
},
@@ -70,7 +70,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2",
"EventName": "UNC_M_PRE_COUNT.RD",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x4",
"Unit": "iMC"
},
@@ -79,7 +79,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2",
"EventName": "UNC_M_PRE_COUNT.WR",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x8",
"Unit": "iMC"
}
diff --git a/tools/perf/pmu-events/arch/x86/haswellx/uncore-power.json b/tools/perf/pmu-events/arch/x86/haswellx/uncore-power.json
index dd1b95655d1d..598678aaf67e 100644
--- a/tools/perf/pmu-events/arch/x86/haswellx/uncore-power.json
+++ b/tools/perf/pmu-events/arch/x86/haswellx/uncore-power.json
@@ -3,7 +3,7 @@
"BriefDescription": "PCU clock ticks. Use to get percentages of PCU cycles events",
"Counter": "0,1,2,3",
"EventName": "UNC_P_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -14,7 +14,7 @@
"Filter": "occ_sel=1",
"MetricExpr": "(UNC_P_POWER_STATE_OCCUPANCY.CORES_C0 / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "power_state_occupancy.cores_c0 %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -25,7 +25,7 @@
"Filter": "occ_sel=2",
"MetricExpr": "(UNC_P_POWER_STATE_OCCUPANCY.CORES_C3 / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "power_state_occupancy.cores_c3 %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -36,7 +36,7 @@
"Filter": "occ_sel=3",
"MetricExpr": "(UNC_P_POWER_STATE_OCCUPANCY.CORES_C6 / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "power_state_occupancy.cores_c6 %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -46,7 +46,7 @@
"EventName": "UNC_P_PROCHOT_EXTERNAL_CYCLES",
"MetricExpr": "(UNC_P_PROCHOT_EXTERNAL_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "prochot_external_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -56,7 +56,7 @@
"EventName": "UNC_P_FREQ_MAX_LIMIT_THERMAL_CYCLES",
"MetricExpr": "(UNC_P_FREQ_MAX_LIMIT_THERMAL_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_max_limit_thermal_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -66,7 +66,7 @@
"EventName": "UNC_P_FREQ_MAX_OS_CYCLES",
"MetricExpr": "(UNC_P_FREQ_MAX_OS_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_max_os_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -76,7 +76,7 @@
"EventName": "UNC_P_FREQ_MAX_POWER_CYCLES",
"MetricExpr": "(UNC_P_FREQ_MAX_POWER_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_max_power_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -86,7 +86,7 @@
"EventName": "UNC_P_FREQ_TRANS_CYCLES",
"MetricExpr": "(UNC_P_FREQ_TRANS_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_trans_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
}
]
diff --git a/tools/perf/pmu-events/arch/x86/ivytown/uncore-cache.json b/tools/perf/pmu-events/arch/x86/ivytown/uncore-cache.json
index 267410594833..09abc07dc5fa 100644
--- a/tools/perf/pmu-events/arch/x86/ivytown/uncore-cache.json
+++ b/tools/perf/pmu-events/arch/x86/ivytown/uncore-cache.json
@@ -3,7 +3,7 @@
"BriefDescription": "Uncore cache clock ticks",
"Counter": "0,1,2,3",
"EventName": "UNC_C_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "CBO"
},
{
@@ -12,7 +12,7 @@
"EventCode": "0x34",
"EventName": "UNC_C_LLC_LOOKUP.ANY",
"Filter": "filter_state=0x1",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x11",
"Unit": "CBO"
@@ -22,7 +22,7 @@
"Counter": "0,1",
"EventCode": "0x37",
"EventName": "UNC_C_LLC_VICTIMS.M_STATE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -33,7 +33,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.DATA_READ",
"Filter": "filter_opc=0x182",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -44,7 +44,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.UNCACHEABLE",
"Filter": "filter_opc=0x187",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -55,7 +55,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.RFO_LLC_PREFETCH",
"Filter": "filter_opc=0x190",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -66,7 +66,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.CODE_LLC_PREFETCH",
"Filter": "filter_opc=0x191",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -77,7 +77,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.DATA_LLC_PREFETCH",
"Filter": "filter_opc=0x192",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -88,7 +88,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.PCIE_WRITE",
"Filter": "filter_opc=0x19c",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -99,7 +99,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.PCIE_READ",
"Filter": "filter_opc=0x19e",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -110,7 +110,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.ITOM_WRITE",
"Filter": "filter_opc=0x1c8",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -121,7 +121,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.PCIE_NON_SNOOP_READ",
"Filter": "filter_opc=0x1e4",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -132,7 +132,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.PCIE_NON_SNOOP_WRITE",
"Filter": "filter_opc=0x1e6",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -143,7 +143,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.STREAMING_FULL",
"Filter": "filter_opc=0x18c",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -154,7 +154,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.STREAMING_PARTIAL",
"Filter": "filter_opc=0x18d",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -165,7 +165,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.PCIE_PARTIAL_READ",
"Filter": "filter_opc=0x195",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -176,7 +176,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.PCIE_WRITE",
"Filter": "filter_opc=0x19c",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -187,7 +187,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.PCIE_READ",
"Filter": "filter_opc=0x19e",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -198,7 +198,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.ITOM_WRITE",
"Filter": "filter_opc=0x1c8",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -209,7 +209,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.PCIE_NS_READ",
"Filter": "filter_opc=0x1e4",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -220,7 +220,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.PCIE_NS_PARTIAL_WRITE",
"Filter": "filter_opc=0x1e5",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -231,7 +231,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.PCIE_NS_WRITE",
"Filter": "filter_opc=0x1e6",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -240,7 +240,7 @@
"BriefDescription": "Occupancy for all LLC misses that are addressed to local memory",
"EventCode": "0x36",
"EventName": "UNC_C_TOR_OCCUPANCY.MISS_LOCAL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x2A",
"Unit": "CBO"
},
@@ -249,7 +249,7 @@
"EventCode": "0x36",
"EventName": "UNC_C_TOR_OCCUPANCY.LLC_DATA_READ",
"Filter": "filter_opc=0x182",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x3",
"Unit": "CBO"
},
@@ -257,7 +257,7 @@
"BriefDescription": "Occupancy for all LLC misses that are addressed to remote memory",
"EventCode": "0x36",
"EventName": "UNC_C_TOR_OCCUPANCY.MISS_REMOTE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x8A",
"Unit": "CBO"
},
@@ -266,7 +266,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_H_REQUESTS.READS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x3",
"Unit": "HA"
},
@@ -275,7 +275,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_H_REQUESTS.WRITES",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0xC",
"Unit": "HA"
},
@@ -284,7 +284,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x21",
"EventName": "UNC_H_SNOOP_RESP.RSP_FWD_WB",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x20",
"Unit": "HA"
@@ -294,7 +294,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x21",
"EventName": "UNC_H_SNOOP_RESP.RSPIFWD",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x4",
"Unit": "HA"
@@ -304,7 +304,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x21",
"EventName": "UNC_H_SNOOP_RESP.RSPS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x2",
"Unit": "HA"
@@ -314,7 +314,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x21",
"EventName": "UNC_H_SNOOP_RESP.RSPSFWD",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x8",
"Unit": "HA"
diff --git a/tools/perf/pmu-events/arch/x86/ivytown/uncore-interconnect.json b/tools/perf/pmu-events/arch/x86/ivytown/uncore-interconnect.json
index b798a860bc81..f7a98c8fd3a4 100644
--- a/tools/perf/pmu-events/arch/x86/ivytown/uncore-interconnect.json
+++ b/tools/perf/pmu-events/arch/x86/ivytown/uncore-interconnect.json
@@ -4,7 +4,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x14",
"EventName": "UNC_Q_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "QPI LL"
},
{
@@ -14,7 +14,7 @@
"EventName": "UNC_Q_RxL0P_POWER_CYCLES",
"MetricExpr": "(UNC_Q_RxL0P_POWER_CYCLES / UNC_Q_CLOCKTICKS) * 100.",
"MetricName": "rxl0p_power_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "QPI LL"
},
{
@@ -24,14 +24,14 @@
"EventName": "UNC_Q_TxL0P_POWER_CYCLES",
"MetricExpr": "(UNC_Q_TxL0P_POWER_CYCLES / UNC_Q_CLOCKTICKS) * 100.",
"MetricName": "txl0p_power_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "QPI LL"
},
{
"BriefDescription": "Number of data flits transmitted ",
"Counter": "0,1,2,3",
"EventName": "UNC_Q_TxL_FLITS_G0.DATA",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "8Bytes",
"UMask": "0x2",
"Unit": "QPI LL"
@@ -40,7 +40,7 @@
"BriefDescription": "Number of non data (control) flits transmitted ",
"Counter": "0,1,2,3",
"EventName": "UNC_Q_TxL_FLITS_G0.NON_DATA",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "8Bytes",
"UMask": "0x4",
"Unit": "QPI LL"
diff --git a/tools/perf/pmu-events/arch/x86/ivytown/uncore-memory.json b/tools/perf/pmu-events/arch/x86/ivytown/uncore-memory.json
index df4b43294fa0..af9fe5598b40 100644
--- a/tools/perf/pmu-events/arch/x86/ivytown/uncore-memory.json
+++ b/tools/perf/pmu-events/arch/x86/ivytown/uncore-memory.json
@@ -4,7 +4,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_M_ACT_COUNT.RD",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x1",
"Umask": "0x3",
"Unit": "iMC"
@@ -14,7 +14,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x4",
"EventName": "LLC_MISSES.MEM_READ",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "iMC"
@@ -24,7 +24,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x4",
"EventName": "LLC_MISSES.MEM_WRITE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0xC",
"Unit": "iMC"
@@ -33,7 +33,7 @@
"BriefDescription": "Memory controller clock ticks. Use to generate percentages for memory controller CYCLES events",
"Counter": "0,1,2,3",
"EventName": "UNC_M_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "iMC"
},
{
@@ -43,7 +43,7 @@
"EventName": "UNC_M_POWER_CHANNEL_PPD",
"MetricExpr": "(UNC_M_POWER_CHANNEL_PPD / UNC_M_CLOCKTICKS) * 100.",
"MetricName": "power_channel_ppd %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "iMC"
},
{
@@ -53,7 +53,7 @@
"EventName": "UNC_M_POWER_CRITICAL_THROTTLE_CYCLES",
"MetricExpr": "(UNC_M_POWER_CRITICAL_THROTTLE_CYCLES / UNC_M_CLOCKTICKS) * 100.",
"MetricName": "power_critical_throttle_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "iMC"
},
{
@@ -63,7 +63,7 @@
"EventName": "UNC_M_POWER_SELF_REFRESH",
"MetricExpr": "(UNC_M_POWER_SELF_REFRESH / UNC_M_CLOCKTICKS) * 100.",
"MetricName": "power_self_refresh %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "iMC"
},
{
@@ -71,7 +71,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2",
"EventName": "UNC_M_PRE_COUNT.PAGE_MISS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x1",
"Unit": "iMC"
}
diff --git a/tools/perf/pmu-events/arch/x86/ivytown/uncore-power.json b/tools/perf/pmu-events/arch/x86/ivytown/uncore-power.json
index 635c09fda1d9..187ac567a0af 100644
--- a/tools/perf/pmu-events/arch/x86/ivytown/uncore-power.json
+++ b/tools/perf/pmu-events/arch/x86/ivytown/uncore-power.json
@@ -3,7 +3,7 @@
"BriefDescription": "PCU clock ticks. Use to get percentages of PCU cycles events",
"Counter": "0,1,2,3",
"EventName": "UNC_P_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -13,7 +13,7 @@
"EventName": "UNC_P_FREQ_BAND0_CYCLES",
"MetricExpr": "(UNC_P_FREQ_BAND0_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_band0_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -23,7 +23,7 @@
"EventName": "UNC_P_FREQ_BAND1_CYCLES",
"MetricExpr": "(UNC_P_FREQ_BAND1_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_band1_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -33,7 +33,7 @@
"EventName": "UNC_P_FREQ_BAND2_CYCLES",
"MetricExpr": "(UNC_P_FREQ_BAND2_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_band2_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -43,7 +43,7 @@
"EventName": "UNC_P_FREQ_BAND3_CYCLES",
"MetricExpr": "(UNC_P_FREQ_BAND3_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_band3_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -54,7 +54,7 @@
"Filter": "edge=1",
"MetricExpr": "(UNC_P_FREQ_BAND0_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_band0_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -65,7 +65,7 @@
"Filter": "edge=1",
"MetricExpr": "(UNC_P_FREQ_BAND1_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_band1_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -76,7 +76,7 @@
"Filter": "edge=1",
"MetricExpr": "(UNC_P_FREQ_BAND2_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_band2_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -87,7 +87,7 @@
"Filter": "edge=1",
"MetricExpr": "(UNC_P_FREQ_BAND3_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_band3_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -98,7 +98,7 @@
"Filter": "occ_sel=1",
"MetricExpr": "(UNC_P_POWER_STATE_OCCUPANCY.CORES_C0 / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "power_state_occupancy.cores_c0 %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -109,7 +109,7 @@
"Filter": "occ_sel=2",
"MetricExpr": "(UNC_P_POWER_STATE_OCCUPANCY.CORES_C3 / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "power_state_occupancy.cores_c3 %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -120,7 +120,7 @@
"Filter": "occ_sel=3",
"MetricExpr": "(UNC_P_POWER_STATE_OCCUPANCY.CORES_C6 / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "power_state_occupancy.cores_c6 %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -130,7 +130,7 @@
"EventName": "UNC_P_PROCHOT_EXTERNAL_CYCLES",
"MetricExpr": "(UNC_P_PROCHOT_EXTERNAL_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "prochot_external_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -140,7 +140,7 @@
"EventName": "UNC_P_FREQ_MAX_LIMIT_THERMAL_CYCLES",
"MetricExpr": "(UNC_P_FREQ_MAX_LIMIT_THERMAL_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_max_limit_thermal_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -150,7 +150,7 @@
"EventName": "UNC_P_FREQ_MAX_OS_CYCLES",
"MetricExpr": "(UNC_P_FREQ_MAX_OS_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_max_os_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -160,7 +160,7 @@
"EventName": "UNC_P_FREQ_MAX_POWER_CYCLES",
"MetricExpr": "(UNC_P_FREQ_MAX_POWER_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_max_power_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -170,7 +170,7 @@
"EventName": "UNC_P_FREQ_MAX_CURRENT_CYCLES",
"MetricExpr": "(UNC_P_FREQ_MAX_CURRENT_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_max_current_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -180,7 +180,7 @@
"EventName": "UNC_P_FREQ_TRANS_CYCLES",
"MetricExpr": "(UNC_P_FREQ_TRANS_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_trans_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -191,7 +191,7 @@
"Filter": "filter_band0=12",
"MetricExpr": "(UNC_P_FREQ_GE_1200MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_ge_1200mhz_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -202,7 +202,7 @@
"Filter": "filter_band1=20",
"MetricExpr": "(UNC_P_FREQ_GE_2000MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_ge_2000mhz_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -213,7 +213,7 @@
"Filter": "filter_band2=30",
"MetricExpr": "(UNC_P_FREQ_GE_3000MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_ge_3000mhz_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -224,7 +224,7 @@
"Filter": "filter_band3=40",
"MetricExpr": "(UNC_P_FREQ_GE_4000MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_ge_4000mhz_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -235,7 +235,7 @@
"Filter": "edge=1,filter_band0=12",
"MetricExpr": "(UNC_P_FREQ_GE_1200MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_ge_1200mhz_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -246,7 +246,7 @@
"Filter": "edge=1,filter_band1=20",
"MetricExpr": "(UNC_P_FREQ_GE_2000MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_ge_2000mhz_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -257,7 +257,7 @@
"Filter": "edge=1,filter_band2=30",
"MetricExpr": "(UNC_P_FREQ_GE_3000MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_ge_3000mhz_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -268,7 +268,7 @@
"Filter": "edge=1,filter_band3=40",
"MetricExpr": "(UNC_P_FREQ_GE_4000MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_ge_4000mhz_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
}
]
diff --git a/tools/perf/pmu-events/arch/x86/jaketown/uncore-cache.json b/tools/perf/pmu-events/arch/x86/jaketown/uncore-cache.json
index 3fa61d962607..98c58b0cf32e 100644
--- a/tools/perf/pmu-events/arch/x86/jaketown/uncore-cache.json
+++ b/tools/perf/pmu-events/arch/x86/jaketown/uncore-cache.json
@@ -3,7 +3,7 @@
"BriefDescription": "Uncore cache clock ticks",
"Counter": "0,1,2,3",
"EventName": "UNC_C_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "CBO"
},
{
@@ -12,7 +12,7 @@
"EventCode": "0x34",
"EventName": "UNC_C_LLC_LOOKUP.ANY",
"Filter": "filter_state=0x1",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x11",
"Unit": "CBO"
@@ -22,7 +22,7 @@
"Counter": "0,1",
"EventCode": "0x37",
"EventName": "UNC_C_LLC_VICTIMS.M_STATE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -33,7 +33,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.DATA_READ",
"Filter": "filter_opc=0x182",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -44,7 +44,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.UNCACHEABLE",
"Filter": "filter_opc=0x187",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -55,7 +55,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.PCIE_WRITE",
"Filter": "filter_opc=0x19c",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -66,7 +66,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.ITOM_WRITE",
"Filter": "filter_opc=0x1c8",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "CBO"
@@ -77,7 +77,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.STREAMING_FULL",
"Filter": "filter_opc=0x18c",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -88,7 +88,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.STREAMING_PARTIAL",
"Filter": "filter_opc=0x18d",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -99,7 +99,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.PCIE_PARTIAL_READ",
"Filter": "filter_opc=0x195",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -110,7 +110,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.PCIE_WRITE",
"Filter": "filter_opc=0x19c",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -121,7 +121,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.PCIE_READ",
"Filter": "filter_opc=0x19e",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -132,7 +132,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.ITOM_WRITE",
"Filter": "filter_opc=0x1c8",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -143,7 +143,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.PCIE_NS_READ",
"Filter": "filter_opc=0x1e4",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -154,7 +154,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.PCIE_NS_PARTIAL_WRITE",
"Filter": "filter_opc=0x1e5",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -165,7 +165,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.PCIE_NS_WRITE",
"Filter": "filter_opc=0x1e6",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x1",
"Unit": "CBO"
@@ -177,7 +177,7 @@
"Filter": "filter_opc=0x182",
"MetricExpr": "(UNC_C_TOR_OCCUPANCY.MISS_ALL / UNC_C_CLOCKTICKS) * 100.",
"MetricName": "tor_occupancy.miss_all %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0xa",
"Unit": "CBO"
},
@@ -185,7 +185,7 @@
"BriefDescription": "Occupancy counter for LLC data reads (demand and L2 prefetch). Derived from unc_c_tor_occupancy.miss_opcode.llc_data_read",
"EventCode": "0x36",
"EventName": "UNC_C_TOR_OCCUPANCY.LLC_DATA_READ",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x3",
"Unit": "CBO"
},
@@ -194,7 +194,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_H_REQUESTS.READS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x3",
"Unit": "HA"
},
@@ -203,7 +203,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_H_REQUESTS.WRITES",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0xc",
"Unit": "HA"
}
diff --git a/tools/perf/pmu-events/arch/x86/jaketown/uncore-interconnect.json b/tools/perf/pmu-events/arch/x86/jaketown/uncore-interconnect.json
index 1b53c0e609e3..a2c9ade947da 100644
--- a/tools/perf/pmu-events/arch/x86/jaketown/uncore-interconnect.json
+++ b/tools/perf/pmu-events/arch/x86/jaketown/uncore-interconnect.json
@@ -4,7 +4,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x14",
"EventName": "UNC_Q_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "QPI LL"
},
{
@@ -14,7 +14,7 @@
"EventName": "UNC_Q_RxL0P_POWER_CYCLES",
"MetricExpr": "(UNC_Q_RxL0P_POWER_CYCLES / UNC_Q_CLOCKTICKS) * 100.",
"MetricName": "rxl0p_power_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "QPI LL"
},
{
@@ -24,14 +24,14 @@
"EventName": "UNC_Q_TxL0P_POWER_CYCLES",
"MetricExpr": "(UNC_Q_TxL0P_POWER_CYCLES / UNC_Q_CLOCKTICKS) * 100.",
"MetricName": "txl0p_power_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "QPI LL"
},
{
"BriefDescription": "Number of data flits transmitted ",
"Counter": "0,1,2,3",
"EventName": "UNC_Q_TxL_FLITS_G0.DATA",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "8Bytes",
"UMask": "0x2",
"Unit": "QPI LL"
@@ -40,7 +40,7 @@
"BriefDescription": "Number of non data (control) flits transmitted ",
"Counter": "0,1,2,3",
"EventName": "UNC_Q_TxL_FLITS_G0.NON_DATA",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "8Bytes",
"UMask": "0x4",
"Unit": "QPI LL"
diff --git a/tools/perf/pmu-events/arch/x86/jaketown/uncore-memory.json b/tools/perf/pmu-events/arch/x86/jaketown/uncore-memory.json
index 8551cebeba23..b59d196c9c1c 100644
--- a/tools/perf/pmu-events/arch/x86/jaketown/uncore-memory.json
+++ b/tools/perf/pmu-events/arch/x86/jaketown/uncore-memory.json
@@ -4,7 +4,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_M_ACT_COUNT",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "iMC"
},
{
@@ -12,7 +12,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x4",
"EventName": "LLC_MISSES.MEM_READ",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x3",
"Unit": "iMC"
},
@@ -21,7 +21,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x4",
"EventName": "LLC_MISSES.MEM_WRITE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0xc",
"Unit": "iMC"
},
@@ -29,7 +29,7 @@
"BriefDescription": "Memory controller clock ticks. Used to get percentages of memory controller cycles events",
"Counter": "0,1,2,3",
"EventName": "UNC_M_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "iMC"
},
{
@@ -39,7 +39,7 @@
"EventName": "UNC_M_POWER_CHANNEL_PPD",
"MetricExpr": "(UNC_M_POWER_CHANNEL_PPD / UNC_M_CLOCKTICKS) * 100.",
"MetricName": "power_channel_ppd %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "iMC"
},
{
@@ -49,7 +49,7 @@
"EventName": "UNC_M_POWER_CRITICAL_THROTTLE_CYCLES",
"MetricExpr": "(UNC_M_POWER_CRITICAL_THROTTLE_CYCLES / UNC_M_CLOCKTICKS) * 100.",
"MetricName": "power_critical_throttle_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "iMC"
},
{
@@ -59,7 +59,7 @@
"EventName": "UNC_M_POWER_SELF_REFRESH",
"MetricExpr": "(UNC_M_POWER_SELF_REFRESH / UNC_M_CLOCKTICKS) * 100.",
"MetricName": "power_self_refresh %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "iMC"
},
{
@@ -67,7 +67,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2",
"EventName": "UNC_M_PRE_COUNT.PAGE_MISS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x1",
"Unit": "iMC"
},
@@ -76,7 +76,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x80",
"EventName": "UNC_M_RPQ_OCCUPANCY",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "iMC"
}
]
diff --git a/tools/perf/pmu-events/arch/x86/jaketown/uncore-power.json b/tools/perf/pmu-events/arch/x86/jaketown/uncore-power.json
index 8755693d86c6..5e4d01b33631 100644
--- a/tools/perf/pmu-events/arch/x86/jaketown/uncore-power.json
+++ b/tools/perf/pmu-events/arch/x86/jaketown/uncore-power.json
@@ -3,7 +3,7 @@
"BriefDescription": "PCU clock ticks. Use to get percentages of PCU cycles events",
"Counter": "0,1,2,3",
"EventName": "UNC_P_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -13,7 +13,7 @@
"EventName": "UNC_P_FREQ_BAND0_CYCLES",
"MetricExpr": "(UNC_P_FREQ_BAND0_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_band0_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -23,7 +23,7 @@
"EventName": "UNC_P_FREQ_BAND1_CYCLES",
"MetricExpr": "(UNC_P_FREQ_BAND1_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_band1_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -33,7 +33,7 @@
"EventName": "UNC_P_FREQ_BAND2_CYCLES",
"MetricExpr": "(UNC_P_FREQ_BAND2_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_band2_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -43,7 +43,7 @@
"EventName": "UNC_P_FREQ_BAND3_CYCLES",
"MetricExpr": "(UNC_P_FREQ_BAND3_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_band3_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -54,7 +54,7 @@
"Filter": "edge=1",
"MetricExpr": "(UNC_P_FREQ_BAND0_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_band0_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -65,7 +65,7 @@
"Filter": "edge=1",
"MetricExpr": "(UNC_P_FREQ_BAND1_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_band1_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -76,7 +76,7 @@
"Filter": "edge=1",
"MetricExpr": "(UNC_P_FREQ_BAND2_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_band2_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -87,7 +87,7 @@
"Filter": "edge=1",
"MetricExpr": "(UNC_P_FREQ_BAND3_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_band3_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -98,7 +98,7 @@
"Filter": "occ_sel=1",
"MetricExpr": "(UNC_P_POWER_STATE_OCCUPANCY.CORES_C0 / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "power_state_occupancy.cores_c0 %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -109,7 +109,7 @@
"Filter": "occ_sel=2",
"MetricExpr": "(UNC_P_POWER_STATE_OCCUPANCY.CORES_C3 / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "power_state_occupancy.cores_c3 %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -120,7 +120,7 @@
"Filter": "occ_sel=3",
"MetricExpr": "(UNC_P_POWER_STATE_OCCUPANCY.CORES_C6 / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "power_state_occupancy.cores_c6 %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -130,7 +130,7 @@
"EventName": "UNC_P_PROCHOT_EXTERNAL_CYCLES",
"MetricExpr": "(UNC_P_PROCHOT_EXTERNAL_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "prochot_external_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -140,7 +140,7 @@
"EventName": "UNC_P_FREQ_MAX_LIMIT_THERMAL_CYCLES",
"MetricExpr": "(UNC_P_FREQ_MAX_LIMIT_THERMAL_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_max_limit_thermal_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -150,7 +150,7 @@
"EventName": "UNC_P_FREQ_MAX_OS_CYCLES",
"MetricExpr": "(UNC_P_FREQ_MAX_OS_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_max_os_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -160,7 +160,7 @@
"EventName": "UNC_P_FREQ_MAX_POWER_CYCLES",
"MetricExpr": "(UNC_P_FREQ_MAX_POWER_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_max_power_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -170,7 +170,7 @@
"EventName": "UNC_P_FREQ_MAX_CURRENT_CYCLES",
"MetricExpr": "(UNC_P_FREQ_MAX_CURRENT_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_max_current_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -179,7 +179,7 @@
"EventName": "UNC_P_FREQ_TRANS_CYCLES",
"MetricExpr": "(UNC_P_FREQ_TRANS_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_trans_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -190,7 +190,7 @@
"Filter": "filter_band0=12",
"MetricExpr": "(UNC_P_FREQ_GE_1200MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_ge_1200mhz_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -201,7 +201,7 @@
"Filter": "filter_band1=20",
"MetricExpr": "(UNC_P_FREQ_GE_2000MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_ge_2000mhz_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -212,7 +212,7 @@
"Filter": "filter_band2=30",
"MetricExpr": "(UNC_P_FREQ_GE_3000MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_ge_3000mhz_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -223,7 +223,7 @@
"Filter": "filter_band3=40",
"MetricExpr": "(UNC_P_FREQ_GE_4000MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_ge_4000mhz_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -234,7 +234,7 @@
"Filter": "edge=1,filter_band0=12",
"MetricExpr": "(UNC_P_FREQ_GE_1200MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_ge_1200mhz_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -245,7 +245,7 @@
"Filter": "edge=1,filter_band1=20",
"MetricExpr": "(UNC_P_FREQ_GE_2000MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_ge_2000mhz_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -256,7 +256,7 @@
"Filter": "edge=1,filter_band2=30",
"MetricExpr": "(UNC_P_FREQ_GE_3000MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_ge_3000mhz_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
},
{
@@ -267,7 +267,7 @@
"Filter": "edge=1,filter_band3=40",
"MetricExpr": "(UNC_P_FREQ_GE_4000MHZ_CYCLES / UNC_P_CLOCKTICKS) * 100.",
"MetricName": "freq_ge_4000mhz_cycles %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "PCU"
}
]
diff --git a/tools/perf/pmu-events/arch/x86/knightslanding/uncore-memory.json b/tools/perf/pmu-events/arch/x86/knightslanding/uncore-memory.json
index e3bcd86c4f56..d31b6d5a4e0a 100644
--- a/tools/perf/pmu-events/arch/x86/knightslanding/uncore-memory.json
+++ b/tools/perf/pmu-events/arch/x86/knightslanding/uncore-memory.json
@@ -4,7 +4,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x03",
"EventName": "UNC_M_CAS_COUNT.RD",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "6.4e-05MiB",
"UMask": "0x01",
"Unit": "imc"
@@ -14,7 +14,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x03",
"EventName": "UNC_M_CAS_COUNT.WR",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "6.4e-05MiB",
"UMask": "0x02",
"Unit": "imc"
@@ -24,7 +24,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x01",
"EventName": "UNC_E_RPQ_INSERTS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "6.4e-05MiB",
"UMask": "0x01",
"Unit": "edc_eclk"
@@ -34,7 +34,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x02",
"EventName": "UNC_E_WPQ_INSERTS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "6.4e-05MiB",
"UMask": "0x01",
"Unit": "edc_eclk"
diff --git a/tools/perf/pmu-events/arch/x86/skylakex/uncore-memory.json b/tools/perf/pmu-events/arch/x86/skylakex/uncore-memory.json
index 9c7e5f8beee2..fb4516c8efac 100644
--- a/tools/perf/pmu-events/arch/x86/skylakex/uncore-memory.json
+++ b/tools/perf/pmu-events/arch/x86/skylakex/uncore-memory.json
@@ -4,7 +4,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x4",
"EventName": "LLC_MISSES.MEM_READ",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "iMC"
@@ -14,7 +14,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x4",
"EventName": "LLC_MISSES.MEM_WRITE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0xC",
"Unit": "iMC"
@@ -23,7 +23,7 @@
"BriefDescription": "Memory controller clock ticks",
"Counter": "0,1,2,3",
"EventName": "UNC_M_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "iMC"
},
{
@@ -33,7 +33,7 @@
"EventName": "UNC_M_POWER_CHANNEL_PPD",
"MetricExpr": "(UNC_M_POWER_CHANNEL_PPD / UNC_M_CLOCKTICKS) * 100.",
"MetricName": "power_channel_ppd %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "iMC"
},
{
@@ -43,7 +43,7 @@
"EventName": "UNC_M_POWER_SELF_REFRESH",
"MetricExpr": "(UNC_M_POWER_SELF_REFRESH / UNC_M_CLOCKTICKS) * 100.",
"MetricName": "power_self_refresh %",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "iMC"
},
{
@@ -51,7 +51,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2",
"EventName": "UNC_M_PRE_COUNT.PAGE_MISS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x1",
"Unit": "iMC"
},
@@ -60,7 +60,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2",
"EventName": "UNC_M_PRE_COUNT.RD",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x4",
"Unit": "iMC"
},
@@ -69,7 +69,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2",
"EventName": "UNC_M_PRE_COUNT.WR",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x8",
"Unit": "iMC"
},
@@ -78,7 +78,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_M_ACT_COUNT.WR",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts DRAM Page Activate commands sent on this channel due to a write request to the iMC (Memory Controller). Activate commands are issued to open up a page on the DRAM devices so that it can be read or written to with a CAS (Column Access Select) command.",
"UMask": "0x2",
"Unit": "iMC"
@@ -88,7 +88,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x4",
"EventName": "UNC_M_CAS_COUNT.ALL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts all CAS (Column Address Select) commands issued to DRAM per memory channel. CAS commands are issued to specify the address to read or write on DRAM, so this event increments for every read and write. This event counts whether AutoPrecharge (which closes the DRAM Page automatically after a read/write) is enabled or not.",
"UMask": "0xF",
"Unit": "iMC"
@@ -98,7 +98,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x4",
"EventName": "LLC_MISSES.MEM_READ",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x3",
"Unit": "iMC"
@@ -108,7 +108,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x4",
"EventName": "UNC_M_CAS_COUNT.RD_REG",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts CAS (Column Access Select) regular read commands issued to DRAM on a per channel basis. CAS commands are issued to specify the address to read or write on DRAM, and this event increments for every regular read. This event only counts regular reads and does not includes underfill reads due to partial write requests. This event counts whether AutoPrecharge (which closes the DRAM Page automatically after a read/write) is enabled or not.",
"UMask": "0x1",
"Unit": "iMC"
@@ -118,7 +118,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x4",
"EventName": "UNC_M_CAS_COUNT.RD_UNDERFILL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts CAS (Column Access Select) underfill read commands issued to DRAM due to a partial write, on a per channel basis. CAS commands are issued to specify the address to read or write on DRAM, and this command counts underfill reads. Partial writes must be completed by first reading in the underfill from DRAM and then merging in the partial write data before writing the full line back to DRAM. This event will generally count about the same as the number of partial writes, but may be slightly less because of partials hitting in the WPQ (due to a previous write request). ",
"UMask": "0x2",
"Unit": "iMC"
@@ -128,7 +128,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x4",
"EventName": "LLC_MISSES.MEM_WRITE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0xC",
"Unit": "iMC"
@@ -138,7 +138,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x10",
"EventName": "UNC_M_RPQ_INSERTS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts the number of read requests allocated into the Read Pending Queue (RPQ). This queue is used to schedule reads out to the memory controller and to track the requests. Requests allocate into the RPQ soon after they enter the memory controller, and need credits for an entry in this buffer before being sent from the CHA to the iMC. The requests deallocate after the read CAS command has been issued to DRAM. This event counts both Isochronous and non-Isochronous requests which were issued to the RPQ. ",
"Unit": "iMC"
},
@@ -147,7 +147,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x80",
"EventName": "UNC_M_RPQ_OCCUPANCY",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts the number of entries in the Read Pending Queue (RPQ) at each cycle. This can then be used to calculate both the average occupancy of the queue (in conjunction with the number of cycles not empty) and the average latency in the queue (in conjunction with the number of allocations). The RPQ is used to schedule reads out to the memory controller and to track the requests. Requests allocate into the RPQ soon after they enter the memory controller, and need credits for an entry in this buffer before being sent from the CHA to the iMC. They deallocate from the RPQ after the CAS command has been issued to memory.",
"Unit": "iMC"
},
@@ -156,7 +156,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x20",
"EventName": "UNC_M_WPQ_INSERTS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts the number of writes requests allocated into the Write Pending Queue (WPQ). The WPQ is used to schedule writes out to the memory controller and to track the requests. Requests allocate into the WPQ soon after they enter the memory controller, and need credits for an entry in this buffer before being sent from the CHA to the iMC (Memory Controller). The write requests deallocate after being issued to DRAM. Write requests themselves are able to complete (from the perspective of the rest of the system) as soon they have 'posted' to the iMC.",
"Unit": "iMC"
},
@@ -165,7 +165,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x81",
"EventName": "UNC_M_WPQ_OCCUPANCY",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts the number of entries in the Write Pending Queue (WPQ) at each cycle. This can then be used to calculate both the average queue occupancy (in conjunction with the number of cycles not empty) and the average latency (in conjunction with the number of allocations). The WPQ is used to schedule writes out to the memory controller and to track the requests.",
"Unit": "iMC"
}
diff --git a/tools/perf/pmu-events/arch/x86/skylakex/uncore-other.json b/tools/perf/pmu-events/arch/x86/skylakex/uncore-other.json
index adb42c72f5c8..b347f9aad2ef 100644
--- a/tools/perf/pmu-events/arch/x86/skylakex/uncore-other.json
+++ b/tools/perf/pmu-events/arch/x86/skylakex/uncore-other.json
@@ -3,7 +3,7 @@
"BriefDescription": "Uncore cache clock ticks",
"Counter": "0,1,2,3",
"EventName": "UNC_CHA_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "CHA"
},
{
@@ -12,7 +12,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.UNCACHEABLE",
"Filter": "config1=0x40e33",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x21",
"Unit": "CHA"
},
@@ -22,7 +22,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.MMIO_READ",
"Filter": "config1=0x40040e33",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x21",
"Unit": "CHA"
},
@@ -32,7 +32,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.MMIO_WRITE",
"Filter": "config1=0x40041e33",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x21",
"Unit": "CHA"
},
@@ -42,7 +42,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.STREAMING_FULL",
"Filter": "config1=0x41833",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x21",
"Unit": "CHA"
@@ -53,7 +53,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.STREAMING_PARTIAL",
"Filter": "config1=0x41a33",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x21",
"Unit": "CHA"
@@ -63,7 +63,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x50",
"EventName": "UNC_CHA_REQUESTS.READS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x03",
"Unit": "CHA"
},
@@ -72,7 +72,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x50",
"EventName": "UNC_CHA_REQUESTS.READS_LOCAL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x01",
"Unit": "CHA"
},
@@ -81,7 +81,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x50",
"EventName": "UNC_CHA_REQUESTS.READS_REMOTE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x02",
"Unit": "CHA"
},
@@ -90,7 +90,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x50",
"EventName": "UNC_CHA_REQUESTS.WRITES",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x0C",
"Unit": "CHA"
},
@@ -99,7 +99,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x50",
"EventName": "UNC_CHA_REQUESTS.WRITES_LOCAL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x04",
"Unit": "CHA"
},
@@ -108,7 +108,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x50",
"EventName": "UNC_CHA_REQUESTS.WRITES_REMOTE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x08",
"Unit": "CHA"
},
@@ -117,7 +117,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2",
"EventName": "UPI_DATA_BANDWIDTH_TX",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "7.11E-06Bytes",
"UMask": "0x0F",
"Unit": "UPI LL"
@@ -131,7 +131,7 @@
"Filter": "ch_mask=0x1f",
"MetricExpr": "UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART0 + UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART1 + UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART2 + UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART3",
"MetricName": "LLC_MISSES.PCIE_READ",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x01",
"ScaleUnit": "4Bytes",
"UMask": "0x04",
@@ -146,7 +146,7 @@
"Filter": "ch_mask=0x1f",
"MetricExpr": "UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART0 +UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART1 +UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART2 +UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART3",
"MetricName": "LLC_MISSES.PCIE_WRITE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x01",
"ScaleUnit": "4Bytes",
"UMask": "0x01",
@@ -160,7 +160,7 @@
"FCMask": "0x07",
"MetricExpr": "UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART0 +UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART1 +UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART2 +UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART3",
"MetricName": "LLC_MISSES.PCIE_WRITE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x01",
"ScaleUnit": "4Bytes",
"UMask": "0x01",
@@ -172,7 +172,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART1",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x02",
"ScaleUnit": "4Bytes",
"UMask": "0x01",
@@ -184,7 +184,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART2",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x04",
"ScaleUnit": "4Bytes",
"UMask": "0x01",
@@ -196,7 +196,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART3",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x08",
"ScaleUnit": "4Bytes",
"UMask": "0x01",
@@ -210,7 +210,7 @@
"FCMask": "0x07",
"MetricExpr": "UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART0 + UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART1 + UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART2 + UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART3",
"MetricName": "LLC_MISSES.PCIE_READ",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x01",
"ScaleUnit": "4Bytes",
"UMask": "0x04",
@@ -222,7 +222,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART1",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x02",
"ScaleUnit": "4Bytes",
"UMask": "0x04",
@@ -234,7 +234,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART2",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x04",
"ScaleUnit": "4Bytes",
"UMask": "0x04",
@@ -246,7 +246,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART3",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x08",
"ScaleUnit": "4Bytes",
"UMask": "0x04",
@@ -257,7 +257,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x33",
"EventName": "UNC_CHA_CORE_SNP.CORE_GTONE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts the number of transactions that trigger a configurable number of cross snoops. Cores are snooped if the transaction looks up the cache and determines that it is necessary based on the operation type and what CoreValid bits are set. For example, if 2 CV bits are set on a data read, the cores must have the data in S state so it is not necessary to snoop them. However, if only 1 CV bit is set the core my have modified the data. If the transaction was an RFO, it would need to invalidate the lines. This event can be filtered based on who triggered the initial snoop(s).",
"UMask": "0x42",
"Unit": "CHA"
@@ -267,7 +267,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x33",
"EventName": "UNC_CHA_CORE_SNP.EVICT_GTONE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts the number of transactions that trigger a configurable number of cross snoops. Cores are snooped if the transaction looks up the cache and determines that it is necessary based on the operation type and what CoreValid bits are set. For example, if 2 CV bits are set on a data read, the cores must have the data in S state so it is not necessary to snoop them. However, if only 1 CV bit is set the core my have modified the data. If the transaction was an RFO, it would need to invalidate the lines. This event can be filtered based on who triggered the initial snoop(s).",
"UMask": "0x82",
"Unit": "CHA"
@@ -277,7 +277,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x53",
"EventName": "UNC_CHA_DIR_LOOKUP.NO_SNP",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts transactions that looked into the multi-socket cacheline Directory state, and therefore did not send a snoop because the Directory indicated it was not needed",
"UMask": "0x02",
"Unit": "CHA"
@@ -287,7 +287,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x53",
"EventName": "UNC_CHA_DIR_LOOKUP.SNP",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts transactions that looked into the multi-socket cacheline Directory state, and sent one or more snoops, because the Directory indicated it was needed",
"UMask": "0x01",
"Unit": "CHA"
@@ -297,7 +297,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x54",
"EventName": "UNC_CHA_DIR_UPDATE.HA",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts only multi-socket cacheline Directory state updates memory writes issued from the HA pipe. This does not include memory write requests which are for I (Invalid) or E (Exclusive) cachelines.",
"UMask": "0x01",
"Unit": "CHA"
@@ -307,7 +307,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x54",
"EventName": "UNC_CHA_DIR_UPDATE.TOR",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts only multi-socket cacheline Directory state updates due to memory writes issued from the TOR pipe which are the result of remote transaction hitting the SF/LLC and returning data Core2Core. This does not include memory write requests which are for I (Invalid) or E (Exclusive) cachelines.",
"UMask": "0x02",
"Unit": "CHA"
@@ -317,7 +317,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x5F",
"EventName": "UNC_CHA_HITME_HIT.EX_RDS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts read requests from a remote socket which hit in the HitME cache (used to cache the multi-socket Directory state) to a line in the E(Exclusive) state. This includes the following read opcodes (RdCode, RdData, RdDataMigratory, RdCur, RdInv*, Inv*)",
"UMask": "0x01",
"Unit": "CHA"
@@ -327,7 +327,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x59",
"EventName": "UNC_CHA_IMC_READS_COUNT.NORMAL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when a normal (Non-Isochronous) read is issued to any of the memory controller channels from the CHA.",
"UMask": "0x01",
"Unit": "CHA"
@@ -337,7 +337,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x5B",
"EventName": "UNC_CHA_IMC_WRITES_COUNT.FULL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when a normal (Non-Isochronous) full line write is issued from the CHA to the any of the memory controller channels.",
"UMask": "0x01",
"Unit": "CHA"
@@ -347,7 +347,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x39",
"EventName": "UNC_CHA_MISC.RFO_HIT_S",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when a RFO (the Read for Ownership issued before a write) request hit a cacheline in the S (Shared) state.",
"UMask": "0x08",
"Unit": "CHA"
@@ -357,7 +357,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x50",
"EventName": "UNC_CHA_REQUESTS.INVITOE_LOCAL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts the total number of requests coming from a unit on this socket for exclusive ownership of a cache line without receiving data (INVITOE) to the CHA.",
"UMask": "0x10",
"Unit": "CHA"
@@ -367,7 +367,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x50",
"EventName": "UNC_CHA_REQUESTS.INVITOE_REMOTE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts the total number of requests coming from a remote socket for exclusive ownership of a cache line without receiving data (INVITOE) to the CHA.",
"UMask": "0x20",
"Unit": "CHA"
@@ -377,7 +377,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x5C",
"EventName": "UNC_CHA_SNOOP_RESP.RSPCNFLCTS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when a a transaction with the opcode type RspCnflct* Snoop Response was received. This is returned when a snoop finds an existing outstanding transaction in a remote caching agent. This triggers conflict resolution hardware. This covers both the opcode RspCnflct and RspCnflctWbI.",
"UMask": "0x40",
"Unit": "CHA"
@@ -387,7 +387,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x5C",
"EventName": "UNC_CHA_SNOOP_RESP.RSPI",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when a transaction with the opcode type RspI Snoop Response was received which indicates the remote cache does not have the data, or when the remote cache silently evicts data (such as when an RFO: the Read for Ownership issued before a write hits non-modified data).",
"UMask": "0x01",
"Unit": "CHA"
@@ -397,7 +397,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x5C",
"EventName": "UNC_CHA_SNOOP_RESP.RSPIFWD",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when a a transaction with the opcode type RspIFwd Snoop Response was received which indicates a remote caching agent forwarded the data and the requesting agent is able to acquire the data in E (Exclusive) or M (modified) states. This is commonly returned with RFO (the Read for Ownership issued before a write) transactions. The snoop could have either been to a cacheline in the M,E,F (Modified, Exclusive or Forward) states.",
"UMask": "0x04",
"Unit": "CHA"
@@ -407,7 +407,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x5C",
"EventName": "UNC_CHA_SNOOP_RESP.RSPSFWD",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when a a transaction with the opcode type RspSFwd Snoop Response was received which indicates a remote caching agent forwarded the data but held on to its current copy. This is common for data and code reads that hit in a remote socket in E (Exclusive) or F (Forward) state.",
"UMask": "0x08",
"Unit": "CHA"
@@ -417,7 +417,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x5C",
"EventName": "UNC_CHA_SNOOP_RESP.RSP_FWD_WB",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when a transaction with the opcode type Rsp*Fwd*WB Snoop Response was received which indicates the data was written back to it's home socket, and the cacheline was forwarded to the requestor socket. This snoop response is only used in >= 4 socket systems. It is used when a snoop HITM's in a remote caching agent and it directly forwards data to a requestor, and simultaneously returns data to it's home socket to be written back to memory.",
"UMask": "0x20",
"Unit": "CHA"
@@ -427,7 +427,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x5C",
"EventName": "UNC_CHA_SNOOP_RESP.RSP_WBWB",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when a transaction with the opcode type Rsp*WB Snoop Response was received which indicates which indicates the data was written back to it's home. This is returned when a non-RFO request hits a cacheline in the Modified state. The Cache can either downgrade the cacheline to a S (Shared) or I (Invalid) state depending on how the system has been configured. This response will also be sent when a cache requests E (Exclusive) ownership of a cache line without receiving data, because the cache must acquire ownership.",
"UMask": "0x10",
"Unit": "CHA"
@@ -437,7 +437,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_IIO_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts clockticks of the 1GHz trafiic controller clock in the IIO unit.",
"Unit": "IIO"
},
@@ -447,7 +447,7 @@
"EventCode": "0xC0",
"EventName": "UNC_IIO_DATA_REQ_BY_CPU.MEM_READ.PART0",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x01",
"PublicDescription": "Counts every read request for 4 bytes of data made by a unit on the main die (generally a core) to the MMIO space of a card on IIO Part0. In the general case, Part0 refers to a standard PCIe card of any size (x16,x8,x4) that is plugged directly into one of the PCIe slots. Part0 could also refer to any device plugged into the first slot of a PCIe riser card or to a device attached to the IIO unit which starts its use of the bus using lane 0 of the 16 lanes supported by the bus.",
"UMask": "0x04",
@@ -459,7 +459,7 @@
"EventCode": "0xC0",
"EventName": "UNC_IIO_DATA_REQ_BY_CPU.MEM_READ.PART1",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x02",
"PublicDescription": "Counts every read request for 4 bytes of data made by a unit on the main die (generally a core) to the MMIO space of a card on IIO Part1. In the general case, Part1 refers to a x4 PCIe card plugged into the second slot of a PCIe riser card, but it could refer to any x4 device attached to the IIO unit using lanes starting at lane 4 of the 16 lanes supported by the bus.",
"UMask": "0x04",
@@ -471,7 +471,7 @@
"EventCode": "0xC0",
"EventName": "UNC_IIO_DATA_REQ_BY_CPU.MEM_READ.PART2",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x04",
"PublicDescription": "Counts every read request for 4 bytes of data made by a unit on the main die (generally a core) to the MMIO space of a card on IIO Part2. In the general case, Part2 refers to a x4 or x8 PCIe card plugged into the third slot of a PCIe riser card, but it could refer to any x4 or x8 device attached to the IIO unit and using lanes starting at lane 8 of the 16 lanes supported by the bus.",
"UMask": "0x04",
@@ -483,7 +483,7 @@
"EventCode": "0xC0",
"EventName": "UNC_IIO_DATA_REQ_BY_CPU.MEM_READ.PART3",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x08",
"PublicDescription": "Counts every read request for 4 bytes of data made by a unit on the main die (generally a core) to the MMIO space of a card on IIO Part3. In the general case, Part3 refers to a x4 PCIe card plugged into the fourth slot of a PCIe riser card, but it could brefer to any device attached to the IIO unit using the lanes starting at lane 12 of the 16 lanes supported by the bus.",
"UMask": "0x04",
@@ -495,7 +495,7 @@
"EventCode": "0xC0",
"EventName": "UNC_IIO_DATA_REQ_BY_CPU.MEM_WRITE.PART0",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x01",
"PublicDescription": "Counts every write request of 4 bytes of data made to the MMIO space of a card on IIO Part0 by a unit on the main die (generally a core). In the general case, Part0 refers to a standard PCIe card of any size (x16,x8,x4) that is plugged directly into one of the PCIe slots. Part0 could also refer to any device plugged into the first slot of a PCIe riser card or to a device attached to the IIO unit which starts its use of the bus using lane 0 of the 16 lanes supported by the bus.",
"UMask": "0x01",
@@ -507,7 +507,7 @@
"EventCode": "0xC0",
"EventName": "UNC_IIO_DATA_REQ_BY_CPU.MEM_WRITE.PART1",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x02",
"PublicDescription": "Counts every write request of 4 bytes of data made to the MMIO space of a card on IIO Part1 by a unit on the main die (generally a core). In the general case, Part1 refers to a x4 PCIe card plugged into the second slot of a PCIe riser card, but it could refer to any x4 device attached to the IIO unit using lanes starting at lane 4 of the 16 lanes supported by the bus.",
"UMask": "0x01",
@@ -519,7 +519,7 @@
"EventCode": "0xC0",
"EventName": "UNC_IIO_DATA_REQ_BY_CPU.MEM_WRITE.PART2",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x04",
"PublicDescription": "Counts every write request of 4 bytes of data made to the MMIO space of a card on IIO Part2 by a unit on the main die (generally a core). In the general case, Part2 refers to a x4 or x8 PCIe card plugged into the third slot of a PCIe riser card, but it could refer to any x4 or x8 device attached to the IIO unit and using lanes starting at lane 8 of the 16 lanes supported by the bus.",
"UMask": "0x01",
@@ -531,7 +531,7 @@
"EventCode": "0xC0",
"EventName": "UNC_IIO_DATA_REQ_BY_CPU.MEM_WRITE.PART3",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x08",
"PublicDescription": "Counts every write request of 4 bytes of data made to the MMIO space of a card on IIO Part3 by a unit on the main die (generally a core). In the general case, Part3 refers to a x4 PCIe card plugged into the fourth slot of a PCIe riser card, but it could brefer to any device attached to the IIO unit using the lanes starting at lane 12 of the 16 lanes supported by the bus.",
"UMask": "0x01",
@@ -543,7 +543,7 @@
"EventCode": "0xC1",
"EventName": "UNC_IIO_TXN_REQ_BY_CPU.MEM_READ.PART0",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x01",
"PublicDescription": "Counts every read request for up to a 64 byte transaction of data made by a unit on the main die (generally a core) to the MMIO space of a card on IIO Part0. In the general case, part0 refers to a standard PCIe card of any size (x16,x8,x4) that is plugged directly into one of the PCIe slots. Part0 could also refer to any device plugged into the first slot of a PCIe riser card or to a device attached to the IIO unit which starts its use of the bus using lane 0 of the 16 lanes supported by the bus.",
"UMask": "0x04",
@@ -555,7 +555,7 @@
"EventCode": "0xC1",
"EventName": "UNC_IIO_TXN_REQ_BY_CPU.MEM_READ.PART1",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x02",
"PublicDescription": "Counts every read request for up to a 64 byte transaction of data made by a unit on the main die (generally a core) to the MMIO space of a card on IIO Part1. In the general case, Part1 refers to a x4 PCIe card plugged into the second slot of a PCIe riser card, but it could refer to any x4 device attached to the IIO unit using lanes starting at lane 4 of the 16 lanes supported by the bus.",
"UMask": "0x04",
@@ -567,7 +567,7 @@
"EventCode": "0xC1",
"EventName": "UNC_IIO_TXN_REQ_BY_CPU.MEM_READ.PART2",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x04",
"PublicDescription": "Counts every read request for up to a 64 byte transaction of data made by a unit on the main die (generally a core) to the MMIO space of a card on IIO Part2. In the general case, Part2 refers to a x4 or x8 PCIe card plugged into the third slot of a PCIe riser card, but it could refer to any x4 or x8 device attached to the IIO unit and using lanes starting at lane 8 of the 16 lanes supported by the bus.",
"UMask": "0x04",
@@ -579,7 +579,7 @@
"EventCode": "0xC1",
"EventName": "UNC_IIO_TXN_REQ_BY_CPU.MEM_READ.PART3",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x08",
"PublicDescription": "Counts every read request for up to a 64 byte transaction of data made by a unit on the main die (generally a core) to the MMIO space of a card on IIO Part3. In the general case, Part3 refers to a x4 PCIe card plugged into the fourth slot of a PCIe riser card, but it could brefer to any device attached to the IIO unit using the lanes starting at lane 12 of the 16 lanes supported by the bus.",
"UMask": "0x04",
@@ -591,7 +591,7 @@
"EventCode": "0xC1",
"EventName": "UNC_IIO_TXN_REQ_BY_CPU.MEM_WRITE.PART0",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x01",
"PublicDescription": "Counts every write request of up to a 64 byte transaction of data made to the MMIO space of a card on IIO Part0 by a unit on the main die (generally a core). In the general case, Part0 refers to a standard PCIe card of any size (x16,x8,x4) that is plugged directly into one of the PCIe slots. Part0 could also refer to any device plugged into the first slot of a PCIe riser card or to a device attached to the IIO unit which starts its use of the bus using lane 0 of the 16 lanes supported by the bus.",
"UMask": "0x01",
@@ -603,7 +603,7 @@
"EventCode": "0xC1",
"EventName": "UNC_IIO_TXN_REQ_BY_CPU.MEM_WRITE.PART1",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x02",
"PublicDescription": "Counts every write request of up to a 64 byte transaction of data made to the MMIO space of a card on IIO Part1 by a unit on the main die (generally a core). In the general case, Part1 refers to a x4 PCIe card plugged into the second slot of a PCIe riser card, but it could refer to any x4 device attached to the IIO unit using lanes starting at lane 4 of the 16 lanes supported by the bus.",
"UMask": "0x01",
@@ -615,7 +615,7 @@
"EventCode": "0xC1",
"EventName": "UNC_IIO_TXN_REQ_BY_CPU.MEM_WRITE.PART2",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x04",
"PublicDescription": "Counts every write request of up to a 64 byte transaction of data made to the MMIO space of a card on IIO Part2 by a unit on the main die (generally a core). In the general case, Part2 refers to a x4 or x8 PCIe card plugged into the third slot of a PCIe riser card, but it could refer to any x4 or x8 device attached to the IIO unit and using lanes starting at lane 8 of the 16 lanes supported by the bus.",
"UMask": "0x01",
@@ -627,7 +627,7 @@
"EventCode": "0xC1",
"EventName": "UNC_IIO_TXN_REQ_BY_CPU.MEM_WRITE.PART3",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x08",
"PublicDescription": "Counts every write request of up to a 64 byte transaction of data made to the MMIO space of a card on IIO Part3 by a unit on the main die (generally a core). In the general case, Part3 refers to a x4 PCIe card plugged into the fourth slot of a PCIe riser card, but it could brefer to any device attached to the IIO unit using the lanes starting at lane 12 of the 16 lanes supported by the bus.",
"UMask": "0x01",
@@ -639,7 +639,7 @@
"EventCode": "0x84",
"EventName": "UNC_IIO_TXN_REQ_OF_CPU.MEM_READ.PART0",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x01",
"PublicDescription": "Counts every read request for up to a 64 byte transaction of data made by IIO Part0 to a unit on the main die (generally memory). In the general case, Part0 refers to a standard PCIe card of any size (x16,x8,x4) that is plugged directly into one of the PCIe slots. Part0 could also refer to any device plugged into the first slot of a PCIe riser card or to a device attached to the IIO unit which starts its use of the bus using lane 0 of the 16 lanes supported by the bus.",
"UMask": "0x04",
@@ -651,7 +651,7 @@
"EventCode": "0x84",
"EventName": "UNC_IIO_TXN_REQ_OF_CPU.MEM_READ.PART1",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x02",
"PublicDescription": "Counts every read request for up to a 64 byte transaction of data made by IIO Part1 to a unit on the main die (generally memory). In the general case, Part1 refers to a x4 PCIe card plugged into the second slot of a PCIe riser card, but it could refer to any x4 device attached to the IIO unit using lanes starting at lane 4 of the 16 lanes supported by the bus.",
"UMask": "0x04",
@@ -663,7 +663,7 @@
"EventCode": "0x84",
"EventName": "UNC_IIO_TXN_REQ_OF_CPU.MEM_READ.PART2",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x04",
"PublicDescription": "Counts every read request for up to a 64 byte transaction of data made by IIO Part2 to a unit on the main die (generally memory). In the general case, Part2 refers to a x4 or x8 PCIe card plugged into the third slot of a PCIe riser card, but it could refer to any x4 or x8 device attached to the IIO unit and using lanes starting at lane 8 of the 16 lanes supported by the bus.",
"UMask": "0x04",
@@ -675,7 +675,7 @@
"EventCode": "0x84",
"EventName": "UNC_IIO_TXN_REQ_OF_CPU.MEM_READ.PART3",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x08",
"PublicDescription": "Counts every read request for up to a 64 byte transaction of data made by IIO Part3 to a unit on the main die (generally memory). In the general case, Part3 refers to a x4 PCIe card plugged into the fourth slot of a PCIe riser card, but it could brefer to any device attached to the IIO unit using the lanes starting at lane 12 of the 16 lanes supported by the bus.",
"UMask": "0x04",
@@ -687,7 +687,7 @@
"EventCode": "0x84",
"EventName": "UNC_IIO_TXN_REQ_OF_CPU.MEM_WRITE.PART0",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x01",
"PublicDescription": "Counts every write request of up to a 64 byte transaction of data made by IIO Part0 to a unit on the main die (generally memory). In the general case, Part0 refers to a standard PCIe card of any size (x16,x8,x4) that is plugged directly into one of the PCIe slots. Part0 could also refer to any device plugged into the first slot of a PCIe riser card or to a device attached to the IIO unit which starts its use of the bus using lane 0 of the 16 lanes supported by the bus.",
"UMask": "0x01",
@@ -699,7 +699,7 @@
"EventCode": "0x84",
"EventName": "UNC_IIO_TXN_REQ_OF_CPU.MEM_WRITE.PART1",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x02",
"PublicDescription": "Counts every write request of up to a 64 byte transaction of data made by IIO Part1 to a unit on the main die (generally memory). In the general case, Part1 refers to a x4 PCIe card plugged into the second slot of a PCIe riser card, but it could refer to any x4 device attached to the IIO unit using lanes starting at lane 4 of the 16 lanes supported by the bus.",
"UMask": "0x01",
@@ -711,7 +711,7 @@
"EventCode": "0x84",
"EventName": "UNC_IIO_TXN_REQ_OF_CPU.MEM_WRITE.PART2",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x04",
"PublicDescription": "Counts every write request of up to a 64 byte transaction of data made by IIO Part2 to a unit on the main die (generally memory). In the general case, Part2 refers to a x4 or x8 PCIe card plugged into the third slot of a PCIe riser card, but it could refer to any x4 or x8 device attached to the IIO unit and using lanes starting at lane 8 of the 16 lanes supported by the bus.",
"UMask": "0x01",
@@ -723,7 +723,7 @@
"EventCode": "0x84",
"EventName": "UNC_IIO_TXN_REQ_OF_CPU.MEM_WRITE.PART3",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x08",
"PublicDescription": "Counts every write request of up to a 64 byte transaction of data made by IIO Part3 to a unit on the main die (generally memory). In the general case, Part3 refers to a x4 PCIe card plugged into the fourth slot of a PCIe riser card, but it could brefer to any device attached to the IIO unit using the lanes starting at lane 12 of the 16 lanes supported by the bus.",
"UMask": "0x01",
@@ -734,7 +734,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x22",
"EventName": "UNC_M2M_BYPASS_M2M_Egress.NOT_TAKEN",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts traffic in which the M2M (Mesh to Memory) to iMC (Memory Controller) bypass was not taken",
"UMask": "0x2",
"Unit": "M2M"
@@ -744,7 +744,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x24",
"EventName": "UNC_M2M_DIRECT2CORE_NOT_TAKEN_DIRSTATE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts cycles when direct to core mode (which bypasses the CHA) was disabled",
"Unit": "M2M"
},
@@ -753,7 +753,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x23",
"EventName": "UNC_M2M_DIRECT2CORE_TAKEN",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when messages were sent direct to core (bypassing the CHA)",
"Unit": "M2M"
},
@@ -762,7 +762,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x25",
"EventName": "UNC_M2M_DIRECT2CORE_TXN_OVERRIDE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts reads in which direct to core transactions (which would have bypassed the CHA) were overridden",
"Unit": "M2M"
},
@@ -771,7 +771,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x28",
"EventName": "UNC_M2M_DIRECT2UPI_NOT_TAKEN_CREDITS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts reads in which direct to Intel Ultra Path Interconnect (UPI) transactions (which would have bypassed the CHA) were overridden",
"Unit": "M2M"
},
@@ -780,7 +780,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x27",
"EventName": "UNC_M2M_DIRECT2UPI_NOT_TAKEN_DIRSTATE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts cycles when the ability to send messages direct to the Intel Ultra Path Interconnect (bypassing the CHA) was disabled",
"Unit": "M2M"
},
@@ -789,7 +789,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x26",
"EventName": "UNC_M2M_DIRECT2UPI_TAKEN",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when messages were sent direct to the Intel Ultra Path Interconnect (bypassing the CHA)",
"Unit": "M2M"
},
@@ -798,7 +798,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x29",
"EventName": "UNC_M2M_DIRECT2UPI_TXN_OVERRIDE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when a read message that was sent direct to the Intel Ultra Path Interconnect (bypassing the CHA) was overridden",
"Unit": "M2M"
},
@@ -807,7 +807,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2D",
"EventName": "UNC_M2M_DIRECTORY_LOOKUP.ANY",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) looks into the multi-socket cacheline Directory state, and found the cacheline marked in Any State (A, I, S or unused)",
"UMask": "0x1",
"Unit": "M2M"
@@ -817,7 +817,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2D",
"EventName": "UNC_M2M_DIRECTORY_LOOKUP.STATE_A",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) looks into the multi-socket cacheline Directory state, and found the cacheline marked in the A (SnoopAll) state, indicating the cacheline is stored in another socket in any state, and we must snoop the other sockets to make sure we get the latest data. The data may be stored in any state in the local socket.",
"UMask": "0x8",
"Unit": "M2M"
@@ -827,7 +827,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2D",
"EventName": "UNC_M2M_DIRECTORY_LOOKUP.STATE_I",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) looks into the multi-socket cacheline Directory state , and found the cacheline marked in the I (Invalid) state indicating the cacheline is not stored in another socket, and so there is no need to snoop the other sockets for the latest data. The data may be stored in any state in the local socket.",
"UMask": "0x2",
"Unit": "M2M"
@@ -837,7 +837,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2D",
"EventName": "UNC_M2M_DIRECTORY_LOOKUP.STATE_S",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) looks into the multi-socket cacheline Directory state , and found the cacheline marked in the S (Shared) state indicating the cacheline is either stored in another socket in the S(hared) state , and so there is no need to snoop the other sockets for the latest data. The data may be stored in any state in the local socket.",
"UMask": "0x4",
"Unit": "M2M"
@@ -847,7 +847,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2E",
"EventName": "UNC_M2M_DIRECTORY_UPDATE.A2I",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from from A (SnoopAll) to I (Invalid)",
"UMask": "0x20",
"Unit": "M2M"
@@ -857,7 +857,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2E",
"EventName": "UNC_M2M_DIRECTORY_UPDATE.A2S",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from from A (SnoopAll) to S (Shared)",
"UMask": "0x40",
"Unit": "M2M"
@@ -867,7 +867,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2E",
"EventName": "UNC_M2M_DIRECTORY_UPDATE.ANY",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory to a new state",
"UMask": "0x1",
"Unit": "M2M"
@@ -877,7 +877,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2E",
"EventName": "UNC_M2M_DIRECTORY_UPDATE.I2A",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from from I (Invalid) to A (SnoopAll)",
"UMask": "0x4",
"Unit": "M2M"
@@ -887,7 +887,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2E",
"EventName": "UNC_M2M_DIRECTORY_UPDATE.I2S",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from from I (Invalid) to S (Shared)",
"UMask": "0x2",
"Unit": "M2M"
@@ -897,7 +897,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2E",
"EventName": "UNC_M2M_DIRECTORY_UPDATE.S2A",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from from S (Shared) to A (SnoopAll)",
"UMask": "0x10",
"Unit": "M2M"
@@ -907,7 +907,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2E",
"EventName": "UNC_M2M_DIRECTORY_UPDATE.S2I",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) updates the multi-socket cacheline Directory state from from S (Shared) to I (Invalid)",
"UMask": "0x8",
"Unit": "M2M"
@@ -917,7 +917,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x37",
"EventName": "UNC_M2M_IMC_READS.ALL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) issues reads to the iMC (Memory Controller). ",
"UMask": "0x4",
"Unit": "M2M"
@@ -927,7 +927,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x37",
"EventName": "UNC_M2M_IMC_READS.NORMAL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) issues reads to the iMC (Memory Controller). It only counts normal priority non-isochronous reads.",
"UMask": "0x1",
"Unit": "M2M"
@@ -937,7 +937,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x38",
"EventName": "UNC_M2M_IMC_WRITES.ALL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) issues writes to the iMC (Memory Controller).",
"UMask": "0x10",
"Unit": "M2M"
@@ -947,7 +947,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x38",
"EventName": "UNC_M2M_IMC_WRITES.PARTIAL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) issues partial writes to the iMC (Memory Controller). It only counts normal priority non-isochronous writes.",
"UMask": "0x2",
"Unit": "M2M"
@@ -957,7 +957,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x56",
"EventName": "UNC_M2M_PREFCAM_DEMAND_PROMOTIONS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) promotes a outstanding request in the prefetch queue due to a subsequent demand read request that entered the M2M with the same address. Explanatory Side Note: The Prefecth queue is made of CAM (Content Addressable Memory)",
"Unit": "M2M"
},
@@ -966,7 +966,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x57",
"EventName": "UNC_M2M_PREFCAM_INSERTS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the M2M (Mesh to Memory) receives a prefetch request and inserts it into its outstanding prefetch queue. Explanatory Side Note: the prefect queue is made from CAM: Content Addressable Memory",
"Unit": "M2M"
},
@@ -975,7 +975,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_M2M_RxC_AD_INSERTS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the a new entry is Received(RxC) and then added to the AD (Address Ring) Ingress Queue from the CMS (Common Mesh Stop). This is generally used for reads, and ",
"Unit": "M2M"
},
@@ -984,7 +984,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x29",
"EventName": "UNC_M3UPI_UPI_PREFETCH_SPAWN",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Count cases where flow control queue that sits between the Intel Ultra Path Interconnect (UPI) and the mesh spawns a prefetch to the iMC (Memory Controller)",
"Unit": "M3UPI"
},
@@ -993,7 +993,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x1",
"EventName": "UNC_UPI_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts clockticks of the fixed frequency clock controlling the Intel Ultra Path Interconnect (UPI). This clock runs at1/8th the 'GT/s' speed of the UPI link. For example, a 9.6GT/s link will have a fixed Frequency of 1.2 Ghz.",
"Unit": "UPI LL"
},
@@ -1002,7 +1002,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x12",
"EventName": "UNC_UPI_DIRECT_ATTEMPTS.D2C",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts Data Response (DRS) packets that attempted to go direct to core bypassing the CHA.",
"UMask": "0x1",
"Unit": "UPI LL"
@@ -1012,7 +1012,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x12",
"EventName": "UNC_UPI_DIRECT_ATTEMPTS.D2U",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts Data Response (DRS) packets that attempted to go direct to Intel Ultra Path Interconnect (UPI) bypassing the CHA .",
"UMask": "0x2",
"Unit": "UPI LL"
@@ -1022,7 +1022,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x21",
"EventName": "UNC_UPI_L1_POWER_CYCLES",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts cycles when the Intel Ultra Path Interconnect (UPI) is in L1 power mode. L1 is a mode that totally shuts down the UPI link. Link power states are per link and per direction, so for example the Tx direction could be in one state while Rx was in another, this event only coutns when both links are shutdown.",
"Unit": "UPI LL"
},
@@ -1031,7 +1031,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x25",
"EventName": "UNC_UPI_RxL0P_POWER_CYCLES",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts cycles when the the receive side (Rx) of the Intel Ultra Path Interconnect(UPI) is in L0p power mode. L0p is a mode where we disable 60% of the UPI lanes, decreasing our bandwidth in order to save power.",
"Unit": "UPI LL"
},
@@ -1040,7 +1040,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x31",
"EventName": "UNC_UPI_RxL_BYPASSED.SLOT0",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts incoming FLITs (FLow control unITs) which bypassed the slot0 RxQ buffer (Receive Queue) and passed directly to the Egress. This is a latency optimization, and should generally be the common case. If this value is less than the number of FLITs transferred, it implies that there was queueing getting onto the ring, and thus the transactions saw higher latency.",
"UMask": "0x1",
"Unit": "UPI LL"
@@ -1050,7 +1050,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x31",
"EventName": "UNC_UPI_RxL_BYPASSED.SLOT1",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts incoming FLITs (FLow control unITs) which bypassed the slot1 RxQ buffer (Receive Queue) and passed directly across the BGF and into the Egress. This is a latency optimization, and should generally be the common case. If this value is less than the number of FLITs transferred, it implies that there was queueing getting onto the ring, and thus the transactions saw higher latency.",
"UMask": "0x2",
"Unit": "UPI LL"
@@ -1060,7 +1060,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x31",
"EventName": "UNC_UPI_RxL_BYPASSED.SLOT2",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts incoming FLITs (FLow control unITs) which bypassed the slot2 RxQ buffer (Receive Queue) and passed directly to the Egress. This is a latency optimization, and should generally be the common case. If this value is less than the number of FLITs transferred, it implies that there was queueing getting onto the ring, and thus the transactions saw higher latency.",
"UMask": "0x4",
"Unit": "UPI LL"
@@ -1070,7 +1070,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x3",
"EventName": "UNC_UPI_RxL_FLITS.ALL_DATA",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts valid data FLITs (80 bit FLow control unITs: 64bits of data) received from any of the 3 Intel Ultra Path Interconnect (UPI) Receive Queue slots on this UPI unit.",
"UMask": "0x0F",
"Unit": "UPI LL"
@@ -1080,7 +1080,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x3",
"EventName": "UNC_UPI_RxL_FLITS.ALL_NULL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts null FLITs (80 bit FLow control unITs) received from any of the 3 Intel Ultra Path Interconnect (UPI) Receive Queue slots on this UPI unit.",
"UMask": "0x27",
"Unit": "UPI LL"
@@ -1090,7 +1090,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x3",
"EventName": "UNC_UPI_RxL_FLITS.NON_DATA",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts protocol header and credit FLITs (80 bit FLow control unITs) received from any of the 3 UPI slots on this UPI unit.",
"UMask": "0x97",
"Unit": "UPI LL"
@@ -1100,7 +1100,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x27",
"EventName": "UNC_UPI_TxL0P_POWER_CYCLES",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts cycles when the transmit side (Tx) of the Intel Ultra Path Interconnect(UPI) is in L0p power mode. L0p is a mode where we disable 60% of the UPI lanes, decreasing our bandwidth in order to save power.",
"Unit": "UPI LL"
},
@@ -1109,7 +1109,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x41",
"EventName": "UNC_UPI_TxL_BYPASSED",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts incoming FLITs (FLow control unITs) which bypassed the TxL(transmit) FLIT buffer and pass directly out the UPI Link. Generally, when data is transmitted across the Intel Ultra Path Interconnect (UPI), it will bypass the TxQ and pass directly to the link. However, the TxQ will be used in L0p (Low Power) mode and (Link Layer Retry) LLR mode, increasing latency to transfer out to the link.",
"Unit": "UPI LL"
},
@@ -1118,7 +1118,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2",
"EventName": "UPI_DATA_BANDWIDTH_TX",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "7.11E-06Bytes",
"UMask": "0x0F",
"Unit": "UPI LL"
@@ -1128,7 +1128,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2",
"EventName": "UNC_UPI_TxL_FLITS.ALL_NULL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts null FLITs (80 bit FLow control unITs) transmitted via any of the 3 Intel Ulra Path Interconnect (UPI) slots on this UPI unit.",
"UMask": "0x27",
"Unit": "UPI LL"
@@ -1138,7 +1138,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2",
"EventName": "UNC_UPI_TxL_FLITS.IDLE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts when the Intel Ultra Path Interconnect(UPI) transmits an idle FLIT(80 bit FLow control unITs). Every UPI cycle must be sending either data FLITs, protocol/credit FLITs or idle FLITs.",
"UMask": "0x47",
"Unit": "UPI LL"
@@ -1148,7 +1148,7 @@
"Counter": "0,1,2,3",
"EventCode": "0x2",
"EventName": "UNC_UPI_TxL_FLITS.NON_DATA",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Counts protocol header and credit FLITs (80 bit FLow control unITs) transmitted across any of the 3 UPI (Ultra Path Interconnect) slots on this UPI unit.",
"UMask": "0x97",
"Unit": "UPI LL"
diff --git a/tools/perf/pmu-events/arch/x86/tremontx/uncore-memory.json b/tools/perf/pmu-events/arch/x86/tremontx/uncore-memory.json
index 15376f2cf052..154f6da96669 100644
--- a/tools/perf/pmu-events/arch/x86/tremontx/uncore-memory.json
+++ b/tools/perf/pmu-events/arch/x86/tremontx/uncore-memory.json
@@ -5,7 +5,7 @@
"CounterType": "PGMABLE",
"EventCode": "0x04",
"EventName": "LLC_MISSES.MEM_READ",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x0f",
"Unit": "iMC"
@@ -16,7 +16,7 @@
"CounterType": "PGMABLE",
"EventCode": "0x04",
"EventName": "LLC_MISSES.MEM_WRITE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0x30",
"Unit": "iMC"
@@ -26,7 +26,7 @@
"Counter": "0,1,2,3",
"CounterType": "PGMABLE",
"EventName": "UNC_M_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "iMC"
},
{
@@ -35,7 +35,7 @@
"CounterType": "PGMABLE",
"EventCode": "0x02",
"EventName": "UNC_M_PRE_COUNT.RD",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x04",
"Unit": "iMC"
},
@@ -45,7 +45,7 @@
"CounterType": "PGMABLE",
"EventCode": "0x02",
"EventName": "UNC_M_PRE_COUNT.WR",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x08",
"Unit": "iMC"
},
@@ -55,7 +55,7 @@
"CounterType": "PGMABLE",
"EventCode": "0x02",
"EventName": "UNC_M_PRE_COUNT.ALL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0x1c",
"Unit": "iMC"
},
@@ -65,7 +65,7 @@
"CounterType": "PGMABLE",
"EventCode": "0x02",
"EventName": "UNC_M_PRE_COUNT.PGT",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "DRAM Precharge commands. : Precharge due to page table : Counts the number of DRAM Precharge commands sent on this channel.",
"UMask": "0x10",
"Unit": "iMC"
diff --git a/tools/perf/pmu-events/arch/x86/tremontx/uncore-other.json b/tools/perf/pmu-events/arch/x86/tremontx/uncore-other.json
index 6deff1fe89e3..981de2670e57 100644
--- a/tools/perf/pmu-events/arch/x86/tremontx/uncore-other.json
+++ b/tools/perf/pmu-events/arch/x86/tremontx/uncore-other.json
@@ -4,7 +4,7 @@
"Counter": "0,1,2,3",
"CounterType": "PGMABLE",
"EventName": "UNC_CHA_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"Unit": "CHA"
},
{
@@ -14,7 +14,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.UNCACHEABLE",
"Filter": "config1=0x40e33",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0xC001FE01",
"UMaskExt": "0xC001FE",
"Unit": "CHA"
@@ -26,7 +26,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.MMIO_READ",
"Filter": "config1=0x40040e33",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0xC001FE01",
"UMaskExt": "0xC001FE",
"Unit": "CHA"
@@ -38,7 +38,7 @@
"EventCode": "0x35",
"EventName": "LLC_MISSES.MMIO_WRITE",
"Filter": "config1=0x40041e33",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"UMask": "0xC001FE01",
"UMaskExt": "0xC001FE",
"Unit": "CHA"
@@ -50,7 +50,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.STREAMING_FULL",
"Filter": "config1=0x41833",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0xC001FE01",
"UMaskExt": "0xC001FE",
@@ -63,7 +63,7 @@
"EventCode": "0x35",
"EventName": "LLC_REFERENCES.STREAMING_PARTIAL",
"Filter": "config1=0x41a33",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"ScaleUnit": "64Bytes",
"UMask": "0xC001FE01",
"UMaskExt": "0xC001FE",
@@ -79,7 +79,7 @@
"Filter": "ch_mask=0x1f",
"MetricExpr": "UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART0 +UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART1 +UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART2 +UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART3",
"MetricName": "LLC_MISSES.PCIE_READ",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x01",
"ScaleUnit": "4Bytes",
"UMask": "0x04",
@@ -95,7 +95,7 @@
"Filter": "ch_mask=0x1f",
"MetricExpr": "UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART0 +UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART1 +UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART2 +UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART3",
"MetricName": "LLC_MISSES.PCIE_WRITE",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x01",
"ScaleUnit": "4Bytes",
"UMask": "0x01",
@@ -108,7 +108,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART1",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x02",
"ScaleUnit": "4Bytes",
"UMask": "0x01",
@@ -121,7 +121,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART2",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x04",
"ScaleUnit": "4Bytes",
"UMask": "0x01",
@@ -134,7 +134,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART3",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x08",
"ScaleUnit": "4Bytes",
"UMask": "0x01",
@@ -147,7 +147,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART1",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x02",
"ScaleUnit": "4Bytes",
"UMask": "0x04",
@@ -160,7 +160,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART2",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x04",
"ScaleUnit": "4Bytes",
"UMask": "0x04",
@@ -173,7 +173,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART3",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x08",
"ScaleUnit": "4Bytes",
"UMask": "0x04",
@@ -185,7 +185,7 @@
"CounterType": "PGMABLE",
"EventCode": "0x35",
"EventName": "UNC_CHA_TOR_INSERTS.IA_MISS_CRD",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "TOR Inserts; Code read from local IA that misses in the snoop filter",
"UMask": "0xC80FFE01",
"UMaskExt": "0xC80FFE",
@@ -197,7 +197,7 @@
"CounterType": "PGMABLE",
"EventCode": "0x35",
"EventName": "UNC_CHA_TOR_INSERTS.IA_MISS_CRD_PREF",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "TOR Inserts; Code read prefetch from local IA that misses in the snoop filter",
"UMask": "0xC88FFE01",
"UMaskExt": "0xC88FFE",
@@ -209,7 +209,7 @@
"CounterType": "PGMABLE",
"EventCode": "0x35",
"EventName": "UNC_CHA_TOR_INSERTS.IA_MISS_DRD_OPT",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "TOR Inserts; Data read opt from local IA that misses in the snoop filter",
"UMask": "0xC827FE01",
"UMaskExt": "0xC827FE",
@@ -221,7 +221,7 @@
"CounterType": "PGMABLE",
"EventCode": "0x35",
"EventName": "UNC_CHA_TOR_INSERTS.IA_MISS_DRD_OPT_PREF",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "TOR Inserts; Data read opt prefetch from local IA that misses in the snoop filter",
"UMask": "0xC8A7FE01",
"UMaskExt": "0xC8A7FE",
@@ -233,7 +233,7 @@
"CounterType": "PGMABLE",
"EventCode": "0x35",
"EventName": "UNC_CHA_TOR_INSERTS.IA_MISS_RFO",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "TOR Inserts; Read for ownership from local IA that misses in the snoop filter",
"UMask": "0xC807FE01",
"UMaskExt": "0xC807FE",
@@ -245,7 +245,7 @@
"CounterType": "PGMABLE",
"EventCode": "0x35",
"EventName": "UNC_CHA_TOR_INSERTS.IA_MISS_RFO_PREF",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "TOR Inserts; Read for ownership prefetch from local IA that misses in the snoop filter",
"UMask": "0xC887FE01",
"UMaskExt": "0xC887FE",
@@ -257,7 +257,7 @@
"CounterType": "PGMABLE",
"EventCode": "0x35",
"EventName": "UNC_CHA_TOR_INSERTS.IA_MISS_WCIL",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "TOR Inserts; Data read from local IA that misses in the snoop filter",
"UMask": "0xC86FFE01",
"UMaskExt": "0xC86FFE",
@@ -269,7 +269,7 @@
"CounterType": "PGMABLE",
"EventCode": "0x35",
"EventName": "UNC_CHA_TOR_INSERTS.IA_MISS_WCILF",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "TOR Inserts; Data read from local IA that misses in the snoop filter",
"UMask": "0xC867FE01",
"UMaskExt": "0xC867FE",
@@ -281,7 +281,7 @@
"CounterType": "PGMABLE",
"EventCode": "0x01",
"EventName": "UNC_IIO_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Clockticks of the integrated IO (IIO) traffic controller",
"Unit": "IIO"
},
@@ -292,7 +292,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART4",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x10",
"PublicDescription": "Data requested of the CPU : Card reading from DRAM : Number of DWs (4 bytes) the card requests of the main die. Includes all requests initiated by the Card, including reads and writes. : x16 card plugged in to stack, Or x8 card plugged in to Lane 0/1, Or x4 card is plugged in to slot 0",
"UMask": "0x04",
@@ -305,7 +305,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART5",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x20",
"PublicDescription": "Data requested of the CPU : Card reading from DRAM : Number of DWs (4 bytes) the card requests of the main die. Includes all requests initiated by the Card, including reads and writes. : x4 card is plugged in to slot 1",
"UMask": "0x04",
@@ -318,7 +318,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART6",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x40",
"PublicDescription": "Data requested of the CPU : Card reading from DRAM : Number of DWs (4 bytes) the card requests of the main die. Includes all requests initiated by the Card, including reads and writes. : x8 card plugged in to Lane 2/3, Or x4 card is plugged in to slot 1",
"UMask": "0x04",
@@ -331,7 +331,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.MEM_READ.PART7",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x80",
"PublicDescription": "Data requested of the CPU : Card reading from DRAM : Number of DWs (4 bytes) the card requests of the main die. Includes all requests initiated by the Card, including reads and writes. : x4 card is plugged in to slot 3",
"UMask": "0x04",
@@ -344,7 +344,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART4",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x10",
"PublicDescription": "Data requested of the CPU : Card writing to DRAM : Number of DWs (4 bytes) the card requests of the main die. Includes all requests initiated by the Card, including reads and writes. : x16 card plugged in to stack, Or x8 card plugged in to Lane 0/1, Or x4 card is plugged in to slot 0",
"UMask": "0x01",
@@ -357,7 +357,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART5",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x20",
"PublicDescription": "Data requested of the CPU : Card writing to DRAM : Number of DWs (4 bytes) the card requests of the main die. Includes all requests initiated by the Card, including reads and writes. : x4 card is plugged in to slot 1",
"UMask": "0x01",
@@ -370,7 +370,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART6",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x40",
"PublicDescription": "Data requested of the CPU : Card writing to DRAM : Number of DWs (4 bytes) the card requests of the main die. Includes all requests initiated by the Card, including reads and writes. : x8 card plugged in to Lane 2/3, Or x4 card is plugged in to slot 1",
"UMask": "0x01",
@@ -383,7 +383,7 @@
"EventCode": "0x83",
"EventName": "UNC_IIO_DATA_REQ_OF_CPU.MEM_WRITE.PART7",
"FCMask": "0x07",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PortMask": "0x80",
"PublicDescription": "Data requested of the CPU : Card writing to DRAM : Number of DWs (4 bytes) the card requests of the main die. Includes all requests initiated by the Card, including reads and writes. : x4 card is plugged in to slot 3",
"UMask": "0x01",
@@ -395,7 +395,7 @@
"CounterType": "PGMABLE",
"EventCode": "0x01",
"EventName": "UNC_I_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Clockticks of the IO coherency tracker (IRP)",
"Unit": "IRP"
},
@@ -404,7 +404,7 @@
"Counter": "0,1,2,3",
"CounterType": "PGMABLE",
"EventName": "UNC_M2M_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Clockticks of the mesh to memory (M2M)",
"Unit": "M2M"
},
@@ -414,7 +414,7 @@
"CounterType": "PGMABLE",
"EventCode": "0x01",
"EventName": "UNC_M2P_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Clockticks of the mesh to PCI (M2P)",
"Unit": "M2PCIe"
},
@@ -424,7 +424,7 @@
"CounterType": "PGMABLE",
"EventCode": "0xff",
"EventName": "UNC_U_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Clockticks in the UBOX using a dedicated 48-bit Fixed Counter",
"Unit": "UBOX"
}
diff --git a/tools/perf/pmu-events/arch/x86/tremontx/uncore-power.json b/tools/perf/pmu-events/arch/x86/tremontx/uncore-power.json
index ea62c092b43f..41f460903161 100644
--- a/tools/perf/pmu-events/arch/x86/tremontx/uncore-power.json
+++ b/tools/perf/pmu-events/arch/x86/tremontx/uncore-power.json
@@ -4,7 +4,7 @@
"Counter": "0,1,2,3",
"CounterType": "PGMABLE",
"EventName": "UNC_P_CLOCKTICKS",
- "PerPkg": "1",
+ "AggregationMode": "PerPkg",
"PublicDescription": "Clockticks of the power control unit (PCU)",
"Unit": "PCU"
}
--
2.26.2
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v3 3/5] perf jevents: Add support for parsing perchip/percore events
2020-07-16 9:42 [PATCH v3 0/5] powerpc/perf: Add json file support for hv_24x7 core level events Kajol Jain
2020-07-16 9:42 ` [PATCH v3 1/5] perf/pmu-events/jevents: Add enum to store aggregation like PerPkg Kajol Jain
2020-07-16 9:42 ` [PATCH v3 2/5] pmu-events/x86/uncore: Replace PerPkg field to AggregationMode in x86 json files Kajol Jain
@ 2020-07-16 9:42 ` Kajol Jain
2020-07-16 9:42 ` [PATCH v3 4/5] perf/tools: Pass pmu_event structure as a parameter for arch_get_runtimeparam Kajol Jain
` (2 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: Kajol Jain @ 2020-07-16 9:42 UTC (permalink / raw)
To: acme
Cc: peterz, mingo, mark.rutland, alexander.shishkin, pc, jolsa,
namhyung, ak, yao.jin, linux-kernel, linux-perf-users, irogers,
maddy, ravi.bangoria, anju, kan.liang, nasastry, kjain
Added the "PerChip" field in enum so that perf knows they are
per chip events.
Added the "PerCore" field in enum so that perf knows they are
per core events and add these fields to pmu_event structure.
Similar to the way we had "PerPkg field
to specify perpkg events.
Signed-off-by: Kajol Jain <kjain@linux.ibm.com>
---
tools/perf/pmu-events/jevents.c | 8 +++++++-
tools/perf/pmu-events/pmu-events.h | 4 +++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
index b2f59f0af63d..e1c43f739083 100644
--- a/tools/perf/pmu-events/jevents.c
+++ b/tools/perf/pmu-events/jevents.c
@@ -54,13 +54,19 @@ int verbose;
char *prog;
enum aggr_mode_class {
- PerPkg = 1
+ PerPkg = 1,
+ PerChip,
+ PerCore
};
enum aggr_mode_class convert(const char *aggr_mode)
{
if (!strcmp(aggr_mode, "PerPkg"))
return PerPkg;
+ else if (!strcmp(aggr_mode, "PerCore"))
+ return PerCore;
+ else if (!strcmp(aggr_mode, "PerChip"))
+ return PerChip;
return -1;
}
diff --git a/tools/perf/pmu-events/pmu-events.h b/tools/perf/pmu-events/pmu-events.h
index 71b7aa6278d0..214ffc681b54 100644
--- a/tools/perf/pmu-events/pmu-events.h
+++ b/tools/perf/pmu-events/pmu-events.h
@@ -3,7 +3,9 @@
#define PMU_EVENTS_H
enum aggr_mode_class {
- PerPkg = 1
+ PerPkg = 1,
+ PerChip,
+ PerCore
};
/*
--
2.26.2
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v3 4/5] perf/tools: Pass pmu_event structure as a parameter for arch_get_runtimeparam
2020-07-16 9:42 [PATCH v3 0/5] powerpc/perf: Add json file support for hv_24x7 core level events Kajol Jain
` (2 preceding siblings ...)
2020-07-16 9:42 ` [PATCH v3 3/5] perf jevents: Add support for parsing perchip/percore events Kajol Jain
@ 2020-07-16 9:42 ` Kajol Jain
2020-07-16 9:42 ` [PATCH v3 5/5] perf/tools/pmu_events/powerpc: Add hv_24x7 core level metric events Kajol Jain
2020-07-16 15:22 ` [PATCH v3 0/5] powerpc/perf: Add json file support for hv_24x7 core level events Arnaldo Carvalho de Melo
5 siblings, 0 replies; 11+ messages in thread
From: Kajol Jain @ 2020-07-16 9:42 UTC (permalink / raw)
To: acme
Cc: peterz, mingo, mark.rutland, alexander.shishkin, pc, jolsa,
namhyung, ak, yao.jin, linux-kernel, linux-perf-users, irogers,
maddy, ravi.bangoria, anju, kan.liang, nasastry, kjain
This patch adds passing of pmu_event as a parameter in function
'arch_get_runtimeparam' which can be used to get details like
if the event is percore/perchip.
Signed-off-by: Kajol Jain <kjain@linux.ibm.com>
---
| 7 +++++--
tools/perf/util/metricgroup.c | 5 ++---
tools/perf/util/metricgroup.h | 3 ++-
3 files changed, 9 insertions(+), 6 deletions(-)
--git a/tools/perf/arch/powerpc/util/header.c b/tools/perf/arch/powerpc/util/header.c
index d4870074f14c..c8a33120a7a3 100644
--- a/tools/perf/arch/powerpc/util/header.c
+++ b/tools/perf/arch/powerpc/util/header.c
@@ -47,8 +47,11 @@ get_cpuid_str(struct perf_pmu *pmu __maybe_unused)
return bufp;
}
-int arch_get_runtimeparam(void)
+int arch_get_runtimeparam(struct pmu_event *pe)
{
int count;
- return sysfs__read_int("/devices/hv_24x7/interface/sockets", &count) < 0 ? 1 : count;
+ char path[PATH_MAX] = "/devices/hv_24x7/interface/";
+
+ atoi(pe->aggr_mode) == PerChip ? strcat(path, "sockets") : strcat(path, "coresperchip");
+ return sysfs__read_int(path, &count) < 0 ? 1 : count;
}
diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
index 82fecb5a302d..58054588f599 100644
--- a/tools/perf/util/metricgroup.c
+++ b/tools/perf/util/metricgroup.c
@@ -15,7 +15,6 @@
#include "rblist.h"
#include <string.h>
#include <errno.h>
-#include "pmu-events/pmu-events.h"
#include "strlist.h"
#include <assert.h>
#include <linux/ctype.h>
@@ -566,7 +565,7 @@ static bool metricgroup__has_constraint(struct pmu_event *pe)
return false;
}
-int __weak arch_get_runtimeparam(void)
+int __weak arch_get_runtimeparam(struct pmu_event *pe __maybe_unused)
{
return 1;
}
@@ -650,7 +649,7 @@ static int metricgroup__add_metric(const char *metric, bool metric_no_group,
} else {
int j, count;
- count = arch_get_runtimeparam();
+ count = arch_get_runtimeparam(pe);
/* This loop is added to create multiple
* events depend on count value and add
diff --git a/tools/perf/util/metricgroup.h b/tools/perf/util/metricgroup.h
index 8315bd1a7da4..3917b5e43ebb 100644
--- a/tools/perf/util/metricgroup.h
+++ b/tools/perf/util/metricgroup.h
@@ -5,6 +5,7 @@
#include <linux/list.h>
#include <linux/rbtree.h>
#include <stdbool.h>
+#include "pmu-events/pmu-events.h"
struct evsel;
struct evlist;
@@ -46,6 +47,6 @@ int metricgroup__parse_groups_test(struct evlist *evlist,
void metricgroup__print(bool metrics, bool groups, char *filter,
bool raw, bool details);
bool metricgroup__has_metric(const char *metric);
-int arch_get_runtimeparam(void);
+int arch_get_runtimeparam(struct pmu_event *pe __maybe_unused);
void metricgroup__rblist_exit(struct rblist *metric_events);
#endif
--
2.26.2
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v3 5/5] perf/tools/pmu_events/powerpc: Add hv_24x7 core level metric events
2020-07-16 9:42 [PATCH v3 0/5] powerpc/perf: Add json file support for hv_24x7 core level events Kajol Jain
` (3 preceding siblings ...)
2020-07-16 9:42 ` [PATCH v3 4/5] perf/tools: Pass pmu_event structure as a parameter for arch_get_runtimeparam Kajol Jain
@ 2020-07-16 9:42 ` Kajol Jain
2020-07-16 15:22 ` [PATCH v3 0/5] powerpc/perf: Add json file support for hv_24x7 core level events Arnaldo Carvalho de Melo
5 siblings, 0 replies; 11+ messages in thread
From: Kajol Jain @ 2020-07-16 9:42 UTC (permalink / raw)
To: acme
Cc: peterz, mingo, mark.rutland, alexander.shishkin, pc, jolsa,
namhyung, ak, yao.jin, linux-kernel, linux-perf-users, irogers,
maddy, ravi.bangoria, anju, kan.liang, nasastry, kjain
This patch adds hv_24x7 core level events in nest_metric.json file
and also add PerChip/PerCore field in metric events.
Result:
power9 platform:
command:# ./perf stat --metric-only -M PowerBUS_Frequency -C 0 -I 1000
1.000070601 1.9 2.0
2.000253881 2.0 1.9
3.000364810 2.0 2.0
Signed-off-by: Kajol Jain <kjain@linux.ibm.com>
---
.../arch/powerpc/power9/nest_metrics.json | 27 ++++++++++++-------
1 file changed, 18 insertions(+), 9 deletions(-)
diff --git a/tools/perf/pmu-events/arch/powerpc/power9/nest_metrics.json b/tools/perf/pmu-events/arch/powerpc/power9/nest_metrics.json
index 8383a37647ad..4672e6d7e7cb 100644
--- a/tools/perf/pmu-events/arch/powerpc/power9/nest_metrics.json
+++ b/tools/perf/pmu-events/arch/powerpc/power9/nest_metrics.json
@@ -1,20 +1,29 @@
[
{
- "MetricExpr": "(hv_24x7@PM_MCS01_128B_RD_DISP_PORT01\\,chip\\=?@ + hv_24x7@PM_MCS01_128B_RD_DISP_PORT23\\,chip\\=?@ + hv_24x7@PM_MCS23_128B_RD_DISP_PORT01\\,chip\\=?@ + hv_24x7@PM_MCS23_128B_RD_DISP_PORT23\\,chip\\=?@)",
- "MetricName": "Memory_RD_BW_Chip",
- "MetricGroup": "Memory_BW",
- "ScaleUnit": "1.6e-2MB"
+ "MetricExpr": "(hv_24x7@PM_MCS01_128B_RD_DISP_PORT01\\,chip\\=?@ + hv_24x7@PM_MCS01_128B_RD_DISP_PORT23\\,chip\\=?@ + hv_24x7@PM_MCS23_128B_RD_DISP_PORT01\\,chip\\=?@ + hv_24x7@PM_MCS23_128B_RD_DISP_PORT23\\,chip\\=?@)",
+ "MetricName": "Memory_RD_BW_Chip",
+ "MetricGroup": "Memory_BW",
+ "ScaleUnit": "1.6e-2MB",
+ "AggregationMode": "PerChip"
},
{
"MetricExpr": "(hv_24x7@PM_MCS01_128B_WR_DISP_PORT01\\,chip\\=?@ + hv_24x7@PM_MCS01_128B_WR_DISP_PORT23\\,chip\\=?@ + hv_24x7@PM_MCS23_128B_WR_DISP_PORT01\\,chip\\=?@ + hv_24x7@PM_MCS23_128B_WR_DISP_PORT23\\,chip\\=?@ )",
- "MetricName": "Memory_WR_BW_Chip",
- "MetricGroup": "Memory_BW",
- "ScaleUnit": "1.6e-2MB"
+ "MetricName": "Memory_WR_BW_Chip",
+ "MetricGroup": "Memory_BW",
+ "ScaleUnit": "1.6e-2MB",
+ "AggregationMode": "PerChip"
},
{
"MetricExpr": "(hv_24x7@PM_PB_CYC\\,chip\\=?@ )",
- "MetricName": "PowerBUS_Frequency",
- "ScaleUnit": "2.5e-7GHz"
+ "MetricName": "PowerBUS_Frequency",
+ "ScaleUnit": "2.5e-7GHz",
+ "AggregationMode": "PerChip"
+ },
+ {
+ "MetricExpr": "(hv_24x7@CPM_CS_32MHZ_CYC\\,domain\\=3\\,core\\=?@ )",
+ "MetricName": "CPM_CS_32MHZ_CYC",
+ "ScaleUnit": "1MHz",
+ "AggregationMode": "PerCore"
},
{
"MetricExpr" : "nest_mcs01_imc@PM_MCS01_128B_RD_DISP_PORT01@ + nest_mcs01_imc@PM_MCS01_128B_RD_DISP_PORT23@",
--
2.26.2
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v3 0/5] powerpc/perf: Add json file support for hv_24x7 core level events
2020-07-16 9:42 [PATCH v3 0/5] powerpc/perf: Add json file support for hv_24x7 core level events Kajol Jain
` (4 preceding siblings ...)
2020-07-16 9:42 ` [PATCH v3 5/5] perf/tools/pmu_events/powerpc: Add hv_24x7 core level metric events Kajol Jain
@ 2020-07-16 15:22 ` Arnaldo Carvalho de Melo
2020-07-17 8:11 ` kajoljain
5 siblings, 1 reply; 11+ messages in thread
From: Arnaldo Carvalho de Melo @ 2020-07-16 15:22 UTC (permalink / raw)
To: Kajol Jain
Cc: peterz, mingo, mark.rutland, alexander.shishkin, pc, jolsa,
namhyung, ak, yao.jin, linux-kernel, linux-perf-users, irogers,
maddy, ravi.bangoria, anju, kan.liang, nasastry
Em Thu, Jul 16, 2020 at 03:12:11PM +0530, Kajol Jain escreveu:
> Patchset enhance current runtime parameter support. It introduces new
> fields like "PerChip" and "PerCore" similar to the field "PerPkg" which is
> used to specify perpkg events.
>
> The "PerCore" and "PerChip" specifies whether its core or chip events.
> Based on which we can decide which runtime parameter user want to
> access. Now character '?' can refers different parameter based on user
> requirement.
>
> Initially, every time we want to add new terms like chip, core, thread
> etc, we need to create corrsponding fields in pmu_events and event
> struct.
> This patchset adds an enum called 'aggr_mode_class' which store all these
> aggregation like perpkg/percore. It also adds new field 'AggregationMode'
> to capture these terms.
> Now, if user wants to add any new term, they just need to add it in
> the enum defined. I try to test it with my current setup.
>
> I also need to replace PerPkg field to AggregationMode in all the
> x86 uncore json files. It will great if Andi and team can test it
> and let me know if they have any concerns.
>
> Changelog:
> v2 -> v3:
> - Did some nits changes suggested by Jiri include correction of
> indentation, and making PerCore/PerChip values forward after
> PerPkg as 1 in the enum.
> - Rebase the patchset on Arnaldo's tmp.perf/core branch.
> - Change RFC tag
Hey, have anybody provided Acked-by/Reviewed-by for previous revisions
of this patchset? If so you could have collected them for patches
without changes, was that the case?
- Arnaldo
> v1 -> v2:
> - Rather then adding new field as PerCore/PerChip, created a new enum
> to get these fields. And new field as "AggregationMode" which can
> be used to capture these fields from json file.
> - Suggested By Ian Rogers
>
>
> Kajol Jain (5):
> perf/pmu-events/jevents: Add enum to store aggregation like PerPkg
> pmu-events/x86/uncore: Replace PerPkg field to AggregationMode in x86
> json files
> perf jevents: Add support for parsing perchip/percore events
> perf/tools: Pass pmu_event structure as a parameter for
> arch_get_runtimeparam
> perf/tools/pmu_events/powerpc: Add hv_24x7 core level metric events
>
> tools/perf/arch/powerpc/util/header.c | 7 +-
> .../arch/powerpc/power9/nest_metrics.json | 27 +-
> .../arch/x86/broadwellde/uncore-cache.json | 62 ++--
> .../arch/x86/broadwellde/uncore-memory.json | 18 +-
> .../arch/x86/broadwellde/uncore-power.json | 18 +-
> .../arch/x86/broadwellx/uncore-cache.json | 62 ++--
> .../x86/broadwellx/uncore-interconnect.json | 6 +-
> .../arch/x86/broadwellx/uncore-memory.json | 18 +-
> .../arch/x86/broadwellx/uncore-power.json | 18 +-
> .../arch/x86/cascadelakex/uncore-memory.json | 64 ++--
> .../arch/x86/cascadelakex/uncore-other.json | 332 +++++++++---------
> .../arch/x86/haswellx/uncore-cache.json | 62 ++--
> .../x86/haswellx/uncore-interconnect.json | 6 +-
> .../arch/x86/haswellx/uncore-memory.json | 18 +-
> .../arch/x86/haswellx/uncore-power.json | 18 +-
> .../arch/x86/ivytown/uncore-cache.json | 62 ++--
> .../arch/x86/ivytown/uncore-interconnect.json | 10 +-
> .../arch/x86/ivytown/uncore-memory.json | 16 +-
> .../arch/x86/ivytown/uncore-power.json | 52 +--
> .../arch/x86/jaketown/uncore-cache.json | 40 +--
> .../x86/jaketown/uncore-interconnect.json | 10 +-
> .../arch/x86/jaketown/uncore-memory.json | 18 +-
> .../arch/x86/jaketown/uncore-power.json | 52 +--
> .../x86/knightslanding/uncore-memory.json | 8 +-
> .../arch/x86/skylakex/uncore-memory.json | 36 +-
> .../arch/x86/skylakex/uncore-other.json | 220 ++++++------
> .../arch/x86/tremontx/uncore-memory.json | 14 +-
> .../arch/x86/tremontx/uncore-other.json | 70 ++--
> .../arch/x86/tremontx/uncore-power.json | 2 +-
> tools/perf/pmu-events/jevents.c | 45 ++-
> tools/perf/pmu-events/jevents.h | 2 +-
> tools/perf/pmu-events/pmu-events.h | 8 +-
> tools/perf/tests/pmu-events.c | 8 +-
> tools/perf/util/metricgroup.c | 5 +-
> tools/perf/util/metricgroup.h | 3 +-
> tools/perf/util/pmu.c | 6 +-
> 36 files changed, 729 insertions(+), 694 deletions(-)
>
> --
> 2.26.2
>
--
- Arnaldo
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v3 0/5] powerpc/perf: Add json file support for hv_24x7 core level events
2020-07-16 15:22 ` [PATCH v3 0/5] powerpc/perf: Add json file support for hv_24x7 core level events Arnaldo Carvalho de Melo
@ 2020-07-17 8:11 ` kajoljain
2020-07-17 8:55 ` Jiri Olsa
0 siblings, 1 reply; 11+ messages in thread
From: kajoljain @ 2020-07-17 8:11 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: peterz, mingo, mark.rutland, alexander.shishkin, pc, jolsa,
namhyung, ak, yao.jin, linux-kernel, linux-perf-users, irogers,
maddy, ravi.bangoria, anju, kan.liang, nasastry
On 7/16/20 8:52 PM, Arnaldo Carvalho de Melo wrote:
> Em Thu, Jul 16, 2020 at 03:12:11PM +0530, Kajol Jain escreveu:
>> Patchset enhance current runtime parameter support. It introduces new
>> fields like "PerChip" and "PerCore" similar to the field "PerPkg" which is
>> used to specify perpkg events.
>>
>> The "PerCore" and "PerChip" specifies whether its core or chip events.
>> Based on which we can decide which runtime parameter user want to
>> access. Now character '?' can refers different parameter based on user
>> requirement.
>>
>> Initially, every time we want to add new terms like chip, core, thread
>> etc, we need to create corrsponding fields in pmu_events and event
>> struct.
>> This patchset adds an enum called 'aggr_mode_class' which store all these
>> aggregation like perpkg/percore. It also adds new field 'AggregationMode'
>> to capture these terms.
>> Now, if user wants to add any new term, they just need to add it in
>> the enum defined. I try to test it with my current setup.
>>
>> I also need to replace PerPkg field to AggregationMode in all the
>> x86 uncore json files. It will great if Andi and team can test it
>> and let me know if they have any concerns.
>>
>> Changelog:
>> v2 -> v3:
>> - Did some nits changes suggested by Jiri include correction of
>> indentation, and making PerCore/PerChip values forward after
>> PerPkg as 1 in the enum.
>> - Rebase the patchset on Arnaldo's tmp.perf/core branch.
>> - Change RFC tag
>
> Hey, have anybody provided Acked-by/Reviewed-by for previous revisions
> of this patchset? If so you could have collected them for patches
> without changes, was that the case?
Hi Arnaldo,
I did get "Acked-by: Ian Rogers" on my initial prototype which I send in my RFC.
Link to the patch: https://lkml.org/lkml/2020/7/5/399
After that, I break it down and made some nits changes as suggested by Jiri, that's why I didn't
add his Acked-by tag.
Ian should I add it, if it seems fine to you.
Thanks,
Kajol Jain
>
> - Arnaldo
>
>> v1 -> v2:
>> - Rather then adding new field as PerCore/PerChip, created a new enum
>> to get these fields. And new field as "AggregationMode" which can
>> be used to capture these fields from json file.
>> - Suggested By Ian Rogers
>>
>>
>> Kajol Jain (5):
>> perf/pmu-events/jevents: Add enum to store aggregation like PerPkg
>> pmu-events/x86/uncore: Replace PerPkg field to AggregationMode in x86
>> json files
>> perf jevents: Add support for parsing perchip/percore events
>> perf/tools: Pass pmu_event structure as a parameter for
>> arch_get_runtimeparam
>> perf/tools/pmu_events/powerpc: Add hv_24x7 core level metric events
>>
>> tools/perf/arch/powerpc/util/header.c | 7 +-
>> .../arch/powerpc/power9/nest_metrics.json | 27 +-
>> .../arch/x86/broadwellde/uncore-cache.json | 62 ++--
>> .../arch/x86/broadwellde/uncore-memory.json | 18 +-
>> .../arch/x86/broadwellde/uncore-power.json | 18 +-
>> .../arch/x86/broadwellx/uncore-cache.json | 62 ++--
>> .../x86/broadwellx/uncore-interconnect.json | 6 +-
>> .../arch/x86/broadwellx/uncore-memory.json | 18 +-
>> .../arch/x86/broadwellx/uncore-power.json | 18 +-
>> .../arch/x86/cascadelakex/uncore-memory.json | 64 ++--
>> .../arch/x86/cascadelakex/uncore-other.json | 332 +++++++++---------
>> .../arch/x86/haswellx/uncore-cache.json | 62 ++--
>> .../x86/haswellx/uncore-interconnect.json | 6 +-
>> .../arch/x86/haswellx/uncore-memory.json | 18 +-
>> .../arch/x86/haswellx/uncore-power.json | 18 +-
>> .../arch/x86/ivytown/uncore-cache.json | 62 ++--
>> .../arch/x86/ivytown/uncore-interconnect.json | 10 +-
>> .../arch/x86/ivytown/uncore-memory.json | 16 +-
>> .../arch/x86/ivytown/uncore-power.json | 52 +--
>> .../arch/x86/jaketown/uncore-cache.json | 40 +--
>> .../x86/jaketown/uncore-interconnect.json | 10 +-
>> .../arch/x86/jaketown/uncore-memory.json | 18 +-
>> .../arch/x86/jaketown/uncore-power.json | 52 +--
>> .../x86/knightslanding/uncore-memory.json | 8 +-
>> .../arch/x86/skylakex/uncore-memory.json | 36 +-
>> .../arch/x86/skylakex/uncore-other.json | 220 ++++++------
>> .../arch/x86/tremontx/uncore-memory.json | 14 +-
>> .../arch/x86/tremontx/uncore-other.json | 70 ++--
>> .../arch/x86/tremontx/uncore-power.json | 2 +-
>> tools/perf/pmu-events/jevents.c | 45 ++-
>> tools/perf/pmu-events/jevents.h | 2 +-
>> tools/perf/pmu-events/pmu-events.h | 8 +-
>> tools/perf/tests/pmu-events.c | 8 +-
>> tools/perf/util/metricgroup.c | 5 +-
>> tools/perf/util/metricgroup.h | 3 +-
>> tools/perf/util/pmu.c | 6 +-
>> 36 files changed, 729 insertions(+), 694 deletions(-)
>>
>> --
>> 2.26.2
>>
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v3 1/5] perf/pmu-events/jevents: Add enum to store aggregation like PerPkg
2020-07-16 9:42 ` [PATCH v3 1/5] perf/pmu-events/jevents: Add enum to store aggregation like PerPkg Kajol Jain
@ 2020-07-17 8:53 ` Jiri Olsa
0 siblings, 0 replies; 11+ messages in thread
From: Jiri Olsa @ 2020-07-17 8:53 UTC (permalink / raw)
To: Kajol Jain
Cc: acme, peterz, mingo, mark.rutland, alexander.shishkin, pc,
namhyung, ak, yao.jin, linux-kernel, linux-perf-users, irogers,
maddy, ravi.bangoria, anju, kan.liang, nasastry
On Thu, Jul 16, 2020 at 03:12:12PM +0530, Kajol Jain wrote:
> Initially, every time we want to add new terms like chip, core thread etc,
> we need to create corrsponding fields in pmu_events and event struct.
> This patch adds an enum called 'aggr_mode_class' which store all these
> aggregation like perpkg/percore. It also adds new field 'aggr_mode'
> to capture these terms.
> Now, if user wants to add any new term, they just need to add it in
> the enum defined.
>
> Signed-off-by: Kajol Jain <kjain@linux.ibm.com>
> ---
> tools/perf/pmu-events/jevents.c | 39 +++++++++++++++++++-----------
> tools/perf/pmu-events/jevents.h | 2 +-
> tools/perf/pmu-events/pmu-events.h | 6 ++++-
> tools/perf/tests/pmu-events.c | 8 +++---
> tools/perf/util/pmu.c | 6 ++---
> 5 files changed, 38 insertions(+), 23 deletions(-)
>
> diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
> index fa86c5f997cc..b2f59f0af63d 100644
> --- a/tools/perf/pmu-events/jevents.c
> +++ b/tools/perf/pmu-events/jevents.c
> @@ -53,6 +53,17 @@
> int verbose;
> char *prog;
>
> +enum aggr_mode_class {
> + PerPkg = 1
> +};
> +
> +enum aggr_mode_class convert(const char *aggr_mode)
> +{
> + if (!strcmp(aggr_mode, "PerPkg"))
> + return PerPkg;
> + return -1;
> +}
I just noticed you define aggr_mode_class twice,
I think we should keep it just in pmu-events.h
like in change below (compiles for me)
thanks,
jirka
---
diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
index e1c43f739083..2f48b783a64d 100644
--- a/tools/perf/pmu-events/jevents.c
+++ b/tools/perf/pmu-events/jevents.c
@@ -49,16 +49,11 @@
#include "jsmn.h"
#include "json.h"
#include "jevents.h"
+#include "pmu-events.h"
int verbose;
char *prog;
-enum aggr_mode_class {
- PerPkg = 1,
- PerChip,
- PerCore
-};
-
enum aggr_mode_class convert(const char *aggr_mode)
{
if (!strcmp(aggr_mode, "PerPkg"))
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v3 0/5] powerpc/perf: Add json file support for hv_24x7 core level events
2020-07-17 8:11 ` kajoljain
@ 2020-07-17 8:55 ` Jiri Olsa
2020-07-17 22:11 ` Ian Rogers
0 siblings, 1 reply; 11+ messages in thread
From: Jiri Olsa @ 2020-07-17 8:55 UTC (permalink / raw)
To: kajoljain
Cc: Arnaldo Carvalho de Melo, peterz, mingo, mark.rutland,
alexander.shishkin, pc, namhyung, ak, yao.jin, linux-kernel,
linux-perf-users, irogers, maddy, ravi.bangoria, anju, kan.liang,
nasastry
On Fri, Jul 17, 2020 at 01:41:22PM +0530, kajoljain wrote:
>
>
> On 7/16/20 8:52 PM, Arnaldo Carvalho de Melo wrote:
> > Em Thu, Jul 16, 2020 at 03:12:11PM +0530, Kajol Jain escreveu:
> >> Patchset enhance current runtime parameter support. It introduces new
> >> fields like "PerChip" and "PerCore" similar to the field "PerPkg" which is
> >> used to specify perpkg events.
> >>
> >> The "PerCore" and "PerChip" specifies whether its core or chip events.
> >> Based on which we can decide which runtime parameter user want to
> >> access. Now character '?' can refers different parameter based on user
> >> requirement.
> >>
> >> Initially, every time we want to add new terms like chip, core, thread
> >> etc, we need to create corrsponding fields in pmu_events and event
> >> struct.
> >> This patchset adds an enum called 'aggr_mode_class' which store all these
> >> aggregation like perpkg/percore. It also adds new field 'AggregationMode'
> >> to capture these terms.
> >> Now, if user wants to add any new term, they just need to add it in
> >> the enum defined. I try to test it with my current setup.
> >>
> >> I also need to replace PerPkg field to AggregationMode in all the
> >> x86 uncore json files. It will great if Andi and team can test it
> >> and let me know if they have any concerns.
> >>
> >> Changelog:
> >> v2 -> v3:
> >> - Did some nits changes suggested by Jiri include correction of
> >> indentation, and making PerCore/PerChip values forward after
> >> PerPkg as 1 in the enum.
> >> - Rebase the patchset on Arnaldo's tmp.perf/core branch.
> >> - Change RFC tag
> >
> > Hey, have anybody provided Acked-by/Reviewed-by for previous revisions
> > of this patchset? If so you could have collected them for patches
> > without changes, was that the case?
>
> Hi Arnaldo,
> I did get "Acked-by: Ian Rogers" on my initial prototype which I send in my RFC.
> Link to the patch: https://lkml.org/lkml/2020/7/5/399
>
> After that, I break it down and made some nits changes as suggested by Jiri, that's why I didn't
> add his Acked-by tag.
> Ian should I add it, if it seems fine to you.
I posted one more comment and I'd also like to hear from
guys maintainng json list on intel side that they are ok
with this, mainly the change introduced in:
pmu-events/x86/uncore: Replace PerPkg field to AggregationMode in x86 json files
Andi?
thanks,
jirka
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v3 0/5] powerpc/perf: Add json file support for hv_24x7 core level events
2020-07-17 8:55 ` Jiri Olsa
@ 2020-07-17 22:11 ` Ian Rogers
0 siblings, 0 replies; 11+ messages in thread
From: Ian Rogers @ 2020-07-17 22:11 UTC (permalink / raw)
To: Jiri Olsa
Cc: kajoljain, Arnaldo Carvalho de Melo, Peter Zijlstra, Ingo Molnar,
Mark Rutland, Alexander Shishkin, Paul Clarke, Namhyung Kim,
Andi Kleen, Jin Yao, LKML, linux-perf-users, maddy,
Ravi Bangoria, Anju T Sudhakar, Liang, Kan, nasastry
On Fri, Jul 17, 2020 at 1:55 AM Jiri Olsa <jolsa@redhat.com> wrote:
>
> On Fri, Jul 17, 2020 at 01:41:22PM +0530, kajoljain wrote:
> >
> >
> > On 7/16/20 8:52 PM, Arnaldo Carvalho de Melo wrote:
> > > Em Thu, Jul 16, 2020 at 03:12:11PM +0530, Kajol Jain escreveu:
> > >> Patchset enhance current runtime parameter support. It introduces new
> > >> fields like "PerChip" and "PerCore" similar to the field "PerPkg" which is
> > >> used to specify perpkg events.
> > >>
> > >> The "PerCore" and "PerChip" specifies whether its core or chip events.
> > >> Based on which we can decide which runtime parameter user want to
> > >> access. Now character '?' can refers different parameter based on user
> > >> requirement.
> > >>
> > >> Initially, every time we want to add new terms like chip, core, thread
> > >> etc, we need to create corrsponding fields in pmu_events and event
> > >> struct.
> > >> This patchset adds an enum called 'aggr_mode_class' which store all these
> > >> aggregation like perpkg/percore. It also adds new field 'AggregationMode'
> > >> to capture these terms.
> > >> Now, if user wants to add any new term, they just need to add it in
> > >> the enum defined. I try to test it with my current setup.
> > >>
> > >> I also need to replace PerPkg field to AggregationMode in all the
> > >> x86 uncore json files. It will great if Andi and team can test it
> > >> and let me know if they have any concerns.
> > >>
> > >> Changelog:
> > >> v2 -> v3:
> > >> - Did some nits changes suggested by Jiri include correction of
> > >> indentation, and making PerCore/PerChip values forward after
> > >> PerPkg as 1 in the enum.
> > >> - Rebase the patchset on Arnaldo's tmp.perf/core branch.
> > >> - Change RFC tag
> > >
> > > Hey, have anybody provided Acked-by/Reviewed-by for previous revisions
> > > of this patchset? If so you could have collected them for patches
> > > without changes, was that the case?
> >
> > Hi Arnaldo,
> > I did get "Acked-by: Ian Rogers" on my initial prototype which I send in my RFC.
> > Link to the patch: https://lkml.org/lkml/2020/7/5/399
> >
> > After that, I break it down and made some nits changes as suggested by Jiri, that's why I didn't
> > add his Acked-by tag.
> > Ian should I add it, if it seems fine to you.
>
> I posted one more comment and I'd also like to hear from
> guys maintainng json list on intel side that they are ok
> with this, mainly the change introduced in:
>
> pmu-events/x86/uncore: Replace PerPkg field to AggregationMode in x86 json files
>
> Andi?
>
> thanks,
> jirka
I am happy with this change.
Acked-by: Ian Rogers <irogers@google.com>
Thanks,
Ian
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2020-07-17 22:11 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-16 9:42 [PATCH v3 0/5] powerpc/perf: Add json file support for hv_24x7 core level events Kajol Jain
2020-07-16 9:42 ` [PATCH v3 1/5] perf/pmu-events/jevents: Add enum to store aggregation like PerPkg Kajol Jain
2020-07-17 8:53 ` Jiri Olsa
2020-07-16 9:42 ` [PATCH v3 2/5] pmu-events/x86/uncore: Replace PerPkg field to AggregationMode in x86 json files Kajol Jain
2020-07-16 9:42 ` [PATCH v3 3/5] perf jevents: Add support for parsing perchip/percore events Kajol Jain
2020-07-16 9:42 ` [PATCH v3 4/5] perf/tools: Pass pmu_event structure as a parameter for arch_get_runtimeparam Kajol Jain
2020-07-16 9:42 ` [PATCH v3 5/5] perf/tools/pmu_events/powerpc: Add hv_24x7 core level metric events Kajol Jain
2020-07-16 15:22 ` [PATCH v3 0/5] powerpc/perf: Add json file support for hv_24x7 core level events Arnaldo Carvalho de Melo
2020-07-17 8:11 ` kajoljain
2020-07-17 8:55 ` Jiri Olsa
2020-07-17 22:11 ` Ian Rogers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).