From 5cd951da85f1d57451c1043c38162dccbb67a3e9 Mon Sep 17 00:00:00 2001
From: Viliam Luc <vluc@cisco.com>
Date: Mon, 3 Oct 2022 14:45:48 +0200
Subject: telemetry: small fixes

- removed remnant debugging code
+ fix compatibility with Metric naming convention
+ fix failures when perf-stat command returns wrong data
+ better handling when perf-stat command fails

Signed-off-by: Viliam Luc <vluc@cisco.com>
Change-Id: I23a064ed09c8cf0394abb5306fb04f4e33c20aa4
---
 .../templates/telemetry/perf_stat_runtime.yaml     | 86 ++++++++++------------
 1 file changed, 39 insertions(+), 47 deletions(-)

(limited to 'resources/templates')

diff --git a/resources/templates/telemetry/perf_stat_runtime.yaml b/resources/templates/telemetry/perf_stat_runtime.yaml
index 54b77a9bcc..ae0f804945 100644
--- a/resources/templates/telemetry/perf_stat_runtime.yaml
+++ b/resources/templates/telemetry/perf_stat_runtime.yaml
@@ -38,105 +38,97 @@ scheduler:
 programs:
   - name: bundle_perf_stat
     metrics:
-      gauge:
-        - name: cpu-cycles
+      counter:
+        - name: cpu_cycles
           documentation: Cycles processed by CPUs
+          namespace: perf_stat
           labelnames:
-            - name
             - thread
             - pid
     events:
-      - name: cpu-cycles # 0x3C umask: 0x00
-        EventCode: 0x3C
-        UMask: 0x00
+      - eventcode: 0x3C # cpu-cycles
+        umask: 0x00
   - name: bundle_perf_stat
     metrics:
-      gauge:
+      counter:
         - name: instructions
           documentation: Instructions retired by CPUs
+          namespace: perf_stat
           labelnames:
-            - name
             - thread
             - pid
     events:
-      - name: instructions # 0xC0 umask: 0x00
-        EventCode: 0xC0
-        UMask: 0x00
+      - eventcode: 0xC0 # instructions
+        umask: 0x00
   - name: bundle_perf_stat
     metrics:
-      gauge:
-        - name: MEM_LOAD_UOPS_RETIRED.L1_HIT
+      counter:
+        - name: mem_load_uops_retired_l1_hit
           documentation: L1 Hit
+          namespace: perf_stat
           labelnames:
-            - name
             - thread
             - pid
     events:
-      - name: MEM_LOAD_UOPS_RETIRED.L1_HIT # 0xD1 umask: 0x01
-        EventCode: 0xD1
-        UMask: 0x01
+      - eventcode: 0xD1 # MEM_LOAD_UOPS_RETIRED.L1_HIT
+        umask: 0x01
   - name: bundle_perf_stat
     metrics:
-      gauge:
-        - name: MEM_LOAD_UOPS_RETIRED.L2_HIT
+      counter:
+        - name: mem_load_uops_retired_l2_hit
           documentation: L2 Hit
+          namespace: perf_stat
           labelnames:
-            - name
             - thread
             - pid
     events:
-      - name: MEM_LOAD_UOPS_RETIRED.L2_HIT # 0xd1 umask: 0x02
-        EventCode: 0xD1
-        UMask: 0x02
+      - eventcode: 0xD1 # MEM_LOAD_UOPS_RETIRED.L2_HIT
+        umask: 0x02
   - name: bundle_perf_stat
     metrics:
-      gauge:
-        - name: MEM_LOAD_UOPS_RETIRED.L3_HIT
+      counter:
+        - name: mem_load_uops_retired_l3_hit
           documentation: L3 Hit
+          namespace: perf_stat
           labelnames:
-            - name
             - thread
             - pid
     events:
-      - name: MEM_LOAD_UOPS_RETIRED.L3_HIT # 0xd1 umask: 0x04
-        EventCode: 0xD1
-        UMask: 0x04
+      - eventcode: 0xD1 # MEM_LOAD_UOPS_RETIRED.L3_HIT
+        umask: 0x04
   - name: bundle_perf_stat
     metrics:
-      gauge:
-        - name: MEM_LOAD_UOPS_RETIRED.L1_MISS
+      counter:
+        - name: mem_load_uops_retired_l1_miss
           documentation: L1 Miss
+          namespace: perf_stat
           labelnames:
-            - name
             - thread
             - pid
     events:
-      - name: MEM_LOAD_UOPS_RETIRED.L1_MISS # 0xd1 umask: 0x08
-        EventCode: 0xD1
-        UMask: 0x08
+      - eventcode: 0xD1 # MEM_LOAD_UOPS_RETIRED.L1_MISS
+        umask: 0x08
   - name: bundle_perf_stat
     metrics:
-      gauge:
-        - name: MEM_LOAD_UOPS_RETIRED.L2_MISS
+      counter:
+        - name: mem_load_uops_retired_l2_miss
           documentation: L2 Miss
+          namespace: perf_stat
           labelnames:
-            - name
             - thread
             - pid
     events:
-      - name: MEM_LOAD_UOPS_RETIRED.L2_MISS # 0xd1 umask: 0x10
-        EventCode: 0xD1
-        UMask: 0x10
+      - eventcode: 0xD1 # MEM_LOAD_UOPS_RETIRED.L2_MISS
+        umask: 0x10
   - name: bundle_perf_stat
     metrics:
-      gauge:
-        - name: MEM_LOAD_UOPS_RETIRED.L3_MISS
+      counter:
+        - name: mem_load_uops_retired_l3_miss
           documentation: L3 Miss
+          namespace: perf_stat
           labelnames:
-            - name
             - thread
             - pid
     events:
-      - name: MEM_LOAD_UOPS_RETIRED.L3_MISS # 0xd1 umask: 0x020
-        EventCode: 0xD1
-        UMask: 0x20
+      - eventcode: 0xD1 # MEM_LOAD_UOPS_RETIRED.L3_MISS
+        umask: 0x20
-- 
cgit 1.2.3-korg