From nobody Sat Apr 11 22:46:19 2026 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 EEAACC25B06 for ; Thu, 4 Aug 2022 22:19:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240090AbiHDWTB (ORCPT ); Thu, 4 Aug 2022 18:19:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240008AbiHDWSr (ORCPT ); Thu, 4 Aug 2022 18:18:47 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B50F70E7A for ; Thu, 4 Aug 2022 15:18:37 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-31f58599ad3so6975577b3.20 for ; Thu, 04 Aug 2022 15:18:37 -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=d4S39rJSe47z417XxG+is96I4EdHbooIiUz1AHwuMQI=; b=lSo6uideD/pCPYRfvu0tpkQMCVlc2ZxYoP9NmxZ8rF/ZVtN4va0vH86E4HEUu82bW2 rXBHtbcpvl3zOMajesJtRy8rE6dpdiCDyPX2wuxm7b0B4csQWtWeanre7pcD1EdjwPyb ei9SrOirY4ZdK/HBopHsY3UNM0PgpT1A+znEmLGCTzWV+jm3pd4zTCqCcgFb9a9x6+eq 5e9QatfFOrGuMxHd1AzOp3pqK587ueystY3xh2zYbEunYUPPI5tBA5B6043ZiWBm5oEB /0i+9pAvAwv8TjByTblaHKWm631XrHo6KsVN4F4S3MDJzGBfRv5hzboem6sbvdyo7Gvj LhwQ== 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=d4S39rJSe47z417XxG+is96I4EdHbooIiUz1AHwuMQI=; b=11yTpxO7chCjn3sBOeb4ifvyevnL3PDKHBU+3lrLTuqrm77TYrEZdocazt3lVJJMa5 SOsv6wcYHY7j0qj5W3Hxft34EgHuo5n6S077D5jLu43+wH4aqSm9sbJMdISgf/nH2+0i XLlkiwEpXLUBa0dcsdHNJXdtuvnEK7AUsBuqtg9m+IDHltl9lJrLYbhotRMJBKhjBBtm PIDrhIiD7byV2rAiGB2ec9btfov8BoUkqHRrQWKggz8ydcfsx2w300Ir3qptAS0E9KTo vyjV6VfvkyWg6kTenGyATFsC1hADiV85mhWQKeylwwP5LozhR+mVQNJigouKCWTq/X6b JrDw== X-Gm-Message-State: ACgBeo2QuDIAvhKH0qSTNx3eIR7agUjvbKgM7iMSw9+JsGyaGYJ1HI0Z DaMqlD1FYxo67YrwMNLMLsKFhsJNgCDf X-Google-Smtp-Source: AA6agR65w87f1sbFT8cO2GlzK8buMgzpA2ioJgHp4z/4uUNcj6GOgy/McAVYE5+48rDu8lIkhosVqS10395v X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:f5e1:5bc5:7dab:2b7c]) (user=irogers job=sendgmr) by 2002:a25:3d45:0:b0:670:b35f:e4b1 with SMTP id k66-20020a253d45000000b00670b35fe4b1mr3120277yba.38.1659651516189; Thu, 04 Aug 2022 15:18:36 -0700 (PDT) Date: Thu, 4 Aug 2022 15:18:04 -0700 In-Reply-To: <20220804221816.1802790-1-irogers@google.com> Message-Id: <20220804221816.1802790-6-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 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: John Garry --- tools/perf/pmu-events/empty-pmu-events.c | 4 ---- 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, 16 deletions(-) diff --git a/tools/perf/pmu-events/empty-pmu-events.c b/tools/perf/pmu-even= ts/empty-pmu-events.c index d8cf9283e486..4182a986f505 100644 --- a/tools/perf/pmu-events/empty-pmu-events.c +++ b/tools/perf/pmu-events/empty-pmu-events.c @@ -112,15 +112,11 @@ const struct pmu_events_map pmu_events_map[] =3D { { .arch =3D "testarch", .cpuid =3D "testcpu", - .version =3D "v1", - .type =3D "core", .table =3D pme_test_soc_cpu, }, { .arch =3D 0, .cpuid =3D 0, - .version =3D 0, - .type =3D 0, .table =3D 0, }, }; diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jeven= ts.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 =3D "testarch", \t.cpuid =3D "testcpu", -\t.version =3D "v1", -\t.type =3D "core", \t.table =3D pme_test_soc_cpu, }, """) @@ -329,8 +327,6 @@ def print_mapping_table(archs: Sequence[str]) -> None: _args.output_file.write(f"""{{ \t.arch =3D "{arch}", \t.cpuid =3D "{cpuid}", -\t.version =3D "{row[1]}", -\t.type =3D "{row[3]}", \t.table =3D {tblname} }}, """) @@ -339,8 +335,6 @@ def print_mapping_table(archs: Sequence[str]) -> None: _args.output_file.write("""{ \t.arch =3D 0, \t.cpuid =3D 0, -\t.version =3D 0, -\t.type =3D 0, \t.table =3D 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; }; =20 diff --git a/tools/perf/tests/expand-cgroup.c b/tools/perf/tests/expand-cgr= oup.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 =3D { .cpuid =3D "test", - .version =3D "1", - .type =3D "core", .table =3D pme_test, }; =20 diff --git a/tools/perf/tests/parse-metric.c b/tools/perf/tests/parse-metri= c.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[] =3D { =20 static const struct pmu_events_map map =3D { .cpuid =3D "test", - .version =3D "1", - .type =3D "core", .table =3D pme_test, }; =20 --=20 2.37.1.559.g78731f0fdb-goog