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

perf vendor events: Update Intel nehalemex 

Update to v3, there are no TMA metrics for nehalemex.

Use script at:
https://github.com/intel/event-converter-for-linux-perf/blob/master/download_and_gen.py



to download and generate the latest events and metrics. Manually copy
the nehalemex files into perf and update mapfile.csv.

Tested on a non-nehalemex with 'perf test':
 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

Note: most of this change is just sorting the keys in the json dictionaries.
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: Caleb Biggers <caleb.biggers@intel.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.garry@huawei.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Kshipra Bopardikar <kshipra.bopardikar@intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Perry Taylor <perry.taylor@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sedat Dilek <sedat.dilek@gmail.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Link: http://lore.kernel.org/lkml/20220727220832.2865794-21-irogers@google.com


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

tools/perf/pmu-events/arch/x86/mapfile.csv

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ GenuineIntel-6-2D,v21,jaketown,core 
GenuineIntel-6-(57|85),v9,knightslanding,core

GenuineIntel-6-AA,v1.00,meteorlake,core

GenuineIntel-6-1[AEF],v3,nehalemep,core

GenuineIntel-6-2E,v2,nehalemex,core

GenuineIntel-6-2E,v3,nehalemex,core

GenuineIntel-6-[4589]E,v24,skylake,core

GenuineIntel-6-A[56],v24,skylake,core

GenuineIntel-6-37,v13,silvermont,core

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

+1487 −1487

File changed.

Preview size limit exceeded, changes collapsed.

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

