|
 |
66aa21 |
commit afa8700ce726153fa1547ce118f7f9b029e675c9
|
|
|
66aa21 |
Author: Stephane Eranian <eranian@gmail.com>
|
|
|
66aa21 |
Date: Wed Jan 16 13:23:11 2019 -0800
|
|
|
66aa21 |
|
|
|
66aa21 |
clarify description of AMD Fam17h MERGE event
|
|
|
66aa21 |
|
|
|
66aa21 |
This is a special event used when merging two counters together.
|
|
|
66aa21 |
It needs to be programmed on the od-numbered performance counter.
|
|
|
66aa21 |
|
|
|
66aa21 |
Signed-off-by: Stephane Eranian <eranian@gmail.com>
|
|
|
66aa21 |
|
|
|
66aa21 |
diff --git a/lib/events/amd64_events_fam17h.h b/lib/events/amd64_events_fam17h.h
|
|
|
66aa21 |
index 4f865b9..b0db898 100644
|
|
|
66aa21 |
--- a/lib/events/amd64_events_fam17h.h
|
|
|
66aa21 |
+++ b/lib/events/amd64_events_fam17h.h
|
|
|
66aa21 |
@@ -954,7 +954,7 @@ static const amd64_entry_t amd64_fam17h_pe[]={
|
|
|
66aa21 |
.umasks = amd64_fam17h_tablewalker_allocation,
|
|
|
66aa21 |
},
|
|
|
66aa21 |
{ .name = "MERGE",
|
|
|
66aa21 |
- .desc = "See <xref file='svd_core_pmc' title='Large Increment per Cycle Events' format='name'>.",
|
|
|
66aa21 |
+ .desc = "Merge two counters together. This event must be programmed on the odd performance counter",
|
|
|
66aa21 |
.modmsk = AMD64_FAM17H_ATTRS,
|
|
|
66aa21 |
.code = 0xfff,
|
|
|
66aa21 |
.flags = 0,
|
|
|
66aa21 |
|
|
|
66aa21 |
commit ac95d1957771d527f7bf8d11a97fb10ee223d6c0
|
|
|
66aa21 |
Author: Stephane Eranian <eranian@gmail.com>
|
|
|
66aa21 |
Date: Thu Mar 14 15:19:13 2019 -0700
|
|
|
66aa21 |
|
|
|
66aa21 |
remove MERGE event from AMD Fam17h table
|
|
|
66aa21 |
|
|
|
66aa21 |
The MERGE event is not measuring an actual micro-architectural event. Instead
|
|
|
66aa21 |
it is used to fuse two consecutive counters together to get a wider counter.
|
|
|
66aa21 |
This should be used cautiously and is not currently compatible with Linux
|
|
|
66aa21 |
perf_events interface and implementation.
|
|
|
66aa21 |
|
|
|
66aa21 |
Signed-off-by: Stephane Eranian <eranian@gmail.com>
|
|
|
66aa21 |
|
|
|
66aa21 |
diff --git a/lib/events/amd64_events_fam17h.h b/lib/events/amd64_events_fam17h.h
|
|
|
66aa21 |
index b0db898..deadbed 100644
|
|
|
66aa21 |
--- a/lib/events/amd64_events_fam17h.h
|
|
|
66aa21 |
+++ b/lib/events/amd64_events_fam17h.h
|
|
|
66aa21 |
@@ -953,13 +953,6 @@ static const amd64_entry_t amd64_fam17h_pe[]={
|
|
|
66aa21 |
.numasks = LIBPFM_ARRAY_SIZE(amd64_fam17h_tablewalker_allocation),
|
|
|
66aa21 |
.umasks = amd64_fam17h_tablewalker_allocation,
|
|
|
66aa21 |
},
|
|
|
66aa21 |
- { .name = "MERGE",
|
|
|
66aa21 |
- .desc = "Merge two counters together. This event must be programmed on the odd performance counter",
|
|
|
66aa21 |
- .modmsk = AMD64_FAM17H_ATTRS,
|
|
|
66aa21 |
- .code = 0xfff,
|
|
|
66aa21 |
- .flags = 0,
|
|
|
66aa21 |
- .ngrp = 0,
|
|
|
66aa21 |
- },
|
|
|
66aa21 |
{ .name = "L1_BTB_CORRECTION",
|
|
|
66aa21 |
.desc = "TBD",
|
|
|
66aa21 |
.modmsk = AMD64_FAM17H_ATTRS,
|