From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f74.google.com (mail-dl1-f74.google.com [74.125.82.74]) (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 9D0FE3FC5C1 for ; Tue, 2 Jun 2026 17:41:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780422121; cv=none; b=cOHN2ReDEU9WKh2ODg5GIndCf1fbGLx+5G8o4aswxEe/ud4PynpT8O6UpuzBc0IPI+nZqClqYepqpZqworWVmbqirSiiscAQO4V2ohwz8Jrks+5Y7BFY+Bl7pPkuYbcpP7LKCfJCPfJT9uwW3OYGjFopB60vveMO84sCxhGhLaQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780422121; c=relaxed/simple; bh=YP41rRWBxcMPt9dpJWX0z7zCQAidn0VH7dcgB/q9htM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=gLDGXmKsZsHjXUze2+jj+KXrLrjwOWAtWE6UACj1xu68dhb1Jya6ENuwgXROQ3UyH6Rm3Ls8RU9DRwXJ+cTsJIRC2qjWBKRqv0qif9mRWNOdfrgT29AU0jbROHU2xWc4UidrbiDY6ir+DVVUToKzEiS0FPjag7rHZp+FmIO5YE4= 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=Ee2kCLK+; arc=none smtp.client-ip=74.125.82.74 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="Ee2kCLK+" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-137d4309062so10245338c88.0 for ; Tue, 02 Jun 2026 10:41:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780422119; x=1781026919; 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=yno3mcqbs/U9dsawrfUUOxSAo6SRkxZ4iFQsq1dS1Q0=; b=Ee2kCLK+xgstbcPySU+ontzuwrmh0y7WfDpv7377iVwqgsuaOkSlLSTF9S+2tmziYd gT50HioWAe2pfRQ18tUaQJkq3xJTXf59zI70ZKBrU7f/8RnJfPIyBUXo/6AW9ngPNIab 8gJKKXgdIsBCQ1kaqxGDAp7wp0M+Ke46jWweir6640fiead3EjYROAT82jgrpwqMhX46 ZgKpji/GTV4nGXKx+hkTzMRbfYjopPy6wZEl+iopCqx32YETRP87AcsNArzEAMir34eg zLK+elxir25beMTyZYk6Jz7ar3rwslb1t0a+4Zb6IKrfrUmAKopHsToXnrPMS6V3cS7N qZEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780422119; x=1781026919; 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=yno3mcqbs/U9dsawrfUUOxSAo6SRkxZ4iFQsq1dS1Q0=; b=IinoQeYPsyse7RmEq1i7MXNOc5ZYCIpHKxAeukAn4UBpcdlsfUc8Sotnzio52tcbj4 XXb88T63iNR7kpRgFvjnb09CmfL2+jZnuizXe1qHsHMjXlaCCNXlW66uiIb0oKj/ph4F BWKm17sds4ww8oNEmawX9gkL55Jz5CPVgVuRelF+u6wzIKSMz9LG9WYzOh2HnKkr3yQg DPjr5sR0l/tswKrPmYohTyRxS8hFUa199rlxnZjkl85+n1L6FmYSMsaroNg4PsT4VWDh fJQeeFSSYMdn+fFqm7FBaAmWjj3uLHFkdx2xXQ2u7EtEw4ebcZfViyCXqmULH9rR50CU EFsw== X-Forwarded-Encrypted: i=1; AFNElJ+ioEeG7YXsgwdWkiNlq4XXL8mtogFGD1D/6ZnSQwLSZMPLHQQ6hKwhBmJTESWD/9q0q0iUUMVVyCDycJ4=@vger.kernel.org X-Gm-Message-State: AOJu0Yy9v2w7Fcl3MugOdTH4op0xIQrwZiol8xuKy5jaF2l1UGHR+axh NzYm8FBtdIP+piAK87eSLde5uvehtWC41zo4dyKcxqexpszwcqNcb0HhUxkTS/eGTWpBXeOpBp0 e2TBLPpKKUg== X-Received: from dlbqq4.prod.google.com ([2002:a05:7022:ed04:b0:137:ea37:a378]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:f98:b0:12a:7165:7405 with SMTP id a92af1059eb24-137d3f197b8mr8359463c88.8.1780422118486; Tue, 02 Jun 2026 10:41:58 -0700 (PDT) Date: Tue, 2 Jun 2026 10:41:17 -0700 In-Reply-To: <20260602174129.3192312-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: <20260602073132.2653307-1-irogers@google.com> <20260602174129.3192312-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1013.g208068f2d8-goog Message-ID: <20260602174129.3192312-7-irogers@google.com> Subject: [PATCH v8 06/18] perf test pmu-events: A sub-test per metric table From: Ian Rogers To: irogers@google.com, acme@kernel.org, namhyung@kernel.org Cc: adrian.hunter@intel.com, alexander.shishkin@linux.intel.com, james.clark@linaro.org, jolsa@kernel.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org Content-Type: text/plain; charset="UTF-8" Break apart the slow "Parsing of PMU event table metrics" tests into one pair of tests (real and fake PMU) per metric table found, storing the specific table pointer in priv data. Implement setup_pmu_events_suite() to dynamically allocate and populate these test cases. Split static parser tests out into a separate test__parsing_fake_static() test case. Update test__parsing() and test__parsing_fake() to retrieve the specific table from priv data and test only that table, maintaining fallback compatibility if priv is NULL. Running these individual tests in parallel significantly reduces overall test execution time. Assisted-by: Gemini-CLI:Google Gemini 3 Signed-off-by: Ian Rogers --- tools/perf/tests/pmu-events.c | 156 ++++++++++++++++++++++++++++++++-- 1 file changed, 148 insertions(+), 8 deletions(-) diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c index b1609a7e1d8c..fd5630f0a13c 100644 --- a/tools/perf/tests/pmu-events.c +++ b/tools/perf/tests/pmu-events.c @@ -923,13 +923,20 @@ static int test__parsing_callback(const struct pmu_metric *pm, return err; } -static int test__parsing(struct test_suite *test __maybe_unused, - int subtest __maybe_unused) +static int test__parsing(struct test_suite *test, int subtest) { int failures = 0; + const struct pmu_metrics_table *table = NULL; - pmu_for_each_core_metric(test__parsing_callback, &failures); - pmu_for_each_sys_metric(test__parsing_callback, &failures); + if (test->test_cases) + table = test->test_cases[subtest].priv; + + if (table) { + pmu_metrics_table__for_each_metric(table, test__parsing_callback, &failures); + } else { + pmu_for_each_core_metric(test__parsing_callback, &failures); + pmu_for_each_sys_metric(test__parsing_callback, &failures); + } return failures == 0 ? TEST_OK : TEST_FAIL; } @@ -1020,8 +1027,8 @@ static int test__parsing_fake_callback(const struct pmu_metric *pm, * Parse all the metrics for current architecture, or all defined cpus via the * 'fake_pmu' in parse_events. */ -static int test__parsing_fake(struct test_suite *test __maybe_unused, - int subtest __maybe_unused) +static int test__parsing_fake_static(struct test_suite *test __maybe_unused, + int subtest __maybe_unused) { int err = 0; @@ -1031,6 +1038,26 @@ static int test__parsing_fake(struct test_suite *test __maybe_unused, return err; } + return 0; +} + +static int test__parsing_fake(struct test_suite *test, int subtest) +{ + int err = 0; + const struct pmu_metrics_table *table = NULL; + + if (test->test_cases) + table = test->test_cases[subtest].priv; + + if (table) + return pmu_metrics_table__for_each_metric(table, test__parsing_fake_callback, NULL); + + for (size_t i = 0; i < ARRAY_SIZE(metrics); i++) { + err = metric_parse_fake("", metrics[i].str); + if (err) + return err; + } + err = pmu_for_each_core_metric(test__parsing_fake_callback, NULL); if (err) return err; @@ -1059,17 +1086,130 @@ static int test__parsing_threshold(struct test_suite *test __maybe_unused, return pmu_for_each_sys_metric(test__parsing_threshold_callback, NULL); } +struct populate_cb_data { + struct test_case *test_cases; + size_t curr; +}; + +static int count_metrics_tables_cb(const struct pmu_metrics_table *table __maybe_unused, void *data) +{ + size_t *count = data; + (*count)++; + return 0; +} + +static int populate_metrics_tables_cb(const struct pmu_metrics_table *table, void *data) +{ + struct populate_cb_data *cb_data = data; + const char *table_name = pmu_metrics_table__name(table); + char *desc_real, *desc_fake; + + if (!table_name) + table_name = "unknown"; + + if (asprintf(&desc_real, "PMU metric parsing: %s", table_name) < 0) + return -ENOMEM; + if (asprintf(&desc_fake, "PMU metric parsing with fake PMU: %s", table_name) < 0) { + free(desc_real); + return -ENOMEM; + } + + cb_data->test_cases[cb_data->curr++] = (struct test_case){ + .name = "parsing", + .desc = desc_real, + .run_case = test__parsing, + .priv = (void *)table, + .skip_reason = "some metrics failed", + }; + + cb_data->test_cases[cb_data->curr++] = (struct test_case){ + .name = "parsing_fake", + .desc = desc_fake, + .run_case = test__parsing_fake, + .priv = (void *)table, + }; + + return 0; +} + +static struct test_case pmu_events_tests[]; + +static int setup_pmu_events_suite(struct test_suite *suite) +{ + size_t num_tables = 0; + size_t num_fixed_tests = 4; + size_t tests_per_table = 2; + size_t total_tests; + struct test_case *test_cases; + size_t curr = 0; + struct populate_cb_data cb_data; + int ret; + + if (suite->test_cases != pmu_events_tests) + return 0; + + ret = pmu_metrics_table__iterate_tables(count_metrics_tables_cb, &num_tables); + if (ret) + return ret; + + total_tests = num_fixed_tests + (num_tables * tests_per_table) + 1; + + test_cases = calloc(total_tests, sizeof(*test_cases)); + if (!test_cases) + return -ENOMEM; + + test_cases[curr++] = (struct test_case){ + .name = "pmu_event_table", + .desc = "PMU event table sanity", + .run_case = test__pmu_event_table, + }; + test_cases[curr++] = (struct test_case){ + .name = "aliases", + .desc = "PMU event map aliases", + .run_case = test__aliases, + }; + test_cases[curr++] = (struct test_case){ + .name = "parsing_fake_static", + .desc = "Parsing of static metrics with fake PMU", + .run_case = test__parsing_fake_static, + }; + test_cases[curr++] = (struct test_case){ + .name = "parsing_threshold", + .desc = "Parsing of metric thresholds with fake PMU", + .run_case = test__parsing_threshold, + }; + + cb_data = (struct populate_cb_data){ + .test_cases = test_cases, + .curr = curr, + }; + + ret = pmu_metrics_table__iterate_tables(populate_metrics_tables_cb, &cb_data); + if (ret) { + size_t i; + + for (i = num_fixed_tests; i < cb_data.curr; i++) + free((char *)test_cases[i].desc); + free(test_cases); + return ret; + } + + suite->test_cases = test_cases; + return 0; +} + static struct test_case pmu_events_tests[] = { TEST_CASE("PMU event table sanity", pmu_event_table), TEST_CASE("PMU event map aliases", aliases), TEST_CASE_REASON("Parsing of PMU event table metrics", parsing, "some metrics failed"), - TEST_CASE("Parsing of PMU event table metrics with fake PMUs", parsing_fake), - TEST_CASE("Parsing of metric thresholds with fake PMUs", parsing_threshold), + TEST_CASE("Parsing of PMU event table metrics with fake PMU", parsing_fake), + TEST_CASE("Parsing of metric thresholds with fake PMU", parsing_threshold), { .name = NULL, } }; struct test_suite suite__pmu_events = { .desc = "PMU JSON event tests", .test_cases = pmu_events_tests, + .setup = setup_pmu_events_suite, }; -- 2.54.0.1013.g208068f2d8-goog