2022-05-28 20:08:40

by Ian Rogers

Subject: [PATCH] perf expr: Allow exponents on floating point values

Pass the optional exponent component through to strtod that already
supports it. We already have exponents in ScaleUnit and so this adds
uniformity.

Reported-by: Zhengjun Xing <[email protected]>
Signed-off-by: Ian Rogers <[email protected]>
---
tools/perf/tests/expr.c | 2 ++
tools/perf/util/expr.l | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/perf/tests/expr.c b/tools/perf/tests/expr.c
index d54c5371c6a6..5c0032fe93ae 100644
--- a/tools/perf/tests/expr.c
+++ b/tools/perf/tests/expr.c
@@ -97,6 +97,8 @@ static int test__expr(struct test_suite *t __maybe_unused, int subtest __maybe_u
ret |= test(ctx, "2.2 > 2.2", 0);
ret |= test(ctx, "2.2 < 1.1", 0);
ret |= test(ctx, "1.1 > 2.2", 0);
+ ret |= test(ctx, "1.1e10 < 1.1e100", 1);
+ ret |= test(ctx, "1.1e2 > 1.1e-2", 1);

if (ret) {
expr__ctx_free(ctx);
diff --git a/tools/perf/util/expr.l b/tools/perf/util/expr.l
index 0a13eb20c814..4dc8edbfd9ce 100644
--- a/tools/perf/util/expr.l
+++ b/tools/perf/util/expr.l
@@ -91,7 +91,7 @@ static int literal(yyscan_t scanner)
}
%}

-number ([0-9]+\.?[0-9]*|[0-9]*\.?[0-9]+)
+number ([0-9]+\.?[0-9]*|[0-9]*\.?[0-9]+)(e-?[0-9]+)?

sch [-,=]
spec \\{sch}
--
2.36.1.124.g0e6072fb45-goog

2022-06-09 05:48:37

by Ian Rogers

Subject: Re: [PATCH] perf expr: Allow exponents on floating point values

On Thu, May 26, 2022 at 7:06 PM Ian Rogers <[email protected]> wrote:
>
> Pass the optional exponent component through to strtod that already
> supports it. We already have exponents in ScaleUnit and so this adds
> uniformity.
>
> Reported-by: Zhengjun Xing <[email protected]>
> Signed-off-by: Ian Rogers <[email protected]>

Ping. Simple fix with tests, PTAL. Thanks,
Ian

> ---
> tools/perf/tests/expr.c | 2 ++
> tools/perf/util/expr.l | 2 +-
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/tests/expr.c b/tools/perf/tests/expr.c
> index d54c5371c6a6..5c0032fe93ae 100644
> --- a/tools/perf/tests/expr.c
> +++ b/tools/perf/tests/expr.c
> @@ -97,6 +97,8 @@ static int test__expr(struct test_suite *t __maybe_unused, int subtest __maybe_u
> ret |= test(ctx, "2.2 > 2.2", 0);
> ret |= test(ctx, "2.2 < 1.1", 0);
> ret |= test(ctx, "1.1 > 2.2", 0);
> + ret |= test(ctx, "1.1e10 < 1.1e100", 1);
> + ret |= test(ctx, "1.1e2 > 1.1e-2", 1);
>
> if (ret) {
> expr__ctx_free(ctx);
> diff --git a/tools/perf/util/expr.l b/tools/perf/util/expr.l
> index 0a13eb20c814..4dc8edbfd9ce 100644
> --- a/tools/perf/util/expr.l
> +++ b/tools/perf/util/expr.l
> @@ -91,7 +91,7 @@ static int literal(yyscan_t scanner)
> }
> %}
>
> -number ([0-9]+\.?[0-9]*|[0-9]*\.?[0-9]+)
> +number ([0-9]+\.?[0-9]*|[0-9]*\.?[0-9]+)(e-?[0-9]+)?
>
> sch [-,=]
> spec \\{sch}
> --
> 2.36.1.124.g0e6072fb45-goog
>

2022-06-09 05:58:00

by kajoljain

Subject: Re: [PATCH] perf expr: Allow exponents on floating point values

Patch looks fine to me

Reviewed-By: Kajol Jain<[email protected]>


