diff options
author | Runzhen Wang <runzhen@linux.vnet.ibm.com> | 2013-06-28 04:14:56 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2013-07-08 16:40:05 -0400 |
commit | 7e40c92019cef784fffbdfc51c6e731e7ee6ba10 (patch) | |
tree | 3885e15f98db3495d76820a56f0b26ccd437000b /arch/powerpc | |
parent | 0276c22a3f22b7f6696fa07b0a77635726b2c0fd (diff) |
perf tools: fix a typo of a Power7 event name
In the Power7 PMU guide:
https://www.power.org/documentation/commonly-used-metrics-for-performance-analysis/
PM_BRU_MPRED is referred to as PM_BR_MPRED.
It fixed the typo by changing the name of the event in kernel and
documentation accordingly.
This patch changes the ABI, there are some reasons I think it's ok:
- It is relatively new interface, specific to the Power7 platform.
- No tools that we know of actually use this interface at this point
(none are listed near the interface).
- Users of this interface (eg oprofile users migrating to perf)
would be more used to the "PM_BR_MPRED" rather than "PM_BRU_MPRED".
- These are in the ABI/testing at this point rather than ABI/stable,
so hoping we have some wiggle room.
Signed-off-by: Runzhen Wang <runzhen@linux.vnet.ibm.com>
Acked-by: Michael Ellerman <michael@ellerman.id.au>
Cc: icycoder@gmail.com
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Michael Ellerman <michael@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Runzhen Wang <runzhew@clemson.edu>
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Cc: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/r/1372407297-6996-2-git-send-email-runzhen@linux.vnet.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/perf/power7-pmu.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/perf/power7-pmu.c b/arch/powerpc/perf/power7-pmu.c index 13c3f0e547a2..d1821b8bbc4c 100644 --- a/arch/powerpc/perf/power7-pmu.c +++ b/arch/powerpc/perf/power7-pmu.c | |||
@@ -60,7 +60,7 @@ | |||
60 | #define PME_PM_LD_REF_L1 0xc880 | 60 | #define PME_PM_LD_REF_L1 0xc880 |
61 | #define PME_PM_LD_MISS_L1 0x400f0 | 61 | #define PME_PM_LD_MISS_L1 0x400f0 |
62 | #define PME_PM_BRU_FIN 0x10068 | 62 | #define PME_PM_BRU_FIN 0x10068 |
63 | #define PME_PM_BRU_MPRED 0x400f6 | 63 | #define PME_PM_BR_MPRED 0x400f6 |
64 | 64 | ||
65 | #define PME_PM_CMPLU_STALL_FXU 0x20014 | 65 | #define PME_PM_CMPLU_STALL_FXU 0x20014 |
66 | #define PME_PM_CMPLU_STALL_DIV 0x40014 | 66 | #define PME_PM_CMPLU_STALL_DIV 0x40014 |
@@ -349,7 +349,7 @@ static int power7_generic_events[] = { | |||
349 | [PERF_COUNT_HW_CACHE_REFERENCES] = PME_PM_LD_REF_L1, | 349 | [PERF_COUNT_HW_CACHE_REFERENCES] = PME_PM_LD_REF_L1, |
350 | [PERF_COUNT_HW_CACHE_MISSES] = PME_PM_LD_MISS_L1, | 350 | [PERF_COUNT_HW_CACHE_MISSES] = PME_PM_LD_MISS_L1, |
351 | [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = PME_PM_BRU_FIN, | 351 | [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = PME_PM_BRU_FIN, |
352 | [PERF_COUNT_HW_BRANCH_MISSES] = PME_PM_BRU_MPRED, | 352 | [PERF_COUNT_HW_BRANCH_MISSES] = PME_PM_BR_MPRED, |
353 | }; | 353 | }; |
354 | 354 | ||
355 | #define C(x) PERF_COUNT_HW_CACHE_##x | 355 | #define C(x) PERF_COUNT_HW_CACHE_##x |
@@ -405,7 +405,7 @@ GENERIC_EVENT_ATTR(instructions, INST_CMPL); | |||
405 | GENERIC_EVENT_ATTR(cache-references, LD_REF_L1); | 405 | GENERIC_EVENT_ATTR(cache-references, LD_REF_L1); |
406 | GENERIC_EVENT_ATTR(cache-misses, LD_MISS_L1); | 406 | GENERIC_EVENT_ATTR(cache-misses, LD_MISS_L1); |
407 | GENERIC_EVENT_ATTR(branch-instructions, BRU_FIN); | 407 | GENERIC_EVENT_ATTR(branch-instructions, BRU_FIN); |
408 | GENERIC_EVENT_ATTR(branch-misses, BRU_MPRED); | 408 | GENERIC_EVENT_ATTR(branch-misses, BR_MPRED); |
409 | 409 | ||
410 | POWER_EVENT_ATTR(CYC, CYC); | 410 | POWER_EVENT_ATTR(CYC, CYC); |
411 | POWER_EVENT_ATTR(GCT_NOSLOT_CYC, GCT_NOSLOT_CYC); | 411 | POWER_EVENT_ATTR(GCT_NOSLOT_CYC, GCT_NOSLOT_CYC); |
@@ -414,7 +414,7 @@ POWER_EVENT_ATTR(INST_CMPL, INST_CMPL); | |||
414 | POWER_EVENT_ATTR(LD_REF_L1, LD_REF_L1); | 414 | POWER_EVENT_ATTR(LD_REF_L1, LD_REF_L1); |
415 | POWER_EVENT_ATTR(LD_MISS_L1, LD_MISS_L1); | 415 | POWER_EVENT_ATTR(LD_MISS_L1, LD_MISS_L1); |
416 | POWER_EVENT_ATTR(BRU_FIN, BRU_FIN) | 416 | POWER_EVENT_ATTR(BRU_FIN, BRU_FIN) |
417 | POWER_EVENT_ATTR(BRU_MPRED, BRU_MPRED); | 417 | POWER_EVENT_ATTR(BR_MPRED, BR_MPRED); |
418 | 418 | ||
419 | POWER_EVENT_ATTR(CMPLU_STALL_FXU, CMPLU_STALL_FXU); | 419 | POWER_EVENT_ATTR(CMPLU_STALL_FXU, CMPLU_STALL_FXU); |
420 | POWER_EVENT_ATTR(CMPLU_STALL_DIV, CMPLU_STALL_DIV); | 420 | POWER_EVENT_ATTR(CMPLU_STALL_DIV, CMPLU_STALL_DIV); |
@@ -449,7 +449,7 @@ static struct attribute *power7_events_attr[] = { | |||
449 | GENERIC_EVENT_PTR(LD_REF_L1), | 449 | GENERIC_EVENT_PTR(LD_REF_L1), |
450 | GENERIC_EVENT_PTR(LD_MISS_L1), | 450 | GENERIC_EVENT_PTR(LD_MISS_L1), |
451 | GENERIC_EVENT_PTR(BRU_FIN), | 451 | GENERIC_EVENT_PTR(BRU_FIN), |
452 | GENERIC_EVENT_PTR(BRU_MPRED), | 452 | GENERIC_EVENT_PTR(BR_MPRED), |
453 | 453 | ||
454 | POWER_EVENT_PTR(CYC), | 454 | POWER_EVENT_PTR(CYC), |
455 | POWER_EVENT_PTR(GCT_NOSLOT_CYC), | 455 | POWER_EVENT_PTR(GCT_NOSLOT_CYC), |
@@ -458,7 +458,7 @@ static struct attribute *power7_events_attr[] = { | |||
458 | POWER_EVENT_PTR(LD_REF_L1), | 458 | POWER_EVENT_PTR(LD_REF_L1), |
459 | POWER_EVENT_PTR(LD_MISS_L1), | 459 | POWER_EVENT_PTR(LD_MISS_L1), |
460 | POWER_EVENT_PTR(BRU_FIN), | 460 | POWER_EVENT_PTR(BRU_FIN), |
461 | POWER_EVENT_PTR(BRU_MPRED), | 461 | POWER_EVENT_PTR(BR_MPRED), |
462 | 462 | ||
463 | POWER_EVENT_PTR(CMPLU_STALL_FXU), | 463 | POWER_EVENT_PTR(CMPLU_STALL_FXU), |
464 | POWER_EVENT_PTR(CMPLU_STALL_DIV), | 464 | POWER_EVENT_PTR(CMPLU_STALL_DIV), |