From: Ian Rogers <irogers@google.com> To: John Garry <john.garry@huawei.com>, Will Deacon <will@kernel.org>, James Clark <james.clark@arm.com>, Mike Leach <mike.leach@linaro.org>, Leo Yan <leo.yan@linaro.org>, Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>, Arnaldo Carvalho de Melo <acme@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>, Andi Kleen <ak@linux.intel.com>, Zhengjun Xing <zhengjun.xing@linux.intel.com>, Ravi Bangoria <ravi.bangoria@amd.com>, Kan Liang <kan.liang@linux.intel.com>, Adrian Hunter <adrian.hunter@intel.com>, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org Cc: Stephane Eranian <eranian@google.com>, Ian Rogers <irogers@google.com> Subject: [PATCH v1 01/15] perf jevents: Simplify generation of C-string Date: Thu, 14 Jul 2022 23:36:39 -0700 [thread overview] Message-ID: <20220715063653.3203761-2-irogers@google.com> (raw) In-Reply-To: <20220715063653.3203761-1-irogers@google.com> 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 <irogers@google.com> --- 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 83e0dcbeac9a..4a170f23bd67 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -204,7 +204,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): @@ -212,17 +212,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.0.170.g444d1eabd0-goog
WARNING: multiple messages have this Message-ID (diff)
From: Ian Rogers <irogers@google.com> To: John Garry <john.garry@huawei.com>, Will Deacon <will@kernel.org>, James Clark <james.clark@arm.com>, Mike Leach <mike.leach@linaro.org>, Leo Yan <leo.yan@linaro.org>, Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>, Arnaldo Carvalho de Melo <acme@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>, Andi Kleen <ak@linux.intel.com>, Zhengjun Xing <zhengjun.xing@linux.intel.com>, Ravi Bangoria <ravi.bangoria@amd.com>, Kan Liang <kan.liang@linux.intel.com>, Adrian Hunter <adrian.hunter@intel.com>, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org Cc: Stephane Eranian <eranian@google.com>, Ian Rogers <irogers@google.com> Subject: [PATCH v1 01/15] perf jevents: Simplify generation of C-string Date: Thu, 14 Jul 2022 23:36:39 -0700 [thread overview] Message-ID: <20220715063653.3203761-2-irogers@google.com> (raw) In-Reply-To: <20220715063653.3203761-1-irogers@google.com> 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 <irogers@google.com> --- 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 83e0dcbeac9a..4a170f23bd67 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -204,7 +204,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): @@ -212,17 +212,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.0.170.g444d1eabd0-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-07-15 6:37 UTC|newest] Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-07-15 6:36 [PATCH v1 00/15] Compress the pmu_event tables Ian Rogers 2022-07-15 6:36 ` Ian Rogers 2022-07-15 6:36 ` Ian Rogers [this message] 2022-07-15 6:36 ` [PATCH v1 01/15] perf jevents: Simplify generation of C-string Ian Rogers 2022-07-15 6:36 ` [PATCH v1 02/15] perf jevents: Add JEVENTS_ARCH make option Ian Rogers 2022-07-15 6:36 ` Ian Rogers 2022-07-15 6:36 ` [PATCH v1 03/15] perf jevent: Add an 'all' architecture argument Ian Rogers 2022-07-15 6:36 ` Ian Rogers 2022-07-15 6:36 ` [PATCH v1 04/15] perf jevents: Remove the type/version variables Ian Rogers 2022-07-15 6:36 ` Ian Rogers 2022-07-15 6:36 ` [PATCH v1 05/15] perf jevents: Provide path to json file on error Ian Rogers 2022-07-15 6:36 ` Ian Rogers 2022-07-15 6:36 ` [PATCH v1 06/15] perf jevents: Sort json files entries Ian Rogers 2022-07-15 6:36 ` Ian Rogers 2022-07-15 6:36 ` [PATCH v1 07/15] perf pmu-events: Hide pmu_sys_event_tables Ian Rogers 2022-07-15 6:36 ` Ian Rogers 2022-07-15 6:36 ` [PATCH v1 08/15] perf pmu-events: Avoid passing pmu_events_map Ian Rogers 2022-07-15 6:36 ` Ian Rogers 2022-07-15 6:36 ` [PATCH v1 09/15] perf pmu-events: Hide pmu_events_map Ian Rogers 2022-07-15 6:36 ` Ian Rogers 2022-07-15 6:36 ` [PATCH v1 10/15] perf test: Use full metric resolution Ian Rogers 2022-07-15 6:36 ` Ian Rogers 2022-07-15 6:36 ` [PATCH v1 11/15] perf pmu-events: Move test events/metrics to json Ian Rogers 2022-07-15 6:36 ` Ian Rogers 2022-07-15 6:36 ` [PATCH v1 12/15] perf pmu-events: Don't assume pmu_event is an array Ian Rogers 2022-07-15 6:36 ` Ian Rogers 2022-07-15 6:36 ` [PATCH v1 13/15] perf pmu-events: Hide the pmu_events Ian Rogers 2022-07-15 6:36 ` Ian Rogers 2022-07-15 6:36 ` [PATCH v1 14/15] perf metrics: Copy entire pmu_event in find metric Ian Rogers 2022-07-15 6:36 ` Ian Rogers 2022-07-15 6:36 ` [PATCH v1 15/15] perf jevents: Compress the pmu_events_table Ian Rogers 2022-07-15 6:36 ` Ian Rogers 2022-07-27 4:04 ` Namhyung Kim 2022-07-27 4:04 ` Namhyung Kim 2022-07-27 4:53 ` Ian Rogers 2022-07-27 4:53 ` Ian Rogers 2022-07-27 23:20 ` Namhyung Kim 2022-07-27 23:20 ` Namhyung Kim 2022-07-27 23:44 ` Ian Rogers 2022-07-27 23:44 ` Ian Rogers
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220715063653.3203761-2-irogers@google.com \ --to=irogers@google.com \ --cc=acme@kernel.org \ --cc=adrian.hunter@intel.com \ --cc=ak@linux.intel.com \ --cc=alexander.shishkin@linux.intel.com \ --cc=eranian@google.com \ --cc=james.clark@arm.com \ --cc=john.garry@huawei.com \ --cc=jolsa@kernel.org \ --cc=kan.liang@linux.intel.com \ --cc=leo.yan@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-perf-users@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=mike.leach@linaro.org \ --cc=mingo@redhat.com \ --cc=namhyung@kernel.org \ --cc=peterz@infradead.org \ --cc=ravi.bangoria@amd.com \ --cc=will@kernel.org \ --cc=zhengjun.xing@linux.intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.