perf cpumap: Add intersect function

The merge function gives the union of two cpu maps. Add an intersect
function which is necessary, for example, when intersecting a PMUs
supported CPUs with user requested.

Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ali Saidi <alisaidi@amazon.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Dmitrii Dolgov <9erthalion6@gmail.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jing Zhang <renyu.zj@linux.alibaba.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kang Minchul <tegongkang@gmail.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Ming Wang <wangming01@loongson.cn>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Sandipan Das <sandipan.das@amd.com>
Cc: Sean Christopherson <seanjc@google.com>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Cc: coresight@lists.linaro.org
Cc: linux-arm-kernel@lists.infradead.org
Link: https://lore.kernel.org/r/20230526215410.2435674-2-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/lib/perf/cpumap.c b/tools/lib/perf/cpumap.c
index 1229b18bcdb168220d0db4db43a2b6b977d0a235..d4f3a1a12522c2d40fc020e0c99ded91cc4b1614 100644 (file)
--- a/tools/lib/perf/cpumap.c
+++ b/tools/lib/perf/cpumap.c
@@ -402,3 +402,38 @@ struct perf_cpu_map *perf_cpu_map__merge(struct perf_cpu_map *orig,
        perf_cpu_map__put(orig);
        return merged;
 }
+
+struct perf_cpu_map *perf_cpu_map__intersect(struct perf_cpu_map *orig,
+                                            struct perf_cpu_map *other)
+{
+       struct perf_cpu *tmp_cpus;
+       int tmp_len;
+       int i, j, k;
+       struct perf_cpu_map *merged = NULL;
+
+       if (perf_cpu_map__is_subset(other, orig))
+               return perf_cpu_map__get(orig);
+       if (perf_cpu_map__is_subset(orig, other))
+               return perf_cpu_map__get(other);
+
+       tmp_len = max(orig->nr, other->nr);
+       tmp_cpus = malloc(tmp_len * sizeof(struct perf_cpu));
+       if (!tmp_cpus)
+               return NULL;
+
+       i = j = k = 0;
+       while (i < orig->nr && j < other->nr) {
+               if (orig->map[i].cpu < other->map[j].cpu)
+                       i++;
+               else if (orig->map[i].cpu > other->map[j].cpu)
+                       j++;
+               else {
+                       j++;
+                       tmp_cpus[k++] = orig->map[i++];
+               }
+       }
+       if (k)
+               merged = cpu_map__trim_new(k, tmp_cpus);
+       free(tmp_cpus);
+       return merged;
+}

diff --git a/tools/lib/perf/include/perf/cpumap.h b/tools/lib/perf/include/perf/cpumap.h
index 8724dde7934271fda19dd7dc9634a984f1df8d11..b4c9a827a88a80ce8b101c68d3942472b0891b5c 100644 (file)
--- a/tools/lib/perf/include/perf/cpumap.h
+++ b/tools/lib/perf/include/perf/cpumap.h
@@ -25,6 +25,8 @@ LIBPERF_API struct perf_cpu_map *perf_cpu_map__read(FILE *file);
 LIBPERF_API struct perf_cpu_map *perf_cpu_map__get(struct perf_cpu_map *map);
 LIBPERF_API struct perf_cpu_map *perf_cpu_map__merge(struct perf_cpu_map *orig,
                                                     struct perf_cpu_map *other);
+LIBPERF_API struct perf_cpu_map *perf_cpu_map__intersect(struct perf_cpu_map *orig,
+                                                        struct perf_cpu_map *other);
 LIBPERF_API void perf_cpu_map__put(struct perf_cpu_map *map);
 LIBPERF_API struct perf_cpu perf_cpu_map__cpu(const struct perf_cpu_map *cpus, int idx);
 LIBPERF_API int perf_cpu_map__nr(const struct perf_cpu_map *cpus);

diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c
index b89d69afcef0e0fa9358465c4a0ee5577b6aeaa0..eef400025fca70442e9720309e08ce74afb25360 100644 (file)
--- a/tools/perf/tests/builtin-test.c
+++ b/tools/perf/tests/builtin-test.c
@@ -97,6 +97,7 @@ static struct test_suite *generic_tests[] = {
        &suite__backward_ring_buffer,
        &suite__cpu_map_print,
        &suite__cpu_map_merge,
+       &suite__cpu_map_intersect,
        &suite__sdt_event,
        &suite__is_printable_array,
        &suite__bitmap_print,

diff --git a/tools/perf/tests/cpumap.c b/tools/perf/tests/cpumap.c
index b1a924314e095b0ddcf8f2201fbcd4301d2e6350..92232978fe5e86671da851ed4457057941dc89e0 100644 (file)
--- a/tools/perf/tests/cpumap.c
+++ b/tools/perf/tests/cpumap.c
@@ -171,6 +171,47 @@ static int test__cpu_map_merge(struct test_suite *test __maybe_unused, int subte
        return 0;
 }
 
+static int __test__cpu_map_intersect(const char *lhs, const char *rhs, int nr, const char *expected)
+{
+       struct perf_cpu_map *a = perf_cpu_map__new(lhs);
+       struct perf_cpu_map *b = perf_cpu_map__new(rhs);
+       struct perf_cpu_map *c = perf_cpu_map__intersect(a, b);
+       char buf[100];
+
+       TEST_ASSERT_EQUAL("failed to intersect map: bad nr", perf_cpu_map__nr(c), nr);
+       cpu_map__snprint(c, buf, sizeof(buf));
+       TEST_ASSERT_VAL("failed to intersect map: bad result", !strcmp(buf, expected));
+       perf_cpu_map__put(a);
+       perf_cpu_map__put(b);
+       perf_cpu_map__put(c);
+       return 0;
+}
+
+static int test__cpu_map_intersect(struct test_suite *test __maybe_unused,
+                                  int subtest __maybe_unused)
+{
+       int ret;
+
+       ret = __test__cpu_map_intersect("4,2,1", "4,5,7", 1, "4");
+       if (ret)
+               return ret;
+       ret = __test__cpu_map_intersect("1-8", "6-9", 3, "6-8");
+       if (ret)
+               return ret;
+       ret = __test__cpu_map_intersect("1-8,12-20", "6-9,15", 4, "6-8,15");
+       if (ret)
+               return ret;
+       ret = __test__cpu_map_intersect("4,2,1", "1", 1, "1");
+       if (ret)
+               return ret;
+       ret = __test__cpu_map_intersect("1", "4,2,1", 1, "1");
+       if (ret)
+               return ret;
+       ret = __test__cpu_map_intersect("1", "1", 1, "1");
+       return ret;
+}
+
 DEFINE_SUITE("Synthesize cpu map", cpu_map_synthesize);
 DEFINE_SUITE("Print cpu map", cpu_map_print);
 DEFINE_SUITE("Merge cpu map", cpu_map_merge);
+DEFINE_SUITE("Intersect cpu map", cpu_map_intersect);

diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h
index 9a0f3904e53d3e3dca0b1e5293ecac4909850c68..b4e54f08bc390e13aaa12d77c0f6ddca34903ee3 100644 (file)
--- a/tools/perf/tests/tests.h
+++ b/tools/perf/tests/tests.h
@@ -127,6 +127,7 @@ DECLARE_SUITE(event_times);
 DECLARE_SUITE(backward_ring_buffer);
 DECLARE_SUITE(cpu_map_print);
 DECLARE_SUITE(cpu_map_merge);
+DECLARE_SUITE(cpu_map_intersect);
 DECLARE_SUITE(sdt_event);
 DECLARE_SUITE(is_printable_array);
 DECLARE_SUITE(bitmap_print);