Commit c42bee96 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf vendor events: Update for Bonnell 

Events are still at version 4:
    https://download.01.org/perfmon/BNL
Json files generated by the latest code at:
    https://github.com/intel/event-converter-for-linux-perf



Tested:

Not tested on a Bonnell, on a SkylakeX:

  ...
    9: Parse perf pmu format                                           : Ok
   10: PMU events                                                      :
   10.1: PMU event table sanity                                        : Ok
   10.2: PMU event map aliases                                         : Ok
   10.3: Parsing of PMU event table metrics                            : Ok
   10.4: Parsing of PMU event table metrics with fake PMUs             : Ok
  ...

Reviewed-by: default avatarKan Liang <kan.liang@linux.intel.com>
Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.garry@huawei.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Zhengjun Xing <zhengjun.xing@linux.intel.com>
Link: https://lore.kernel.org/r/20220201015858.1226914-10-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 09625cff

tools/perf/pmu-events/arch/x86/bonnell/cache.json

+374 −374

File changed.

Preview size limit exceeded, changes collapsed.

tools/perf/pmu-events/arch/x86/bonnell/floating-point.json

+137 −137
Original line number Diff line number Diff line 
[

    {

        "EventCode": "0x10",

        "BriefDescription": "Floating point assists for retired operations.",

        "Counter": "0,1",

        "UMask": "0x1",

        "EventName": "X87_COMP_OPS_EXE.ANY.S",

        "SampleAfterValue": "2000000",

        "BriefDescription": "Floating point computational micro-ops executed."

        "EventCode": "0x11",

        "EventName": "FP_ASSIST.AR",

        "SampleAfterValue": "10000",

        "UMask": "0x81"

    },

    {

        "PEBS": "2",

        "EventCode": "0x10",

        "BriefDescription": "Floating point assists.",

        "Counter": "0,1",

        "UMask": "0x81",

        "EventName": "X87_COMP_OPS_EXE.ANY.AR",

        "SampleAfterValue": "2000000",

        "BriefDescription": "Floating point computational micro-ops retired."

        "EventCode": "0x11",

        "EventName": "FP_ASSIST.S",

        "SampleAfterValue": "10000",

        "UMask": "0x1"

    },

    {

        "EventCode": "0x10",

        "BriefDescription": "SIMD assists invoked.",

        "Counter": "0,1",

        "UMask": "0x2",

        "EventName": "X87_COMP_OPS_EXE.FXCH.S",

        "SampleAfterValue": "2000000",

        "BriefDescription": "FXCH uops executed."

        "EventCode": "0xCD",

        "EventName": "SIMD_ASSIST",

        "SampleAfterValue": "100000",

        "UMask": "0x0"

    },

    {

        "PEBS": "2",

        "EventCode": "0x10",

        "BriefDescription": "Retired computational Streaming SIMD Extensions (SSE) packed-single instructions.",

        "Counter": "0,1",

        "UMask": "0x82",

        "EventName": "X87_COMP_OPS_EXE.FXCH.AR",

        "EventCode": "0xCA",

        "EventName": "SIMD_COMP_INST_RETIRED.PACKED_SINGLE",

        "SampleAfterValue": "2000000",

        "BriefDescription": "FXCH uops retired."

        "UMask": "0x1"

    },

    {

        "EventCode": "0x11",

        "BriefDescription": "Retired computational Streaming SIMD Extensions 2 (SSE2) scalar-double instructions.",

        "Counter": "0,1",

        "UMask": "0x1",

        "EventName": "FP_ASSIST.S",

        "SampleAfterValue": "10000",

        "BriefDescription": "Floating point assists."

        "EventCode": "0xCA",

        "EventName": "SIMD_COMP_INST_RETIRED.SCALAR_DOUBLE",

        "SampleAfterValue": "2000000",

        "UMask": "0x8"

    },

    {

        "EventCode": "0x11",

        "BriefDescription": "Retired computational Streaming SIMD Extensions (SSE) scalar-single instructions.",

        "Counter": "0,1",

        "UMask": "0x81",

        "EventName": "FP_ASSIST.AR",

        "SampleAfterValue": "10000",

        "BriefDescription": "Floating point assists for retired operations."

        "EventCode": "0xCA",

        "EventName": "SIMD_COMP_INST_RETIRED.SCALAR_SINGLE",

        "SampleAfterValue": "2000000",

        "UMask": "0x2"

    },

    {

        "EventCode": "0xB0",

        "BriefDescription": "SIMD Instructions retired.",

        "Counter": "0,1",

        "UMask": "0x0",

        "EventName": "SIMD_UOPS_EXEC.S",

        "EventCode": "0xCE",

        "EventName": "SIMD_INSTR_RETIRED",

        "SampleAfterValue": "2000000",

        "BriefDescription": "SIMD micro-ops executed (excluding stores)."

        "UMask": "0x0"

    },

    {

        "PEBS": "2",

        "EventCode": "0xB0",

        "BriefDescription": "Retired Streaming SIMD Extensions (SSE) packed-single instructions.",

        "Counter": "0,1",

        "UMask": "0x80",

        "EventName": "SIMD_UOPS_EXEC.AR",

        "EventCode": "0xC7",

        "EventName": "SIMD_INST_RETIRED.PACKED_SINGLE",

        "SampleAfterValue": "2000000",

        "BriefDescription": "SIMD micro-ops retired (excluding stores)."

        "UMask": "0x1"

    },

    {

        "EventCode": "0xB1",

        "BriefDescription": "Retired Streaming SIMD Extensions 2 (SSE2) scalar-double instructions.",

        "Counter": "0,1",

        "UMask": "0x0",

        "EventName": "SIMD_SAT_UOP_EXEC.S",

        "EventCode": "0xC7",

        "EventName": "SIMD_INST_RETIRED.SCALAR_DOUBLE",

        "SampleAfterValue": "2000000",

        "BriefDescription": "SIMD saturated arithmetic micro-ops executed."

        "UMask": "0x8"

    },

    {

        "EventCode": "0xB1",

        "BriefDescription": "Retired Streaming SIMD Extensions (SSE) scalar-single instructions.",

        "Counter": "0,1",

        "UMask": "0x80",

        "EventName": "SIMD_SAT_UOP_EXEC.AR",

        "EventCode": "0xC7",

        "EventName": "SIMD_INST_RETIRED.SCALAR_SINGLE",

        "SampleAfterValue": "2000000",

        "BriefDescription": "SIMD saturated arithmetic micro-ops retired."

        "UMask": "0x2"

    },

    {

        "EventCode": "0xB3",

        "BriefDescription": "Retired Streaming SIMD Extensions 2 (SSE2) vector instructions.",

        "Counter": "0,1",

        "UMask": "0x1",

        "EventName": "SIMD_UOP_TYPE_EXEC.MUL.S",

        "EventCode": "0xC7",

        "EventName": "SIMD_INST_RETIRED.VECTOR",

        "SampleAfterValue": "2000000",

        "BriefDescription": "SIMD packed multiply micro-ops executed"

        "UMask": "0x10"

    },

    {

        "EventCode": "0xB3",

        "BriefDescription": "Saturated arithmetic instructions retired.",

        "Counter": "0,1",

        "UMask": "0x81",

        "EventName": "SIMD_UOP_TYPE_EXEC.MUL.AR",

        "EventCode": "0xCF",

        "EventName": "SIMD_SAT_INSTR_RETIRED",

        "SampleAfterValue": "2000000",

        "BriefDescription": "SIMD packed multiply micro-ops retired"

        "UMask": "0x0"

    },

    {

        "EventCode": "0xB3",

        "BriefDescription": "SIMD saturated arithmetic micro-ops retired.",

        "Counter": "0,1",

        "UMask": "0x2",

        "EventName": "SIMD_UOP_TYPE_EXEC.SHIFT.S",

        "EventCode": "0xB1",

        "EventName": "SIMD_SAT_UOP_EXEC.AR",

        "SampleAfterValue": "2000000",

        "BriefDescription": "SIMD packed shift micro-ops executed"

        "UMask": "0x80"

    },

    {

        "EventCode": "0xB3",

        "BriefDescription": "SIMD saturated arithmetic micro-ops executed.",

        "Counter": "0,1",

        "UMask": "0x82",

        "EventName": "SIMD_UOP_TYPE_EXEC.SHIFT.AR",

        "EventCode": "0xB1",

        "EventName": "SIMD_SAT_UOP_EXEC.S",

        "SampleAfterValue": "2000000",

        "BriefDescription": "SIMD packed shift micro-ops retired"

        "UMask": "0x0"

    },

    {

        "EventCode": "0xB3",

        "BriefDescription": "SIMD micro-ops retired (excluding stores).",

        "Counter": "0,1",

        "UMask": "0x4",

        "EventName": "SIMD_UOP_TYPE_EXEC.PACK.S",

        "EventCode": "0xB0",

        "EventName": "SIMD_UOPS_EXEC.AR",

        "PEBS": "2",

        "SampleAfterValue": "2000000",

        "BriefDescription": "SIMD packed micro-ops executed"

        "UMask": "0x80"

    },

    {

        "EventCode": "0xB3",

        "BriefDescription": "SIMD micro-ops executed (excluding stores).",

        "Counter": "0,1",

        "UMask": "0x84",

        "EventName": "SIMD_UOP_TYPE_EXEC.PACK.AR",

        "EventCode": "0xB0",

        "EventName": "SIMD_UOPS_EXEC.S",

        "SampleAfterValue": "2000000",

        "BriefDescription": "SIMD packed micro-ops retired"

        "UMask": "0x0"

    },

    {

        "EventCode": "0xB3",

        "BriefDescription": "SIMD packed arithmetic micro-ops retired",

        "Counter": "0,1",

        "UMask": "0x8",

        "EventName": "SIMD_UOP_TYPE_EXEC.UNPACK.S",

        "EventCode": "0xB3",

        "EventName": "SIMD_UOP_TYPE_EXEC.ARITHMETIC.AR",

        "SampleAfterValue": "2000000",

        "BriefDescription": "SIMD unpacked micro-ops executed"

        "UMask": "0xa0"

    },

    {

        "EventCode": "0xB3",

        "BriefDescription": "SIMD packed arithmetic micro-ops executed",

        "Counter": "0,1",

        "UMask": "0x88",

        "EventName": "SIMD_UOP_TYPE_EXEC.UNPACK.AR",

        "EventCode": "0xB3",

        "EventName": "SIMD_UOP_TYPE_EXEC.ARITHMETIC.S",

        "SampleAfterValue": "2000000",

        "BriefDescription": "SIMD unpacked micro-ops retired"

        "UMask": "0x20"

    },

    {

        "EventCode": "0xB3",

        "BriefDescription": "SIMD packed logical micro-ops retired",

        "Counter": "0,1",

        "UMask": "0x10",

        "EventName": "SIMD_UOP_TYPE_EXEC.LOGICAL.S",

        "EventCode": "0xB3",

        "EventName": "SIMD_UOP_TYPE_EXEC.LOGICAL.AR",

        "SampleAfterValue": "2000000",

        "BriefDescription": "SIMD packed logical micro-ops executed"

        "UMask": "0x90"

    },

    {

        "EventCode": "0xB3",

        "BriefDescription": "SIMD packed logical micro-ops executed",

        "Counter": "0,1",

        "UMask": "0x90",

        "EventName": "SIMD_UOP_TYPE_EXEC.LOGICAL.AR",

        "EventCode": "0xB3",

        "EventName": "SIMD_UOP_TYPE_EXEC.LOGICAL.S",

        "SampleAfterValue": "2000000",

        "BriefDescription": "SIMD packed logical micro-ops retired"

        "UMask": "0x10"

    },

    {

        "EventCode": "0xB3",

        "BriefDescription": "SIMD packed multiply micro-ops retired",

        "Counter": "0,1",

        "UMask": "0x20",

        "EventName": "SIMD_UOP_TYPE_EXEC.ARITHMETIC.S",

        "EventCode": "0xB3",

        "EventName": "SIMD_UOP_TYPE_EXEC.MUL.AR",

        "SampleAfterValue": "2000000",

        "BriefDescription": "SIMD packed arithmetic micro-ops executed"

        "UMask": "0x81"

    },

    {

        "EventCode": "0xB3",

        "BriefDescription": "SIMD packed multiply micro-ops executed",

        "Counter": "0,1",

        "UMask": "0xa0",

        "EventName": "SIMD_UOP_TYPE_EXEC.ARITHMETIC.AR",

        "EventCode": "0xB3",

        "EventName": "SIMD_UOP_TYPE_EXEC.MUL.S",

        "SampleAfterValue": "2000000",

        "BriefDescription": "SIMD packed arithmetic micro-ops retired"

        "UMask": "0x1"

    },

    {

        "EventCode": "0xC7",

        "BriefDescription": "SIMD packed micro-ops retired",

        "Counter": "0,1",

        "UMask": "0x1",

        "EventName": "SIMD_INST_RETIRED.PACKED_SINGLE",

        "EventCode": "0xB3",

        "EventName": "SIMD_UOP_TYPE_EXEC.PACK.AR",

        "SampleAfterValue": "2000000",

        "BriefDescription": "Retired Streaming SIMD Extensions (SSE) packed-single instructions."

        "UMask": "0x84"

    },

    {

        "EventCode": "0xC7",

        "BriefDescription": "SIMD packed micro-ops executed",

        "Counter": "0,1",

        "UMask": "0x2",

        "EventName": "SIMD_INST_RETIRED.SCALAR_SINGLE",

        "EventCode": "0xB3",

        "EventName": "SIMD_UOP_TYPE_EXEC.PACK.S",

        "SampleAfterValue": "2000000",

        "BriefDescription": "Retired Streaming SIMD Extensions (SSE) scalar-single instructions."

        "UMask": "0x4"

    },

    {

        "EventCode": "0xC7",

        "BriefDescription": "SIMD packed shift micro-ops retired",

        "Counter": "0,1",

        "UMask": "0x8",

        "EventName": "SIMD_INST_RETIRED.SCALAR_DOUBLE",

        "EventCode": "0xB3",

        "EventName": "SIMD_UOP_TYPE_EXEC.SHIFT.AR",

        "SampleAfterValue": "2000000",

        "BriefDescription": "Retired Streaming SIMD Extensions 2 (SSE2) scalar-double instructions."

        "UMask": "0x82"

    },

    {

        "EventCode": "0xC7",

        "BriefDescription": "SIMD packed shift micro-ops executed",

        "Counter": "0,1",

        "UMask": "0x10",

        "EventName": "SIMD_INST_RETIRED.VECTOR",

        "EventCode": "0xB3",

        "EventName": "SIMD_UOP_TYPE_EXEC.SHIFT.S",

        "SampleAfterValue": "2000000",

        "BriefDescription": "Retired Streaming SIMD Extensions 2 (SSE2) vector instructions."

        "UMask": "0x2"

    },

    {

        "EventCode": "0xCA",

        "BriefDescription": "SIMD unpacked micro-ops retired",

        "Counter": "0,1",

        "UMask": "0x1",

        "EventName": "SIMD_COMP_INST_RETIRED.PACKED_SINGLE",

        "EventCode": "0xB3",

        "EventName": "SIMD_UOP_TYPE_EXEC.UNPACK.AR",

        "SampleAfterValue": "2000000",

        "BriefDescription": "Retired computational Streaming SIMD Extensions (SSE) packed-single instructions."

        "UMask": "0x88"

    },

    {

        "EventCode": "0xCA",

        "BriefDescription": "SIMD unpacked micro-ops executed",

        "Counter": "0,1",

        "UMask": "0x2",

        "EventName": "SIMD_COMP_INST_RETIRED.SCALAR_SINGLE",

        "EventCode": "0xB3",

        "EventName": "SIMD_UOP_TYPE_EXEC.UNPACK.S",

        "SampleAfterValue": "2000000",

        "BriefDescription": "Retired computational Streaming SIMD Extensions (SSE) scalar-single instructions."

        "UMask": "0x8"

    },

    {

        "EventCode": "0xCA",

        "BriefDescription": "Floating point computational micro-ops retired.",

        "Counter": "0,1",

        "UMask": "0x8",

        "EventName": "SIMD_COMP_INST_RETIRED.SCALAR_DOUBLE",

        "EventCode": "0x10",

        "EventName": "X87_COMP_OPS_EXE.ANY.AR",

        "PEBS": "2",

        "SampleAfterValue": "2000000",

        "BriefDescription": "Retired computational Streaming SIMD Extensions 2 (SSE2) scalar-double instructions."

        "UMask": "0x81"

    },

    {

        "EventCode": "0xCD",

        "BriefDescription": "Floating point computational micro-ops executed.",

        "Counter": "0,1",

        "UMask": "0x0",

        "EventName": "SIMD_ASSIST",

        "SampleAfterValue": "100000",

        "BriefDescription": "SIMD assists invoked."

        "EventCode": "0x10",

        "EventName": "X87_COMP_OPS_EXE.ANY.S",

        "SampleAfterValue": "2000000",

        "UMask": "0x1"

    },

    {

        "EventCode": "0xCE",

        "BriefDescription": "FXCH uops retired.",

        "Counter": "0,1",

        "UMask": "0x0",

        "EventName": "SIMD_INSTR_RETIRED",

        "EventCode": "0x10",

        "EventName": "X87_COMP_OPS_EXE.FXCH.AR",

        "PEBS": "2",

        "SampleAfterValue": "2000000",

        "BriefDescription": "SIMD Instructions retired."

        "UMask": "0x82"

    },

    {

        "EventCode": "0xCF",

        "BriefDescription": "FXCH uops executed.",

        "Counter": "0,1",

        "UMask": "0x0",

        "EventName": "SIMD_SAT_INSTR_RETIRED",

        "EventCode": "0x10",

        "EventName": "X87_COMP_OPS_EXE.FXCH.S",

        "SampleAfterValue": "2000000",

        "BriefDescription": "Saturated arithmetic instructions retired."

        "UMask": "0x2"

    }

]
 
 No newline at end of file

