lkml.org 
[lkml]   [2013]   [Sep]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/8][v4] powerpc/perf: Rename Power8 macros to start with PME
    Date
    We use helpers like GENERIC_EVENT_ATTR() to list the generic events in
    sysfs. To avoid name collisions, GENERIC_EVENT_ATTR() requires the perf
    event macros to start with PME.

    Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
    ---
    arch/powerpc/perf/power8-pmu.c | 24 ++++++++++++------------
    1 file changed, 12 insertions(+), 12 deletions(-)

    diff --git a/arch/powerpc/perf/power8-pmu.c b/arch/powerpc/perf/power8-pmu.c
    index 96a64d6..30c6b12 100644
    --- a/arch/powerpc/perf/power8-pmu.c
    +++ b/arch/powerpc/perf/power8-pmu.c
    @@ -18,12 +18,12 @@
    /*
    * Some power8 event codes.
    */
    -#define PM_CYC 0x0001e
    -#define PM_GCT_NOSLOT_CYC 0x100f8
    -#define PM_CMPLU_STALL 0x4000a
    -#define PM_INST_CMPL 0x00002
    -#define PM_BRU_FIN 0x10068
    -#define PM_BR_MPRED_CMPL 0x400f6
    +#define PME_PM_CYC 0x0001e
    +#define PME_PM_GCT_NOSLOT_CYC 0x100f8
    +#define PME_PM_CMPLU_STALL 0x4000a
    +#define PME_PM_INST_CMPL 0x00002
    +#define PME_PM_BRU_FIN 0x10068
    +#define PME_PM_BR_MPRED_CMPL 0x400f6


    /*
    @@ -550,12 +550,12 @@ static const struct attribute_group *power8_pmu_attr_groups[] = {
    };

    static int power8_generic_events[] = {
    - [PERF_COUNT_HW_CPU_CYCLES] = PM_CYC,
    - [PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] = PM_GCT_NOSLOT_CYC,
    - [PERF_COUNT_HW_STALLED_CYCLES_BACKEND] = PM_CMPLU_STALL,
    - [PERF_COUNT_HW_INSTRUCTIONS] = PM_INST_CMPL,
    - [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = PM_BRU_FIN,
    - [PERF_COUNT_HW_BRANCH_MISSES] = PM_BR_MPRED_CMPL,
    + [PERF_COUNT_HW_CPU_CYCLES] = PME_PM_CYC,
    + [PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] = PME_PM_GCT_NOSLOT_CYC,
    + [PERF_COUNT_HW_STALLED_CYCLES_BACKEND] = PME_PM_CMPLU_STALL,
    + [PERF_COUNT_HW_INSTRUCTIONS] = PME_PM_INST_CMPL,
    + [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = PME_PM_BRU_FIN,
    + [PERF_COUNT_HW_BRANCH_MISSES] = PME_PM_BR_MPRED_CMPL,
    };

    static u64 power8_bhrb_filter_map(u64 branch_sample_type)
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2013-09-14 03:21    [W:3.614 / U:0.156 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site