From nobody Mon Feb 9 15:26:05 2026 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (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 F0ADD14A8E for ; Thu, 14 Mar 2024 05:51:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710395492; cv=none; b=kx8K+He0fi+NqDxQNKUco0da6N7mQFvQxg2lAkGbXGj7aLvy9BUaspCR6POK6nV0CZXskSpAymqaviCPA7O297uVWTsYSRzFsQhjL8yp8qPjCtOO/GY1BUvT0h/GrQVSH3cmDqnKwxaHo97rrvYTD3b8lpVxZg51mTKsuaBNv60= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710395492; c=relaxed/simple; bh=oswX3i20yiaJHjTAeWqAXOG6a2/1Ta4qOMh9xoJeXu4=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=ax1YxUn9S7jWnkBzn16CyKWh0J+UbrzeQpFn2O3CKvVuXUeCzi7A9HJ5kKJp+JDnthXPOBtXfKGrUkzNt+HWokNZqivdRdZb8uRovqUc/z+QNKVpz2GptsRmcEL3kdrR62DEkUnyhHgNe+EiRM83S5QZ4XiRdf4iYiWvjL/VbFQ= 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=Z0SKOH5l; arc=none smtp.client-ip=209.85.128.201 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="Z0SKOH5l" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-60ab69a9e6fso16991137b3.0 for ; Wed, 13 Mar 2024 22:51:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1710395490; x=1711000290; 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=F9W2L65moWfkRODZWtj1+8FpZZOCQB/UnzNIcvAZEKE=; b=Z0SKOH5lBDXANRYDT3FT4OtVU/68DBsGFiAedYfoHYtmAtNZjcYdRi+bT/VG3Ge2m+ tKX2QWO0JlasGCCSH1SHWFMlaZci74YOFqlZhT0Yjgx4L3gHJnPxCP8qITe5VpXVPFm7 2LUOFALrcWicwLmzzLrOIBPzVC1Jg8XuVUQF30yt7zysz+6hUKxYGMYs6wM7DawEyfoc GIEC1MvYJuEdw3dEWKOpNFvc7BdJ6P9g6GXiYRT+JDfpjZ7PPt15a7L+Ep7KcGKoe/qy bfm37x+P1gcTFWuRxaURc9WO8OyS03qVQ8TuH5YDKnK1kNEKQd6XGKeMo/CfEkmdXuNh 1RJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710395490; x=1711000290; 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=F9W2L65moWfkRODZWtj1+8FpZZOCQB/UnzNIcvAZEKE=; b=GDeBmMbo4mZ8e9pdJSRUvl0AfTHBtIQb5ng5uymj9rYvtVe4JuAZljxFF2C2FhCeoo AGUzgceq2To2tJhO4Y22LK755C3OXxDEezioKk11Yr+ctEk3WboZnBiqUvWnvhiGTbTa Q/HrrbSPq1nETtlGkaMysVociQ2uVJxRJana1DoeEhtAGmUVVZ2V/xJGTWEXBFa/HPg4 YdnW9IUlSg6uf6RxMkLw5soEO+gfrMQ0+5X8W0+blW160SMjWp46wpP+kQdVxa8B1clF 5ZKPYkQ5560PWLvQlO7rTyh9wDH/MJ8uwpwH0F1zP9KL3fZ381GUxF0yGiHLQmST8Kt4 wrqQ== X-Forwarded-Encrypted: i=1; AJvYcCXXLUcCc4KisoWodEW3Fdb/l818uVToAvsz9c/so+VwpzFPuyimt9AxWeIks8cY4+D3VJdaN0BaH/z/TENNy6mrN8HybC49dMEHLp9z X-Gm-Message-State: AOJu0Yy9R59h92MH8SXtMm5SqSeILBOKqf+pK7BgHvAs2EFYpfSofiN2 ZWSWN9g2ZdieDm9Sus2taIHrT7bhqqCgiTUGgWi6aG0se4uShjNuAmtKuTn64YXQUQx+yrg579Y KUxv2FA== X-Google-Smtp-Source: AGHT+IEWSnrDCNmwOwoNayo+Na8bh0N+7sXrpF4N0p5X7i9MQDILAXeEfZ+11sj+7d1o+2cE64r68zbGMoSY X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:449f:3bde:a4cd:806a]) (user=irogers job=sendgmr) by 2002:a81:5255:0:b0:60c:3c63:92a with SMTP id g82-20020a815255000000b0060c3c63092amr238651ywb.0.1710395490226; Wed, 13 Mar 2024 22:51:30 -0700 (PDT) Date: Wed, 13 Mar 2024 22:50:45 -0700 In-Reply-To: <20240314055051.1960527-1-irogers@google.com> Message-Id: <20240314055051.1960527-7-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 06/12] perf jevents: Term list fix in event parsing 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" 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.44.0.278.ge034bb2e1d-goog