perf: strcmp_cpuid_str() expression fixups
Subsystems (2)
v2 cover perf: strcmp_cpuid_str() expression fixups
Set of fixes related to the comments here [1]. Mainly cleanups, additional tests and refactoring since adding the new strcmp_cpuid_str() metric expression.
I added the string replace function to the perf utils rather than tools/lib/string.c because it didn't seem easy to add tests for tools/lib.
---
Changes since v1:
* s -> haystack
* find -> needle
James Clark (7):
perf test: Check result of has_event(cycles) test perf jevents: Remove unused keyword
perf util: Add a function for replacing characters in a string perf test: Add a test for strcmp_cpuid_str() expression perf pmu: Move pmu__find_core_pmu() to pmus.c
perf pmus: Simplify perf_pmus__find_core_pmu()
perf pmu: Remove unused function
tools/perf/arch/arm64/util/pmu.c | 20 ++++++------- tools/perf/pmu-events/metric.py | 3 +- tools/perf/tests/Build | 1 + tools/perf/tests/builtin-test.c | 1 + tools/perf/tests/expr.c | 33 ++++++++++++++++++---- tools/perf/tests/tests.h | 1 + tools/perf/tests/util.c | 31 +++++++++++++++++++++ tools/perf/util/expr.c | 2 +- tools/perf/util/pmu.c | 22 --------------- tools/perf/util/pmu.h | 3 +- tools/perf/util/pmus.c | 6 ++++ tools/perf/util/string.c | 48 ++++++++++++++++++++++++++++++++ tools/perf/util/string2.h | 1 + 13 files changed, 128 insertions(+), 44 deletions(-) create mode 100644 tools/perf/tests/util.c
Signature · 1 line
2.34.1
PATCH v2 1/7 perf test: Check result of has_event(cycles) test
Currently the function always returns 0, so even when the has_event() test fails, the test still passes. Fix it by returning ret instead.
--- tools/perf/tests/expr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/tests/expr.c +1 -1
@@ -263,7 +263,7 @@ static int test__expr(struct test_suite *t __maybe_unused, int subtest __maybe_uexpr__ctx_free (ctx); -return 0 ; +return ret; }DEFINE_SUITE ("Simple expression parser" , expr);
Signature · 1 line
2.34.1
PATCH v2 2/7 perf jevents: Remove unused keyword
In reply to James Clark'cpuid_not_more_than' was the working title of the new 'strcmp_cpuid_str' keyword and was accidentally left in. It was never used so tidying it up has no effect.
--- tools/perf/pmu-events/metric.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
tools/perf/pmu-events/metric.py +1 -2
@@ -558,8 +558,7 @@ def ParsePerfJson(orig: str) -> Expression: # Convert accidentally converted scientific notation constants back py = re.sub(r'([0-9]+)Event\(r"(e[0-9]+)"\)', r'\1\2', py) # Convert all the known keywords back from events to just the keyword - keywords = ['if', 'else', 'min', 'max', 'd_ratio', 'source_count', 'has_event', 'strcmp_cpuid_str', - 'cpuid_not_more_than'] + keywords = ['if', 'else', 'min', 'max', 'd_ratio', 'source_count', 'has_event', 'strcmp_cpuid_str'] for kw in keywords: py = re.sub(rf'Event\(r"{kw}"\)', kw, py) try:
Signature · 1 line
2.34.1
PATCH v2 3/7 perf util: Add a function for replacing characters in a string
In reply to James ClarkIt finds all occurrences of a single character and replaces them with a multi character string. This will be used in a test in a following commit.
--- tools/perf/tests/Build | 1 + tools/perf/tests/builtin-test.c | 1 + tools/perf/tests/tests.h | 1 + tools/perf/tests/util.c | 31 +++++++++++++++++++++ tools/perf/util/string.c | 48 +++++++++++++++++++++++++++++++++ tools/perf/util/string2.h | 1 + 6 files changed, 83 insertions(+) create mode 100644 tools/perf/tests/util.c
tools/perf/tests/Build +1 -0
@@ -66,6 +66,7 @@ perf-y += dlfilter-test.o perf-y += sigtrap.o perf-y += event_groups.o perf-y += symbols.o +perf-y += util.o ifeq ($(SRCARCH),$(filter $(SRCARCH),x86 arm arm64 powerpc)) perf-$(CONFIG_DWARF_UNWIND) += dwarf-unwind.o
tools/perf/tests/builtin-test.c +1 -0
@@ -123,6 +123,7 @@ static struct test_suite *generic_tests[] = { &suite__sigtrap, &suite__event_groups, &suite__symbols, + &suite__util, NULL, };
tools/perf/tests/tests.h +1 -0
@@ -145,6 +145,7 @@ DECLARE_SUITE(dlfilter);DECLARE_SUITE (sigtrap);DECLARE_SUITE (event_groups);DECLARE_SUITE (symbols); +DECLARE_SUITE (util);/* * PowerPC and S390 do not support creation of instruction breakpoints using the
tools/perf/tests/util.c new file +31 -0
@@ -0,0 +1,31 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "tests.h" +#include "util/debug.h" + +#include <linux/compiler.h> +#include <stdlib.h> +#include <string2.h> + +static int test_strreplace (char needle,const char *haystack, +const char *replace,const char *expected) +{ +char *new =strreplace_chars (needle, haystack, replace); +int ret =strcmp (new, expected); + +free (new); +return ret ==0 ; +} + +static int test__util (struct test_suite *t__maybe_unused ,int subtest__maybe_unused ) +{ +TEST_ASSERT_VAL ("empty string" ,test_strreplace (' ' ,"" ,"123" ,"" )); +TEST_ASSERT_VAL ("no match" ,test_strreplace ('5' ,"123" ,"4" ,"123" )); +TEST_ASSERT_VAL ("replace 1" ,test_strreplace ('3' ,"123" ,"4" ,"124" )); +TEST_ASSERT_VAL ("replace 2" ,test_strreplace ('a' ,"abcabc" ,"ef" ,"efbcefbc" )); +TEST_ASSERT_VAL ("replace long" ,test_strreplace ('a' ,"abcabc" ,"longlong" , +"longlongbclonglongbc" )); + +return 0 ; +} + +DEFINE_SUITE ("util" , util);
tools/perf/util/string.c +48 -0
51 lines not on this page · raw message
tools/perf/util/string2.h +1 -0
@@ -39,5 +39,6 @@ char *strpbrk_esc(char *str, const char *stopset);char *strdup_esc (const char *str);unsigned int hex (char c); +char *strreplace_chars (char needle,const char *haystack,const char *replace);#endif /* PERF_STRING_H */
Signature · 1 line
2.34.1
PATCH v2 4/7 perf test: Add a test for strcmp_cpuid_str() expression
In reply to James ClarkTest 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".
--- tools/perf/tests/expr.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-)
tools/perf/tests/expr.c +27 -4
@@ -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_uint 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_uTEST_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);
Signature · 1 line
2.34.1
PATCH v2 5/7 perf pmu: Move pmu__find_core_pmu() to pmus.c
In reply to James Clarkpmu__find_core_pmu() more logically belongs in pmus.c because it iterates over all PMUs, so move it to pmus.c
At the same time rename it to perf_pmus__find_core_pmu() to match the naming convention in this file.
--- tools/perf/arch/arm64/util/pmu.c | 6 +++--- tools/perf/tests/expr.c | 2 +- tools/perf/util/expr.c | 2 +- tools/perf/util/pmu.c | 17 ----------------- tools/perf/util/pmu.h | 2 +- tools/perf/util/pmus.c | 18 ++++++++++++++++++ 6 files changed, 24 insertions(+), 23 deletions(-)
tools/perf/arch/arm64/util/pmu.c +3 -3
@@ -10,7 +10,7 @@const struct pmu_metrics_table *pmu_metrics_table__find (void ) { -struct perf_pmu *pmu =pmu__find_core_pmu (); +struct perf_pmu *pmu =perf_pmus__find_core_pmu ();if (pmu)return perf_pmu__find_metrics_table (pmu);
@@ -20,7 +20,7 @@ const struct pmu_metrics_table *pmu_metrics_table__find(void)const struct pmu_events_table *pmu_events_table__find (void ) { -struct perf_pmu *pmu =pmu__find_core_pmu (); +struct perf_pmu *pmu =perf_pmus__find_core_pmu ();if (pmu)return perf_pmu__find_events_table (pmu);
@@ -32,7 +32,7 @@ double perf_pmu__cpu_slots_per_cycle(void) {char path[PATH_MAX ];unsigned long long slots =0 ; -struct perf_pmu *pmu =pmu__find_core_pmu (); +struct perf_pmu *pmu =perf_pmus__find_core_pmu ();if (pmu) { perf_pmu__pathname_scnprintf(path, sizeof(path),
tools/perf/tests/expr.c +1 -1
@@ -76,7 +76,7 @@ static int test__expr(struct test_suite *t __maybe_unused, int subtest __maybe_ustruct expr_parse_ctx *ctx;bool is_intel = false;char strcmp_cpuid_buf[256 ]; -struct perf_pmu *pmu =pmu__find_core_pmu (); +struct perf_pmu *pmu =perf_pmus__find_core_pmu ();char *cpuid =perf_pmu__getcpuid (pmu);char *escaped_cpuid1, *escaped_cpuid2;
tools/perf/util/expr.c +1 -1
@@ -509,7 +509,7 @@ double expr__strcmp_cpuid_str(const struct expr_parse_ctx *ctx __maybe_unused, bool compute_ids __maybe_unused, const char *test_id) { double ret; -struct perf_pmu *pmu =pmu__find_core_pmu (); +struct perf_pmu *pmu =perf_pmus__find_core_pmu ();char *cpuid =perf_pmu__getcpuid (pmu);if (!cpuid)
tools/perf/util/pmu.c +0 -17
@@ -2049,20 +2049,3 @@ void perf_pmu__delete(struct perf_pmu *pmu)zfree (&pmu->id);free (pmu); } - -struct perf_pmu *pmu__find_core_pmu (void ) -{ -struct perf_pmu *pmu =NULL ; - -while ((pmu =perf_pmus__scan_core (pmu))) { -/* -* The cpumap should cover all CPUs. Otherwise, some CPUs may -* not support some events or have different event IDs. -*/ -if (RC_CHK_ACCESS (pmu->cpus)->nr !=cpu__max_cpu ().cpu) -return NULL ; - -return pmu; - } -return NULL ; -}
tools/perf/util/pmu.h +1 -1
@@ -264,6 +264,6 @@ int perf_pmu__pathname_fd(int dirfd, const char *pmu_name, const char *filename,struct perf_pmu *perf_pmu__lookup (struct list_head *pmus,int dirfd,const char *lookup_name);struct perf_pmu *perf_pmu__create_placeholder_core_pmu (struct list_head *core_pmus);void perf_pmu__delete (struct perf_pmu *pmu); -struct perf_pmu *pmu__find_core_pmu (void ); +struct perf_pmu *perf_pmus__find_core_pmu (void );#endif /* __PMU_H */
tools/perf/util/pmus.c +18 -0
@@ -10,6 +10,7 @@#include <pthread.h> #include <string.h> #include <unistd.h> +#include "cpumap.h" #include "debug.h" #include "evsel.h" #include "pmus.h"
@@ -592,3 +593,20 @@ struct perf_pmu *evsel__find_pmu(const struct evsel *evsel) }return pmu; } + +struct perf_pmu *perf_pmus__find_core_pmu (void ) +{ +struct perf_pmu *pmu =NULL ; + +while ((pmu =perf_pmus__scan_core (pmu))) { +/* +* The cpumap should cover all CPUs. Otherwise, some CPUs may +* not support some events or have different event IDs. +*/ +if (RC_CHK_ACCESS (pmu->cpus)->nr !=cpu__max_cpu ().cpu) +return NULL ; + +return pmu; + } +return NULL ; +}
Signature · 1 line
2.34.1
PATCH v2 6/7 perf pmus: Simplify perf_pmus__find_core_pmu()
In reply to James ClarkCurrently the while loop always either exits on the first iteration with a core PMU, or exits with NULL on heterogeneous systems or when not all CPUs are online.
Both of the latter behaviors are undesirable for platforms other than Arm so simplify it to always return the first core PMU, or NULL if none exist.
This behavior was depended on by the Arm version of pmu_metrics_table__find(), so the logic has been moved there instead.
--- tools/perf/arch/arm64/util/pmu.c | 8 +++++++- tools/perf/util/pmus.c | 14 +------------- 2 files changed, 8 insertions(+), 14 deletions(-)
tools/perf/arch/arm64/util/pmu.c +7 -1
@@ -10,8 +10,14 @@const struct pmu_metrics_table *pmu_metrics_table__find (void ) { -struct perf_pmu *pmu =perf_pmus__find_core_pmu (); +struct perf_pmu *pmu; + +/* Metrics aren't currently supported on heterogeneous Arm systems */ +if (perf_pmus__num_core_pmus () >1 ) +return NULL ; +/* Doesn't matter which one here because they'll all be the same */ + pmu =perf_pmus__find_core_pmu ();if (pmu)return perf_pmu__find_metrics_table (pmu);
tools/perf/util/pmus.c +1 -13
@@ -596,17 +596,5 @@ struct perf_pmu *evsel__find_pmu(const struct evsel *evsel)struct perf_pmu *perf_pmus__find_core_pmu (void ) { -struct perf_pmu *pmu =NULL ; - -while ((pmu =perf_pmus__scan_core (pmu))) { -/* -* The cpumap should cover all CPUs. Otherwise, some CPUs may -* not support some events or have different event IDs. -*/ -if (RC_CHK_ACCESS (pmu->cpus)->nr !=cpu__max_cpu ().cpu) -return NULL ; - -return pmu; - } -return NULL ; +return perf_pmus__scan_core (NULL ); }
Signature · 1 line
2.34.1
PATCH v2 7/7 perf pmu: Remove unused function
In reply to James Clarkpmu_events_table__find() is no longer used so remove it and its Arm specific version.
--- tools/perf/arch/arm64/util/pmu.c | 10 ---------- tools/perf/util/pmu.c | 5 ----- tools/perf/util/pmu.h | 1 - 3 files changed, 16 deletions(-)
tools/perf/arch/arm64/util/pmu.c +0 -10
@@ -24,16 +24,6 @@ const struct pmu_metrics_table *pmu_metrics_table__find(void)return NULL ; } -const struct pmu_events_table *pmu_events_table__find (void ) -{ -struct perf_pmu *pmu =perf_pmus__find_core_pmu (); - -if (pmu) -return perf_pmu__find_events_table (pmu); - -return NULL ; -} -double perf_pmu__cpu_slots_per_cycle (void ) {char path[PATH_MAX ];
tools/perf/util/pmu.c +0 -5
@@ -775,11 +775,6 @@ char *perf_pmu__getcpuid(struct perf_pmu *pmu)return cpuid; } -__weak const struct pmu_events_table *pmu_events_table__find (void ) -{ -return perf_pmu__find_events_table (NULL ); -} -__weak const struct pmu_metrics_table *pmu_metrics_table__find (void ) {return perf_pmu__find_metrics_table (NULL );
tools/perf/util/pmu.h +0 -1
@@ -238,7 +238,6 @@ void pmu_add_cpu_aliases_table(struct perf_pmu *pmu, const struct pmu_events_table *table);char *perf_pmu__getcpuid (struct perf_pmu *pmu); -const struct pmu_events_table *pmu_events_table__find (void );const struct pmu_metrics_table *pmu_metrics_table__find (void );int perf_pmu__convert_scale (const char *scale,char **end,double *sval);
Signature · 7 lines
2.34.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel