From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E9C536A03A for ; Wed, 13 May 2026 23:05:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778713510; cv=none; b=a7R61/J4pvLMa4cm2uuAyDANp/tc3Z7jlARLrNPEyxysjG4PXDDMPlRXMYIVu0joO2pcBPjoRhP3d5Memr19vEuM+h4eU2r7HNK1ixlLOMda25jO5yrr0LJZHxj1MQQJPwfhrTq2obW76PZ5E+VxPusiHcvriYLWKV8C+KZuFZ0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778713510; c=relaxed/simple; bh=0VzOE0ot4b3f2vvk1/OvkM/0MKgE/N1+G8iaEUZxOWI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=b/7gB4NEnGeNq9sqNzxI2VEpb88jaJLrFf4McsVO9dZOzLYbdfjDMzDGk0FGpCWLnENvkQnGWhp4zSFX0DXlfhfebv8Tpn48ly/csenOwWrkYjwfB+l3izxJSfOMZTZ3BncyEty2is4Iv+v38fCmNYm6slC0r+NTWK4GezjEBOU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=HPTuMlgB; arc=none smtp.client-ip=74.125.82.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="HPTuMlgB" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-30230e64087so898337eec.0 for ; Wed, 13 May 2026 16:05:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778713508; x=1779318308; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Jkrk98vhl1bt1NhVobJy4TmFkqOtkUaeiFL1iFYE8dI=; b=HPTuMlgBBYZ5grFq1IwSPJ/O3Cf1elKTXlGQrsY7IoohnKh925HmP0ZVwhTIE9NVPd ROgeuH+xCUFTMeKFMOl+oWOv3MpVBp68FSVItZPiIyr2PLpywpYJnkvPyNLKCHXopCnt iXFQdDRfTqHARjvSuxy+/M6GZ432D7SEztYrE228tsJLY8AMgOok6Sqj2/hlKpGxz+j4 J1SOJjSBBO0mHJhJAUSdl+RuxDBKSADiqZCGbz+EXNVwqCV84JTayXyvgQ2b+cBXPJYc AT0GxLs1PUWNbiRakBEKpjoUXoXIyQ15HoTPP1ySvbcxoCWHzM0VghVH7/OblA9l/etZ XNhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778713508; x=1779318308; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Jkrk98vhl1bt1NhVobJy4TmFkqOtkUaeiFL1iFYE8dI=; b=K38tj/NOVrU8nwmIcb/B2XNqhExF7Ei3Fk/KQqlIDz4VmB7vCqI+I/JZyKhM/tqDr6 7ogCNwvvtzYzNGhNoaklnZ9mVKfGbOgLRMQqxfjvCaVnP2jILHvitdE2LXlT/6gt9e7O kqNCSpuDpjPu4VLwNAbLHRdlieoSVt/TNCVWpKB/9KckZttn+E+sL0Dx0Ux49DSpYR1T cpWn0+2Wq0VHu0L9dbLtch0VrwdvCMmqpqRRvAjWEBqJNmbYC9vzQ/FrYtWF84F5NGAr 5JQh2j0xxLMa5k+Hu1sYBoEtdY27T7uig1VRZRYMu7gcAxdUnP4KWxSeL6TGbaGbrIrE TmeA== X-Forwarded-Encrypted: i=1; AFNElJ96R264j6Q3r7NWa16f2MT7PFLwgCa093XPt8ARh21mm1oRIj0ZOOSvGGDwWkq47bNQOWa/O9Zi/conSBE=@vger.kernel.org X-Gm-Message-State: AOJu0YwOIwSwaSv/bBW+psUGSIS09avoqKNSEwaQYVr4zMpB+CfFmOzq yBNEakV7R37GyfWc9kF2v8jRaYwSVUKkeYRNoE6cs6VQFoKORw7oYiSMhKitwoU8lZAgboR42BS IIe1N//W1zg== X-Received: from dlbvg4.prod.google.com ([2002:a05:7022:7f04:b0:132:8d92:4d62]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:670e:b0:130:c9cc:3384 with SMTP id a92af1059eb24-1349ac64a08mr2884246c88.30.1778713508048; Wed, 13 May 2026 16:05:08 -0700 (PDT) Date: Wed, 13 May 2026 16:04:38 -0700 In-Reply-To: <20260513230450.529380-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260513230450.529380-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260513230450.529380-3-irogers@google.com> Subject: [PATCH v1 02/14] perf pmu-events: Add API to get metric table name and iterate tables From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Alexander Shishkin , Jiri Olsa , Adrian Hunter , James Clark , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Cc: Ian Rogers Content-Type: text/plain; charset="UTF-8" Add name field to struct pmu_metrics_table and populate it in generated tables. Add pmu_metrics_table__name() to retrieve the name. Add pmu_metrics_table__for_each_table() to iterate over all known metric tables. This will be used to break apart slow metric tests per table. Assisted-by: Gemini-CLI:Google Gemini 3 Signed-off-by: Ian Rogers --- tools/perf/pmu-events/empty-pmu-events.c | 36 +++++++++++++++++-- tools/perf/pmu-events/jevents.py | 44 ++++++++++++++++++++++-- tools/perf/pmu-events/pmu-events.h | 4 +++ 3 files changed, 80 insertions(+), 4 deletions(-) diff --git a/tools/perf/pmu-events/empty-pmu-events.c b/tools/perf/pmu-events/empty-pmu-events.c index 322e6c2d58cb..f51062ef25d3 100644 --- a/tools/perf/pmu-events/empty-pmu-events.c +++ b/tools/perf/pmu-events/empty-pmu-events.c @@ -5403,6 +5403,7 @@ struct pmu_events_table { /* Struct used to make the PMU metric table implementation opaque to callers. */ struct pmu_metrics_table { + const char *name; const struct pmu_table_entry *pmus; uint32_t num_pmus; }; @@ -5435,6 +5436,7 @@ static const struct pmu_events_map pmu_events_map[] = { .num_pmus = ARRAY_SIZE(pmu_events__common), }, .metric_table = { + .name = "common", .pmus = pmu_metrics__common, .num_pmus = ARRAY_SIZE(pmu_metrics__common), }, @@ -5447,6 +5449,7 @@ static const struct pmu_events_map pmu_events_map[] = { .num_pmus = ARRAY_SIZE(pmu_events__test_soc_cpu), }, .metric_table = { + .name = "test_soc_cpu", .pmus = pmu_metrics__test_soc_cpu, .num_pmus = ARRAY_SIZE(pmu_metrics__test_soc_cpu), } @@ -5455,7 +5458,7 @@ static const struct pmu_events_map pmu_events_map[] = { .arch = 0, .cpuid = 0, .event_table = { 0, 0 }, - .metric_table = { 0, 0 }, + .metric_table = { 0 }, } }; @@ -5475,7 +5478,7 @@ static const struct pmu_sys_events pmu_sys_event_tables[] = { }, { .event_table = { 0, 0 }, - .metric_table = { 0, 0 }, + .metric_table = { 0 }, }, }; /* clang-format on */ @@ -5992,6 +5995,35 @@ int pmu_for_each_sys_metric(pmu_metric_iter_fn fn, void *data) return 0; } +const char *pmu_metrics_table__name(const struct pmu_metrics_table *table) +{ + return table ? table->name : NULL; +} + +int pmu_metrics_table__for_each_table( + int (*fn)(const struct pmu_metrics_table *table, void *data), + void *data) +{ + size_t i; + int ret; + + for (i = 0; pmu_events_map[i].cpuid; i++) { + if (!pmu_events_map[i].metric_table.pmus) + continue; + ret = fn(&pmu_events_map[i].metric_table, data); + if (ret) + return ret; + } + for (i = 0; pmu_sys_event_tables[i].name; i++) { + if (!pmu_sys_event_tables[i].metric_table.pmus) + continue; + ret = fn(&pmu_sys_event_tables[i].metric_table, data); + if (ret) + return ret; + } + return 0; +} + static const int metricgroups[][2] = { }; diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jevents.py index 7d325604f04d..a74c5e828bd1 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -712,6 +712,7 @@ struct pmu_events_table { /* Struct used to make the PMU metric table implementation opaque to callers. */ struct pmu_metrics_table { +\tconst char *name; \tconst struct pmu_table_entry *pmus; \tuint32_t num_pmus; }; @@ -747,6 +748,7 @@ static const struct pmu_events_map pmu_events_map[] = { \t\t.num_pmus = ARRAY_SIZE(pmu_events__test_soc_cpu), \t}, \t.metric_table = { +\t\t.name = "test_soc_cpu", \t\t.pmus = pmu_metrics__test_soc_cpu, \t\t.num_pmus = ARRAY_SIZE(pmu_metrics__test_soc_cpu), \t} @@ -761,6 +763,7 @@ static const struct pmu_events_map pmu_events_map[] = { \t\t.num_pmus = ARRAY_SIZE(pmu_events__common), \t}, \t.metric_table = { +\t\t.name = "common", \t\t.pmus = pmu_metrics__common, \t\t.num_pmus = ARRAY_SIZE(pmu_metrics__common), \t}, @@ -796,6 +799,7 @@ static const struct pmu_events_map pmu_events_map[] = { \t\t.num_pmus = {event_size} \t}}, \t.metric_table = {{ +\t\t.name = "{metric_tblname.replace('pmu_metrics__', '')}", \t\t.pmus = {metric_tblname}, \t\t.num_pmus = {metric_size} \t}} @@ -807,12 +811,45 @@ static const struct pmu_events_map pmu_events_map[] = { \t.arch = 0, \t.cpuid = 0, \t.event_table = { 0, 0 }, -\t.metric_table = { 0, 0 }, +\t.metric_table = { 0 }, } }; """) +def print_metric_table_functions() -> None: + _args.output_file.write(""" +const char *pmu_metrics_table__name(const struct pmu_metrics_table *table) +{ +\treturn table ? table->name : NULL; +} + +int pmu_metrics_table__for_each_table( +\tint (*fn)(const struct pmu_metrics_table *table, void *data), +\tvoid *data) +{ +\tsize_t i; +\tint ret; + +\tfor (i = 0; pmu_events_map[i].cpuid; i++) { +\t\tif (!pmu_events_map[i].metric_table.pmus) +\t\t\tcontinue; +\t\tret = fn(&pmu_events_map[i].metric_table, data); +\t\tif (ret) +\t\t\treturn ret; +\t} +\tfor (i = 0; pmu_sys_event_tables[i].name; i++) { +\t\tif (!pmu_sys_event_tables[i].metric_table.pmus) +\t\t\tcontinue; +\t\tret = fn(&pmu_sys_event_tables[i].metric_table, data); +\t\tif (ret) +\t\t\treturn ret; +\t} +\treturn 0; +} +""") + + def print_system_mapping_table() -> None: """C struct mapping table array for tables from /sys directories.""" _args.output_file.write(""" @@ -835,6 +872,7 @@ static const struct pmu_sys_events pmu_sys_event_tables[] = { if metric_tblname in _sys_metric_tables: _args.output_file.write(f""" \t\t.metric_table = {{ +\t\t\t.name = "{metric_tblname.replace('pmu_metrics__', '')}", \t\t\t.pmus = {metric_tblname}, \t\t\t.num_pmus = ARRAY_SIZE({metric_tblname}) \t\t}},""") @@ -848,6 +886,7 @@ static const struct pmu_sys_events pmu_sys_event_tables[] = { continue _args.output_file.write(f"""\t{{ \t\t.metric_table = {{ +\t\t\t.name = "{tblname.replace('pmu_metrics__', '')}", \t\t\t.pmus = {tblname}, \t\t\t.num_pmus = ARRAY_SIZE({tblname}) \t\t}}, @@ -856,7 +895,7 @@ static const struct pmu_sys_events pmu_sys_event_tables[] = { """) _args.output_file.write("""\t{ \t\t.event_table = { 0, 0 }, -\t\t.metric_table = { 0, 0 }, +\t\t.metric_table = { 0 }, \t}, }; /* clang-format on */ @@ -1475,6 +1514,7 @@ struct pmu_table_entry { print_mapping_table(archs) print_system_mapping_table() + print_metric_table_functions() print_metricgroups() if __name__ == '__main__': diff --git a/tools/perf/pmu-events/pmu-events.h b/tools/perf/pmu-events/pmu-events.h index d3b24014c6ff..9cac617c9702 100644 --- a/tools/perf/pmu-events/pmu-events.h +++ b/tools/perf/pmu-events/pmu-events.h @@ -112,6 +112,10 @@ size_t pmu_events_table__num_events(const struct pmu_events_table *table, int pmu_metrics_table__for_each_metric(const struct pmu_metrics_table *table, pmu_metric_iter_fn fn, void *data); +const char *pmu_metrics_table__name(const struct pmu_metrics_table *table); +int pmu_metrics_table__for_each_table( + int (*fn)(const struct pmu_metrics_table *table, void *data), + void *data); /* * Search for a table and entry matching with pmu__name_wildcard_match or any * tables if pmu is NULL. Each matching metric has fn called on it. 0 implies to -- 2.54.0.563.g4f69b47b94-goog