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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB770C00144 for ; Fri, 29 Jul 2022 07:44:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234942AbiG2HoX (ORCPT ); Fri, 29 Jul 2022 03:44:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235029AbiG2HoS (ORCPT ); Fri, 29 Jul 2022 03:44:18 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 68DE781B17 for ; Fri, 29 Jul 2022 00:44:15 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-3225b644be1so36443777b3.1 for ; Fri, 29 Jul 2022 00:44:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=0p5UtNhgly+OTzkIJIIsc2EA2UcuBV0UctPUvpqsf3w=; b=m8bPlFQpgLYJUbB+UeU3eNFKTszNzcYKPY4sMWEB4i8lPeEdHF1ko8hWyRi7g6lflv +OsMGJFc6EY6Oy2kIuGOxIFqAaorn1NeHpngcC6WNYuMY22GpCAK+IRSYroXU0SP3sLG VKp0QcUBs8jzqjp/66l8mYymCba/9iFJmqatIxgyuwIc6GMe2mhND79XxhWDZ8PT5/mq pawV8GV2vnCV7YY6jaXHOG3hjx6Q3jPSrjZRuxZCmmrwEzZ9i2l+CbXRkN5aVDeR5/PO flR+ilwXLJDqxXYCf1af4n+QE4YDuze779KGRZtKigtjGnhg3othnTFwB5P40oXX53Fn 22kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=0p5UtNhgly+OTzkIJIIsc2EA2UcuBV0UctPUvpqsf3w=; b=pKXuxDrkKBoWip5XZc6phGhhmLvdan3EUABL3DRxPxzkwrGZ6/m61gnKkVYs+1deiK PIp682rOytgTztN7F6MWenbqUWVF2dW2DhcGyLXv5MhGZCWNSn54IjTfjlV0PzMqI/TE 0AV2O7LWWM/uhGS+PyD5998Mbw3oIX8jgjBTZe7+UqdKlec2YOjh3We+Co3H0lWHyIcq 0SgT7XWs2eDZqsQ9wGMDsyoV4pzLHzMXdqjT8hTDP0JCeT4A5zEqwSqgSwcP3XVxhm/M 3A2jVhk1NExGWdRfhZH4tVby3Oy9yuxBac1nLgLT4qaC6tCYG7iiCWlxrX2/VnqsVZUG MMgQ== X-Gm-Message-State: ACgBeo0UYZa0cSCm2ZkA1spw3tpNHmV7au8D6eOSGMZXIE+mQHYN9jtc t3IHklSxw3+O5AhKJjPHecGj7HvZjdu1 X-Google-Smtp-Source: AA6agR5UupBuBpyx9U7oV6Zn/0T9hjA3Obc+2V2iQvV2q7Rr0iTRvbk9/ckSXIRERBkQ06cuJvrB/n2XF+Of X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:524b:47b4:2aeb:1b49]) (user=irogers job=sendgmr) by 2002:a05:6902:ce:b0:670:82dd:d174 with SMTP id i14-20020a05690200ce00b0067082ddd174mr1627428ybs.76.1659080654685; Fri, 29 Jul 2022 00:44:14 -0700 (PDT) Date: Fri, 29 Jul 2022 00:43:39 -0700 In-Reply-To: <20220729074351.138260-1-irogers@google.com> Message-Id: <20220729074351.138260-6-irogers@google.com> Mime-Version: 1.0 References: <20220729074351.138260-1-irogers@google.com> X-Mailer: git-send-email 2.37.1.455.g008518b4e5-goog Subject: [PATCH v3 05/17] perf jevents: Remove the type/version variables 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 pmu_events_map has a type variable that is always initialized to "core" and a version variable that is never read. Remove these from the API as it is straightforward to add them back when necessary. Signed-off-by: Ian Rogers --- tools/perf/pmu-events/empty-pmu-events.c | 6 ++---- tools/perf/pmu-events/jevents.py | 6 ------ tools/perf/pmu-events/pmu-events.h | 2 -- tools/perf/tests/expand-cgroup.c | 2 -- tools/perf/tests/parse-metric.c | 2 -- 5 files changed, 2 insertions(+), 16 deletions(-) diff --git a/tools/perf/pmu-events/empty-pmu-events.c b/tools/perf/pmu-events/empty-pmu-events.c index 77e655c6f116..4182a986f505 100644 --- a/tools/perf/pmu-events/empty-pmu-events.c +++ b/tools/perf/pmu-events/empty-pmu-events.c @@ -110,15 +110,13 @@ static const struct pmu_event pme_test_soc_cpu[] = { const struct pmu_events_map pmu_events_map[] = { { + .arch = "testarch", .cpuid = "testcpu", - .version = "v1", - .type = "core", .table = pme_test_soc_cpu, }, { + .arch = 0, .cpuid = 0, - .version = 0, - .type = 0, .table = 0, }, }; diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jevents.py index e6e6c42c3f8a..98d18d5c3830 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -312,8 +312,6 @@ def print_mapping_table(archs: Sequence[str]) -> None: _args.output_file.write("""{ \t.arch = "testarch", \t.cpuid = "testcpu", -\t.version = "v1", -\t.type = "core", \t.table = pme_test_soc_cpu, }, """) @@ -329,8 +327,6 @@ def print_mapping_table(archs: Sequence[str]) -> None: _args.output_file.write(f"""{{ \t.arch = "{arch}", \t.cpuid = "{cpuid}", -\t.version = "{row[1]}", -\t.type = "{row[3]}", \t.table = {tblname} }}, """) @@ -339,8 +335,6 @@ def print_mapping_table(archs: Sequence[str]) -> None: _args.output_file.write("""{ \t.arch = 0, \t.cpuid = 0, -\t.version = 0, -\t.type = 0, \t.table = 0, } }; diff --git a/tools/perf/pmu-events/pmu-events.h b/tools/perf/pmu-events/pmu-events.h index 7a360792635f..a491b117c8ac 100644 --- a/tools/perf/pmu-events/pmu-events.h +++ b/tools/perf/pmu-events/pmu-events.h @@ -40,8 +40,6 @@ struct pmu_event { struct pmu_events_map { const char *arch; const char *cpuid; - const char *version; - const char *type; /* core, uncore etc */ const struct pmu_event *table; }; diff --git a/tools/perf/tests/expand-cgroup.c b/tools/perf/tests/expand-cgroup.c index dfefe5b60eb2..dc4038f997d7 100644 --- a/tools/perf/tests/expand-cgroup.c +++ b/tools/perf/tests/expand-cgroup.c @@ -197,8 +197,6 @@ static int expand_metric_events(void) }; const struct pmu_events_map ev_map = { .cpuid = "test", - .version = "1", - .type = "core", .table = pme_test, }; diff --git a/tools/perf/tests/parse-metric.c b/tools/perf/tests/parse-metric.c index 07b6f4ec024f..1b811a26f4ee 100644 --- a/tools/perf/tests/parse-metric.c +++ b/tools/perf/tests/parse-metric.c @@ -81,8 +81,6 @@ static struct pmu_event pme_test[] = { static const struct pmu_events_map map = { .cpuid = "test", - .version = "1", - .type = "core", .table = pme_test, }; -- 2.37.1.455.g008518b4e5-goog