Message ID | 20231019140325.3660923-1-peterlin@andestech.com (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | Support Andes PMU extension | expand |
Context | Check | Description |
---|---|---|
conchuod/vmtest-fixes-PR | fail | merge-conflict |
On Thu, Oct 19, 2023 at 7:07 AM Yu Chien Peter Lin <peterlin@andestech.com> wrote: > > From: Locus Wei-Han Chen <locus84@andestech.com> > > This patch adds the Andes AX45 JSON files in the perf tool, > allowing perf to be used with symbolic event names. > > Signed-off-by: Locus Wei-Han Chen <locus84@andestech.com> > Reviewed-by: Yu Chien Peter Lin <peterlin@andestech.com> > Reviewed-by: Charles Ci-Jyun Wu <dminus@andestech.com> > Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com> Acked-by: Ian Rogers <irogers@google.com> Thanks, Ian > --- > Changes v1 -> v2: > - No change > --- > .../arch/riscv/andes/ax45/firmware.json | 68 ++++++++++ > .../arch/riscv/andes/ax45/instructions.json | 127 ++++++++++++++++++ > .../arch/riscv/andes/ax45/memory.json | 57 ++++++++ > .../arch/riscv/andes/ax45/microarch.json | 77 +++++++++++ > tools/perf/pmu-events/arch/riscv/mapfile.csv | 1 + > 5 files changed, 330 insertions(+) > create mode 100644 tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json > create mode 100644 tools/perf/pmu-events/arch/riscv/andes/ax45/instructions.json > create mode 100644 tools/perf/pmu-events/arch/riscv/andes/ax45/memory.json > create mode 100644 tools/perf/pmu-events/arch/riscv/andes/ax45/microarch.json > > diff --git a/tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json b/tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json > new file mode 100644 > index 000000000000..9b4a032186a7 > --- /dev/null > +++ b/tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json > @@ -0,0 +1,68 @@ > +[ > + { > + "ArchStdEvent": "FW_MISALIGNED_LOAD" > + }, > + { > + "ArchStdEvent": "FW_MISALIGNED_STORE" > + }, > + { > + "ArchStdEvent": "FW_ACCESS_LOAD" > + }, > + { > + "ArchStdEvent": "FW_ACCESS_STORE" > + }, > + { > + "ArchStdEvent": "FW_ILLEGAL_INSN" > + }, > + { > + "ArchStdEvent": "FW_SET_TIMER" > + }, > + { > + "ArchStdEvent": "FW_IPI_SENT" > + }, > + { > + "ArchStdEvent": "FW_IPI_RECEIVED" > + }, > + { > + "ArchStdEvent": "FW_FENCE_I_SENT" > + }, > + { > + "ArchStdEvent": "FW_FENCE_I_RECEIVED" > + }, > + { > + "ArchStdEvent": "FW_SFENCE_VMA_SENT" > + }, > + { > + "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED" > + }, > + { > + "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED" > + }, > + { > + "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED" > + }, > + { > + "ArchStdEvent": "FW_HFENCE_GVMA_SENT" > + }, > + { > + "ArchStdEvent": "FW_HFENCE_GVMA_RECEIVED" > + }, > + { > + "ArchStdEvent": "FW_HFENCE_GVMA_VMID_SENT" > + }, > + { > + "ArchStdEvent": "FW_HFENCE_GVMA_VMID_RECEIVED" > + }, > + { > + "ArchStdEvent": "FW_HFENCE_VVMA_SENT" > + }, > + { > + "ArchStdEvent": "FW_HFENCE_VVMA_RECEIVED" > + }, > + { > + "ArchStdEvent": "FW_HFENCE_VVMA_ASID_SENT" > + }, > + { > + "ArchStdEvent": "FW_HFENCE_VVMA_ASID_RECEIVED" > + } > +] > diff --git a/tools/perf/pmu-events/arch/riscv/andes/ax45/instructions.json b/tools/perf/pmu-events/arch/riscv/andes/ax45/instructions.json > new file mode 100644 > index 000000000000..713a08c1a40f > --- /dev/null > +++ b/tools/perf/pmu-events/arch/riscv/andes/ax45/instructions.json > @@ -0,0 +1,127 @@ > +[ > + { > + "EventCode": "0x10", > + "EventName": "cycle_count", > + "BriefDescription": "Cycle count" > + }, > + { > + "EventCode": "0x20", > + "EventName": "inst_count", > + "BriefDescription": "Retired instruction count" > + }, > + { > + "EventCode": "0x30", > + "EventName": "int_load_inst", > + "BriefDescription": "Integer load instruction count" > + }, > + { > + "EventCode": "0x40", > + "EventName": "int_store_inst", > + "BriefDescription": "Integer store instruction count" > + }, > + { > + "EventCode": "0x50", > + "EventName": "atomic_inst", > + "BriefDescription": "Atomic instruction count" > + }, > + { > + "EventCode": "0x60", > + "EventName": "sys_inst", > + "BriefDescription": "System instruction count" > + }, > + { > + "EventCode": "0x70", > + "EventName": "int_compute_inst", > + "BriefDescription": "Integer computational instruction count" > + }, > + { > + "EventCode": "0x80", > + "EventName": "condition_br", > + "BriefDescription": "Conditional branch instruction count" > + }, > + { > + "EventCode": "0x90", > + "EventName": "taken_condition_br", > + "BriefDescription": "Taken conditional branch instruction count" > + }, > + { > + "EventCode": "0xA0", > + "EventName": "jal_inst", > + "BriefDescription": "JAL instruction count" > + }, > + { > + "EventCode": "0xB0", > + "EventName": "jalr_inst", > + "BriefDescription": "JALR instruction count" > + }, > + { > + "EventCode": "0xC0", > + "EventName": "ret_inst", > + "BriefDescription": "Return instruction count" > + }, > + { > + "EventCode": "0xD0", > + "EventName": "control_trans_inst", > + "BriefDescription": "Control transfer instruction count" > + }, > + { > + "EventCode": "0xE0", > + "EventName": "ex9_inst", > + "BriefDescription": "EXEC.IT instruction count" > + }, > + { > + "EventCode": "0xF0", > + "EventName": "int_mul_inst", > + "BriefDescription": "Integer multiplication instruction count" > + }, > + { > + "EventCode": "0x100", > + "EventName": "int_div_rem_inst", > + "BriefDescription": "Integer division/remainder instruction count" > + }, > + { > + "EventCode": "0x110", > + "EventName": "float_load_inst", > + "BriefDescription": "Floating-point load instruction count" > + }, > + { > + "EventCode": "0x120", > + "EventName": "float_store_inst", > + "BriefDescription": "Floating-point store instruction count" > + }, > + { > + "EventCode": "0x130", > + "EventName": "float_add_sub_inst", > + "BriefDescription": "Floating-point addition/subtraction instruction count" > + }, > + { > + "EventCode": "0x140", > + "EventName": "float_mul_inst", > + "BriefDescription": "Floating-point multiplication instruction count" > + }, > + { > + "EventCode": "0x150", > + "EventName": "float_fused_muladd_inst", > + "BriefDescription": "Floating-point fused multiply-add instruction count" > + }, > + { > + "EventCode": "0x160", > + "EventName": "float_div_sqrt_inst", > + "BriefDescription": "Floating-point division or square-root instruction count" > + }, > + { > + "EventCode": "0x170", > + "EventName": "other_float_inst", > + "BriefDescription": "Other floating-point instruction count" > + }, > + { > + "EventCode": "0x180", > + "EventName": "int_mul_add_sub_inst", > + "BriefDescription": "Integer multiplication and add/sub instruction count" > + }, > + { > + "EventCode": "0x190", > + "EventName": "retired_ops", > + "BriefDescription": "Retired operation count" > + } > +] > diff --git a/tools/perf/pmu-events/arch/riscv/andes/ax45/memory.json b/tools/perf/pmu-events/arch/riscv/andes/ax45/memory.json > new file mode 100644 > index 000000000000..c7401b526c77 > --- /dev/null > +++ b/tools/perf/pmu-events/arch/riscv/andes/ax45/memory.json > @@ -0,0 +1,57 @@ > +[ > + { > + "EventCode": "0x01", > + "EventName": "ilm_access", > + "BriefDescription": "ILM access" > + }, > + { > + "EventCode": "0x11", > + "EventName": "dlm_access", > + "BriefDescription": "DLM access" > + }, > + { > + "EventCode": "0x21", > + "EventName": "icache_access", > + "BriefDescription": "ICACHE access" > + }, > + { > + "EventCode": "0x31", > + "EventName": "icache_miss", > + "BriefDescription": "ICACHE miss" > + }, > + { > + "EventCode": "0x41", > + "EventName": "dcache_access", > + "BriefDescription": "DCACHE access" > + }, > + { > + "EventCode": "0x51", > + "EventName": "dcache_miss", > + "BriefDescription": "DCACHE miss" > + }, > + { > + "EventCode": "0x61", > + "EventName": "dcache_load_access", > + "BriefDescription": "DCACHE load access" > + }, > + { > + "EventCode": "0x71", > + "EventName": "dcache_load_miss", > + "BriefDescription": "DCACHE load miss" > + }, > + { > + "EventCode": "0x81", > + "EventName": "dcache_store_access", > + "BriefDescription": "DCACHE store access" > + }, > + { > + "EventCode": "0x91", > + "EventName": "dcache_store_miss", > + "BriefDescription": "DCACHE store miss" > + }, > + { > + "EventCode": "0xA1", > + "EventName": "dcache_wb", > + "BriefDescription": "DCACHE writeback" > + } > +] > diff --git a/tools/perf/pmu-events/arch/riscv/andes/ax45/microarch.json b/tools/perf/pmu-events/arch/riscv/andes/ax45/microarch.json > new file mode 100644 > index 000000000000..a6d378cbaa74 > --- /dev/null > +++ b/tools/perf/pmu-events/arch/riscv/andes/ax45/microarch.json > @@ -0,0 +1,77 @@ > +[ > + { > + "EventCode": "0xB1", > + "EventName": "cycle_wait_icache_fill", > + "BriefDescription": "Cycles waiting for ICACHE fill data" > + }, > + { > + "EventCode": "0xC1", > + "EventName": "cycle_wait_dcache_fill", > + "BriefDescription": "Cycles waiting for DCACHE fill data" > + }, > + { > + "EventCode": "0xD1", > + "EventName": "uncached_ifetch_from_bus", > + "BriefDescription": "Uncached ifetch data access from bus" > + }, > + { > + "EventCode": "0xE1", > + "EventName": "uncached_load_from_bus", > + "BriefDescription": "Uncached load data access from bus" > + }, > + { > + "EventCode": "0xF1", > + "EventName": "cycle_wait_uncached_ifetch", > + "BriefDescription": "Cycles waiting for uncached ifetch data from bus" > + }, > + { > + "EventCode": "0x101", > + "EventName": "cycle_wait_uncached_load", > + "BriefDescription": "Cycles waiting for uncached load data from bus" > + }, > + { > + "EventCode": "0x111", > + "EventName": "main_itlb_access", > + "BriefDescription": "Main ITLB access" > + }, > + { > + "EventCode": "0x121", > + "EventName": "main_itlb_miss", > + "BriefDescription": "Main ITLB miss" > + }, > + { > + "EventCode": "0x131", > + "EventName": "main_dtlb_access", > + "BriefDescription": "Main DTLB access" > + }, > + { > + "EventCode": "0x141", > + "EventName": "main_dtlb_miss", > + "BriefDescription": "Main DTLB miss" > + }, > + { > + "EventCode": "0x151", > + "EventName": "cycle_wait_itlb_fill", > + "BriefDescription": "Cycles waiting for Main ITLB fill data" > + }, > + { > + "EventCode": "0x161", > + "EventName": "pipe_stall_cycle_dtlb_miss", > + "BriefDescription": "Pipeline stall cycles caused by Main DTLB miss" > + }, > + { > + "EventCode": "0x02", > + "EventName": "mispredict_condition_br", > + "BriefDescription": "Misprediction of conditional branches" > + }, > + { > + "EventCode": "0x12", > + "EventName": "mispredict_take_condition_br", > + "BriefDescription": "Misprediction of taken conditional branches" > + }, > + { > + "EventCode": "0x22", > + "EventName": "mispredict_target_ret_inst", > + "BriefDescription": "Misprediction of targets of Return instructions" > + } > +] > diff --git a/tools/perf/pmu-events/arch/riscv/mapfile.csv b/tools/perf/pmu-events/arch/riscv/mapfile.csv > index c61b3d6ef616..5bf09af14c1b 100644 > --- a/tools/perf/pmu-events/arch/riscv/mapfile.csv > +++ b/tools/perf/pmu-events/arch/riscv/mapfile.csv > @@ -15,3 +15,4 @@ > # > #MVENDORID-MARCHID-MIMPID,Version,Filename,EventType > 0x489-0x8000000000000007-0x[[:xdigit:]]+,v1,sifive/u74,core > +0x31e-0x8000000000008a45-0x[[:xdigit:]]+,v1,andes/ax45,core > -- > 2.34.1 >
diff --git a/tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json b/tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json new file mode 100644 index 000000000000..9b4a032186a7 --- /dev/null +++ b/tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json @@ -0,0 +1,68 @@ +[ + { + "ArchStdEvent": "FW_MISALIGNED_LOAD" + }, + { + "ArchStdEvent": "FW_MISALIGNED_STORE" + }, + { + "ArchStdEvent": "FW_ACCESS_LOAD" + }, + { + "ArchStdEvent": "FW_ACCESS_STORE" + }, + { + "ArchStdEvent": "FW_ILLEGAL_INSN" + }, + { + "ArchStdEvent": "FW_SET_TIMER" + }, + { + "ArchStdEvent": "FW_IPI_SENT" + }, + { + "ArchStdEvent": "FW_IPI_RECEIVED" + }, + { + "ArchStdEvent": "FW_FENCE_I_SENT" + }, + { + "ArchStdEvent": "FW_FENCE_I_RECEIVED" + }, + { + "ArchStdEvent": "FW_SFENCE_VMA_SENT" + }, + { + "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED" + }, + { + "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED" + }, + { + "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED" + }, + { + "ArchStdEvent": "FW_HFENCE_GVMA_SENT" + }, + { + "ArchStdEvent": "FW_HFENCE_GVMA_RECEIVED" + }, + { + "ArchStdEvent": "FW_HFENCE_GVMA_VMID_SENT" + }, + { + "ArchStdEvent": "FW_HFENCE_GVMA_VMID_RECEIVED" + }, + { + "ArchStdEvent": "FW_HFENCE_VVMA_SENT" + }, + { + "ArchStdEvent": "FW_HFENCE_VVMA_RECEIVED" + }, + { + "ArchStdEvent": "FW_HFENCE_VVMA_ASID_SENT" + }, + { + "ArchStdEvent": "FW_HFENCE_VVMA_ASID_RECEIVED" + } +] diff --git a/tools/perf/pmu-events/arch/riscv/andes/ax45/instructions.json b/tools/perf/pmu-events/arch/riscv/andes/ax45/instructions.json new file mode 100644 index 000000000000..713a08c1a40f --- /dev/null +++ b/tools/perf/pmu-events/arch/riscv/andes/ax45/instructions.json @@ -0,0 +1,127 @@ +[ + { + "EventCode": "0x10", + "EventName": "cycle_count", + "BriefDescription": "Cycle count" + }, + { + "EventCode": "0x20", + "EventName": "inst_count", + "BriefDescription": "Retired instruction count" + }, + { + "EventCode": "0x30", + "EventName": "int_load_inst", + "BriefDescription": "Integer load instruction count" + }, + { + "EventCode": "0x40", + "EventName": "int_store_inst", + "BriefDescription": "Integer store instruction count" + }, + { + "EventCode": "0x50", + "EventName": "atomic_inst", + "BriefDescription": "Atomic instruction count" + }, + { + "EventCode": "0x60", + "EventName": "sys_inst", + "BriefDescription": "System instruction count" + }, + { + "EventCode": "0x70", + "EventName": "int_compute_inst", + "BriefDescription": "Integer computational instruction count" + }, + { + "EventCode": "0x80", + "EventName": "condition_br", + "BriefDescription": "Conditional branch instruction count" + }, + { + "EventCode": "0x90", + "EventName": "taken_condition_br", + "BriefDescription": "Taken conditional branch instruction count" + }, + { + "EventCode": "0xA0", + "EventName": "jal_inst", + "BriefDescription": "JAL instruction count" + }, + { + "EventCode": "0xB0", + "EventName": "jalr_inst", + "BriefDescription": "JALR instruction count" + }, + { + "EventCode": "0xC0", + "EventName": "ret_inst", + "BriefDescription": "Return instruction count" + }, + { + "EventCode": "0xD0", + "EventName": "control_trans_inst", + "BriefDescription": "Control transfer instruction count" + }, + { + "EventCode": "0xE0", + "EventName": "ex9_inst", + "BriefDescription": "EXEC.IT instruction count" + }, + { + "EventCode": "0xF0", + "EventName": "int_mul_inst", + "BriefDescription": "Integer multiplication instruction count" + }, + { + "EventCode": "0x100", + "EventName": "int_div_rem_inst", + "BriefDescription": "Integer division/remainder instruction count" + }, + { + "EventCode": "0x110", + "EventName": "float_load_inst", + "BriefDescription": "Floating-point load instruction count" + }, + { + "EventCode": "0x120", + "EventName": "float_store_inst", + "BriefDescription": "Floating-point store instruction count" + }, + { + "EventCode": "0x130", + "EventName": "float_add_sub_inst", + "BriefDescription": "Floating-point addition/subtraction instruction count" + }, + { + "EventCode": "0x140", + "EventName": "float_mul_inst", + "BriefDescription": "Floating-point multiplication instruction count" + }, + { + "EventCode": "0x150", + "EventName": "float_fused_muladd_inst", + "BriefDescription": "Floating-point fused multiply-add instruction count" + }, + { + "EventCode": "0x160", + "EventName": "float_div_sqrt_inst", + "BriefDescription": "Floating-point division or square-root instruction count" + }, + { + "EventCode": "0x170", + "EventName": "other_float_inst", + "BriefDescription": "Other floating-point instruction count" + }, + { + "EventCode": "0x180", + "EventName": "int_mul_add_sub_inst", + "BriefDescription": "Integer multiplication and add/sub instruction count" + }, + { + "EventCode": "0x190", + "EventName": "retired_ops", + "BriefDescription": "Retired operation count" + } +] diff --git a/tools/perf/pmu-events/arch/riscv/andes/ax45/memory.json b/tools/perf/pmu-events/arch/riscv/andes/ax45/memory.json new file mode 100644 index 000000000000..c7401b526c77 --- /dev/null +++ b/tools/perf/pmu-events/arch/riscv/andes/ax45/memory.json @@ -0,0 +1,57 @@ +[ + { + "EventCode": "0x01", + "EventName": "ilm_access", + "BriefDescription": "ILM access" + }, + { + "EventCode": "0x11", + "EventName": "dlm_access", + "BriefDescription": "DLM access" + }, + { + "EventCode": "0x21", + "EventName": "icache_access", + "BriefDescription": "ICACHE access" + }, + { + "EventCode": "0x31", + "EventName": "icache_miss", + "BriefDescription": "ICACHE miss" + }, + { + "EventCode": "0x41", + "EventName": "dcache_access", + "BriefDescription": "DCACHE access" + }, + { + "EventCode": "0x51", + "EventName": "dcache_miss", + "BriefDescription": "DCACHE miss" + }, + { + "EventCode": "0x61", + "EventName": "dcache_load_access", + "BriefDescription": "DCACHE load access" + }, + { + "EventCode": "0x71", + "EventName": "dcache_load_miss", + "BriefDescription": "DCACHE load miss" + }, + { + "EventCode": "0x81", + "EventName": "dcache_store_access", + "BriefDescription": "DCACHE store access" + }, + { + "EventCode": "0x91", + "EventName": "dcache_store_miss", + "BriefDescription": "DCACHE store miss" + }, + { + "EventCode": "0xA1", + "EventName": "dcache_wb", + "BriefDescription": "DCACHE writeback" + } +] diff --git a/tools/perf/pmu-events/arch/riscv/andes/ax45/microarch.json b/tools/perf/pmu-events/arch/riscv/andes/ax45/microarch.json new file mode 100644 index 000000000000..a6d378cbaa74 --- /dev/null +++ b/tools/perf/pmu-events/arch/riscv/andes/ax45/microarch.json @@ -0,0 +1,77 @@ +[ + { + "EventCode": "0xB1", + "EventName": "cycle_wait_icache_fill", + "BriefDescription": "Cycles waiting for ICACHE fill data" + }, + { + "EventCode": "0xC1", + "EventName": "cycle_wait_dcache_fill", + "BriefDescription": "Cycles waiting for DCACHE fill data" + }, + { + "EventCode": "0xD1", + "EventName": "uncached_ifetch_from_bus", + "BriefDescription": "Uncached ifetch data access from bus" + }, + { + "EventCode": "0xE1", + "EventName": "uncached_load_from_bus", + "BriefDescription": "Uncached load data access from bus" + }, + { + "EventCode": "0xF1", + "EventName": "cycle_wait_uncached_ifetch", + "BriefDescription": "Cycles waiting for uncached ifetch data from bus" + }, + { + "EventCode": "0x101", + "EventName": "cycle_wait_uncached_load", + "BriefDescription": "Cycles waiting for uncached load data from bus" + }, + { + "EventCode": "0x111", + "EventName": "main_itlb_access", + "BriefDescription": "Main ITLB access" + }, + { + "EventCode": "0x121", + "EventName": "main_itlb_miss", + "BriefDescription": "Main ITLB miss" + }, + { + "EventCode": "0x131", + "EventName": "main_dtlb_access", + "BriefDescription": "Main DTLB access" + }, + { + "EventCode": "0x141", + "EventName": "main_dtlb_miss", + "BriefDescription": "Main DTLB miss" + }, + { + "EventCode": "0x151", + "EventName": "cycle_wait_itlb_fill", + "BriefDescription": "Cycles waiting for Main ITLB fill data" + }, + { + "EventCode": "0x161", + "EventName": "pipe_stall_cycle_dtlb_miss", + "BriefDescription": "Pipeline stall cycles caused by Main DTLB miss" + }, + { + "EventCode": "0x02", + "EventName": "mispredict_condition_br", + "BriefDescription": "Misprediction of conditional branches" + }, + { + "EventCode": "0x12", + "EventName": "mispredict_take_condition_br", + "BriefDescription": "Misprediction of taken conditional branches" + }, + { + "EventCode": "0x22", + "EventName": "mispredict_target_ret_inst", + "BriefDescription": "Misprediction of targets of Return instructions" + } +] diff --git a/tools/perf/pmu-events/arch/riscv/mapfile.csv b/tools/perf/pmu-events/arch/riscv/mapfile.csv index c61b3d6ef616..5bf09af14c1b 100644 --- a/tools/perf/pmu-events/arch/riscv/mapfile.csv +++ b/tools/perf/pmu-events/arch/riscv/mapfile.csv @@ -15,3 +15,4 @@ # #MVENDORID-MARCHID-MIMPID,Version,Filename,EventType 0x489-0x8000000000000007-0x[[:xdigit:]]+,v1,sifive/u74,core +0x31e-0x8000000000008a45-0x[[:xdigit:]]+,v1,andes/ax45,core