[tip:perf/core] perf vendor events: Add JSON metrics for Broadwell Server

[tip-bot for Andi Kleen]

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

perf vendor events: Add JSON metrics for Broadwell Server

Add JSON metrics for Broadwell Server.

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>
---
 .../x86/{broadwell/bdw-metrics.json => broadwellx/bdx-metrics.json}     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/pmu-events/arch/x86/broadwell/bdw-metrics.json b/tools/perf/pmu-events/arch/x86/broadwellx/bdx-metrics.json
similarity index 95%
copy from tools/perf/pmu-events/arch/x86/broadwell/bdw-metrics.json
copy to tools/perf/pmu-events/arch/x86/broadwellx/bdx-metrics.json
index 49c5f12..4248b02 100644
--- a/tools/perf/pmu-events/arch/x86/broadwell/bdw-metrics.json
+++ b/tools/perf/pmu-events/arch/x86/broadwellx/bdx-metrics.json
@@ -85,7 +85,7 @@
     },
     {
         "BriefDescription": "Utilization of the core's Page Walker(s) serving STLB misses triggered by instruction/Load/Store accesses",
-	"MetricExpr": "( cpu@xxxxxxxxxxxxxxxxxxxxxxxxx\\,cmask\\=1@ + cpu@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\\,cmask\\=1@ + cpu@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\\,cmask\\=1@ + 7*(DTLB_STORE_MISSES.WALK_COMPLETED+DTLB_LOAD_MISSES.WALK_COMPLETED+ITLB_MISSES.WALK_COMPLETED)) / ( CPU_CLK_UNHALTED.THREAD_ANY / 2 ) if #SMT_on else cycles",
+        "MetricExpr": "( ITLB_MISSES.WALK_DURATION + DTLB_LOAD_MISSES.WALK_DURATION + DTLB_STORE_MISSES.WALK_DURATION + 7*(DTLB_STORE_MISSES.WALK_COMPLETED+DTLB_LOAD_MISSES.WALK_COMPLETED+ITLB_MISSES.WALK_COMPLETED) ) / (2*( CPU_CLK_UNHALTED.THREAD_ANY / 2 ) if #SMT_on else cycles)",
         "MetricGroup": "TLB",
         "MetricName": "Page_Walks_Utilization"
     },