+91 −91
Original line number Diff line number Diff line 
[

    {

        "PEBS": "1",

        "EventCode": "0xF7",

        "BriefDescription": "X87 Floating point assists (Precise Event)",

        "Counter": "0,1,2,3",

        "UMask": "0x1",

        "EventCode": "0xF7",

        "EventName": "FP_ASSIST.ALL",

        "PEBS": "1",

        "SampleAfterValue": "20000",

        "BriefDescription": "X87 Floating point assists (Precise Event)"

        "UMask": "0x1"

    },

    {

        "PEBS": "1",

        "EventCode": "0xF7",

        "BriefDescription": "X87 Floating poiint assists for invalid input value (Precise Event)",

        "Counter": "0,1,2,3",

        "UMask": "0x4",

        "EventCode": "0xF7",

        "EventName": "FP_ASSIST.INPUT",

        "PEBS": "1",

        "SampleAfterValue": "20000",

        "BriefDescription": "X87 Floating poiint assists for invalid input value (Precise Event)"

        "UMask": "0x4"

    },

    {

        "PEBS": "1",

        "EventCode": "0xF7",

        "BriefDescription": "X87 Floating point assists for invalid output value (Precise Event)",

        "Counter": "0,1,2,3",

        "UMask": "0x2",

        "EventCode": "0xF7",

        "EventName": "FP_ASSIST.OUTPUT",

        "PEBS": "1",

        "SampleAfterValue": "20000",

        "BriefDescription": "X87 Floating point assists for invalid output value (Precise Event)"

        "UMask": "0x2"

    },

    {

        "EventCode": "0x10",

        "BriefDescription": "MMX Uops",

        "Counter": "0,1,2,3",

        "UMask": "0x2",

        "EventCode": "0x10",

        "EventName": "FP_COMP_OPS_EXE.MMX",

        "SampleAfterValue": "2000000",

        "BriefDescription": "MMX Uops"

        "UMask": "0x2"

    },

    {

        "BriefDescription": "SSE2 integer Uops",

        "Counter": "0,1,2,3",

        "EventCode": "0x10",

        "EventName": "FP_COMP_OPS_EXE.SSE2_INTEGER",

        "SampleAfterValue": "2000000",

        "UMask": "0x8"

    },

    {

        "BriefDescription": "SSE* FP double precision Uops",

        "Counter": "0,1,2,3",

        "UMask": "0x80",

        "EventCode": "0x10",

        "EventName": "FP_COMP_OPS_EXE.SSE_DOUBLE_PRECISION",

        "SampleAfterValue": "2000000",

        "BriefDescription": "SSE* FP double precision Uops"

        "UMask": "0x80"

    },

    {

        "EventCode": "0x10",

        "BriefDescription": "SSE and SSE2 FP Uops",

        "Counter": "0,1,2,3",

        "UMask": "0x4",

        "EventCode": "0x10",

        "EventName": "FP_COMP_OPS_EXE.SSE_FP",

        "SampleAfterValue": "2000000",

        "BriefDescription": "SSE and SSE2 FP Uops"

        "UMask": "0x4"

    },

    {

        "EventCode": "0x10",

        "BriefDescription": "SSE FP packed Uops",

        "Counter": "0,1,2,3",

        "UMask": "0x10",

        "EventCode": "0x10",

        "EventName": "FP_COMP_OPS_EXE.SSE_FP_PACKED",

        "SampleAfterValue": "2000000",

        "BriefDescription": "SSE FP packed Uops"

        "UMask": "0x10"

    },

    {

        "EventCode": "0x10",

        "BriefDescription": "SSE FP scalar Uops",

        "Counter": "0,1,2,3",

        "UMask": "0x20",

        "EventCode": "0x10",

        "EventName": "FP_COMP_OPS_EXE.SSE_FP_SCALAR",

        "SampleAfterValue": "2000000",

        "BriefDescription": "SSE FP scalar Uops"

        "UMask": "0x20"

    },

    {

        "EventCode": "0x10",

        "BriefDescription": "SSE* FP single precision Uops",

        "Counter": "0,1,2,3",

        "UMask": "0x40",

        "EventCode": "0x10",

        "EventName": "FP_COMP_OPS_EXE.SSE_SINGLE_PRECISION",

        "SampleAfterValue": "2000000",

        "BriefDescription": "SSE* FP single precision Uops"

        "UMask": "0x40"

    },

    {

        "EventCode": "0x10",

        "BriefDescription": "Computational floating-point operations executed",

        "Counter": "0,1,2,3",

        "UMask": "0x8",

        "EventName": "FP_COMP_OPS_EXE.SSE2_INTEGER",

        "SampleAfterValue": "2000000",

        "BriefDescription": "SSE2 integer Uops"

    },

    {

        "EventCode": "0x10",

        "Counter": "0,1,2,3",

        "UMask": "0x1",

        "EventName": "FP_COMP_OPS_EXE.X87",

        "SampleAfterValue": "2000000",

        "BriefDescription": "Computational floating-point operations executed"

        "UMask": "0x1"

    },

    {

        "EventCode": "0xCC",

        "BriefDescription": "All Floating Point to and from MMX transitions",

        "Counter": "0,1,2,3",

        "UMask": "0x3",

        "EventCode": "0xCC",

        "EventName": "FP_MMX_TRANS.ANY",

        "SampleAfterValue": "2000000",

        "BriefDescription": "All Floating Point to and from MMX transitions"

        "UMask": "0x3"

    },

    {

        "EventCode": "0xCC",

        "BriefDescription": "Transitions from MMX to Floating Point instructions",

        "Counter": "0,1,2,3",

        "UMask": "0x1",

        "EventCode": "0xCC",

        "EventName": "FP_MMX_TRANS.TO_FP",

        "SampleAfterValue": "2000000",

        "BriefDescription": "Transitions from MMX to Floating Point instructions"

        "UMask": "0x1"

    },

    {

        "EventCode": "0xCC",

        "BriefDescription": "Transitions from Floating Point to MMX instructions",

        "Counter": "0,1,2,3",

        "UMask": "0x2",

        "EventCode": "0xCC",

        "EventName": "FP_MMX_TRANS.TO_MMX",

        "SampleAfterValue": "2000000",

        "BriefDescription": "Transitions from Floating Point to MMX instructions"

        "UMask": "0x2"

    },

    {

        "EventCode": "0x12",

        "BriefDescription": "128 bit SIMD integer pack operations",

        "Counter": "0,1,2,3",

        "UMask": "0x4",

        "EventCode": "0x12",

        "EventName": "SIMD_INT_128.PACK",

        "SampleAfterValue": "200000",

        "BriefDescription": "128 bit SIMD integer pack operations"

        "UMask": "0x4"

    },

    {

        "EventCode": "0x12",

        "BriefDescription": "128 bit SIMD integer arithmetic operations",

        "Counter": "0,1,2,3",

        "UMask": "0x20",

        "EventCode": "0x12",

        "EventName": "SIMD_INT_128.PACKED_ARITH",

        "SampleAfterValue": "200000",

        "BriefDescription": "128 bit SIMD integer arithmetic operations"

        "UMask": "0x20"

    },

    {

        "EventCode": "0x12",

        "BriefDescription": "128 bit SIMD integer logical operations",

        "Counter": "0,1,2,3",

        "UMask": "0x10",

        "EventCode": "0x12",

        "EventName": "SIMD_INT_128.PACKED_LOGICAL",

        "SampleAfterValue": "200000",

        "BriefDescription": "128 bit SIMD integer logical operations"

        "UMask": "0x10"

    },

    {

        "EventCode": "0x12",

        "BriefDescription": "128 bit SIMD integer multiply operations",

        "Counter": "0,1,2,3",

        "UMask": "0x1",

        "EventCode": "0x12",

        "EventName": "SIMD_INT_128.PACKED_MPY",

        "SampleAfterValue": "200000",

        "BriefDescription": "128 bit SIMD integer multiply operations"

        "UMask": "0x1"

    },

    {

        "EventCode": "0x12",

        "BriefDescription": "128 bit SIMD integer shift operations",

        "Counter": "0,1,2,3",

        "UMask": "0x2",

        "EventCode": "0x12",

        "EventName": "SIMD_INT_128.PACKED_SHIFT",

        "SampleAfterValue": "200000",

        "BriefDescription": "128 bit SIMD integer shift operations"

        "UMask": "0x2"

    },

    {

        "EventCode": "0x12",

        "BriefDescription": "128 bit SIMD integer shuffle/move operations",

        "Counter": "0,1,2,3",

        "UMask": "0x40",

        "EventCode": "0x12",

        "EventName": "SIMD_INT_128.SHUFFLE_MOVE",

        "SampleAfterValue": "200000",

        "BriefDescription": "128 bit SIMD integer shuffle/move operations"

        "UMask": "0x40"

    },

    {

        "EventCode": "0x12",

        "BriefDescription": "128 bit SIMD integer unpack operations",

        "Counter": "0,1,2,3",

        "UMask": "0x8",

        "EventCode": "0x12",

        "EventName": "SIMD_INT_128.UNPACK",

        "SampleAfterValue": "200000",

        "BriefDescription": "128 bit SIMD integer unpack operations"

        "UMask": "0x8"

    },

    {

        "EventCode": "0xFD",

        "BriefDescription": "SIMD integer 64 bit pack operations",

        "Counter": "0,1,2,3",

        "UMask": "0x4",

        "EventCode": "0xFD",

        "EventName": "SIMD_INT_64.PACK",

        "SampleAfterValue": "200000",

        "BriefDescription": "SIMD integer 64 bit pack operations"

        "UMask": "0x4"

    },

    {

        "EventCode": "0xFD",

        "BriefDescription": "SIMD integer 64 bit arithmetic operations",

        "Counter": "0,1,2,3",

        "UMask": "0x20",

        "EventCode": "0xFD",

        "EventName": "SIMD_INT_64.PACKED_ARITH",

        "SampleAfterValue": "200000",

        "BriefDescription": "SIMD integer 64 bit arithmetic operations"

        "UMask": "0x20"

    },

    {

        "EventCode": "0xFD",

        "BriefDescription": "SIMD integer 64 bit logical operations",

        "Counter": "0,1,2,3",

        "UMask": "0x10",

        "EventCode": "0xFD",

        "EventName": "SIMD_INT_64.PACKED_LOGICAL",

        "SampleAfterValue": "200000",

        "BriefDescription": "SIMD integer 64 bit logical operations"

        "UMask": "0x10"

    },

    {

        "EventCode": "0xFD",

        "BriefDescription": "SIMD integer 64 bit packed multiply operations",

        "Counter": "0,1,2,3",

        "UMask": "0x1",

        "EventCode": "0xFD",

        "EventName": "SIMD_INT_64.PACKED_MPY",

        "SampleAfterValue": "200000",

        "BriefDescription": "SIMD integer 64 bit packed multiply operations"

        "UMask": "0x1"

    },

    {

        "EventCode": "0xFD",

        "BriefDescription": "SIMD integer 64 bit shift operations",

        "Counter": "0,1,2,3",

        "UMask": "0x2",

        "EventCode": "0xFD",

        "EventName": "SIMD_INT_64.PACKED_SHIFT",

        "SampleAfterValue": "200000",

        "BriefDescription": "SIMD integer 64 bit shift operations"

        "UMask": "0x2"

    },

    {

        "EventCode": "0xFD",

        "BriefDescription": "SIMD integer 64 bit shuffle/move operations",

        "Counter": "0,1,2,3",

        "UMask": "0x40",

        "EventCode": "0xFD",

        "EventName": "SIMD_INT_64.SHUFFLE_MOVE",

        "SampleAfterValue": "200000",

        "BriefDescription": "SIMD integer 64 bit shuffle/move operations"

        "UMask": "0x40"

    },

    {

        "EventCode": "0xFD",

        "BriefDescription": "SIMD integer 64 bit unpack operations",

        "Counter": "0,1,2,3",

        "UMask": "0x8",

        "EventCode": "0xFD",

        "EventName": "SIMD_INT_64.UNPACK",

        "SampleAfterValue": "200000",

        "BriefDescription": "SIMD integer 64 bit unpack operations"

        "UMask": "0x8"

    }

]

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

