[tip:perf/core] perf vendor events: Add JSON metrics for Haswell EP

[tip-bot for Andi Kleen]

Commit-ID:  5e49f7321b06428ac68c51096cff9a4a55c3d4d6
Gitweb:     http://git.kernel.org/tip/5e49f7321b06428ac68c51096cff9a4a55c3d4d6
Author:     Andi Kleen <ak@xxxxxxxxxxxxxxx>
AuthorDate: Sun, 23 Jul 2017 21:55:39 -0700
Committer:  Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitDate: Wed, 13 Sep 2017 09:49:18 -0300

perf vendor events: Add JSON metrics for Haswell EP

Add JSON metrics for Haswell EP.

Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx>
Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
Link: http://lkml.kernel.org/r/20170908180133.GA20128@xxxxxxxxxxxxxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
 .../arch/x86/{haswell/hsw-metrics.json => haswellx/hsx-metrics.json}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/pmu-events/arch/x86/haswell/hsw-metrics.json b/tools/perf/pmu-events/arch/x86/haswellx/hsx-metrics.json
similarity index 98%
copy from tools/perf/pmu-events/arch/x86/haswell/hsw-metrics.json
copy to tools/perf/pmu-events/arch/x86/haswellx/hsx-metrics.json
index 03d8949..0bae5ed 100644
--- a/tools/perf/pmu-events/arch/x86/haswell/hsw-metrics.json
+++ b/tools/perf/pmu-events/arch/x86/haswellx/hsx-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.CORE / 2 / ( cpu@xxxxxxxxxxxxxxxxxx\\,cmask\\=1@ / 2)) if #SMT_on else (UOPS_EXECUTED.CORE / cpu@xxxxxxxxxxxxxxxxxx\\,cmask\\=1@)",
+	"MetricExpr": "( UOPS_EXECUTED.CORE / 2 / ( cpu@xxxxxxxxxxxxxxxxxx\\,cmask\\=1@ / 2)) if #SMT_on else UOPS_EXECUTED.CORE / cpu@xxxxxxxxxxxxxxxxxx\\,cmask\\=1@",
         "MetricGroup": "Pipeline;Ports_Utilization",
         "MetricName": "ILP"
     },