perf expr: Allow exponents on floating point values

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

Posted by Ian Rogers 3 years, 11 months ago

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 <zhengjun.xing@linux.intel.com>
Signed-off-by: Ian Rogers <irogers@google.com>
---
 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

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

Posted by kajoljain 3 years, 10 months ago

Patch looks fine to me

Reviewed-By: Kajol Jain<kjain@linux.ibm.com>


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 <zhengjun.xing@linux.intel.com>
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
>  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}

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

Posted by Ian Rogers 3 years, 10 months ago

On Thu, May 26, 2022 at 7:06 PM Ian Rogers <irogers@google.com> 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 <zhengjun.xing@linux.intel.com>
> Signed-off-by: Ian Rogers <irogers@google.com>

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
>