|
@@ -60,7 +60,7 @@
|
|
|
#define PME_PM_LD_REF_L1 0xc880
|
|
|
#define PME_PM_LD_MISS_L1 0x400f0
|
|
|
#define PME_PM_BRU_FIN 0x10068
|
|
|
-#define PME_PM_BRU_MPRED 0x400f6
|
|
|
+#define PME_PM_BR_MPRED 0x400f6
|
|
|
|
|
|
#define PME_PM_CMPLU_STALL_FXU 0x20014
|
|
|
#define PME_PM_CMPLU_STALL_DIV 0x40014
|
|
@@ -349,7 +349,7 @@ static int power7_generic_events[] = {
|
|
|
[PERF_COUNT_HW_CACHE_REFERENCES] = PME_PM_LD_REF_L1,
|
|
|
[PERF_COUNT_HW_CACHE_MISSES] = PME_PM_LD_MISS_L1,
|
|
|
[PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = PME_PM_BRU_FIN,
|
|
|
- [PERF_COUNT_HW_BRANCH_MISSES] = PME_PM_BRU_MPRED,
|
|
|
+ [PERF_COUNT_HW_BRANCH_MISSES] = PME_PM_BR_MPRED,
|
|
|
};
|
|
|
|
|
|
#define C(x) PERF_COUNT_HW_CACHE_##x
|
|
@@ -405,7 +405,7 @@ GENERIC_EVENT_ATTR(instructions, INST_CMPL);
|
|
|
GENERIC_EVENT_ATTR(cache-references, LD_REF_L1);
|
|
|
GENERIC_EVENT_ATTR(cache-misses, LD_MISS_L1);
|
|
|
GENERIC_EVENT_ATTR(branch-instructions, BRU_FIN);
|
|
|
-GENERIC_EVENT_ATTR(branch-misses, BRU_MPRED);
|
|
|
+GENERIC_EVENT_ATTR(branch-misses, BR_MPRED);
|
|
|
|
|
|
POWER_EVENT_ATTR(CYC, CYC);
|
|
|
POWER_EVENT_ATTR(GCT_NOSLOT_CYC, GCT_NOSLOT_CYC);
|
|
@@ -414,7 +414,7 @@ POWER_EVENT_ATTR(INST_CMPL, INST_CMPL);
|
|
|
POWER_EVENT_ATTR(LD_REF_L1, LD_REF_L1);
|
|
|
POWER_EVENT_ATTR(LD_MISS_L1, LD_MISS_L1);
|
|
|
POWER_EVENT_ATTR(BRU_FIN, BRU_FIN)
|
|
|
-POWER_EVENT_ATTR(BRU_MPRED, BRU_MPRED);
|
|
|
+POWER_EVENT_ATTR(BR_MPRED, BR_MPRED);
|
|
|
|
|
|
POWER_EVENT_ATTR(CMPLU_STALL_FXU, CMPLU_STALL_FXU);
|
|
|
POWER_EVENT_ATTR(CMPLU_STALL_DIV, CMPLU_STALL_DIV);
|
|
@@ -449,7 +449,7 @@ static struct attribute *power7_events_attr[] = {
|
|
|
GENERIC_EVENT_PTR(LD_REF_L1),
|
|
|
GENERIC_EVENT_PTR(LD_MISS_L1),
|
|
|
GENERIC_EVENT_PTR(BRU_FIN),
|
|
|
- GENERIC_EVENT_PTR(BRU_MPRED),
|
|
|
+ GENERIC_EVENT_PTR(BR_MPRED),
|
|
|
|
|
|
POWER_EVENT_PTR(CYC),
|
|
|
POWER_EVENT_PTR(GCT_NOSLOT_CYC),
|
|
@@ -458,7 +458,7 @@ static struct attribute *power7_events_attr[] = {
|
|
|
POWER_EVENT_PTR(LD_REF_L1),
|
|
|
POWER_EVENT_PTR(LD_MISS_L1),
|
|
|
POWER_EVENT_PTR(BRU_FIN),
|
|
|
- POWER_EVENT_PTR(BRU_MPRED),
|
|
|
+ POWER_EVENT_PTR(BR_MPRED),
|
|
|
|
|
|
POWER_EVENT_PTR(CMPLU_STALL_FXU),
|
|
|
POWER_EVENT_PTR(CMPLU_STALL_DIV),
|