summaryrefslogtreecommitdiffstats
path: root/tools/perf/util
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2020-05-19 23:36:52 -0700
committerArnaldo Carvalho de Melo <acme@redhat.com>2020-05-28 10:03:27 -0300
commita45badc7392b4613708748f6a2cc0c6f63a1c8d6 (patch)
treec34d905a6e0f52add9f0310243c3c48e4091833f /tools/perf/util
parent45db55f2ef5e98ef096096efad975dc684a9493f (diff)
downloadlinux-stable-a45badc7392b4613708748f6a2cc0c6f63a1c8d6.tar.gz
linux-stable-a45badc7392b4613708748f6a2cc0c6f63a1c8d6.tar.bz2
linux-stable-a45badc7392b4613708748f6a2cc0c6f63a1c8d6.zip
perf expr: Allow numbers to be followed by a dot
Metrics like UNC_M_POWER_SELF_REFRESH encode 100 as "100." and consequently the 100 is treated as a symbol. Alter the regular expression to allow the dot to be before or after the number. Note, this passed the pmu-events test as that tests the validity of a number using strtod rather than lex code. strtod allows the dot after. Add a test for this behavior. Fixes: 26226a97724d (perf expr: Move expr lexer to flex) Signed-off-by: Ian Rogers <irogers@google.com> Acked-by: Jiri Olsa <jolsa@redhat.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: John Garry <john.garry@huawei.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Clarke <pc@us.ibm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util')
-rw-r--r--tools/perf/util/expr.l2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/expr.l b/tools/perf/util/expr.l
index ceab11bea6f9..f397bf8b1a48 100644
--- a/tools/perf/util/expr.l
+++ b/tools/perf/util/expr.l
@@ -81,7 +81,7 @@ static int str(yyscan_t scanner, int token, int runtime)
}
%}
-number [0-9]*\.?[0-9]+
+number ([0-9]+\.?[0-9]*|[0-9]*\.?[0-9]+)
sch [-,=]
spec \\{sch}