lkml.org 
[lkml]   [2017]   [Sep]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/2] perf, tools, json: Fix ILP metrics
    Date
    From: Andi Kleen <ak@linux.intel.com>

    - Add missing brackets in the ILP metric definitions that lead
    to impossible high ILP when Hyper Threading was disabled.

    - Always spell events in upper case, needed for the next patch.

    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    ---
    tools/perf/pmu-events/arch/x86/broadwell/bdw-metrics.json | 2 +-
    tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json | 2 +-
    tools/perf/pmu-events/arch/x86/broadwellx/bdx-metrics.json | 2 +-
    tools/perf/pmu-events/arch/x86/ivybridge/ivb-metrics.json | 2 +-
    tools/perf/pmu-events/arch/x86/ivytown/ivt-metrics.json | 2 +-
    tools/perf/pmu-events/arch/x86/jaketown/jkt-metrics.json | 2 +-
    tools/perf/pmu-events/arch/x86/sandybridge/snb-metrics.json | 2 +-
    7 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/tools/perf/pmu-events/arch/x86/broadwell/bdw-metrics.json b/tools/perf/pmu-events/arch/x86/broadwell/bdw-metrics.json
    index 49c5f123d811..d2c78c302a71 100644
    --- a/tools/perf/pmu-events/arch/x86/broadwell/bdw-metrics.json
    +++ b/tools/perf/pmu-events/arch/x86/broadwell/bdw-metrics.json
    @@ -55,7 +55,7 @@
    },
    {
    "BriefDescription": "Instruction-Level-Parallelism (average number of uops executed when there is at least 1 uop executed)",
    - "MetricExpr": "UOPS_EXECUTED.THREAD / ( cpu@uops_executed.core\\,cmask\\=1@ / 2) if #SMT_on else UOPS_EXECUTED.CYCLES_GE_1_UOP_EXEC",
    + "MetricExpr": "UOPS_EXECUTED.THREAD / ( ( cpu@uops_executed.core\\,cmask\\=1@ / 2) if #SMT_on else UOPS_EXECUTED.CYCLES_GE_1_UOP_EXEC)",
    "MetricGroup": "Pipeline;Ports_Utilization",
    "MetricName": "ILP"
    },
    diff --git a/tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json b/tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json
    index 49c5f123d811..804abe02b7ef 100644
    --- a/tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json
    +++ b/tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json
    @@ -55,7 +55,7 @@
    },
    {
    "BriefDescription": "Instruction-Level-Parallelism (average number of uops executed when there is at least 1 uop executed)",
    - "MetricExpr": "UOPS_EXECUTED.THREAD / ( cpu@uops_executed.core\\,cmask\\=1@ / 2) if #SMT_on else UOPS_EXECUTED.CYCLES_GE_1_UOP_EXEC",
    + "MetricExpr": "UOPS_EXECUTED.THREAD / ( ( cpu@uops_executed.core\\,cmask\\=1@ / 2) if #SMT_on else UOPS_EXECUTED.CYCLES_GE_1_UOP_EXEC )",
    "MetricGroup": "Pipeline;Ports_Utilization",
    "MetricName": "ILP"
    },
    diff --git a/tools/perf/pmu-events/arch/x86/broadwellx/bdx-metrics.json b/tools/perf/pmu-events/arch/x86/broadwellx/bdx-metrics.json
    index 4248b029d199..f831673ddc4c 100644
    --- a/tools/perf/pmu-events/arch/x86/broadwellx/bdx-metrics.json
    +++ b/tools/perf/pmu-events/arch/x86/broadwellx/bdx-metrics.json
    @@ -55,7 +55,7 @@
    },
    {
    "BriefDescription": "Instruction-Level-Parallelism (average number of uops executed when there is at least 1 uop executed)",
    - "MetricExpr": "UOPS_EXECUTED.THREAD / ( cpu@uops_executed.core\\,cmask\\=1@ / 2) if #SMT_on else UOPS_EXECUTED.CYCLES_GE_1_UOP_EXEC",
    + "MetricExpr": "UOPS_EXECUTED.THREAD / (( cpu@uops_executed.core\\,cmask\\=1@ / 2) if #SMT_on else UOPS_EXECUTED.CYCLES_GE_1_UOP_EXEC)",
    "MetricGroup": "Pipeline;Ports_Utilization",
    "MetricName": "ILP"
    },
    diff --git a/tools/perf/pmu-events/arch/x86/ivybridge/ivb-metrics.json b/tools/perf/pmu-events/arch/x86/ivybridge/ivb-metrics.json
    index 057a832f1a6a..19cf34686355 100644
    --- a/tools/perf/pmu-events/arch/x86/ivybridge/ivb-metrics.json
    +++ b/tools/perf/pmu-events/arch/x86/ivybridge/ivb-metrics.json
    @@ -55,7 +55,7 @@
    },
    {
    "BriefDescription": "Instruction-Level-Parallelism (average number of uops executed when there is at least 1 uop executed)",
    - "MetricExpr": "UOPS_EXECUTED.THREAD / ( cpu@uops_executed.core\\,cmask\\=1@ / 2) if #SMT_on else UOPS_EXECUTED.CYCLES_GE_1_UOP_EXEC",
    + "MetricExpr": "UOPS_EXECUTED.THREAD / (( cpu@UOPS_EXECUTED.CORE\\,cmask\\=1@ / 2) if #SMT_on else UOPS_EXECUTED.CYCLES_GE_1_UOP_EXEC)",
    "MetricGroup": "Pipeline;Ports_Utilization",
    "MetricName": "ILP"
    },
    diff --git a/tools/perf/pmu-events/arch/x86/ivytown/ivt-metrics.json b/tools/perf/pmu-events/arch/x86/ivytown/ivt-metrics.json
    index 057a832f1a6a..1d8a8fef90f2 100644
    --- a/tools/perf/pmu-events/arch/x86/ivytown/ivt-metrics.json
    +++ b/tools/perf/pmu-events/arch/x86/ivytown/ivt-metrics.json
    @@ -55,7 +55,7 @@
    },
    {
    "BriefDescription": "Instruction-Level-Parallelism (average number of uops executed when there is at least 1 uop executed)",
    - "MetricExpr": "UOPS_EXECUTED.THREAD / ( cpu@uops_executed.core\\,cmask\\=1@ / 2) if #SMT_on else UOPS_EXECUTED.CYCLES_GE_1_UOP_EXEC",
    + "MetricExpr": "UOPS_EXECUTED.THREAD / ( ( cpu@UOPS_EXECUTED.CORE\\,cmask\\=1@ / 2) if #SMT_on else UOPS_EXECUTED.CYCLES_GE_1_UOP_EXEC )",
    "MetricGroup": "Pipeline;Ports_Utilization",
    "MetricName": "ILP"
    },
    diff --git a/tools/perf/pmu-events/arch/x86/jaketown/jkt-metrics.json b/tools/perf/pmu-events/arch/x86/jaketown/jkt-metrics.json
    index b35b1c153c8a..4ba75525852d 100644
    --- a/tools/perf/pmu-events/arch/x86/jaketown/jkt-metrics.json
    +++ b/tools/perf/pmu-events/arch/x86/jaketown/jkt-metrics.json
    @@ -55,7 +55,7 @@
    },
    {
    "BriefDescription": "Instruction-Level-Parallelism (average number of uops executed when there is at least 1 uop executed)",
    - "MetricExpr": "UOPS_DISPATCHED.THREAD / ( cpu@UOPS_DISPATCHED.CORE\\,cmask\\=1@ / 2) if #SMT_on else cpu@UOPS_DISPATCHED.CORE\\,cmask\\=1@",
    + "MetricExpr": "UOPS_DISPATCHED.THREAD / (( cpu@UOPS_DISPATCHED.CORE\\,cmask\\=1@ / 2) if #SMT_on else cpu@UOPS_DISPATCHED.CORE\\,cmask\\=1@)",
    "MetricGroup": "Pipeline;Ports_Utilization",
    "MetricName": "ILP"
    },
    diff --git a/tools/perf/pmu-events/arch/x86/sandybridge/snb-metrics.json b/tools/perf/pmu-events/arch/x86/sandybridge/snb-metrics.json
    index b35b1c153c8a..4ba75525852d 100644
    --- a/tools/perf/pmu-events/arch/x86/sandybridge/snb-metrics.json
    +++ b/tools/perf/pmu-events/arch/x86/sandybridge/snb-metrics.json
    @@ -55,7 +55,7 @@
    },
    {
    "BriefDescription": "Instruction-Level-Parallelism (average number of uops executed when there is at least 1 uop executed)",
    - "MetricExpr": "UOPS_DISPATCHED.THREAD / ( cpu@UOPS_DISPATCHED.CORE\\,cmask\\=1@ / 2) if #SMT_on else cpu@UOPS_DISPATCHED.CORE\\,cmask\\=1@",
    + "MetricExpr": "UOPS_DISPATCHED.THREAD / (( cpu@UOPS_DISPATCHED.CORE\\,cmask\\=1@ / 2) if #SMT_on else cpu@UOPS_DISPATCHED.CORE\\,cmask\\=1@)",
    "MetricGroup": "Pipeline;Ports_Utilization",
    "MetricName": "ILP"
    },
    --
    2.9.5
    \
     
     \ /
      Last update: 2017-09-12 21:57    [W:3.835 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site