perf: strcmp_cpuid_str() expression fixups
Subsystems (2)
v3 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.
[1]: https://lore.kernel.org/linux-arm-kernel/CAP-5=fVnUx0BnJC7X1rrm42OD7Bk=ZsHWNwAZMBYyB7yWhBfhQ@mail.gmail.com/
[2]: https://lore.kernel.org/linux-perf-users/[email protected]/
---
Changes since v2:
* Drop patches that were already applied (which makes the cover letter mostly redundant)
* Avoid generating the compiler warning reported here [2]
Changes since v1:
* s -> haystack
* find -> needle
James Clark (3):
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/tests/expr.c | 2 +- tools/perf/util/expr.c | 2 +- tools/perf/util/pmu.c | 22 ---------------------- tools/perf/util/pmu.h | 3 +-- tools/perf/util/pmus.c | 8 +++++++- 6 files changed, 18 insertions(+), 39 deletions(-)
Signature · 1 line
2.34.1
PATCH v3 1/3 perf pmu: Move pmu__find_core_pmu() to pmus.c
pmu__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.
list_prepare_entry() can't be used in perf_pmus__scan_core() anymore now that it's called from the same compilation unit. This is with -O2 (specifically -O1 -ftree-vrp -finline-functions -finline-small-functions) which allow the bounds of the array access to be determined at compile time. list_prepare_entry() subtracts the offset of the 'list' member in struct perf_pmu from &core_pmus, which isn't a struct perf_pmu. The compiler sees that pmu results in &core_pmus - 8 and refuses to compile. At runtime this works because list_for_each_entry_continue() always adds the offset back again before dereferencing ->next, but it's technically undefined behavior. With -fsanitize=undefined an additional warning is generated.
Using list_first_entry_or_null() to get the first entry here avoids doing &core_pmus - 8 but has the same result and fixes both the compile warning and the undefined behavior warning. There are other uses of list_prepare_entry() in pmus.c, but the compiler doesn't seem to be able to see that they can also be called with &core_pmus, so I won't change any at this time.
--- 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 | 20 +++++++++++++++++++- 6 files changed, 25 insertions(+), 24 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
@@ -2050,20 +2050,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 +19 -1
@@ -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"
@@ -268,7 +269,7 @@ struct perf_pmu *perf_pmus__scan_core(struct perf_pmu *pmu) {if (!pmu) {pmu_read_sysfs (/*core_only=*/ true); - pmu =list_prepare_entry (pmu, &core_pmus, list); +return list_first_entry_or_null (&core_pmus,typeof (*pmu), list); }list_for_each_entry_continue (pmu, &core_pmus, list)return pmu;
@@ -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
Re: [PATCH v3 1/3] perf pmu: Move pmu__find_core_pmu() to pmus.c
Quoted 19 lines · James Clark
pmu__find_core_pmu()more logically belongs inpmus.cbecause it iterates over all PMUs, so move it topmus.cAt the same time rename it to
perf_pmus__find_core_pmu()to match the naming convention in this file.
list_prepare_entry()can't be used inperf_pmus__scan_core()anymore now that it's called from the same compilation unit. This is with -O2 (specifically -O1 -ftree-vrp -finline-functions -finline-small-functions) which allow the bounds of the array access to be determined at compile time.list_prepare_entry()subtracts the offset of the 'list' member in structperf_pmufrom&core_pmus, which isn't a structperf_pmu. The compiler sees that pmu results in&core_pmus- 8 and refuses to compile. At runtime this works becauselist_for_each_entry_continue()always adds the offset back again before dereferencing ->next, but it's technically undefined behavior. With -fsanitize=undefined an additional warning is generated.
Quoted 8 lines
Using
list_first_entry_or_null()to get the first entry here avoids doing&core_pmus- 8 but has the same result and fixes both the compile warning and the undefined behavior warning. There are other uses oflist_prepare_entry()inpmus.c, but the compiler doesn't seem to be able to see that they can also be called with&core_pmus, so I won't change any at this time.Signed-off-by James Clark <[email protected]>
Thanks,
Ian
Quoted 148 lines
--- 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 | 20 +++++++++++++++++++- 6 files changed, 25 insertions(+), 24 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@@ -2050,20 +2050,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 +19
-2@@ -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" @@ -268,7 +269,7 @@ struct perf_pmu *perf_pmus__scan_core(struct perf_pmu *pmu) {if (!pmu) {pmu_read_sysfs (/*core_only=*/ true); - pmu =list_prepare_entry (pmu, &core_pmus, list); +return list_first_entry_or_null (&core_pmus,typeof (*pmu), list); }list_for_each_entry_continue (pmu, &core_pmus, list)return pmu;@@ -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 ; +} --2.34.1
Re: [PATCH v3 1/3] perf pmu: Move pmu__find_core_pmu() to pmus.c
In reply to James ClarkQuoted 25 lines · James Clark
pmu__find_core_pmu()more logically belongs inpmus.cbecause it iterates over all PMUs, so move it topmus.cAt the same time rename it to
perf_pmus__find_core_pmu()to match the naming convention in this file.
list_prepare_entry()can't be used inperf_pmus__scan_core()anymore now that it's called from the same compilation unit. This is with -O2 (specifically -O1 -ftree-vrp -finline-functions -finline-small-functions) which allow the bounds of the array access to be determined at compile time.list_prepare_entry()subtracts the offset of the 'list' member in structperf_pmufrom&core_pmus, which isn't a structperf_pmu. The compiler sees that pmu results in&core_pmus- 8 and refuses to compile. At runtime this works becauselist_for_each_entry_continue()always adds the offset back again before dereferencing ->next, but it's technically undefined behavior. With -fsanitize=undefined an additional warning is generated.Using
list_first_entry_or_null()to get the first entry here avoids doing&core_pmus- 8 but has the same result and fixes both the compile warning and the undefined behavior warning. There are other uses oflist_prepare_entry()inpmus.c, but the compiler doesn't seem to be able to see that they can also be called with&core_pmus, so I won't change any at this time.
Quoted 2 lines
Signed-off-by James Clark<[email protected]>---
PATCH v3 2/3 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
Re: [PATCH v3 2/3] perf pmus: Simplify perf_pmus__find_core_pmu()
Quoted 8 lines · James Clark
Currently 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.
Quoted 6 lines
This behavior was depended on by the Arm version of
pmu_metrics_table__find(), so the logic has been moved there instead.Suggested-by Ian Rogers <[email protected]>Reviewed-by Ian Rogers <[email protected]>Signed-off-by James Clark <[email protected]>
Re: [PATCH v3 2/3] perf pmus: Simplify perf_pmus__find_core_pmu()
In reply to James ClarkQuoted 8 lines · James Clark
Currently 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.
Quoted 6 lines
This behavior was depended on by the Arm version of
pmu_metrics_table__find(), so the logic has been moved there instead.Suggested-by Ian Rogers <[email protected]>Reviewed-by Ian Rogers <[email protected]>Signed-off-by James Clark <[email protected]>
Turns out the "Simple expression parser" test is failing on heterogeneous arm systems without this patch. I didn't realise there was a dependency and should have put the commits the other way round. I will leave the error message here in case someone bumps into it, but no fix is required apart from applying the remaining patches in this set:
$ perf test expr -v 4: Simple expression parser : --- start --- test child forked, pid 4902 Using CPUID 0x00000000410fd070 FAILED tests/expr.c:83 get_cpuid test child finished with -1 ---- end ---- Simple expression parser: FAILED!
Quoted 48 lines
--- 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 ); }
PATCH v3 3/3 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
@@ -776,11 +776,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 · 1 line
2.34.1
Re: [PATCH v3 3/3] perf pmu: Remove unused function
Quoted 6 lines · James Clark
pmu_events_table__find()is no longer used so remove it and its Arm specific version.Reviewed-by Ian Rogers <[email protected]>Signed-off-by James Clark <[email protected]>---
You really should put the name of the function in the subject. Apart from that:
Quoted 54 lines
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@@ -776,11 +776,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);
Re: [PATCH v3 3/3] perf pmu: Remove unused function
Quoted 4 lines · John Garry
Quoted 3 lines · James Clark
pmu_events_table__find()is no longer used so remove it and its Arm specific version.
Quoted 9 lines
Quoted 3 lines
Reviewed-by Ian Rogers <[email protected]>Signed-off-by James Clark <[email protected]>---
You really should put the name of the function in the subject. Apart from that:
Reviewed-by John Garry <[email protected]>
Noted, will do next time. Thanks for the reviews.
Quoted 54 lines
Quoted 53 lines
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
-9@@ -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
-4@@ -776,11 +776,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);
Hello,
Quoted 18 lines · James Clark
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.cbecause it didn't seem easy to add tests fortools/lib.[1]: https://lore.kernel.org/linux-arm-kernel/CAP-5=fVnUx0BnJC7X1rrm42OD7Bk=ZsHWNwAZMBYyB7yWhBfhQ@mail.gmail.com/
[2]: https://lore.kernel.org/linux-perf-users/[email protected]/---
Changes since v2:
* Drop patches that were already applied (which makes the cover letter mostly redundant)
* Avoid generating the compiler warning reported here [2]
Quoted 8 lines
Changes since v1:
* s -> haystack
* find -> needleJames Clark (3):
perf pmu: Movepmu__find_core_pmu()topmus.c
perf pmus: Simplifyperf_pmus__find_core_pmu()
perf pmu: Remove unused function
Applied to perf-tools-next, thanks!
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel