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

perf vendor events: Update Intel jaketown 

Update to v21, the metrics are based on TMA 4.4 full.

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 jaketown files into perf and update mapfile.csv.

Tested on a non-jaketown 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

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-17-irogers@google.com


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

tools/perf/pmu-events/arch/x86/jaketown/jkt-metrics.json

+9 −2
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ 
        "MetricName": "FLOPc_SMT"

    },

    {

        "BriefDescription": "Instruction-Level-Parallelism (average number of uops executed when there is at least 1 uop executed)",

        "BriefDescription": "Instruction-Level-Parallelism (average number of uops executed when there is execution) per-core",

        "MetricExpr": "UOPS_DISPATCHED.THREAD / (( cpu@UOPS_DISPATCHED.CORE\\,cmask\\=1@ / 2 ) if #SMT_on else cpu@UOPS_DISPATCHED.CORE\\,cmask\\=1@)",

        "MetricGroup": "Backend;Cor;Pipeline;PortsUtil",

        "MetricName": "ILP"
@@ -141,6 +141,12 @@ 
        "MetricGroup": "Summary;TmaL1",

        "MetricName": "Instructions"

    },

    {

        "BriefDescription": "Average number of Uops retired in cycles where at least one uop has retired.",

        "MetricExpr": "UOPS_RETIRED.RETIRE_SLOTS / cpu@UOPS_RETIRED.RETIRE_SLOTS\\,cmask\\=1@",

        "MetricGroup": "Pipeline;Ret",

        "MetricName": "Retire"

    },

    {

        "BriefDescription": "Fraction of Uops delivered by the DSB (aka Decoded ICache; or Uop Cache)",

        "MetricExpr": "IDQ.DSB_UOPS / (( IDQ.DSB_UOPS + LSD.UOPS + IDQ.MITE_UOPS + IDQ.MS_UOPS ) )",
@@ -163,7 +169,8 @@ 
        "BriefDescription": "Giga Floating Point Operations Per Second",

        "MetricExpr": "( ( 1 * ( FP_COMP_OPS_EXE.SSE_SCALAR_SINGLE + FP_COMP_OPS_EXE.SSE_SCALAR_DOUBLE ) + 2 * FP_COMP_OPS_EXE.SSE_PACKED_DOUBLE + 4 * ( FP_COMP_OPS_EXE.SSE_PACKED_SINGLE + SIMD_FP_256.PACKED_DOUBLE ) + 8 * SIMD_FP_256.PACKED_SINGLE ) / 1000000000 ) / duration_time",

        "MetricGroup": "Cor;Flops;HPC",

        "MetricName": "GFLOPs"

        "MetricName": "GFLOPs",

        "PublicDescription": "Giga Floating Point Operations Per Second. Aggregate across all supported options of: FP precisions, scalar and vector instructions, vector-width and AMX engine."

    },

    {

        "BriefDescription": "Average Frequency Utilization relative nominal frequency",

tools/perf/pmu-events/arch/x86/jaketown/pipeline.json

+8 −8
Original line number Diff line number Diff line
@@ -410,8 +410,8 @@ 
    },

    {

        "BriefDescription": "Reference cycles when the core is not in halt state.",

        "Counter": "Fixed counter 3",

        "CounterHTOff": "Fixed counter 3",

        "Counter": "Fixed counter 2",

        "CounterHTOff": "Fixed counter 2",

        "EventName": "CPU_CLK_UNHALTED.REF_TSC",

        "PublicDescription": "This event counts the number of reference cycles when the core is not in a halt state. The core enters the halt state when it is running the HLT instruction or the MWAIT instruction. This event is not affected by core frequency changes (for example, P states, TM2 transitions) but has the same incrementing frequency as the time stamp counter. This event can approximate elapsed time while the core was not in a halt state. This event has a constant ratio with the CPU_CLK_UNHALTED.REF_XCLK event. It is counted on a dedicated fixed counter, leaving the four (eight when Hyperthreading is disabled) programmable counters available for other events.",

        "SampleAfterValue": "2000003",
@@ -439,8 +439,8 @@ 
    },

    {

        "BriefDescription": "Core cycles when the thread is not in halt state.",

        "Counter": "Fixed counter 2",

        "CounterHTOff": "Fixed counter 2",

        "Counter": "Fixed counter 1",

        "CounterHTOff": "Fixed counter 1",

        "EventName": "CPU_CLK_UNHALTED.THREAD",

        "PublicDescription": "This event counts the number of core cycles while the thread is not in a halt state. The thread enters the halt state when it is running the HLT instruction. This event is a component in many key event ratios. The core frequency may change from time to time due to transitions associated with Enhanced Intel SpeedStep Technology or TM2. For this reason this event may have a changing ratio with regards to time. When the core frequency is constant, this event can approximate elapsed time while the core was not in the halt state. It is counted on a dedicated fixed counter, leaving the four (eight when Hyperthreading is disabled) programmable counters available for other events.",

        "SampleAfterValue": "2000003",
@@ -542,8 +542,8 @@ 
    },

    {

        "BriefDescription": "Instructions retired from execution.",

        "Counter": "Fixed counter 1",

        "CounterHTOff": "Fixed counter 1",

        "Counter": "Fixed counter 0",

        "CounterHTOff": "Fixed counter 0",

        "EventName": "INST_RETIRED.ANY",

        "PublicDescription": "This event counts the number of instructions retired from execution. For instructions that consist of multiple micro-ops, this event counts the retirement of the last micro-op of the instruction. Counting continues during hardware interrupts, traps, and inside interrupt handlers.",

        "SampleAfterValue": "2000003",
@@ -599,7 +599,7 @@ 
        "UMask": "0x3"

    },

    {

        "BriefDescription": "Number of occurences waiting for the checkpoints in Resource Allocation Table (RAT) to be recovered after Nuke due to all other cases except JEClear (e.g. whenever a ucode assist is needed like SSE exception, memory disambiguation, etc...).",

        "BriefDescription": "Number of occurrences waiting for the checkpoints in Resource Allocation Table (RAT) to be recovered after Nuke due to all other cases except JEClear (e.g. whenever a ucode assist is needed like SSE exception, memory disambiguation, etc...).",

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

        "CounterHTOff": "0,1,2,3,4,5,6,7",

        "CounterMask": "1",

tools/perf/pmu-events/arch/x86/jaketown/uncore-cache.json

+1863 −97

File changed.

Preview size limit exceeded, changes collapsed.

tools/perf/pmu-events/arch/x86/jaketown/uncore-interconnect.json

+813 −11

File changed.

Preview size limit exceeded, changes collapsed.

tools/perf/pmu-events/arch/x86/jaketown/uncore-memory.json

+428 −17

File changed.

Preview size limit exceeded, changes collapsed.