Skip to contentSkip to conversation

perf jevents: Don't encode MSRs with no value

PATCH In review Ian Rogers 4 participants 4 messages Nov 5 – Nov 6 perf events

lore
Share & tools
lore

Ian Rogers

author reviewer
#0 lore raw

PATCH 1/1 perf jevents: Don't encode MSRs with no value

Fixes the events mem_trans_retired.load_latency (EMR) and mem_inst_retired.latency_above_threshold_0 (NHM, WSM) that were having their ldlat= value encoded as python's None.

Fixes ffc606ada3d7 ("perf jevents: Add python converter script")
---
 tools/perf/pmu-events/jevents.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/pmu-events/jevents.py +1 -1
index 080e04b51b8c..e083f7495e67 100755
@@ -396,7 +396,7 @@ class JsonEvent:
         event += f',{value}{canonicalize_value(jd[key])}'
     if filter:
       event += f',{filter}'
-    if msr:
+    if msr and msrval:
       event += f',{msr}{msrval}'
     if self.desc and extra_desc:
       self.desc += extra_desc
Signature · 1 line
2.56.0.455.g6c5a503b38-goog
#1 lore raw
Sashiko has reviewed this patch and found no issues.
Quoted 8 lines

Fixes the events mem_trans_retired.load_latency (EMR) and mem_inst_retired.latency_above_threshold_0 (NHM, WSM) that were having their ldlat= value encoded as python's None.

Fixes ffc606ada3d7 ("perf jevents: Add python converter script")

Sashiko has reviewed this patch and found no issues.

Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Reviewed-by on v1 1/1
#2 lore raw
In reply to Ian Rogers
Quoted 25 lines · Ian Rogers

Fixes the events mem_trans_retired.load_latency (EMR) and mem_inst_retired.latency_above_threshold_0 (NHM, WSM) that were having their ldlat= value encoded as python's None.

Fixes ffc606ada3d7 ("perf jevents: Add python converter script")
---
 tools/perf/pmu-events/jevents.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/pmu-events/jevents.py +1 -1
index 080e04b51b8c..e083f7495e67 100755
@@ -396,7 +396,7 @@ class JsonEvent:
         event += f',{value}{canonicalize_value(jd[key])}'
     if filter:
       event += f',{filter}'
-    if msr:
+    if msr and msrval:
       event += f',{msr}{msrval}'
     if self.desc and extra_desc:
       self.desc += extra_desc
maintainer
#3 lore raw
In reply to Ian Rogers
Quoted 8 lines · Ian Rogers

Fixes the events mem_trans_retired.load_latency (EMR) and mem_inst_retired.latency_above_threshold_0 (NHM, WSM) that were having their ldlat= value encoded as python's None.

Fixes ffc606ada3d7 ("perf jevents: Add python converter script")

Arnaldo, I think it's good to go to v7.4.

Thanks,
Namhyung

Quoted 20 lines
---
 tools/perf/pmu-events/jevents.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/pmu-events/jevents.py +1 -1
index 080e04b51b8c..e083f7495e67 100755
@@ -396,7 +396,7 @@ class JsonEvent:
         event += f',{value}{canonicalize_value(jd[key])}'
     if filter:
       event += f',{filter}'
-    if msr:
+    if msr and msrval:
       event += f',{msr}{msrval}'
     if self.desc and extra_desc:
       self.desc += extra_desc
Signature · 1 line
2.56.0.455.g6c5a503b38-goog