On 5/27/22 07:36, Ian Rogers wrote:
> Pass the optional exponent component through to strtod that already
> supports it. We already have exponents in ScaleUnit and so this adds
> uniformity.
>
> Reported-by: Zhengjun Xing <[email protected]>
> Signed-off-by: Ian Rogers <[email protected]>
> ---
> tools/perf/tests/expr.c | 2 ++
> tools/perf/util/expr.l | 2 +-
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/tests/expr.c b/tools/perf/tests/expr.c
> index d54c5371c6a6..5c0032fe93ae 100644
> --- a/tools/perf/tests/expr.c
> +++ b/tools/perf/tests/expr.c
> @@ -97,6 +97,8 @@ static int test__expr(struct test_suite *t __maybe_unused, int subtest __maybe_u
> ret |= test(ctx, "2.2 > 2.2", 0);
> ret |= test(ctx, "2.2 < 1.1", 0);
> ret |= test(ctx, "1.1 > 2.2", 0);
> + ret |= test(ctx, "1.1e10 < 1.1e100", 1);
> + ret |= test(ctx, "1.1e2 > 1.1e-2", 1);
>
> if (ret) {
> expr__ctx_free(ctx);
> diff --git a/tools/perf/util/expr.l b/tools/perf/util/expr.l
> index 0a13eb20c814..4dc8edbfd9ce 100644
> --- a/tools/perf/util/expr.l
> +++ b/tools/perf/util/expr.l
> @@ -91,7 +91,7 @@ static int literal(yyscan_t scanner)
> }
> %}
>
> -number ([0-9]+\.?[0-9]*|[0-9]*\.?[0-9]+)
> +number ([0-9]+\.?[0-9]*|[0-9]*\.?[0-9]+)(e-?[0-9]+)?
>
> sch [-,=]
> spec \\{sch}

2022-06-17 18:58:24

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH] perf expr: Allow exponents on floating point values

Em Wed, Jun 15, 2022 at 10:16:32PM -0700, Ian Rogers escreveu:
> On Wed, Jun 8, 2022 at 10:47 PM kajoljain <[email protected]> wrote:
>
> > Patch looks fine to me
> >
> > Reviewed-By: Kajol Jain<[email protected]>
> >
>
> Thanks! Arnaldo, can this one go in?

Sure, applied.

- Arnaldo

> Ian
>
>
> >
> > On 5/27/22 07:36, Ian Rogers wrote:
> > > Pass the optional exponent component through to strtod that already
> > > supports it. We already have exponents in ScaleUnit and so this adds
> > > uniformity.
> > >
> > > Reported-by: Zhengjun Xing <[email protected]>
> > > Signed-off-by: Ian Rogers <[email protected]>
> > > ---
> > > tools/perf/tests/expr.c | 2 ++
> > > tools/perf/util/expr.l | 2 +-
> > > 2 files changed, 3 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/tools/perf/tests/expr.c b/tools/perf/tests/expr.c
> > > index d54c5371c6a6..5c0032fe93ae 100644
> > > --- a/tools/perf/tests/expr.c
> > > +++ b/tools/perf/tests/expr.c
> > > @@ -97,6 +97,8 @@ static int test__expr(struct test_suite *t
> > __maybe_unused, int subtest __maybe_u
> > > ret |= test(ctx, "2.2 > 2.2", 0);
> > > ret |= test(ctx, "2.2 < 1.1", 0);
> > > ret |= test(ctx, "1.1 > 2.2", 0);
> > > + ret |= test(ctx, "1.1e10 < 1.1e100", 1);
> > > + ret |= test(ctx, "1.1e2 > 1.1e-2", 1);
> > >
> > > if (ret) {
> > > expr__ctx_free(ctx);
> > > diff --git a/tools/perf/util/expr.l b/tools/perf/util/expr.l
> > > index 0a13eb20c814..4dc8edbfd9ce 100644
> > > --- a/tools/perf/util/expr.l
> > > +++ b/tools/perf/util/expr.l
> > > @@ -91,7 +91,7 @@ static int literal(yyscan_t scanner)
> > > }
> > > %}
> > >
> > > -number ([0-9]+\.?[0-9]*|[0-9]*\.?[0-9]+)
> > > +number ([0-9]+\.?[0-9]*|[0-9]*\.?[0-9]+)(e-?[0-9]+)?
> > >
> > > sch [-,=]
> > > spec \\{sch}
> >

--

- Arnaldo