From nobody Thu Dec 11 19:04:03 2025 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.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 84B5D2D0C9F for ; Tue, 2 Dec 2025 17:51:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764697900; cv=none; b=q9UVPZe5gTAbSFN8Fk5zk1GwpX/7HnyKo7KwaunGBwLsG1kFrfBRqjWEpPXUh+hJG7DFzARF2ae1aysytxjr3wCv/rxfcpOye8q+Cb01S6epqs7xA+mpHnuKzMXhm4khs9hlyABb7DSynK1Qe9KIvdxv1sCC526S+rw7J0i2RaQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764697900; c=relaxed/simple; bh=jDM2keAq6JzZV0xeWQw8r6/oNg7uOTPVE1rsKGWrjvM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=Zz7DvO4s6vdZRL9RGLfhBL7jh9hQNjQmh+2Qn4pcWLYLPQKGnqQ+34uY07ighcMHFxlTljBDMbaDfRI40JFrOsWW3g+QRfktvT/A70qo3r+YK6pE24/fmsF/iCXhYJRH38d20qoZMmrolAst8zg1NpdpQeitqqAQ19JhdUAOXS4= 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=zF16tJMT; arc=none smtp.client-ip=209.85.215.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="zF16tJMT" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-bf06c3426b7so2087849a12.3 for ; Tue, 02 Dec 2025 09:51:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1764697899; x=1765302699; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=X8m+1Rep2c6fy/eFqYgnfb5iZa+BxpCo5oTQZvaCNcw=; b=zF16tJMTN0oCMoW6r5dsZ5zVylpgzoFn1uWFKolyD4dR8WmOVrm0MlEI1SRWkOV3F7 DNpS9lnwuf0vzb0xHxTprYjejfY4pXRaQ2LFgFsl2+u3xini6A+Be1I5nPSQE5n/QZcC M3rolm5yNnG8OHL/BuW6HppNOvHGx36gZ0mQuyhX0eAyEXDcy/xwM0N5LxQHoHO2M/Ss udXy4A1+Jhy0X62hWg2kkQ9nEzsPWCTVr8hzOC5cie36P87mewLgFc5RIteTlvEubbSE cC9GTd8KW1DNWEMwYsxNWgX089irpOGc8WKCkhRM8yyQBFn56Ru3eXWAiWVj4zAV5VJP etjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764697899; x=1765302699; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=X8m+1Rep2c6fy/eFqYgnfb5iZa+BxpCo5oTQZvaCNcw=; b=SV8MW2t7nwXYUR7j061a3x5CS/1vh7XiPEaugRC2r4cY2z8FTAoaoTstoC3y+ggD8v dThTmlCcIATQCFm5Yj/2njHJi8nNjIiQYpIEe7LMZAgf4PUsAxovtTUtCD4FjYV9K1/a Gtl0IIK4dSmfzZyL7JW3bHREq8G0ZyPl6trZif59BCxJJJiuZNpolbK8lieOBOFQ3xLf mZdJFjBaydRsgddRJr5DcOZ5x8ZTxV7cDYL8eCTVXkQ4weflQfA4m4Iu+TCBorpDn1pO jf9jgpVvM8lesajfxV/EjLiEuJnS3ZQ7CpnbXg4kzJw5uQDbwkchNLLI7wDcaXHf433B ls+w== X-Forwarded-Encrypted: i=1; AJvYcCUxnA8Dz1t5teamHW6YR7Y+tEzTUyzltbV/1hwKzmZE9e6nmMu6hqAdVIsZcBLhO9O/GNc+nS4l4A3A1Q0=@vger.kernel.org X-Gm-Message-State: AOJu0YxmugDnLf+md4t4eHyLQXj9Q1jWx81NAX6MDw/PS+WvGChybZwv FXWcNHETkn0MrnofcmA3C4j+sOlhDMn5MqX8A6og973WpEwUHlUJJsOiP8BgzLiJ5zZgKy7Z4eB 1EvGIi2hKbg== X-Google-Smtp-Source: AGHT+IFkCd9N6NIhwzGIwZmLg4mlvjlGzmjd171cvG4Dxf6lfWAM/Po6Fh7WLEOOcKuLpJDmX8ZrpKBrYGmJ X-Received: from dyer27.prod.google.com ([2002:a05:7300:231b:b0:2a4:6899:e5f0]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7301:db04:b0:2a7:27d:66e3 with SMTP id 5a478bee46e88-2a7190739f4mr21115142eec.2.1764697898880; Tue, 02 Dec 2025 09:51:38 -0800 (PST) Date: Tue, 2 Dec 2025 09:50:03 -0800 In-Reply-To: <20251202175043.623597-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251202175043.623597-1-irogers@google.com> X-Mailer: git-send-email 2.52.0.158.g65b55ccf14-goog Message-ID: <20251202175043.623597-9-irogers@google.com> Subject: [PATCH v9 08/48] perf jevents: Term list fix in event parsing From: Ian Rogers To: Adrian Hunter , Alexander Shishkin , Arnaldo Carvalho de Melo , Benjamin Gray , Caleb Biggers , Edward Baker , Ian Rogers , Ingo Molnar , James Clark , Jing Zhang , Jiri Olsa , John Garry , Leo Yan , Namhyung Kim , Perry Taylor , Peter Zijlstra , Samantha Alt , Sandipan Das , Thomas Falcon , Weilin Wang , Xu Yang , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Fix events seemingly broken apart at a comma. Signed-off-by: Ian Rogers Tested-by: Thomas Falcon --- tools/perf/pmu-events/metric.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/perf/pmu-events/metric.py b/tools/perf/pmu-events/metric= .py index 31eea2f45152..0f4e67e5cfea 100644 --- a/tools/perf/pmu-events/metric.py +++ b/tools/perf/pmu-events/metric.py @@ -568,6 +568,12 @@ def ParsePerfJson(orig: str) -> Expression: r'Event(r"\1")', py) # If it started with a # it should have been a literal, rather than an e= vent name py =3D re.sub(r'#Event\(r"([^"]*)"\)', r'Literal("#\1")', py) + # Fix events wrongly broken at a ',' + while True: + prev_py =3D py + py =3D re.sub(r'Event\(r"([^"]*)"\),Event\(r"([^"]*)"\)', r'Event(r"\1= ,\2")', py) + if py =3D=3D prev_py: + break # Convert accidentally converted hex constants ("0Event(r"xDEADBEEF)"") = back to a constant, # but keep it wrapped in Event(), otherwise Python drops the 0x prefix a= nd it gets interpreted as # a double by the Bison parser @@ -586,7 +592,6 @@ def ParsePerfJson(orig: str) -> Expression: parsed =3D ast.fix_missing_locations(parsed) return _Constify(eval(compile(parsed, orig, 'eval'))) =20 - def RewriteMetricsInTermsOfOthers(metrics: List[Tuple[str, str, Expression= ]] )-> Dict[Tuple[str, str], Expression]: """Shorten metrics by rewriting in terms of others. --=20 2.52.0.158.g65b55ccf14-goog