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 5FAF0C04A68 for ; Thu, 28 Jul 2022 22:29:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232622AbiG1W3F (ORCPT ); Thu, 28 Jul 2022 18:29:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35694 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232366AbiG1W2v (ORCPT ); Thu, 28 Jul 2022 18:28:51 -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 59EC67A50A for ; Thu, 28 Jul 2022 15:28:50 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id s14-20020a5b044e000000b00672caf96368so2532050ybp.21 for ; Thu, 28 Jul 2022 15:28:50 -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=UwvXd1+CCRIu6R4Mhwmc2t8ngksFcbZo5emnkm+oSPs=; b=gi36y7OC72GDDlIZvwhxHf+q0lDZK1FvZvtkKTsk0G8OvRF+b9m0WkTvvdS/fxskML yZNPIEmLBXeyp2SiJh0jAW+EOTh6eQ3oaGZY6Q6mH39KRTkdO4z1AJvgNf+waFjgaDhq XjgRT7eUvR2Cj5IcupH66CBWsHK/eYcS/mhrwWY3kASOJ8sB9VUMQmzZTaZh5GsgMNAs GQQvlPgeivUHncLUZbJiJ7YdPEBvgGRtZpEcd4EpjJhMF9GeImFj7J34BuI1IqOLQckH 08av5khO1VNA+feu0Nq8P/Sh6p/tJTOEmmCo+ReLF7Iew7JoMueEPqBx18ef6Q2J0g6N YBpw== 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=UwvXd1+CCRIu6R4Mhwmc2t8ngksFcbZo5emnkm+oSPs=; b=cOjjxYks1igf9l/rX5RtzJlIMiFS5ollbSSWQ7TVzIPgGNvvFIDnWG0CjLecfgMdko 3/KtaJgvqfzAlB4bsn4XQIsyISD/cijjo+XdbyV+E0v6V9ubXIdPb8WmpOxLPrpm/5Vz 00xfz/Lra023qA+FqjGxB62uKvw03sXnc5i/0KgtpeZ9oFSEynFKKZp6mP3Rwob82eLH qR3htfvDbrekFSqPXyRkG44P1iG5LR4CEgRyQtDngcpf/nCW73pTo1EhcozLrjJprKzd xZlTf3RIyOk0FWgh0e/Z+cbrlyV52sfP8pl/8SXUJeoFK3i0BziIziEja51UuNOnhTo4 DM/A== X-Gm-Message-State: ACgBeo03U50Iijlywm+EDHfy7BIXIeHKR65MB15w5GfoDf6iyxloW53D qh6Nf7lswE6pMD79sEXOSRCw4L1lRnN6 X-Google-Smtp-Source: AA6agR6/XK2mkdn7daZqtt+4ikwmPfU8uL2CYp31Tb0Fc3Dtrz+3voPsKbcF6BQtAuoBcPWuZFQVoCx2xJb+ X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:fd09:96c3:28af:b08f]) (user=irogers job=sendgmr) by 2002:a0d:e613:0:b0:31f:62f0:8510 with SMTP id p19-20020a0de613000000b0031f62f08510mr771550ywe.189.1659047329663; Thu, 28 Jul 2022 15:28:49 -0700 (PDT) Date: Thu, 28 Jul 2022 15:28:23 -0700 In-Reply-To: <20220728222835.3254224-1-irogers@google.com> Message-Id: <20220728222835.3254224-5-irogers@google.com> Mime-Version: 1.0 References: <20220728222835.3254224-1-irogers@google.com> X-Mailer: git-send-email 2.37.1.455.g008518b4e5-goog Subject: [PATCH v2 04/16] 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-kernel@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 2a9a1a086dee..c53c744da56b 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -313,8 +313,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, }, """) @@ -330,8 +328,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} }}, """) @@ -340,8 +336,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