Skip to content

Commit c43c64f

Browse files
captain5050namhyung
authored andcommitted
perf vendor events intel: Update tsx_cycles_per_elision metrics
Update tsx_cycles_per_elision as per: intel/perfmon#116 Prefer the el-start event rather than cycles-t for detecting whether the metric will work as HLE may be disabled. Remove the metric from sapphirerapids that has no el-start event. Signed-off-by: Ian Rogers <irogers@google.com> Reviewed-by: Kan Liang <kan.liang@linux.intel.com> Cc: Alexandre Torgue <alexandre.torgue@foss.st.com> Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com> Cc: Edward Baker <edward.baker@intel.com> Cc: Zhengjun Xing <zhengjun.xing@linux.intel.com> Link: https://lore.kernel.org/r/20231026003149.3287633-9-irogers@google.com Signed-off-by: Namhyung Kim <namhyung@kernel.org>
1 parent c44c311 commit c43c64f

File tree

8 files changed

+7
-14
lines changed

8 files changed

+7
-14
lines changed

tools/perf/pmu-events/arch/x86/cascadelakex/clx-metrics.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1837,7 +1837,7 @@
18371837
},
18381838
{
18391839
"BriefDescription": "Number of cycles within a transaction divided by the number of elisions.",
1840-
"MetricExpr": "(cycles\\-t / el\\-start if has_event(cycles\\-t) else 0)",
1840+
"MetricExpr": "(cycles\\-t / el\\-start if has_event(el\\-start) else 0)",
18411841
"MetricGroup": "transaction",
18421842
"MetricName": "tsx_cycles_per_elision",
18431843
"ScaleUnit": "1cycles / elision"

tools/perf/pmu-events/arch/x86/icelake/icl-metrics.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1525,7 +1525,7 @@
15251525
},
15261526
{
15271527
"BriefDescription": "Number of cycles within a transaction divided by the number of elisions.",
1528-
"MetricExpr": "(cycles\\-t / el\\-start if has_event(cycles\\-t) else 0)",
1528+
"MetricExpr": "(cycles\\-t / el\\-start if has_event(el\\-start) else 0)",
15291529
"MetricGroup": "transaction",
15301530
"MetricName": "tsx_cycles_per_elision",
15311531
"ScaleUnit": "1cycles / elision"

tools/perf/pmu-events/arch/x86/icelakex/icx-metrics.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1821,7 +1821,7 @@
18211821
},
18221822
{
18231823
"BriefDescription": "Number of cycles within a transaction divided by the number of elisions.",
1824-
"MetricExpr": "(cycles\\-t / el\\-start if has_event(cycles\\-t) else 0)",
1824+
"MetricExpr": "(cycles\\-t / el\\-start if has_event(el\\-start) else 0)",
18251825
"MetricGroup": "transaction",
18261826
"MetricName": "tsx_cycles_per_elision",
18271827
"ScaleUnit": "1cycles / elision"

tools/perf/pmu-events/arch/x86/rocketlake/rkl-metrics.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1551,7 +1551,7 @@
15511551
},
15521552
{
15531553
"BriefDescription": "Number of cycles within a transaction divided by the number of elisions.",
1554-
"MetricExpr": "(cycles\\-t / el\\-start if has_event(cycles\\-t) else 0)",
1554+
"MetricExpr": "(cycles\\-t / el\\-start if has_event(el\\-start) else 0)",
15551555
"MetricGroup": "transaction",
15561556
"MetricName": "tsx_cycles_per_elision",
15571557
"ScaleUnit": "1cycles / elision"

tools/perf/pmu-events/arch/x86/sapphirerapids/spr-metrics.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1944,13 +1944,6 @@
19441944
"MetricName": "tsx_aborted_cycles",
19451945
"ScaleUnit": "100%"
19461946
},
1947-
{
1948-
"BriefDescription": "Number of cycles within a transaction divided by the number of elisions.",
1949-
"MetricExpr": "(cycles\\-t / el\\-start if has_event(cycles\\-t) else 0)",
1950-
"MetricGroup": "transaction",
1951-
"MetricName": "tsx_cycles_per_elision",
1952-
"ScaleUnit": "1cycles / elision"
1953-
},
19541947
{
19551948
"BriefDescription": "Number of cycles within a transaction divided by the number of transactions.",
19561949
"MetricExpr": "(cycles\\-t / tx\\-start if has_event(cycles\\-t) else 0)",

tools/perf/pmu-events/arch/x86/skylake/skl-metrics.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1473,7 +1473,7 @@
14731473
},
14741474
{
14751475
"BriefDescription": "Number of cycles within a transaction divided by the number of elisions.",
1476-
"MetricExpr": "(cycles\\-t / el\\-start if has_event(cycles\\-t) else 0)",
1476+
"MetricExpr": "(cycles\\-t / el\\-start if has_event(el\\-start) else 0)",
14771477
"MetricGroup": "transaction",
14781478
"MetricName": "tsx_cycles_per_elision",
14791479
"ScaleUnit": "1cycles / elision"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1781,7 +1781,7 @@
17811781
},
17821782
{
17831783
"BriefDescription": "Number of cycles within a transaction divided by the number of elisions.",
1784-
"MetricExpr": "(cycles\\-t / el\\-start if has_event(cycles\\-t) else 0)",
1784+
"MetricExpr": "(cycles\\-t / el\\-start if has_event(el\\-start) else 0)",
17851785
"MetricGroup": "transaction",
17861786
"MetricName": "tsx_cycles_per_elision",
17871787
"ScaleUnit": "1cycles / elision"

tools/perf/pmu-events/arch/x86/tigerlake/tgl-metrics.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1551,7 +1551,7 @@
15511551
},
15521552
{
15531553
"BriefDescription": "Number of cycles within a transaction divided by the number of elisions.",
1554-
"MetricExpr": "(cycles\\-t / el\\-start if has_event(cycles\\-t) else 0)",
1554+
"MetricExpr": "(cycles\\-t / el\\-start if has_event(el\\-start) else 0)",
15551555
"MetricGroup": "transaction",
15561556
"MetricName": "tsx_cycles_per_elision",
15571557
"ScaleUnit": "1cycles / elision"

0 commit comments

Comments
 (0)