From nobody Tue Dec 9 03:42:38 2025 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.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 8546B289811 for ; Thu, 13 Nov 2025 03:21:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763004071; cv=none; b=iOHZ5SGNy2eiF3uoAmwg06Jh0OKkOcCAlyCsQomMM9kC4P8I4VLSLHN20+NKnYOjeqEU9XNiVTkYb9YLzQsaSxljkySyJBNbxmmfS8OhaIlLPxAD07KsA7uEfAsTgA1n5unoBakj2DKe9jqwmBxbvOvBPvx+wNCN+O3WaaUtk94= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763004071; c=relaxed/simple; bh=IuI0DBDwoxo5ySbCWplL1dPTgS4OKxYpJaT94wcANoU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=ZKaE7cScvyOHVuP9PeTVAse61YJyqiLN+99FMogD3M+X2Ie65BoDViqmwE28iMGohOjXEN5+VnHoQ+F40FU1hsdyxMDja/ihQViePyAeL1HEi/ckfb7eKTqSfI08A/nP1tPCzaX84LU7kfP5uEjue7yOP0AIEB/DX+GPGNs/ypk= 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=gP3D0K1R; arc=none smtp.client-ip=209.85.214.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="gP3D0K1R" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-297dde580c8so10724975ad.1 for ; Wed, 12 Nov 2025 19:21:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1763004070; x=1763608870; 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=y5goI1b2CVDlVAFfDby5CniqVJA/yvNmGYJuLu24zbE=; b=gP3D0K1RB4oLkf6kuiuf4y8xwhOmiLAVDNQ5+tmUcL2g/Va+FmRbQmnXp/IwIPGxtd ZOKvvpHYPs2ePhFUXSSQRL7kBt0fGUSrF7Vm6wSuB7BCGL46elxlUIIq7D6gNIiqrY9r gIP+7XwREV+al+8TIXPyLNyvS2iqZObOt6dyen/jxwnBc9Nc6rcN7A7fIYVwGyJf9ZO2 klsaziWYbJQJk1lAiUK6ZUDVQaZJ0Nlonw66q9EEmFpcGh6SHDqYxKBBxwouCfUczNhu EeKDKPl2tiOtIASjtm5hIgoe6l01LhuGoxfL5UyJi5qPeJsIlZkwrmmw69UvFDntbvOk BcIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763004070; x=1763608870; 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=y5goI1b2CVDlVAFfDby5CniqVJA/yvNmGYJuLu24zbE=; b=DvMm5gIb9UATmnHQgBIslAheYJfCep4gbXhDRvS0n5VgzfrzFerwL7CKEUd7RFbd7f PGZqNtTg81smPyhb1O0m2kPE2wb5Wf6Lx2624rADQDuQuT5NoqAOAfMLl5oGw8llXD2F sz0cdu9tlYQ3WCdwGNQU56xNuwHdeWXLt2js8NmgIP/QsulK6BLyZGBZMgBKYUiGgzpp VaWR4JDaeledBUG85PM4NP9FwW3/jLdT5klXeZNmFEhkRPZkeRlTMmhfUgoWIMRDRda8 uN8DMUNz4GKjzFntB2uUjpmB0haWBkfhTdVUD4MYMyR1YDOwFhUFSNElx2rMgF3aQ9BH ImPg== X-Forwarded-Encrypted: i=1; AJvYcCWOABFxmJlYM7d463/ODqr8CdrVeRNPislfr3jYqAqOBZ6QT6GlE7Yufe+VAJ9JYwARcbIevIGA5AZccMI=@vger.kernel.org X-Gm-Message-State: AOJu0YworaiJi5RPGiCR0OOAIVllaefikrDhU0fPxBNLKsCzHO62rYM1 6eU3q2gz9h6Hzj9xn1v5KuJl8Knco59qRfesmsDboURKoFcxixbwPVRtMAJhAZJAvqjuaTywvjJ /8wdq9rcLzg== X-Google-Smtp-Source: AGHT+IFzScfXqjEwErWjXv1s4AzfZSABbYxXa0s96vKLlASb+dEtIhbvJSQOMZbQgHT6eoxz6akNYvCtVbyU X-Received: from dycnb15.prod.google.com ([2002:a05:7301:b0f:b0:2a4:4f7b:275d]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:fc84:b0:297:dfc8:8fd with SMTP id d9443c01a7336-2984edefeeamr69482385ad.51.1763004069976; Wed, 12 Nov 2025 19:21:09 -0800 (PST) Date: Wed, 12 Nov 2025 19:19:56 -0800 In-Reply-To: <20251113032040.1994090-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: <20251113032040.1994090-1-irogers@google.com> X-Mailer: git-send-email 2.51.2.1041.gc1ab5b90ca-goog Message-ID: <20251113032040.1994090-9-irogers@google.com> Subject: [PATCH v8 08/52] 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 --- 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.51.2.1041.gc1ab5b90ca-goog