tools/perf/pmu-events/arch/x86/bonnell/frontend.json

+52 −44
Original line number Diff line number Diff line 
[

    {

        "EventCode": "0x80",

        "BriefDescription": "BACLEARS asserted.",

        "Counter": "0,1",

        "UMask": "0x3",

        "EventName": "ICACHE.ACCESSES",

        "SampleAfterValue": "200000",

        "BriefDescription": "Instruction fetches."

        "EventCode": "0xE6",

        "EventName": "BACLEARS.ANY",

        "SampleAfterValue": "2000000",

        "UMask": "0x1"

    },

    {

        "EventCode": "0x80",

        "BriefDescription": "Cycles during which instruction fetches are  stalled.",

        "Counter": "0,1",

        "UMask": "0x1",

        "EventName": "ICACHE.HIT",

        "SampleAfterValue": "200000",

        "BriefDescription": "Icache hit"

        "EventCode": "0x86",

        "EventName": "CYCLES_ICACHE_MEM_STALLED.ICACHE_MEM_STALLED",

        "SampleAfterValue": "2000000",

        "UMask": "0x1"

    },

    {

        "EventCode": "0x80",

        "BriefDescription": "Decode stall due to IQ full",

        "Counter": "0,1",

        "UMask": "0x2",

        "EventName": "ICACHE.MISSES",

        "SampleAfterValue": "200000",

        "BriefDescription": "Icache miss"

        "EventCode": "0x87",

        "EventName": "DECODE_STALL.IQ_FULL",

        "SampleAfterValue": "2000000",

        "UMask": "0x2"

    },

    {

        "EventCode": "0x86",

        "BriefDescription": "Decode stall due to PFB empty",

        "Counter": "0,1",

        "UMask": "0x1",

        "EventName": "CYCLES_ICACHE_MEM_STALLED.ICACHE_MEM_STALLED",

        "EventCode": "0x87",

        "EventName": "DECODE_STALL.PFB_EMPTY",

        "SampleAfterValue": "2000000",

        "BriefDescription": "Cycles during which instruction fetches are  stalled."

        "UMask": "0x1"

    },

    {

        "EventCode": "0x87",

        "BriefDescription": "Instruction fetches.",

        "Counter": "0,1",

        "UMask": "0x1",

        "EventName": "DECODE_STALL.PFB_EMPTY",

        "SampleAfterValue": "2000000",

        "BriefDescription": "Decode stall due to PFB empty"

        "EventCode": "0x80",

        "EventName": "ICACHE.ACCESSES",

        "SampleAfterValue": "200000",

        "UMask": "0x3"

    },

    {

        "EventCode": "0x87",

        "BriefDescription": "Icache hit",

        "Counter": "0,1",

        "UMask": "0x2",

        "EventName": "DECODE_STALL.IQ_FULL",

        "SampleAfterValue": "2000000",

        "BriefDescription": "Decode stall due to IQ full"

        "EventCode": "0x80",

        "EventName": "ICACHE.HIT",

        "SampleAfterValue": "200000",

        "UMask": "0x1"

    },

    {

        "EventCode": "0xAA",

        "BriefDescription": "Icache miss",

        "Counter": "0,1",

        "UMask": "0x1",

        "EventName": "MACRO_INSTS.NON_CISC_DECODED",

        "SampleAfterValue": "2000000",

        "BriefDescription": "Non-CISC nacro instructions decoded"

        "EventCode": "0x80",

        "EventName": "ICACHE.MISSES",

        "SampleAfterValue": "200000",

        "UMask": "0x2"

    },

    {

        "BriefDescription": "All Instructions decoded",

        "Counter": "0,1",

        "EventCode": "0xAA",

        "EventName": "MACRO_INSTS.ALL_DECODED",

        "SampleAfterValue": "2000000",

        "UMask": "0x3"

    },

    {

        "BriefDescription": "CISC macro instructions decoded",

        "Counter": "0,1",

        "UMask": "0x2",

        "EventCode": "0xAA",

        "EventName": "MACRO_INSTS.CISC_DECODED",

        "SampleAfterValue": "2000000",

        "BriefDescription": "CISC macro instructions decoded"

        "UMask": "0x2"

    },

    {

        "EventCode": "0xAA",

        "BriefDescription": "Non-CISC nacro instructions decoded",

        "Counter": "0,1",

        "UMask": "0x3",

        "EventName": "MACRO_INSTS.ALL_DECODED",

        "EventCode": "0xAA",

        "EventName": "MACRO_INSTS.NON_CISC_DECODED",

        "SampleAfterValue": "2000000",

        "BriefDescription": "All Instructions decoded"

        "UMask": "0x1"

    },

    {

        "EventCode": "0xA9",

        "BriefDescription": "This event counts the cycles where 1 or more uops are issued by the micro-sequencer (MS), including microcode assists and inserted flows, and written to the IQ.",

        "Counter": "0,1",

        "UMask": "0x1",

        "CounterMask": "1",

        "EventCode": "0xA9",

        "EventName": "UOPS.MS_CYCLES",

        "SampleAfterValue": "2000000",

        "BriefDescription": "This event counts the cycles where 1 or more uops are issued by the micro-sequencer (MS), including microcode assists and inserted flows, and written to the IQ.",

        "CounterMask": "1"

        "UMask": "0x1"

    }

]
 
 No newline at end of file

tools/perf/pmu-events/arch/x86/bonnell/memory.json

+76 −76

File changed.

Preview size limit exceeded, changes collapsed.

tools/perf/pmu-events/arch/x86/bonnell/other.json

+226 −226

File changed.

Preview size limit exceeded, changes collapsed.