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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 387C5C25B08 for ; Thu, 4 Aug 2022 22:18:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239745AbiHDWSa (ORCPT ); Thu, 4 Aug 2022 18:18:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239634AbiHDWS3 (ORCPT ); Thu, 4 Aug 2022 18:18:29 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D09CF6E2CF for ; Thu, 4 Aug 2022 15:18:28 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id bt7-20020a056902136700b006777a976adfso576027ybb.20 for ; Thu, 04 Aug 2022 15:18:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc; bh=N++Mrhq6kQeFrF8RmnJUsnk+16Uv6ufZYhZg1IA0uDA=; b=TXD73nrJU+7eARBRcGR55uk4+DwtVJBAQxSiOVKpyhrRZ5RO7RndxUr8lO+mmzD4T2 BrmRQ3He1TQzRs029LnPWblE5dDPet7+BdRpqE++iRb8WKUkWedWWxDuC9LNd6CK/9Ls XQzmnEiLmYEUmR6zXQxllkqPR7bc6ihVYbrExoW3EK5EzMwEL61px4MxFO9qSKyoPdeB vQYyXhVQEiRbh4P7lnLmVwTfQLwukDO+GiT0AcC+Usl7ncPvlPu6IuVxZQjwhoVd7KXU 439AEoMLzX8I1tlwlwoC3jRIbz6ON9tce+YmPNEV4jmtBaGSTw0iXPfg1Pr7xiY5YobC HIJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc; bh=N++Mrhq6kQeFrF8RmnJUsnk+16Uv6ufZYhZg1IA0uDA=; b=a4glUQ42slxdIupS5yMHtmsR0y/oPGLMnFQKA0867dsVUctRLZK6gKkQDkkBvZIQ+h ZO/I+otI2ccNRvxu3246f26MaD1oLjXQuEDYlcoK/d1/GRJn13dxytZSrK4Av1hGE+iA poewCqwMQ0MEEbLhfuW7n2i+9f0Bwi4411rU8wZfB2ereYTIgLKjhy7rBjqSuk+O4j8b kgC3oa5cgrZFk7ldAfofGhWCVRjo4/yuzuuHC12viBzyGWiKkFhMSmosfGMIErWdqAZP OUiaiVhJkwKLTeK9qGOPjG0qau5igMuT4qcAxG6wrf0vluDB5wHL81XfkQOyUITCl7VC sEMw== X-Gm-Message-State: ACgBeo0yjC0jR0sP2Cbsoz+fbvXB1ekkuFbAZHvOUX6XupnDa/MnomiQ uY0v2OtqX9cQSTf3nmBFMl6FkEQ5l8GT X-Google-Smtp-Source: AA6agR6l2OkctpCBldtJSDt5KcZmeFaj7z6S97AUd0CAOBSyjbZU2NHKqPh/zAmXOFewOm+ciB+zYLxT+Eka X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:f5e1:5bc5:7dab:2b7c]) (user=irogers job=sendgmr) by 2002:a25:9b48:0:b0:67a:6ad0:f078 with SMTP id u8-20020a259b48000000b0067a6ad0f078mr3169103ybo.536.1659651508142; Thu, 04 Aug 2022 15:18:28 -0700 (PDT) Date: Thu, 4 Aug 2022 15:18:01 -0700 In-Reply-To: <20220804221816.1802790-1-irogers@google.com> Message-Id: <20220804221816.1802790-3-irogers@google.com> Mime-Version: 1.0 References: <20220804221816.1802790-1-irogers@google.com> X-Mailer: git-send-email 2.37.1.559.g78731f0fdb-goog Subject: [PATCH v4 02/17] perf jevents: Simplify generation of C-string From: Ian Rogers To: John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Andi Kleen , Zhengjun Xing , Ravi Bangoria , Kan Liang , Adrian Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org Cc: Stephane Eranian , Ian Rogers Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org Previous implementation wanted variable order and '(null)' string output to match the C implementation. The '(null)' string output was a quirk/bug and so there is no need to carry it forward. Signed-off-by: Ian Rogers --- tools/perf/pmu-events/jevents.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jevents.py index 5b72048d50da..cdfa4e0e7557 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -203,7 +203,7 @@ class JsonEvent: """Representation of the event as a C struct initializer.""" def attr_string(attr: str, value: str) -> str: - return '\t.%s = \"%s\",\n' % (attr, value) + return f'\t.{attr} = \"{value}\",\n' def str_if_present(self, attr: str) -> str: if not getattr(self, attr): @@ -211,17 +211,11 @@ class JsonEvent: return attr_string(attr, getattr(self, attr)) s = '{\n' - for attr in ['name', 'event']: - s += str_if_present(self, attr) - if self.desc is not None: - s += attr_string('desc', self.desc) - else: - s += attr_string('desc', '(null)') - s += str_if_present(self, 'compat') s += f'\t.topic = "{topic_local}",\n' for attr in [ - 'long_desc', 'pmu', 'unit', 'perpkg', 'aggr_mode', 'metric_expr', - 'metric_name', 'metric_group', 'deprecated', 'metric_constraint' + 'aggr_mode', 'compat', 'deprecated', 'desc', 'event', 'long_desc', + 'metric_constraint', 'metric_expr', 'metric_group', 'metric_name', + 'name', 'perpkg', 'pmu', 'unit' ]: s += str_if_present(self, attr) s += '},\n' -- 2.37.1.559.g78731f0fdb-goog