perf expr: Add metric literals for topology.

Allow the number of cpus, cores, dies and packages to be queried by a
metric expression.

Signed-off-by: Ian Rogers <irogers@google.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul A . Clarke <pc@us.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Riccardo Mancini <rickyman7@gmail.com>
Cc: Song Liu <song@kernel.org>
Cc: Wan Jiabing <wanjiabing@vivo.com>
Cc: Yury Norov <yury.norov@gmail.com>
Link: https://lore.kernel.org/r/20211111002109.194172-7-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/tests/expr.c b/tools/perf/tests/expr.c
index 48c62d0789c522bcb2cba30f6043ec6ed1ebfd20..ed95ebda49a7e5fb407d14463a367cf32e9a78de 100644 (file)
--- a/tools/perf/tests/expr.c
+++ b/tools/perf/tests/expr.c
@@ -66,7 +66,7 @@ static int test__expr(struct test_suite *t __maybe_unused, int subtest __maybe_u
 {
        struct expr_id_data *val_ptr;
        const char *p;
-       double val;
+       double val, num_cpus, num_cores, num_dies, num_packages;
        int ret;
        struct expr_parse_ctx *ctx;
 
@@ -161,6 +161,16 @@ static int test__expr(struct test_suite *t __maybe_unused, int subtest __maybe_u
                        NULL, ctx) == 0);
        TEST_ASSERT_VAL("find ids", hashmap__size(ctx->ids) == 0);
 
+       /* Test toplogy constants appear well ordered. */
+       expr__ctx_clear(ctx);
+       TEST_ASSERT_VAL("#num_cpus", expr__parse(&num_cpus, ctx, "#num_cpus") == 0);
+       TEST_ASSERT_VAL("#num_cores", expr__parse(&num_cores, ctx, "#num_cores") == 0);
+       TEST_ASSERT_VAL("#num_cpus >= #num_cores", num_cpus >= num_cores);
+       TEST_ASSERT_VAL("#num_dies", expr__parse(&num_dies, ctx, "#num_dies") == 0);
+       TEST_ASSERT_VAL("#num_cores >= #num_dies", num_cores >= num_dies);
+       TEST_ASSERT_VAL("#num_packages", expr__parse(&num_packages, ctx, "#num_packages") == 0);
+       TEST_ASSERT_VAL("#num_dies >= #num_packages", num_dies >= num_packages);
+
        expr__ctx_free(ctx);
 
        return 0;

diff --git a/tools/perf/util/expr.c b/tools/perf/util/expr.c
index 7464739c2890bc80e4719b354187017dfa9d9585..15af8b8ef5e743a18393b2606afc460d830df6a0 100644 (file)
--- a/tools/perf/util/expr.c
+++ b/tools/perf/util/expr.c
@@ -5,6 +5,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include "metricgroup.h"
+#include "cpumap.h"
+#include "cputopo.h"
 #include "debug.h"
 #include "expr.h"
 #include "expr-bison.h"
@@ -375,9 +377,34 @@ double expr_id_data__value(const struct expr_id_data *data)
 
 double expr__get_literal(const char *literal)
 {
+       static struct cpu_topology *topology;
+
        if (!strcmp("#smt_on", literal))
                return smt_on() > 0 ? 1.0 : 0.0;
 
+       if (!strcmp("#num_cpus", literal))
+               return cpu__max_present_cpu();
+
+       /*
+        * Assume that topology strings are consistent, such as CPUs "0-1"
+        * wouldn't be listed as "0,1", and so after deduplication the number of
+        * these strings gives an indication of the number of packages, dies,
+        * etc.
+        */
+       if (!topology) {
+               topology = cpu_topology__new();
+               if (!topology) {
+                       pr_err("Error creating CPU topology");
+                       return NAN;
+               }
+       }
+       if (!strcmp("#num_packages", literal))
+               return topology->package_cpus_lists;
+       if (!strcmp("#num_dies", literal))
+               return topology->die_cpus_lists;
+       if (!strcmp("#num_cores", literal))
+               return topology->core_cpus_lists;
+
        pr_err("Unrecognized literal '%s'", literal);
        return NAN;
 }