From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 761EBC3DA7F for ; Mon, 5 Aug 2024 19:47:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:To:From:Subject :References:Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=NGlP+W+E1rzo+Hc23sUegbyHJcwAQCTmYUNWikKKi2I=; b=y+QE3RHlieHaLdhn/3NlfIgstq fZJA0REEanEWkgoQvVBqbNkZr2FE3FkaHVUZfiAtwelWRhcSljsQrZlxWYhYAQPU90Igqa8vG8xgY h/pXDE3sPMK7L92B08TXqVbOs55qws6Gfxz2Ff+xruk5nVwYWB9SAFk2MX96BG5GuuFGagoJDJQHc x0mbVKm4Ut8/7Hvvdu18RHuMwGSFTs0lXbWdJ0wG0JERKjBvTU4Y+E4METAfe9R6IlcIaWpTp9nnb G8OT+5VgIfPv/F+9/Bpqx2qj+7UxHwi3zmeiU9GCq6jCAh3iHxWQopTuC+OrlRt9+Ihx23jSkAOGy 2n2Rm31w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sb3fo-0000000H4RX-3q25; Mon, 05 Aug 2024 19:47:17 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sb3dL-0000000H3Yp-0m8q for linux-arm-kernel@lists.infradead.org; Mon, 05 Aug 2024 19:44:45 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-e0b8fa94718so14980376276.0 for ; Mon, 05 Aug 2024 12:44:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1722887081; x=1723491881; darn=lists.infradead.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=NGlP+W+E1rzo+Hc23sUegbyHJcwAQCTmYUNWikKKi2I=; b=NqNH6Hw1V3A5ATM7MO3K2Kzrc6MQU6fzH9epH0FNQDJJIwT0ImNfbnXYYGzOZ3coxQ zE6Jb4MQ/E/g1AIgFbz7Sy4DIGHoCm9ikJ5I8clm4NI8Y2QzEZ79mA05KqVkvXxWmGe/ WzVr+Glm9IUM36g3RF0ZRjTIyk26DrJkiD/4cwKUP0FD2MSKzhWJcm6LhU8+GkSuofWF Qszor6fg2s7ZBshHuRS4A6QshimtiG+g00QJ5D3VPwn0m3B1g7r5sXRLXUnQGk2v7o42 uJZRK5OPuvJ8CTvIZfaXPlqnyVKFf6UNQcfL7UPH1u32DpHkuvYFgpjaCR7hWiZwek1K sj7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722887081; x=1723491881; 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=NGlP+W+E1rzo+Hc23sUegbyHJcwAQCTmYUNWikKKi2I=; b=q4XdDupm1CjLXmpsdr8YXs206OJptrNfJ4NQoknNp6nkNKug/3upxS0dl9hL2Veo2T hpcjpPU/c5+AII8vLKh8ansiU9ink2QQRfdZ6b1aOFcyx1HB7vChY54gvBigJDpNsvWQ 7/eBvPqRZ1dRZ/QwhTdYiTy0uIHhzamC3OBA2iuXpPoJ7yzzErt0EnQ1Qte3LoYJTteU r5ybsQvimF2jzwM6dNIZFWmgKBegDy89xWubzaPtW7xDq7eZRwuDpAjlxON35B2rZdeq +8X+bzEuAXnGa63gFGjUx/QK1tSproGm/ZJmUQQzueMOIEcULiMNTJbqxhv6q7LLyJqJ XVhg== X-Forwarded-Encrypted: i=1; AJvYcCVS7GZVk/tbXvzAKF3T8WowDJP96q69OTXzOZgJEVeQTis49cg1tgsn5AcGt9vdO5RBuQlVdYba33ObZWeYGM26cZlUeZ02O9M5JbVVqTO574B7LoA= X-Gm-Message-State: AOJu0Yw0WqlrdXZRMx3rKFsStAlo5217vHs2Kvfpi1js5D42GVxSN9fQ VcZ1Us4ctb2GcIiAhJYI+TXdgdj626uIESg88o9hKGt4iklmpdWMKzxTockqi7Dd+cEV/R7LhEY p1hb5Zw== X-Google-Smtp-Source: AGHT+IE+AeucgMIyAO3Z0FES/ae0JgHq8LbXGHTnVeU3bAh9HD4a6vZXuMVuSJRiYYFv5skWk5Mgq+Gnxr3N X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:1f65:8dc8:61d0:4b08]) (user=irogers job=sendgmr) by 2002:a05:6902:705:b0:e0e:3f14:c29d with SMTP id 3f1490d57ef6-e0e3f14cae8mr166124276.4.1722887081584; Mon, 05 Aug 2024 12:44:41 -0700 (PDT) Date: Mon, 5 Aug 2024 12:44:24 -0700 In-Reply-To: <20240805194424.597244-1-irogers@google.com> Message-Id: <20240805194424.597244-5-irogers@google.com> Mime-Version: 1.0 References: <20240805194424.597244-1-irogers@google.com> X-Mailer: git-send-email 2.46.0.rc2.264.g509ed76dc8-goog Subject: [PATCH v1 5/5] perf jevents.py: Ensure event names aren't duplicated 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 , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Paul Walmsley , Palmer Dabbelt , Albert Ou , Samuel Holland , Charles Ci-Jyun Wu , Locus Wei-Han Chen , Atish Patra , Ji Sheng Teoh , Inochi Amaoto , Jing Zhang , Xu Yang , Sandipan Das , Guilherme Amadio , Changbin Du , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-riscv@lists.infradead.org, vincent.chen@sifive.com, greentime.hu@sifive.com, Eric Lin Content-Type: text/plain; charset="UTF-8" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240805_124443_274122_E04C8D81 X-CRM114-Status: GOOD ( 11.48 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Duplicate event names break invariants in perf list. Assert that an event name isn't duplicated so that broken json won't build. Signed-off-by: Ian Rogers --- tools/perf/pmu-events/jevents.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jevents.py index fcf0158438b5..1d96b2204e52 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -503,8 +503,11 @@ def print_pending_events() -> None: first = True last_pmu = None + last_name = None pmus = set() for event in sorted(_pending_events, key=event_cmp_key): + if last_pmu and last_pmu == event.pmu: + assert event.name != last_name, f"Duplicate event: {last_pmu}/{last_name}/ in {_pending_events_tblname}" if event.pmu != last_pmu: if not first: _args.output_file.write('};\n') @@ -516,6 +519,7 @@ def print_pending_events() -> None: pmus.add((event.pmu, pmu_name)) _args.output_file.write(event.to_c_string(metric=False)) + last_name = event.name _pending_events = [] _args.output_file.write(f""" -- 2.46.0.rc2.264.g509ed76dc8-goog