microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

perf vendor events arm64: fixup A53 to use recommended events 

This patch fixes the ARM Cortex-A53 json to use event definition from
the ARMv8 recommended events.

In addition to this change, other changes were made:

- remove stray ','
- remove mirrored events in memory.json and bus.json
- fixed indentation to be consistent with other ARM
  JSONs

Signed-off-by: John Garry <john.garry@huawei.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ganapatrao Kulkarni <ganapatrao.kulkarni@cavium.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Shaokun Zhang <zhangshaokun@hisilicon.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: William Cohen <wcohen@redhat.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linuxarm@huawei.com
Link: http://lkml.kernel.org/r/1520506716-197429-11-git-send-email-john.garry@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
John Garry 2018-03-08 18:58:35 +08:00 коммит произвёл Arnaldo Carvalho de Melo
Родитель ae43053bd2
Коммит afe4d08962
6 изменённых файлов: 62 добавлений и 92 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

14
tools/perf/pmu-events/arch/arm64/arm/cortex-a53/branch.json
Просмотреть файл

@ -1,25 +1,23 @@
[ [
{, {
"EventCode": "0x7A", "ArchStdEvent": "BR_INDIRECT_SPEC",
"EventName": "BR_INDIRECT_SPEC",
"BriefDescription": "Branch speculatively executed - Indirect branch"
}, },
{, {
"EventCode": "0xC9", "EventCode": "0xC9",
"EventName": "BR_COND", "EventName": "BR_COND",
"BriefDescription": "Conditional branch executed" "BriefDescription": "Conditional branch executed"
}, },
{, {
"EventCode": "0xCA", "EventCode": "0xCA",
"EventName": "BR_INDIRECT_MISPRED", "EventName": "BR_INDIRECT_MISPRED",
"BriefDescription": "Indirect branch mispredicted" "BriefDescription": "Indirect branch mispredicted"
}, },
{, {
"EventCode": "0xCB", "EventCode": "0xCB",
"EventName": "BR_INDIRECT_MISPRED_ADDR", "EventName": "BR_INDIRECT_MISPRED_ADDR",
"BriefDescription": "Indirect branch mispredicted because of address miscompare" "BriefDescription": "Indirect branch mispredicted because of address miscompare"
}, },
{, {
"EventCode": "0xCC", "EventCode": "0xCC",
"EventName": "BR_COND_MISPRED", "EventName": "BR_COND_MISPRED",
"BriefDescription": "Conditional branch mispredicted" "BriefDescription": "Conditional branch mispredicted"

22
tools/perf/pmu-events/arch/arm64/arm/cortex-a53/bus.json
Просмотреть файл

@ -1,22 +1,8 @@
[ [
{, {
"EventCode": "0x60", "ArchStdEvent": "BUS_ACCESS_RD",
"EventName": "BUS_ACCESS_LD",
"BriefDescription": "Bus access - Read"
}, },
{, {
"EventCode": "0x61", "ArchStdEvent": "BUS_ACCESS_WR",
"EventName": "BUS_ACCESS_ST",
"BriefDescription": "Bus access - Write"
},
{,
"EventCode": "0xC0",
"EventName": "EXT_MEM_REQ",
"BriefDescription": "External memory request"
},
{,
"EventCode": "0xC1",
"EventName": "EXT_MEM_REQ_NC",
"BriefDescription": "Non-cacheable external memory request"
} }
] ]

40
tools/perf/pmu-events/arch/arm64/arm/cortex-a53/cache.json
Просмотреть файл

@ -1,27 +1,27 @@
[ [
{, {
"EventCode": "0xC2", "EventCode": "0xC2",
"EventName": "PREFETCH_LINEFILL", "EventName": "PREFETCH_LINEFILL",
"BriefDescription": "Linefill because of prefetch" "BriefDescription": "Linefill because of prefetch"
}, },
{, {
"EventCode": "0xC3", "EventCode": "0xC3",
"EventName": "PREFETCH_LINEFILL_DROP", "EventName": "PREFETCH_LINEFILL_DROP",
"BriefDescription": "Instruction Cache Throttle occurred" "BriefDescription": "Instruction Cache Throttle occurred"
}, },
{, {
"EventCode": "0xC4", "EventCode": "0xC4",
"EventName": "READ_ALLOC_ENTER", "EventName": "READ_ALLOC_ENTER",
"BriefDescription": "Entering read allocate mode" "BriefDescription": "Entering read allocate mode"
}, },
{, {
"EventCode": "0xC5", "EventCode": "0xC5",
"EventName": "READ_ALLOC", "EventName": "READ_ALLOC",
"BriefDescription": "Read allocate mode" "BriefDescription": "Read allocate mode"
}, },
{, {
"EventCode": "0xC8", "EventCode": "0xC8",
"EventName": "EXT_SNOOP", "EventName": "EXT_SNOOP",
"BriefDescription": "SCU Snooped data from another CPU for this CPU" "BriefDescription": "SCU Snooped data from another CPU for this CPU"
} }
] ]

14
tools/perf/pmu-events/arch/arm64/arm/cortex-a53/memory.json
Просмотреть файл

@ -1,20 +1,10 @@
[ [
{, {
"EventCode": "0x60",
"EventName": "BUS_ACCESS_LD",
"BriefDescription": "Bus access - Read"
},
{,
"EventCode": "0x61",
"EventName": "BUS_ACCESS_ST",
"BriefDescription": "Bus access - Write"
},
{,
"EventCode": "0xC0", "EventCode": "0xC0",
"EventName": "EXT_MEM_REQ", "EventName": "EXT_MEM_REQ",
"BriefDescription": "External memory request" "BriefDescription": "External memory request"
}, },
{, {
"EventCode": "0xC1", "EventCode": "0xC1",
"EventName": "EXT_MEM_REQ_NC", "EventName": "EXT_MEM_REQ_NC",
"BriefDescription": "Non-cacheable external memory request" "BriefDescription": "Non-cacheable external memory request"

44
tools/perf/pmu-events/arch/arm64/arm/cortex-a53/other.json
Просмотреть файл

@ -1,32 +1,28 @@
[ [
{, {
"EventCode": "0x86", "ArchStdEvent": "EXC_IRQ",
"EventName": "EXC_IRQ",
"BriefDescription": "Exception taken, IRQ"
}, },
{, {
"EventCode": "0x87", "ArchStdEvent": "EXC_FIQ",
"EventName": "EXC_FIQ",
"BriefDescription": "Exception taken, FIQ"
}, },
{, {
"EventCode": "0xC6", "EventCode": "0xC6",
"EventName": "PRE_DECODE_ERR", "EventName": "PRE_DECODE_ERR",
"BriefDescription": "Pre-decode error" "BriefDescription": "Pre-decode error"
}, },
{, {
"EventCode": "0xD0", "EventCode": "0xD0",
"EventName": "L1I_CACHE_ERR", "EventName": "L1I_CACHE_ERR",
"BriefDescription": "L1 Instruction Cache (data or tag) memory error" "BriefDescription": "L1 Instruction Cache (data or tag) memory error"
}, },
{, {
"EventCode": "0xD1", "EventCode": "0xD1",
"EventName": "L1D_CACHE_ERR", "EventName": "L1D_CACHE_ERR",
"BriefDescription": "L1 Data Cache (data, tag or dirty) memory error, correctable or non-correctable" "BriefDescription": "L1 Data Cache (data, tag or dirty) memory error, correctable or non-correctable"
}, },
{, {
"EventCode": "0xD2", "EventCode": "0xD2",
"EventName": "TLB_ERR", "EventName": "TLB_ERR",
"BriefDescription": "TLB memory error" "BriefDescription": "TLB memory error"
} }
] ]

20
tools/perf/pmu-events/arch/arm64/arm/cortex-a53/pipeline.json
Просмотреть файл

@ -1,50 +1,50 @@
[ [
{, {
"EventCode": "0xC7", "EventCode": "0xC7",
"EventName": "STALL_SB_FULL", "EventName": "STALL_SB_FULL",
"BriefDescription": "Data Write operation that stalls the pipeline because the store buffer is full" "BriefDescription": "Data Write operation that stalls the pipeline because the store buffer is full"
}, },
{, {
"EventCode": "0xE0", "EventCode": "0xE0",
"EventName": "OTHER_IQ_DEP_STALL", "EventName": "OTHER_IQ_DEP_STALL",
"BriefDescription": "Cycles that the DPU IQ is empty and that is not because of a recent micro-TLB miss, instruction cache miss or pre-decode error" "BriefDescription": "Cycles that the DPU IQ is empty and that is not because of a recent micro-TLB miss, instruction cache miss or pre-decode error"
}, },
{, {
"EventCode": "0xE1", "EventCode": "0xE1",
"EventName": "IC_DEP_STALL", "EventName": "IC_DEP_STALL",
"BriefDescription": "Cycles the DPU IQ is empty and there is an instruction cache miss being processed" "BriefDescription": "Cycles the DPU IQ is empty and there is an instruction cache miss being processed"
}, },
{, {
"EventCode": "0xE2", "EventCode": "0xE2",
"EventName": "IUTLB_DEP_STALL", "EventName": "IUTLB_DEP_STALL",
"BriefDescription": "Cycles the DPU IQ is empty and there is an instruction micro-TLB miss being processed" "BriefDescription": "Cycles the DPU IQ is empty and there is an instruction micro-TLB miss being processed"
}, },
{, {
"EventCode": "0xE3", "EventCode": "0xE3",
"EventName": "DECODE_DEP_STALL", "EventName": "DECODE_DEP_STALL",
"BriefDescription": "Cycles the DPU IQ is empty and there is a pre-decode error being processed" "BriefDescription": "Cycles the DPU IQ is empty and there is a pre-decode error being processed"
}, },
{, {
"EventCode": "0xE4", "EventCode": "0xE4",
"EventName": "OTHER_INTERLOCK_STALL", "EventName": "OTHER_INTERLOCK_STALL",
"BriefDescription": "Cycles there is an interlock other than Advanced SIMD/Floating-point instructions or load/store instruction" "BriefDescription": "Cycles there is an interlock other than Advanced SIMD/Floating-point instructions or load/store instruction"
}, },
{, {
"EventCode": "0xE5", "EventCode": "0xE5",
"EventName": "AGU_DEP_STALL", "EventName": "AGU_DEP_STALL",
"BriefDescription": "Cycles there is an interlock for a load/store instruction waiting for data to calculate the address in the AGU" "BriefDescription": "Cycles there is an interlock for a load/store instruction waiting for data to calculate the address in the AGU"
}, },
{, {
"EventCode": "0xE6", "EventCode": "0xE6",
"EventName": "SIMD_DEP_STALL", "EventName": "SIMD_DEP_STALL",
"BriefDescription": "Cycles there is an interlock for an Advanced SIMD/Floating-point operation." "BriefDescription": "Cycles there is an interlock for an Advanced SIMD/Floating-point operation."
}, },
{, {
"EventCode": "0xE7", "EventCode": "0xE7",
"EventName": "LD_DEP_STALL", "EventName": "LD_DEP_STALL",
"BriefDescription": "Cycles there is a stall in the Wr stage because of a load miss" "BriefDescription": "Cycles there is a stall in the Wr stage because of a load miss"
}, },
{, {
"EventCode": "0xE8", "EventCode": "0xE8",
"EventName": "ST_DEP_STALL", "EventName": "ST_DEP_STALL",
"BriefDescription": "Cycles there is a stall in the Wr stage because of a store" "BriefDescription": "Cycles there is a stall in the Wr stage because of a store"