From nobody Thu Dec 11 19:16:21 2025 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.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 75D4F2EA158 for ; Tue, 2 Dec 2025 17:54:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764698086; cv=none; b=M4Krjc1f/Y5vUunrCFHDO+IS+00o6ovPF96q+ArFpjnXNtHGmCnoefGSFBQrgUKE4Py0s/0YOoBX6ieYIhS6p+nrgY1rXBcrBMBna8tPklSVCzL5EeQVOWrlThIDmN5O3bcsaLkaWImOyJA5rEAfxh4AkQ64vxLr5Uv9dh/UoEw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764698086; c=relaxed/simple; bh=NThdRYCNtlYSZW1PU5R9Tup9FW5EJkaG8hpy/1kktlg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=mTNAU6w2GrXMFwtjLRa5fNQZNXIFOajfu17glQlqWRSdydw2WIqUYsWy3Lv3F2TvE49w3TADEaGADPyQKl49yKhbkv6EfpXv9Z9Xeu6oLym6Paabrfe1MJuvDreSdewr0olGPXw9xKMau/V/gyV78Lwvds0nG3BLI06t7aieGMQ= 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=shEfZGmt; arc=none smtp.client-ip=209.85.215.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="shEfZGmt" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-b98e6ff908aso12797491a12.2 for ; Tue, 02 Dec 2025 09:54:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1764698084; x=1765302884; 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=hpG0g9svAOA/ifhIkPcMdbZNaWTbft53MOj1l178nKA=; b=shEfZGmtPRn2Ckv/7iXxnjPMkKEldOunYM1vCQe0DB5vrSgmArPKTDQ4kNtc46opiB daepG1FgaeQev1iDduTCAbhkPlTHoRIX/tcpZXRRTXMK5toP/uJPkoL3kSe5m+ncUdKB hA4/74PEJACYP5oaHsm5OyRnWa0vpsxVTWxjKz64zQl+cdwcplKcTOKV+WkkkNvketo8 LSHfru8vSa2JonE3Xb4BFwmeUJhFIh2JfXIttwHcYXNRV6swKjG86Xllvf25E8zkWeIw dvEGyNTl4GUNiqQOI+g6sjlEwc04/mrwvHGHZ4ScWgia1amXMlUAJfEFFjxH1cX9cEdH awsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764698084; x=1765302884; 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=hpG0g9svAOA/ifhIkPcMdbZNaWTbft53MOj1l178nKA=; b=ZFp2HQZ3A7KrE8YI5yqfGnXDA2bdXwAz9EDzy/VbY3bEPddRvuuu8pyl/ly1X/CxAq klIXud7/pZ80NCk5Sq59YKov2n7IIWPnrXBbEnnSfoM5jDHbB1E2rqdow2X6gz3Ae0QP Kqe6fJbpAkUSDayJjjIK9KLEtCCiUFuX0vq8y+/k/IXN8/yX6lgiVChBn3MrZ4cEY3on 3DYUNry/wYM8jYU1EttcK8Xsh/YtTXthYrzgDn8/Gs8ArNp7MYoRBsF+iDq4Rd2R8duf VAMTuob4Ry2dG/JiAJGu6/zY+iBows6tQ7DtekI8WkiHt+BhtU9roUaGY/S3Oy6nvA0r tsqA== X-Forwarded-Encrypted: i=1; AJvYcCXY9r6tYkeoEyJP/H/BozGadainKexV1P9D6s4gwV220GQfJSAqcFKLeeua4CmZl/T5Ff1dKDfEBlmnNKI=@vger.kernel.org X-Gm-Message-State: AOJu0YzhwW1XYz+OOOD5IUWLGJBPtbuS1dDjDDtX3v3pKoIgUoyt824l mGYJYYSEgd9Maj2AfElP8CpgmiPYVySnL/hfdOUrrebwFD8nm0po5XsRbf4zCuoW5DjranKxGBh dbFi5aEUtWA== X-Google-Smtp-Source: AGHT+IEiOJtx1L/vRmXs2XCuIRpwv4DZI8C4Zm/hXM1RlAj8t+Am6utsOUHU4zFQZAoy0PPuTzlTeoM7fhXo X-Received: from dycnl9.prod.google.com ([2002:a05:7300:d109:b0:2a2:2846:c4f7]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:7f01:b0:2a4:3592:cf7c with SMTP id 5a478bee46e88-2a94189ac9dmr16149909eec.32.1764698083732; Tue, 02 Dec 2025 09:54:43 -0800 (PST) Date: Tue, 2 Dec 2025 09:50:43 -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-49-irogers@google.com> Subject: [PATCH v9 48/48] 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 Tested-by: Thomas Falcon --- 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.52.0.158.g65b55ccf14-goog