Commit 8076dc8c authored by Ian Rogers's avatar Ian Rogers Committed by Namhyung Kim
Browse files

perf vendor metrics intel: Make transaction metrics conditional 



Make the transaction metrics conditional on the cycles-tx event being
present. This event may not be present when TSX extensions have been
disabled.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Tested-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Eduard Zingerman <eddyz87@gmail.com>
Cc: Sohom Datta <sohomdatta1@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Caleb Biggers <caleb.biggers@intel.com>
Cc: Edward Baker <edward.baker@intel.com>
Cc: Perry Taylor <perry.taylor@intel.com>
Cc: Samantha Alt <samantha.alt@intel.com>
Cc: Weilin Wang <weilin.wang@intel.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Andrii Nakryiko <andrii@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Jing Zhang <renyu.zj@linux.alibaba.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Zhengjun Xing <zhengjun.xing@linux.intel.com>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Ingo Molnar <mingo@redhat.com>
Link: https://lore.kernel.org/r/20230623151016.4193660-4-irogers@google.com


Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
parent eadc0040

tools/perf/pmu-events/arch/x86/alderlake/adl-metrics.json

+4 −4
Original line number Diff line number Diff line
@@ -92,28 +92,28 @@ 
    },

    {

        "BriefDescription": "Percentage of cycles in aborted transactions.",

        "MetricExpr": "max(cpu@cycles\\-t@ - cpu@cycles\\-ct@, 0) / cycles",

        "MetricExpr": "(max(cycles\\-t - cycles\\-ct, 0) / cycles if has_event(cycles\\-t) else 0)",

        "MetricGroup": "transaction",

        "MetricName": "tsx_aborted_cycles",

        "ScaleUnit": "100%"

    },

    {

        "BriefDescription": "Number of cycles within a transaction divided by the number of elisions.",

        "MetricExpr": "cpu@cycles\\-t@ / cpu@el\\-start@",

        "MetricExpr": "(cycles\\-t / el\\-start if has_event(cycles\\-t) else 0)",

        "MetricGroup": "transaction",

        "MetricName": "tsx_cycles_per_elision",

        "ScaleUnit": "1cycles / elision"

    },

    {

        "BriefDescription": "Number of cycles within a transaction divided by the number of transactions.",

        "MetricExpr": "cpu@cycles\\-t@ / cpu@tx\\-start@",

        "MetricExpr": "(cycles\\-t / tx\\-start if has_event(cycles\\-t) else 0)",

        "MetricGroup": "transaction",

        "MetricName": "tsx_cycles_per_transaction",

        "ScaleUnit": "1cycles / transaction"

    },

    {

        "BriefDescription": "Percentage of cycles within a transaction region.",

        "MetricExpr": "cpu@cycles\\-t@ / cycles",

        "MetricExpr": "(cycles\\-t / cycles if has_event(cycles\\-t) else 0)",

        "MetricGroup": "transaction",

        "MetricName": "tsx_transactional_cycles",

        "ScaleUnit": "100%"

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

+4 −4
Original line number Diff line number Diff line
@@ -1830,28 +1830,28 @@ 
    },

    {

        "BriefDescription": "Percentage of cycles in aborted transactions.",

        "MetricExpr": "max(cpu@cycles\\-t@ - cpu@cycles\\-ct@, 0) / cycles",

        "MetricExpr": "(max(cycles\\-t - cycles\\-ct, 0) / cycles if has_event(cycles\\-t) else 0)",

        "MetricGroup": "transaction",

        "MetricName": "tsx_aborted_cycles",

        "ScaleUnit": "100%"

    },

    {

        "BriefDescription": "Number of cycles within a transaction divided by the number of elisions.",

        "MetricExpr": "cpu@cycles\\-t@ / cpu@el\\-start@",

        "MetricExpr": "(cycles\\-t / el\\-start if has_event(cycles\\-t) else 0)",

        "MetricGroup": "transaction",

        "MetricName": "tsx_cycles_per_elision",

        "ScaleUnit": "1cycles / elision"

    },

    {

        "BriefDescription": "Number of cycles within a transaction divided by the number of transactions.",

        "MetricExpr": "cpu@cycles\\-t@ / cpu@tx\\-start@",

        "MetricExpr": "(cycles\\-t / tx\\-start if has_event(cycles\\-t) else 0)",

        "MetricGroup": "transaction",

        "MetricName": "tsx_cycles_per_transaction",

        "ScaleUnit": "1cycles / transaction"

    },

    {

        "BriefDescription": "Percentage of cycles within a transaction region.",

        "MetricExpr": "cpu@cycles\\-t@ / cycles",

        "MetricExpr": "(cycles\\-t / cycles if has_event(cycles\\-t) else 0)",

        "MetricGroup": "transaction",

        "MetricName": "tsx_transactional_cycles",

        "ScaleUnit": "100%"

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

+4 −4
Original line number Diff line number Diff line
@@ -1516,28 +1516,28 @@ 
    },

    {

        "BriefDescription": "Percentage of cycles in aborted transactions.",

        "MetricExpr": "max(cpu@cycles\\-t@ - cpu@cycles\\-ct@, 0) / cycles",

        "MetricExpr": "(max(cycles\\-t - cycles\\-ct, 0) / cycles if has_event(cycles\\-t) else 0)",

        "MetricGroup": "transaction",

        "MetricName": "tsx_aborted_cycles",

        "ScaleUnit": "100%"

    },

    {

        "BriefDescription": "Number of cycles within a transaction divided by the number of elisions.",

        "MetricExpr": "cpu@cycles\\-t@ / cpu@el\\-start@",

        "MetricExpr": "(cycles\\-t / el\\-start if has_event(cycles\\-t) else 0)",

        "MetricGroup": "transaction",

        "MetricName": "tsx_cycles_per_elision",

        "ScaleUnit": "1cycles / elision"

    },

    {

        "BriefDescription": "Number of cycles within a transaction divided by the number of transactions.",

        "MetricExpr": "cpu@cycles\\-t@ / cpu@tx\\-start@",

        "MetricExpr": "(cycles\\-t / tx\\-start if has_event(cycles\\-t) else 0)",

        "MetricGroup": "transaction",

        "MetricName": "tsx_cycles_per_transaction",

        "ScaleUnit": "1cycles / transaction"

    },

    {

        "BriefDescription": "Percentage of cycles within a transaction region.",

        "MetricExpr": "cpu@cycles\\-t@ / cycles",

        "MetricExpr": "(cycles\\-t / cycles if has_event(cycles\\-t) else 0)",

        "MetricGroup": "transaction",

        "MetricName": "tsx_transactional_cycles",

        "ScaleUnit": "100%"

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

+4 −4
Original line number Diff line number Diff line
@@ -1812,28 +1812,28 @@ 
    },

    {

        "BriefDescription": "Percentage of cycles in aborted transactions.",

        "MetricExpr": "max(cpu@cycles\\-t@ - cpu@cycles\\-ct@, 0) / cycles",

        "MetricExpr": "(max(cycles\\-t - cycles\\-ct, 0) / cycles if has_event(cycles\\-t) else 0)",

        "MetricGroup": "transaction",

        "MetricName": "tsx_aborted_cycles",

        "ScaleUnit": "100%"

    },

    {

        "BriefDescription": "Number of cycles within a transaction divided by the number of elisions.",

        "MetricExpr": "cpu@cycles\\-t@ / cpu@el\\-start@",

        "MetricExpr": "(cycles\\-t / el\\-start if has_event(cycles\\-t) else 0)",

        "MetricGroup": "transaction",

        "MetricName": "tsx_cycles_per_elision",

        "ScaleUnit": "1cycles / elision"

    },

    {

        "BriefDescription": "Number of cycles within a transaction divided by the number of transactions.",

        "MetricExpr": "cpu@cycles\\-t@ / cpu@tx\\-start@",

        "MetricExpr": "(cycles\\-t / tx\\-start if has_event(cycles\\-t) else 0)",

        "MetricGroup": "transaction",

        "MetricName": "tsx_cycles_per_transaction",

        "ScaleUnit": "1cycles / transaction"

    },

    {

        "BriefDescription": "Percentage of cycles within a transaction region.",

        "MetricExpr": "cpu@cycles\\-t@ / cycles",

        "MetricExpr": "(cycles\\-t / cycles if has_event(cycles\\-t) else 0)",

        "MetricGroup": "transaction",

        "MetricName": "tsx_transactional_cycles",

        "ScaleUnit": "100%"

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

+4 −4
Original line number Diff line number Diff line
@@ -1938,28 +1938,28 @@ 
    },

    {

        "BriefDescription": "Percentage of cycles in aborted transactions.",

        "MetricExpr": "max(cpu@cycles\\-t@ - cpu@cycles\\-ct@, 0) / cycles",

        "MetricExpr": "(max(cycles\\-t - cycles\\-ct, 0) / cycles if has_event(cycles\\-t) else 0)",

        "MetricGroup": "transaction",

        "MetricName": "tsx_aborted_cycles",

        "ScaleUnit": "100%"

    },

    {

        "BriefDescription": "Number of cycles within a transaction divided by the number of elisions.",

        "MetricExpr": "cpu@cycles\\-t@ / cpu@el\\-start@",

        "MetricExpr": "(cycles\\-t / el\\-start if has_event(cycles\\-t) else 0)",

        "MetricGroup": "transaction",

        "MetricName": "tsx_cycles_per_elision",

        "ScaleUnit": "1cycles / elision"

    },

    {

        "BriefDescription": "Number of cycles within a transaction divided by the number of transactions.",

        "MetricExpr": "cpu@cycles\\-t@ / cpu@tx\\-start@",

        "MetricExpr": "(cycles\\-t / tx\\-start if has_event(cycles\\-t) else 0)",

        "MetricGroup": "transaction",

        "MetricName": "tsx_cycles_per_transaction",

        "ScaleUnit": "1cycles / transaction"

    },

    {

        "BriefDescription": "Percentage of cycles within a transaction region.",

        "MetricExpr": "cpu@cycles\\-t@ / cycles",

        "MetricExpr": "(cycles\\-t / cycles if has_event(cycles\\-t) else 0)",

        "MetricGroup": "transaction",

        "MetricName": "tsx_transactional_cycles",

        "ScaleUnit": "100%"