From nobody Tue Dec 9 03:43:13 2025 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.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 11087320CD5 for ; Thu, 13 Nov 2025 03:22:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763004154; cv=none; b=UqQZWdq8qez5FLNzYVzNpM3q0W5EGOY9DsHSjnuU1aWtCDl+0pDo4zc7DC5h264UtDntUavFwQDlUYw9NO1WFlK6+DJE2HdAbvuB8vXMAaW3enN9bjPE1hXC8A5rJF1CRAs0lo34rMGHJj/saEn0ko2mOEmG6sb8qao7AFH4JdM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763004154; c=relaxed/simple; bh=PYYj0BU/XGMQcfYDNwI5vZ9QIwJJl77gXefIpVh8h6k=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=iTvS3VgpwIOJX3UwBQy1X6JgTrou8T1E8VbZyMvskTeT0NOftaUe/0yfhODkJu83SIlt8olDvWy5MlWhYMGojm90pq6TaEVYeHKUrPvnTpC21d5vfMUXwg7+R1K4yQLEft+sII4Rbfqz833YSVjsiwqz12ZZMc7lc8oBedjBiHA= 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=z1jwEihb; arc=none smtp.client-ip=209.85.214.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="z1jwEihb" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2958a134514so4598605ad.2 for ; Wed, 12 Nov 2025 19:22:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1763004152; x=1763608952; 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=EpiV5EOs3sfeUi27FfFfkzyZAK5h+RJI1H4AImCQC2s=; b=z1jwEihb833qgx6lwt7G8LED0bvXxjOmoXKk2hli9jK+YfiOuXIjV8NF3VgYxuwZKk tUDNSzPsxCYB7swJVTXtlSbSaGlOJ2Q20y3EDrYxVghVKdmKvLUS110HPERQEPICUBf5 3A00aBzVeELOlnSpDxbcBrgjVRoBvXGWpdcIj1H9FspcTToz/i8OivKnw6AUkVp4lftC ouFL8yD5Sxk73wxXB+Q9RXv1CN9jxS/apo3vFJhVe8fXF77zAUdolzarhoxvP7QK3Eap n27gQBsOO73lnihX20xXn6MfP13AzsgQrKbFEnaomlijj9PWjL40E4RRyuWlMGNJGQQt GX7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763004152; x=1763608952; 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=EpiV5EOs3sfeUi27FfFfkzyZAK5h+RJI1H4AImCQC2s=; b=s58N2c7CGJTtIdRRULyPEEqlj0yz/UXLFiRMXAn2+puE72ESMogar5HSOVkcKMaDsS no99XMkMEwrroiiPHr8CEDV2895mxQYYywcb4GE+/5TL6h6YyuqbcIpPokgrGY0ki+eQ hRF76LJ4W/pMsKAq2j7YN/bMpmz0GDiyJXrhPLMU8jJCIEgyqt6Hql0K79LwmlpFgPPv ihzlnfjnh4IwHjwLVaHLYzWKzTMsE4Z92odnN2ci1y83IjB8eevlAYrc29VyRxYvssM3 wijh/xsXcYuV0do0VqeAGLS3OKNj4zHgs7woJDZE6yIFAU3yrvy9Zb9X4cAhCunxSYuA 9DQg== X-Forwarded-Encrypted: i=1; AJvYcCWxKSpNyEVyJ5cqEFe3VBKJ5ebIf7hZgTmX/RvCZnW3DXZxv2uKIcg6BMYC5KKGtIzXD895UtTB0rXP8hU=@vger.kernel.org X-Gm-Message-State: AOJu0YzcgoHuHDwp/71/5dt6+okiUNmGjPl7W2XRJmHF6V6PfVpowRDn vgEe1HqP8Wanw+pNIHAML2D+kK2QltcBFXSdm/LZKQm0K9bqxJ3sqTCo4Y2IWNph5+ZnfLkVath h/DxGyPF9Vw== X-Google-Smtp-Source: AGHT+IGwLbEYZHnLyWaZ1D+XpbNhBJmfreqS26xY8slF2pPAsU5UgWmp2DKmUKpTsYFsPo2XCG9i/zA5d4VO X-Received: from dycrq23.prod.google.com ([2002:a05:693c:2c17:b0:2a4:633b:7a61]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:ce10:b0:298:3a2f:2333 with SMTP id d9443c01a7336-2984ede9f70mr69159195ad.31.1763004152511; Wed, 12 Nov 2025 19:22:32 -0800 (PST) Date: Wed, 12 Nov 2025 19:20:40 -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-53-irogers@google.com> Subject: [PATCH v8 52/52] perf jevents: Validate that all names given an Event 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" Validate they exist in a json file from one directory found from one directory above the model's json directory. This avoids broken fallback encodings being created. Signed-off-by: Ian Rogers --- tools/perf/pmu-events/metric.py | 36 +++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/tools/perf/pmu-events/metric.py b/tools/perf/pmu-events/metric= .py index 2029b6e28365..585454828c2f 100644 --- a/tools/perf/pmu-events/metric.py +++ b/tools/perf/pmu-events/metric.py @@ -11,12 +11,14 @@ from typing import Dict, List, Optional, Set, Tuple, Un= ion all_pmus =3D set() all_events =3D set() experimental_events =3D set() +all_events_all_models =3D set() =20 def LoadEvents(directory: str) -> None: """Populate a global set of all known events for the purpose of validati= ng Event names""" global all_pmus global all_events global experimental_events + global all_events_all_models all_events =3D { "context\\-switches", "cpu\\-cycles", @@ -42,6 +44,20 @@ def LoadEvents(directory: str) -> None: # The generated directory may be the same as the input, which # causes partial json files. Ignore errors. pass + all_events_all_models =3D all_events.copy() + for root, dirs, files in os.walk(directory + ".."): + for filename in files: + if filename.endswith(".json"): + try: + for x in json.load(open(f"{root}/{filename}")): + if "EventName" in x: + all_events_all_models.add(x["EventName"]) + elif "ArchStdEvent" in x: + all_events_all_models.add(x["ArchStdEvent"]) + except json.decoder.JSONDecodeError: + # The generated directory may be the same as the input, which + # causes partial json files. Ignore errors. + pass =20 =20 def CheckPmu(name: str) -> bool: @@ -64,6 +80,25 @@ def CheckEvent(name: str) -> bool: =20 return name in all_events =20 +def CheckEveryEvent(*names: str) -> None: + """Check all the events exist in at least one json file""" + global all_events_all_models + if len(all_events_all_models) =3D=3D 0: + assert len(names) =3D=3D 1, f"Cannot determine valid events in {names}" + # No events loaded so assume any event is good. + return + + for name in names: + # Remove trailing modifier. + if ':' in name: + name =3D name[:name.find(':')] + elif '/' in name: + name =3D name[:name.find('/')] + if any([name.startswith(x) for x in ['amd', 'arm', 'cpu', 'msr', 'po= wer']]): + continue + if name not in all_events_all_models: + raise Exception(f"Is {name} a named json event?") + =20 def IsExperimentalEvent(name: str) -> bool: global experimental_events @@ -403,6 +438,7 @@ class Event(Expression): =20 def __init__(self, *args: str): error =3D "" + CheckEveryEvent(*args) for name in args: if CheckEvent(name): self.name =3D _FixEscapes(name) --=20 2.51.2.1041.gc1ab5b90ca-goog