Received-SPF: pass (google.com: domain of linux-kernel+bounces-93420-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Precedence: bulk
MIME-Version: 1.0
References: <20240302005950.2847058-1-irogers@google.com> <20240302005950.2847058-6-irogers@google.com>
In-Reply-To: <20240302005950.2847058-6-irogers@google.com>
From: Namhyung Kim <namhyung@kernel.org>
Date: Tue, 5 Mar 2024 23:20:44 -0800
Message-ID: <CAM9d7cjVE=gH8A4zzsUFwLibgHy=3C71UnFe5SEu-RDFTOWkDw@mail.gmail.com>
Subject: Re: [PATCH v2 05/12] perf jevents: Support parsing negative exponents
To: Ian Rogers <irogers@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>, 
	Arnaldo Carvalho de Melo <acme@kernel.org>, Mark Rutland <mark.rutland@arm.com>, 
	Alexander Shishkin <alexander.shishkin@linux.intel.com>, Jiri Olsa <jolsa@kernel.org>, 
	Adrian Hunter <adrian.hunter@intel.com>, John Garry <john.g.garry@oracle.com>, 
	Kan Liang <kan.liang@linux.intel.com>, Jing Zhang <renyu.zj@linux.alibaba.com>, 
	Thomas Richter <tmricht@linux.ibm.com>, James Clark <james.clark@arm.com>, 
	linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, 
	Andi Kleen <ak@linux.intel.com>, Kajol Jain <kjain@linux.ibm.com>, 
	Sandipan Das <sandipan.das@amd.com>, Ravi Bangoria <ravi.bangoria@amd.com>, 
	Perry Taylor <perry.taylor@intel.com>, Samantha Alt <samantha.alt@intel.com>, 
	Caleb Biggers <caleb.biggers@intel.com>, Weilin Wang <weilin.wang@intel.com>, 
	Edward Baker <edward.baker@intel.com>, Stephane Eranian <eranian@google.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Fri, Mar 1, 2024 at 5:00=E2=80=AFPM Ian Rogers <irogers@google.com> wrot=
e:
>
> Support negative exponents when parsing from a json metric string by
> making the numbers after the 'e' optional in the 'Event' insertion fix
> up.
>
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
>  tools/perf/pmu-events/metric.py      | 2 +-
>  tools/perf/pmu-events/metric_test.py | 4 ++++
>  2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/pmu-events/metric.py b/tools/perf/pmu-events/metr=
ic.py
> index 847b614d40d5..31eea2f45152 100644
> --- a/tools/perf/pmu-events/metric.py
> +++ b/tools/perf/pmu-events/metric.py
> @@ -573,7 +573,7 @@ def ParsePerfJson(orig: str) -> Expression:
>    # a double by the Bison parser
>    py =3D re.sub(r'0Event\(r"[xX]([0-9a-fA-F]*)"\)', r'Event("0x\1")', py=
)
>    # Convert accidentally converted scientific notation constants back
> -  py =3D re.sub(r'([0-9]+)Event\(r"(e[0-9]+)"\)', r'\1\2', py)
> +  py =3D re.sub(r'([0-9]+)Event\(r"(e[0-9]*)"\)', r'\1\2', py)

I don't understand how it can handle negative numbers.
Why isn't it like Event\(r"(e-?[0-9]+)"\) ?

Thanks,
Namhyung


>    # Convert all the known keywords back from events to just the keyword
>    keywords =3D ['if', 'else', 'min', 'max', 'd_ratio', 'source_count', '=
has_event', 'strcmp_cpuid_str']
>    for kw in keywords:
> diff --git a/tools/perf/pmu-events/metric_test.py b/tools/perf/pmu-events=
/metric_test.py
> index ee22ff43ddd7..8acfe4652b55 100755
> --- a/tools/perf/pmu-events/metric_test.py
> +++ b/tools/perf/pmu-events/metric_test.py
> @@ -61,6 +61,10 @@ class TestMetricExpressions(unittest.TestCase):
>      after =3D before
>      self.assertEqual(ParsePerfJson(before).ToPerfJson(), after)
>
> +    before =3D r'a + 3e-12 + b'
> +    after =3D before
> +    self.assertEqual(ParsePerfJson(before).ToPerfJson(), after)
> +
>    def test_IfElseTests(self):
>      # if-else needs rewriting to Select and back.
>      before =3D r'Event1 if #smt_on else Event2'
> --
> 2.44.0.278.ge034bb2e1d-goog
>