| Message ID | 1520506716-197429-10-git-send-email-john.garry@huawei.com |
|---|---|
| State | Accepted |
| Commit | ae43053bd2595dc98f0909505dc1d7e1ed8bd239 |
| Headers | show |
| Series | perf events patches for improved ARM64 support | expand |
Hi John, On Thu, Mar 8, 2018 at 4:28 PM, John Garry <john.garry@huawei.com> wrote: > This patch fixes the Cavium ThunderX2 JSON to use event definitions > from the ARMv8 recommended events. > > Cc: Ganapatrao Kulkarni <ganapatrao.kulkarni@cavium.com> > Signed-off-by: John Garry <john.garry@huawei.com> > --- > .../arch/arm64/cavium/thunderx2/core-imp-def.json | 50 +++++----------------- > 1 file changed, 10 insertions(+), 40 deletions(-) > > diff --git a/tools/perf/pmu-events/arch/arm64/cavium/thunderx2/core-imp-def.json b/tools/perf/pmu-events/arch/arm64/cavium/thunderx2/core-imp-def.json > index 2db45c4..bc03c06 100644 > --- a/tools/perf/pmu-events/arch/arm64/cavium/thunderx2/core-imp-def.json > +++ b/tools/perf/pmu-events/arch/arm64/cavium/thunderx2/core-imp-def.json > @@ -1,62 +1,32 @@ > [ > { > - "PublicDescription": "Attributable Level 1 data cache access, read", > - "EventCode": "0x40", > - "EventName": "l1d_cache_rd", > - "BriefDescription": "L1D cache read", > + "ArchStdEvent": "L1D_CACHE_RD", > }, > { > - "PublicDescription": "Attributable Level 1 data cache access, write ", > - "EventCode": "0x41", > - "EventName": "l1d_cache_wr", > - "BriefDescription": "L1D cache write", > + "ArchStdEvent": "L1D_CACHE_WR", > }, > { > - "PublicDescription": "Attributable Level 1 data cache refill, read", > - "EventCode": "0x42", > - "EventName": "l1d_cache_refill_rd", > - "BriefDescription": "L1D cache refill read", > + "ArchStdEvent": "L1D_CACHE_REFILL_RD", > }, > { > - "PublicDescription": "Attributable Level 1 data cache refill, write", > - "EventCode": "0x43", > - "EventName": "l1d_cache_refill_wr", > - "BriefDescription": "L1D refill write", > + "ArchStdEvent": "L1D_CACHE_REFILL_WR", > }, > { > - "PublicDescription": "Attributable Level 1 data TLB refill, read", > - "EventCode": "0x4C", > - "EventName": "l1d_tlb_refill_rd", > - "BriefDescription": "L1D tlb refill read", > + "ArchStdEvent": "L1D_TLB_REFILL_RD", > }, > { > - "PublicDescription": "Attributable Level 1 data TLB refill, write", > - "EventCode": "0x4D", > - "EventName": "l1d_tlb_refill_wr", > - "BriefDescription": "L1D tlb refill write", > + "ArchStdEvent": "L1D_TLB_REFILL_WR", > }, > { > - "PublicDescription": "Attributable Level 1 data or unified TLB access, read", > - "EventCode": "0x4E", > - "EventName": "l1d_tlb_rd", > - "BriefDescription": "L1D tlb read", > + "ArchStdEvent": "L1D_TLB_RD", > }, > { > - "PublicDescription": "Attributable Level 1 data or unified TLB access, write", > - "EventCode": "0x4F", > - "EventName": "l1d_tlb_wr", > - "BriefDescription": "L1D tlb write", > + "ArchStdEvent": "L1D_TLB_WR", > }, > { > - "PublicDescription": "Bus access read", > - "EventCode": "0x60", > - "EventName": "bus_access_rd", > - "BriefDescription": "Bus access read", > + "ArchStdEvent": "BUS_ACCESS_RD", > }, > { > - "PublicDescription": "Bus access write", > - "EventCode": "0x61", > - "EventName": "bus_access_wr", > - "BriefDescription": "Bus access write", > + "ArchStdEvent": "BUS_ACCESS_WR", > } > ] This patch looks ok to me. i have tried on thunderx2 for few events and it is working fine. Tested-by: Ganapatrao Kulkarni <ganapatrao.kulkarni@cavium.com> > -- > 1.9.1 > thanks Ganapat
diff --git a/tools/perf/pmu-events/arch/arm64/cavium/thunderx2/core-imp-def.json b/tools/perf/pmu-events/arch/arm64/cavium/thunderx2/core-imp-def.json index 2db45c4..bc03c06 100644 --- a/tools/perf/pmu-events/arch/arm64/cavium/thunderx2/core-imp-def.json +++ b/tools/perf/pmu-events/arch/arm64/cavium/thunderx2/core-imp-def.json @@ -1,62 +1,32 @@ [ { - "PublicDescription": "Attributable Level 1 data cache access, read", - "EventCode": "0x40", - "EventName": "l1d_cache_rd", - "BriefDescription": "L1D cache read", + "ArchStdEvent": "L1D_CACHE_RD", }, { - "PublicDescription": "Attributable Level 1 data cache access, write ", - "EventCode": "0x41", - "EventName": "l1d_cache_wr", - "BriefDescription": "L1D cache write", + "ArchStdEvent": "L1D_CACHE_WR", }, { - "PublicDescription": "Attributable Level 1 data cache refill, read", - "EventCode": "0x42", - "EventName": "l1d_cache_refill_rd", - "BriefDescription": "L1D cache refill read", + "ArchStdEvent": "L1D_CACHE_REFILL_RD", }, { - "PublicDescription": "Attributable Level 1 data cache refill, write", - "EventCode": "0x43", - "EventName": "l1d_cache_refill_wr", - "BriefDescription": "L1D refill write", + "ArchStdEvent": "L1D_CACHE_REFILL_WR", }, { - "PublicDescription": "Attributable Level 1 data TLB refill, read", - "EventCode": "0x4C", - "EventName": "l1d_tlb_refill_rd", - "BriefDescription": "L1D tlb refill read", + "ArchStdEvent": "L1D_TLB_REFILL_RD", }, { - "PublicDescription": "Attributable Level 1 data TLB refill, write", - "EventCode": "0x4D", - "EventName": "l1d_tlb_refill_wr", - "BriefDescription": "L1D tlb refill write", + "ArchStdEvent": "L1D_TLB_REFILL_WR", }, { - "PublicDescription": "Attributable Level 1 data or unified TLB access, read", - "EventCode": "0x4E", - "EventName": "l1d_tlb_rd", - "BriefDescription": "L1D tlb read", + "ArchStdEvent": "L1D_TLB_RD", }, { - "PublicDescription": "Attributable Level 1 data or unified TLB access, write", - "EventCode": "0x4F", - "EventName": "l1d_tlb_wr", - "BriefDescription": "L1D tlb write", + "ArchStdEvent": "L1D_TLB_WR", }, { - "PublicDescription": "Bus access read", - "EventCode": "0x60", - "EventName": "bus_access_rd", - "BriefDescription": "Bus access read", + "ArchStdEvent": "BUS_ACCESS_RD", }, { - "PublicDescription": "Bus access write", - "EventCode": "0x61", - "EventName": "bus_access_wr", - "BriefDescription": "Bus access write", + "ArchStdEvent": "BUS_ACCESS_WR", } ]
This patch fixes the Cavium ThunderX2 JSON to use event definitions from the ARMv8 recommended events. Cc: Ganapatrao Kulkarni <ganapatrao.kulkarni@cavium.com> Signed-off-by: John Garry <john.garry@huawei.com> --- .../arch/arm64/cavium/thunderx2/core-imp-def.json | 50 +++++----------------- 1 file changed, 10 insertions(+), 40 deletions(-) -- 1.9.1