+10 −10
Original line number Diff line number Diff line 
[

    {

        "EventCode": "0xD0",

        "BriefDescription": "Instructions decoded",

        "Counter": "0,1,2,3",

        "UMask": "0x1",

        "EventCode": "0xD0",

        "EventName": "MACRO_INSTS.DECODED",

        "SampleAfterValue": "2000000",

        "BriefDescription": "Instructions decoded"

        "UMask": "0x1"

    },

    {

        "EventCode": "0xA6",

        "BriefDescription": "Macro-fused instructions decoded",

        "Counter": "0,1,2,3",

        "UMask": "0x1",

        "EventCode": "0xA6",

        "EventName": "MACRO_INSTS.FUSIONS_DECODED",

        "SampleAfterValue": "2000000",

        "BriefDescription": "Macro-fused instructions decoded"

        "UMask": "0x1"

    },

    {

        "EventCode": "0x19",

        "BriefDescription": "Two Uop instructions decoded",

        "Counter": "0,1,2,3",

        "UMask": "0x1",

        "EventCode": "0x19",

        "EventName": "TWO_UOP_INSTS_DECODED",

        "SampleAfterValue": "2000000",

        "BriefDescription": "Two Uop instructions decoded"

        "UMask": "0x1"

    }

]

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

+336 −336

File changed.

Preview size limit exceeded, changes collapsed.