perf test: Add a test for strcmp_cpuid_str() expression

Test that the new expression builtin returns a match when the current
escaped CPU ID is given, and that it doesn't match when "0x0" is given.

The CPU ID in test__expr() has to be changed to perf_pmu__getcpuid()
which returns the CPU ID string, rather than the raw CPU ID that
get_cpuid() returns because that can't be used with strcmp_cpuid_str().
It doesn't affect the is_intel test because both versions contain
"Intel".

Reviewed-by: Ian Rogers <irogers@google.com>
Signed-off-by: James Clark <james.clark@arm.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Chen Zhongjin <chenzhongjin@huawei.com>
Cc: Eduard Zingerman <eddyz87@gmail.com>
Cc: Haixin Yu <yuhaixin.yhx@linux.alibaba.com>
Cc: Ingo Molnar <mingo@redhat.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: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Will Deacon <will@kernel.org>
Cc: Yang Jihong <yangjihong1@huawei.com>
Cc: linux-arm-kernel@lists.infradead.org
Link: https://lore.kernel.org/r/20230904095104.1162928-5-james.clark@arm.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 39be7f3b3a53ba312b113d635cb161746d171a91..78544092ef0c4ab91f85c43229bd52cecde0c977 100644 (file)
--- a/tools/perf/tests/expr.c
+++ b/tools/perf/tests/expr.c
@@ -9,6 +9,7 @@
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
+#include <string2.h>
 #include <linux/zalloc.h>
 
 static int test_ids_union(void)
@@ -74,10 +75,13 @@ static int test__expr(struct test_suite *t __maybe_unused, int subtest __maybe_u
        int ret;
        struct expr_parse_ctx *ctx;
        bool is_intel = false;
-       char buf[128];
+       char strcmp_cpuid_buf[256];
+       struct perf_pmu *pmu = pmu__find_core_pmu();
+       char *cpuid = perf_pmu__getcpuid(pmu);
+       char *escaped_cpuid1, *escaped_cpuid2;
 
-       if (!get_cpuid(buf, sizeof(buf)))
-               is_intel = strstr(buf, "Intel") != NULL;
+       TEST_ASSERT_VAL("get_cpuid", cpuid);
+       is_intel = strstr(cpuid, "Intel") != NULL;
 
        TEST_ASSERT_EQUAL("ids_union", test_ids_union(), 0);
 
@@ -257,9 +261,28 @@ static int test__expr(struct test_suite *t __maybe_unused, int subtest __maybe_u
        TEST_ASSERT_VAL("source count", hashmap__size(ctx->ids) == 1);
        TEST_ASSERT_VAL("source count", hashmap__find(ctx->ids, "EVENT1", &val_ptr));
 
+
+       /* Test no cpuid match */
+       ret = test(ctx, "strcmp_cpuid_str(0x0)", 0);
+
+       /*
+        * Test cpuid match with current cpuid. Special chars have to be
+        * escaped.
+        */
+       escaped_cpuid1 = strreplace_chars('-', cpuid, "\\-");
+       free(cpuid);
+       escaped_cpuid2 = strreplace_chars(',', escaped_cpuid1, "\\,");
+       free(escaped_cpuid1);
+       escaped_cpuid1 = strreplace_chars('=', escaped_cpuid2, "\\=");
+       free(escaped_cpuid2);
+       scnprintf(strcmp_cpuid_buf, sizeof(strcmp_cpuid_buf),
+                 "strcmp_cpuid_str(%s)", escaped_cpuid1);
+       free(escaped_cpuid1);
+       ret |= test(ctx, strcmp_cpuid_buf, 1);
+
        /* has_event returns 1 when an event exists. */
        expr__add_id_val(ctx, strdup("cycles"), 2);
-       ret = test(ctx, "has_event(cycles)", 1);
+       ret |= test(ctx, "has_event(cycles)", 1);
 
        expr__ctx_free(ctx);