From nobody Fri Oct 3 06:35:32 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 D3C6927703A for ; Thu, 4 Sep 2025 19:41:49 +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=1757014911; cv=none; b=ci6BEcx0vDVcFebYPoYe6KEW6D3MfK6mg7qzaozRbcriw/6w6GhoyKre9WUqnZBV9lILIZ+mcqCmjVAt8Am0jCCAj9B3t/mbZEtIHwY+ohy9QdnMbeRw6MwJ/XIEUsUukpGnUZS0ZNi7VV844SlWNM0QFUj7LMDDl30esmlTFqQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757014911; c=relaxed/simple; bh=tq+7uK3RNkzWKqgghouLXQ6ydvGUzT8I9ujvOYYLYpY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=V/XH9jTQyz4Eiyjv8oioJzrVdi9ycFhwrrIV461SUCbZm9Ug3DbNMpagwMcwIS3GEdwE8ByeFBZkHcsgN0YwTaOUrb+9uUUG4GttOo9UA6lbNqDxh7SSm1HfgsZh5WwNlGaMDHE8WSZ3x9jQESe8dDgLnPaWl5MLjqbH35OMbJo= 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=sBS/cKkA; 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="sBS/cKkA" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-24c9304b7bcso15848715ad.3 for ; Thu, 04 Sep 2025 12:41:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1757014909; x=1757619709; 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=sLeowBwbmQjy8Diimn5aYxWMz09beruC8PAjvN25K+s=; b=sBS/cKkAD9wMWwySnSLBpKYWLe3myp6B7euAEvVp41ZMZ2WmS3lrpqwdUMT7kjQA/f Kp/VTg4WIpee1YixfwSM365tpFSdAyCk21CqtdGdgU1zDitvhysqqjiXQcrs9SOrFIhW 7o1Wmirt0bjcN1GIIsedl4jdaKp5DvB2fPAi9jH9AvPn1Kz6tnS4E0ScYa4Jmfti7gkq tEkfcoNQBKxlm2wF0Pcj6I18PwIoQD355gUT45Ua2Z7o6n1QIiCh85FIJY9xFdPh1Yzm rjc+ldPmuG9SSmBNJZQNuW07IHx4jQ4hFrmbyviXKmLblFpIbLL9KQ0PgLCRKKBc2Jsf RbZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757014909; x=1757619709; 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=sLeowBwbmQjy8Diimn5aYxWMz09beruC8PAjvN25K+s=; b=XKSavbiTKRLexn7kw2Jd9fNIUfpmPXEpmiOFfKbaQZlvvHQobHQKP+/kdoCGiwQnwL tmZ5DJff4WzoLn7kqPxcNfSbtqMWIU7tjLjMi0VVPhVbVBm0whJ9du1FTX6ah/aRLunX e0AR5KcECtmdP5r9X52YDZmkPw8rAu5peOLsdUmv4ecJS3Sl7dBem3iPqxlLpx7nXR0t F/250nklLJjnILJnbaV4SkVKXD3+/6PJ4G/zfOxQ1g77OO2kcoiHklgShz2H+vSVQFiq 6luIfr7XRSIcypKnOTnu+FlSJZKu02BFE1jCXnk6f5cGF0KO7n5g2Xd4cPhzWIDrsdtP 8Bdw== X-Forwarded-Encrypted: i=1; AJvYcCWvwqRaYZvM61EY6/SpWlQJTDPWcM1XOKI/+DTUr2xGtN0QAFyg9Fg0EiihrTedKt+nVKtocMQOOO5FvQ0=@vger.kernel.org X-Gm-Message-State: AOJu0YydIU/9kL9f7eam42OduKiUBNdDoGnRgIuVbRxXverblIZ/68dl TiG4LBOJ0eT5M18s0bczRO5aAGJ/1wCXbvjJvFoX0fdyAB0fm4lHcjKcfVYH47328JGVTTKbSQA TXO4C2WPuJA== X-Google-Smtp-Source: AGHT+IHOB6CqGG31C3TB2oFy7ZLtb/1XgDWq9belMrFQZ/ICWYQNjGIhyYl39Z21TKgn08wM23bNH8G4iN8z X-Received: from plblm13.prod.google.com ([2002:a17:903:298d:b0:248:9b66:3356]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:e84a:b0:24b:270e:56c0 with SMTP id d9443c01a7336-24b270e59d9mr133206195ad.36.1757014909264; Thu, 04 Sep 2025 12:41:49 -0700 (PDT) Date: Thu, 4 Sep 2025 12:41:39 -0700 In-Reply-To: <20250904194139.1540230-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: <20250904194139.1540230-1-irogers@google.com> X-Mailer: git-send-email 2.51.0.355.g5224444f11-goog Message-ID: <20250904194139.1540230-4-irogers@google.com> Subject: [PATCH v7 3/3] perf jevents: Validate that all names given an Event From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , James Clark , Xu Yang , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, John Garry , Jing Zhang , Sandipan Das , Benjamin Gray , Leo Yan 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.0.355.g5224444f11-goog