2023-09-14 06:03:18

by Ian Rogers

Subject: [PATCH v1] perf jevents metric: Fix type of strcmp_cpuid_str

The parser wraps all strings as Events, so the input is an
Event. Using a string would be bad as functions like Simplify are
called on the arguments, which wouldn't be present on a string.

Fixes: 9d5da30e4ae9 ("perf jevents: Add a new expression builtin
strcmp_cpuid_str()")

Signed-off-by: Ian Rogers <[email protected]>
---
tools/perf/pmu-events/metric.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/pmu-events/metric.py b/tools/perf/pmu-events/metric.py
index 0e9ec65d92ae..3e673f25d5fd 100644
--- a/tools/perf/pmu-events/metric.py
+++ b/tools/perf/pmu-events/metric.py
@@ -413,10 +413,10 @@ def has_event(event: Event) -> Function:
# pylint: disable=invalid-name
return Function('has_event', event)

-def strcmp_cpuid_str(event: str) -> Function:
+def strcmp_cpuid_str(cpuid: Event) -> Function:
# pylint: disable=redefined-builtin
# pylint: disable=invalid-name
- return Function('strcmp_cpuid_str', event)
+ return Function('strcmp_cpuid_str', cpuid)

class Metric:
"""An individual metric that will specifiable on the perf command line."""
--
2.42.0.459.ge4e396fd5e-goog

2023-09-17 05:28:33

by Namhyung Kim

Subject: Re: [PATCH v1] perf jevents metric: Fix type of strcmp_cpuid_str

On Wed, Sep 13, 2023 at 7:22 PM Ian Rogers <[email protected]> wrote:
>
> The parser wraps all strings as Events, so the input is an
> Event. Using a string would be bad as functions like Simplify are
> called on the arguments, which wouldn't be present on a string.
>
> Fixes: 9d5da30e4ae9 ("perf jevents: Add a new expression builtin
> strcmp_cpuid_str()")
>
> Signed-off-by: Ian Rogers <[email protected]>


Applied to perf-tools, thanks!

Namhyung