From nobody Mon Feb 9 16:51:57 2026 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EB50E11C85 for ; Thu, 14 Mar 2024 05:51:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710395490; cv=none; b=fsvNJY8ZvtLL7R2jLlTH5zojyxnkPuzc/9kHlKNM1y/YUr8SjYiTgEeEQ32EB1lxZswQDoe40GKM6Q/w+p5GUhTsjMhwkg0v1QLz8PBY125lLGDZDQPSjgUKiqRO8n3qWqqQN53VcL5xCALl9O10EZnhNZlANbOVpWrA4eXErns= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710395490; c=relaxed/simple; bh=j1Uteud1mWr9qwRDjsafkmahAN/I9mDRvh5Ckh8gIQo=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=EI3WBS4ls4UeF8nhaEu527/hBudgNK9pEhKgglBq7Usu3c8w6AOvpFzpagAcK1vUWFt9SpvsT6FFWArTV55TQBSh12Ys4HMpWza67aFTBmHSnc8VN1LpVNkGfVBBGIISGQdzAyU5aJbVZSHz05TTVIWw7aqOsx6nt6TrL342vsk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Ixsn8cOj; arc=none smtp.client-ip=209.85.219.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Ixsn8cOj" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dc6ceade361so938636276.0 for ; Wed, 13 Mar 2024 22:51:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1710395488; x=1711000288; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=bBWDWJvSshoSjEVW3Suakt0O9q+vGDdTpywx5NXn+PM=; b=Ixsn8cOjAx0Rphql+mkLr1x8nVu2ueFwRt+a3RdTaOW2qUU/TJ+BbOkkTsy+4EQSFQ BtdlFAYWBeyyeFV9JQbRqZ3CEsrs8PYqLvP124lAVVSWGC7yoqjFhff4fC1FkaYj+Sfq BztnyPoC8qS1mgcSoWLMZxoFr4OPmqa2X9hRPrxg0YXseeTtUw1wU9R2WaXRYWt+SpRO hj37wu4yLs2rufBQcmD4nH989PKU2bx1Q05Q8HPcZGAcTLgIqLu5IUFW9aMEv/uGKaaa Eeu3oWPXHkjZb/cUybS2wfHZ0X/FdKaoJuk4mOVj80o98twVMT1EWPIVzZXY50dRFPOQ zCbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710395488; x=1711000288; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=bBWDWJvSshoSjEVW3Suakt0O9q+vGDdTpywx5NXn+PM=; b=b/IcM9+6hTeP2I7oDfUn2Ia1ezvIzWpQwMKfwfthM8ebBSS+3uqSVTM3/8qkxP/LP6 Tq3jdsWcnqM76yo86Oxed7s7vuX3g1BXRDbne7sw6O+r6ZQFyxsLAsjMWDmQP3CTO4UM Dw2CyWakmSfSHUkm/qv4EWdeuFJhEoOUKQrzOclCKHqBTm/B06IqCEOir7RD5hBjQfHF d7tvGVpZ6ajzcyPuY5E4CrCWGv2EjJlNoqKSGMOO7EPffht8nqWXU5yS9+/F9XVS6y7A GcoRN7+1DKedcwcYCAX5kFISHjX3ozvk0PXrStTXxKdfsPmYAbW74fG1goArZ/vR+x3G 5s4Q== X-Forwarded-Encrypted: i=1; AJvYcCVsoje8m8sSefkWlaWPyCyhm50HWengUcrA895kQJOif+CjALkDoILErFAbYxOZarVSSRtA7b+x760QiTtCuJo/afV/6Etmm91JFJ2z X-Gm-Message-State: AOJu0YxCdmNj94CDIC07rH6CL6YEGZrtRlq/jsPg+1ifSWdjzfUH52cq WTMD/+06xx8cXQb2QMeAjZ2q9lD7aeHcj5JPUPn8KHBaK5KgxMysNofbHv7ArOjLtAMSc4aaKUM sz+1nWQ== X-Google-Smtp-Source: AGHT+IFa7AP3IAGDDTK1TeUY6o785EBxZQfo4Yqw/fB+vYDzS43SHEh9iogU9Y+RZYdamDFOvOpYMXb0Ud1v X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:449f:3bde:a4cd:806a]) (user=irogers job=sendgmr) by 2002:a05:6902:e09:b0:dcb:abcc:62be with SMTP id df9-20020a0569020e0900b00dcbabcc62bemr260520ybb.6.1710395488045; Wed, 13 Mar 2024 22:51:28 -0700 (PDT) Date: Wed, 13 Mar 2024 22:50:44 -0700 In-Reply-To: <20240314055051.1960527-1-irogers@google.com> Message-Id: <20240314055051.1960527-6-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240314055051.1960527-1-irogers@google.com> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog Subject: [PATCH v3 05/12] perf jevents: Support parsing negative exponents From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , John Garry , Kan Liang , Jing Zhang , Thomas Richter , James Clark , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Andi Kleen , Kajol Jain , Sandipan Das , Ravi Bangoria , Perry Taylor , Samantha Alt , Caleb Biggers , Weilin Wang , Edward Baker , Stephane Eranian Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 --- 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/metric= .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) # Convert all the known keywords back from events to just the keyword keywords =3D ['if', 'else', 'min', 'max', 'd_ratio', 'source_count', 'ha= s_event', 'strcmp_cpuid_str'] for kw in keywords: diff --git a/tools/perf/pmu-events/metric_test.py b/tools/perf/pmu-events/m= etric_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) =20 + 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' --=20 2.44.0.278.ge034bb2e1d-goog