From: Ian Rogers <irogers@google.com>

Date: Fri, 1 May 2020 10:33:24 -0700

Subject: perf metrics: Fix parse errors in skylake metrics

Git-commit: 7db61f384dae23217d9a31ca2c996ce10bc6c764

References: git-fixes

​

Remove over escaping with \\.

​

Fixes: fd5500989c8f (perf vendor events intel: Update metrics from TMAM 3.5)

Signed-off-by: Ian Rogers <irogers@google.com>

Acked-by: Jiri Olsa <jolsa@redhat.com>

Cc: Adrian Hunter <adrian.hunter@intel.com>

Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>

Cc: Andi Kleen <ak@linux.intel.com>

Cc: Haiyan Song <haiyanx.song@intel.com>

Cc: Jin Yao <yao.jin@linux.intel.com>

Cc: John Garry <john.garry@huawei.com>

Cc: Kajol Jain <kjain@linux.ibm.com>

Cc: Kan Liang <kan.liang@linux.intel.com>

Cc: Leo Yan <leo.yan@linaro.org>

Cc: Mark Rutland <mark.rutland@arm.com>

Cc: Namhyung Kim <namhyung@kernel.org>

Cc: Paul Clarke <pc@us.ibm.com>

Cc: Peter Zijlstra <peterz@infradead.org>

Cc: Ravi Bangoria <ravi.bangoria@linux.ibm.com>

Cc: Song Liu <songliubraving@fb.com>

Cc: Stephane Eranian <eranian@google.com>

Link: http://lore.kernel.org/lkml/20200501173333.227162-4-irogers@google.com

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Acked-by: Tony Jones <tonyj@suse.de>

---

 tools/perf/pmu-events/arch/x86/skylakex/skx-metrics.json | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

​

diff --git a/tools/perf/pmu-events/arch/x86/skylakex/skx-metrics.json b/tools/perf/pmu-events/arch/x86/skylakex/skx-metrics.json

index b4f91137f40c..390bdab1be9d 100644

--- a/tools/perf/pmu-events/arch/x86/skylakex/skx-metrics.json

+++ b/tools/perf/pmu-events/arch/x86/skylakex/skx-metrics.json

@@ -328,13 +328,13 @@

     },

     {

         "BriefDescription": "Average latency of data read request to external memory (in nanoseconds). Accounts for demand loads and L1/L2 prefetches",

-        "MetricExpr": "1000000000 * ( cha@event\\=0x36\\\\\\,umask\\=0x21@ / cha@event\\=0x35\\\\\\,umask\\=0x21@ ) / ( cha_0@event\\=0x0@ / duration_time )",

+        "MetricExpr": "1000000000 * ( cha@event\\=0x36\\,umask\\=0x21@ / cha@event\\=0x35\\,umask\\=0x21@ ) / ( cha_0@event\\=0x0@ / duration_time )",

         "MetricGroup": "Memory_Lat",

         "MetricName": "DRAM_Read_Latency"

     },

     {

         "BriefDescription": "Average number of parallel data read requests to external memory. Accounts for demand loads and L1/L2 prefetches",

-        "MetricExpr": "cha@event\\=0x36\\\\\\,umask\\=0x21@ / cha@event\\=0x36\\\\\\,umask\\=0x21\\\\\\,thresh\\=1@",

+        "MetricExpr": "cha@event\\=0x36\\,umask\\=0x21@ / cha@event\\=0x36\\,umask\\=0x21\\,thresh\\=1@",

         "MetricGroup": "Memory_BW",

         "MetricName": "DRAM_Parallel_Reads"

     },

​

​