From patchwork Fri Aug 12 23:09:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 12942606 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 A11E9C00140 for ; Fri, 12 Aug 2022 23:11:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=dsnHTqi1pWTL0ZccTF+geuQe//9gLr5txnxNOnlWC3M=; b=O+pkuCZUZUB7LO7HK47x4OQcRY 7uKLfA7s07GcHqF4j/+vVuBVi5CdZkPj8J+0OgS3uDbfQoW2Eg9ZEdICNw1XNR6mdk80YfYo0b4CN laIQ+0aAqFedMZRNbrNoeyFf34aiugGjqQu74BiUDs7G7f06qWDaKtcDI4XxRVog3X0Eydo1MGY+i +KraBlZFIALg2D3Q9r4byp1YOrRqpGUqqpjJLYLVoNwX4RqBVyrgyRj6kASy120KAVk7xrJ6DiWmt BEZtT4lxkqrBbLR+tjU42j0lsHMPV3Z/DNX+Rr7OJ6ZXZHucmoUPzqSux5Wq4S5UyUUY5FlQqNfJF za2mdUFQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oMdnh-000TdS-80; Fri, 12 Aug 2022 23:10:45 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oMdn4-000TCE-3z for linux-arm-kernel@lists.infradead.org; Fri, 12 Aug 2022 23:10:08 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id e82-20020a25e755000000b00684673963a6so1476512ybh.15 for ; Fri, 12 Aug 2022 16:10:05 -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=vHc00R1etBBIHmVhT/J70GR1lgdExkJ5oc83QaUQWSc=; b=haQLiQ/QV0C7Rv0bIumzuWMIBSXjJVpYzLMonAWjASpxv8AO5rUFuyvFRAIeAxfdv8 z8WrIwm4SCDuURjdYmFHGBZvttLO6KVNdS4cUIl7ETIoWMlDkl+7Jp+yZ3Vu610eSRDF jqwzNi3uI0Z/aUgBxqffFLUFA+jbZsgkP6/lo4mt0cSytUDnt23zo3RjHgWMAmNIZ8Ch wfFCKY1BB6y6lM0hHIr8brvxjIlr4MZaN4Pfc1lTRdZMo/FoiwtYinPF1dzPDaXbgnA1 HvaVkjApIreWUdmCmMkWcNKPeosLuBU+VqG9+FG3b+2QCokdbmYHm3QWZNt87TjteZvS ux5w== 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=vHc00R1etBBIHmVhT/J70GR1lgdExkJ5oc83QaUQWSc=; b=j493rkS9HWWb6FTR5ks53SdVIXpiZ9IFn3i6vgNsJuSnHSkZwy0NcUmpA+x39mId14 DZBQ8hd1PIzJrFVlCEFJgv5Uf8Ew46Ihyhzd+SQX5mLPRRhi4M0BOGzSxFhlOOsKq000 1W2mAoIfg7Y2d4dFt6RxVCVfpfFb3FsWTLqqj1fOijZsaeO5IYPA3mOR73xU6FlkOqBA m7eW3A16RZBF4QjRfWyv5Mcls6MwQHDXRbDg5VAUTLvSGaVHVHYT2RrPJk+05GvjZtnu vk3NR3kFwoPpjotJp6mGKGV1Lmz1OtXKCwNPqkdxlO5IcOF5ca9q0maD2rrsP75z+I7f nsjg== X-Gm-Message-State: ACgBeo1tnUdGYXHc26G8EHii0/v9Z/AYTZEOVRUE2yTwd0Eivmqsaesh aRbspoPyTlzLtvVl7ekzxXiMmuvtJpLv X-Google-Smtp-Source: AA6agR7++xwE1+x1j8sC9gzVFlLoULkq6LLbqYrd8eV+7tKPFcLGTxp0wBOLbYmWNiEAXkoKbduxpmXUVnUu X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:d668:2937:8218:c5ec]) (user=irogers job=sendgmr) by 2002:a81:a10b:0:b0:31f:5960:4e8c with SMTP id y11-20020a81a10b000000b0031f59604e8cmr5503815ywg.67.1660345804767; Fri, 12 Aug 2022 16:10:04 -0700 (PDT) Date: Fri, 12 Aug 2022 16:09:39 -0700 In-Reply-To: <20220812230949.683239-1-irogers@google.com> Message-Id: <20220812230949.683239-5-irogers@google.com> Mime-Version: 1.0 References: <20220812230949.683239-1-irogers@google.com> X-Mailer: git-send-email 2.37.1.595.g718a3a8f04-goog Subject: [PATCH v5 04/14] perf jevents: Sort json files entries 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220812_161006_252721_A6549F8E X-CRM114-Status: GOOD ( 17.13 ) 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 Sort the json files entries on conversion to C. The sort order tries to replicated cmp_sevent from pmu.c so that the input there is already sorted except for sysfs events. Specifically, the sort order is given by the tuple: (not j.desc is None, fix_none(j.topic), fix_none(j.name), fix_none(j.pmu), fix_none(j.metric_name)) which is putting events with descriptions and topics before those without, then sorting by name, then pmu and finally metric_name Add the topic to JsonEvent on reading to simplify. Remove an unnecessary lambda in the json reading. Signed-off-by: Ian Rogers --- tools/perf/pmu-events/jevents.py | 48 +++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jevents.py index 31936eafa9ff..84fbb0f384cc 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -18,6 +18,8 @@ _sys_event_tables = [] _arch_std_events = {} # Track whether an events table is currently being defined and needs closing. _close_table = False +# Events to write out when the table is closed +_pending_events = [] def removesuffix(s: str, suffix: str) -> str: @@ -128,6 +130,7 @@ class JsonEvent: eventcode |= int(jd['ExtSel']) << 8 configcode = int(jd['ConfigCode'], 0) if 'ConfigCode' in jd else None self.name = jd['EventName'].lower() if 'EventName' in jd else None + self.topic = '' self.compat = jd.get('Compat') self.desc = fixdesc(jd.get('BriefDescription')) self.long_desc = fixdesc(jd.get('PublicDescription')) @@ -200,7 +203,7 @@ class JsonEvent: s += f'\t{attr} = {value},\n' return s + '}' - def to_c_string(self, topic_local: str) -> str: + def to_c_string(self) -> str: """Representation of the event as a C struct initializer.""" def attr_string(attr: str, value: str) -> str: @@ -212,25 +215,27 @@ class JsonEvent: return attr_string(attr, getattr(self, attr)) s = '{\n' - s += f'\t.topic = "{topic_local}",\n' for attr in [ 'aggr_mode', 'compat', 'deprecated', 'desc', 'event', 'long_desc', 'metric_constraint', 'metric_expr', 'metric_group', 'metric_name', - 'name', 'perpkg', 'pmu', 'unit' + 'name', 'perpkg', 'pmu', 'topic', 'unit' ]: s += str_if_present(self, attr) s += '},\n' return s -def read_json_events(path: str) -> Sequence[JsonEvent]: +def read_json_events(path: str, topic: str) -> Sequence[JsonEvent]: """Read json events from the specified file.""" try: - return json.load(open(path), object_hook=lambda d: JsonEvent(d)) + result = json.load(open(path), object_hook=JsonEvent) except BaseException as err: print(f"Exception processing {path}") raise + for event in result: + event.topic = topic + return result def preprocess_arch_std_files(archpath: str) -> None: @@ -238,7 +243,7 @@ def preprocess_arch_std_files(archpath: str) -> None: global _arch_std_events for item in os.scandir(archpath): if item.is_file() and item.name.endswith('.json'): - for event in read_json_events(item.path): + for event in read_json_events(item.path, topic=''): if event.name: _arch_std_events[event.name.lower()] = event @@ -252,19 +257,36 @@ def print_events_table_prefix(tblname: str) -> None: _close_table = True -def print_events_table_entries(item: os.DirEntry, topic: str) -> None: - """Create contents of an events table.""" +def add_events_table_entries(item: os.DirEntry, topic: str) -> None: + """Add contents of file to _pending_events table.""" if not _close_table: raise IOError('Table entries missing prefix') - for event in read_json_events(item.path): - _args.output_file.write(event.to_c_string(topic)) + for e in read_json_events(item.path, topic): + _pending_events.append(e) def print_events_table_suffix() -> None: """Optionally close events table.""" + + def event_cmp_key(j: JsonEvent): + def fix_none(s: str): + if s is None: + return '' + return s + + return (not j.desc is None, fix_none(j.topic), fix_none(j.name), fix_none(j.pmu), + fix_none(j.metric_name)) + global _close_table - if _close_table: - _args.output_file.write("""{ + if not _close_table: + return + + global _pending_events + for event in sorted(_pending_events, key=event_cmp_key): + _args.output_file.write(event.to_c_string()) + _pending_events = [] + + _args.output_file.write("""{ \t.name = 0, \t.event = 0, \t.desc = 0, @@ -307,7 +329,7 @@ def process_one_file(parents: Sequence[str], item: os.DirEntry) -> None: if not item.is_file() or not item.name.endswith('.json'): return - print_events_table_entries(item, get_topic(item.name)) + add_events_table_entries(item, get_topic(item.name)) def print_mapping_table(archs: Sequence[str]) -> None: