From nobody Wed Apr 1 09:46:38 2026 Received: from mail-dy1-f202.google.com (mail-dy1-f202.google.com [74.125.82.202]) (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 EC003425CEC for ; Tue, 31 Mar 2026 16:52:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774975935; cv=none; b=X9f6j9ud+2/sH5YH9VGMqtzrI/QXeFtxaOzT8KPEqe08BhoV5IrakH3seUeYIAlftolhDkJi+Z/vAIB4+K8m5UECcPP+HnI6GrDluaSAs1LPQ28ffbeLNWYdufSMO/IZqisjWfrTIs4/WTOGtebNNiv1x4WkAaFINUxOWcQIcBQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774975935; c=relaxed/simple; bh=/qhy3JMCYs2OLnPi5kD4WBCGTXnlVGs2PWAFKShKqgY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=BBi0gD9+flxs6Yt5LLnWy+FHZkR5aIEnyEnmcCYw176ZV0d91KMEFF2vhcO9K6dn9MoQ9zhdTrFHk0R9BE6tTqVhQdU+X3tyJD8FO/CWu+uXHEwryDvHR5YXUJcboGIX32Ts540dQGiAbJcj0VIGdsZT4s8I+OFawOXBFs0aLM4= 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=dqAm43Zo; arc=none smtp.client-ip=74.125.82.202 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="dqAm43Zo" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2c18175fc54so19719512eec.1 for ; Tue, 31 Mar 2026 09:52:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1774975933; x=1775580733; 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=QIFHjvSgbLiFNEhlXedtq/geYE0GEjUjul1cL8X268M=; b=dqAm43ZoCqq0z/VuzjDtRnmwFxx7NwnNOfr3J+mcagduPvvvYjPzT/gbm/9vRFtLl/ Arw8W7Pp8E6BVVkIHpuWzJiL4zbmqh1Z0a6qZnObKV1fVXnM17yA7MAzuGbAh5QJNB4r P4seL6Q6RSdff3U47B4BaGsM6rOwUjyOB4sCPxNrOoOXNbp7I3Hjya0IVZr5uIH5+Tbw oY50JyjWYC5zpMcTWZZYszbko4PsYMU3NAEEBsFr77UJL9iRsiNkR2ZnE6oAV4dt4mui 2DwP5Ey9hO86g1RDFxmDLNtR8I7BBG3FSIsH3XU+93J4ODoYunHLGEqM3JH6f7fnK3ay yMIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774975933; x=1775580733; 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=QIFHjvSgbLiFNEhlXedtq/geYE0GEjUjul1cL8X268M=; b=LPm1E3Cml6S+Ud4RmRmnzIM6IjvS4ALTe3TUWrQ52VKpCd9T1juff6DYK1INGVVG+p F8qD4FRIvObdkFOpfscwjmkR6VP3IA/KXABcA7JzCssVqq2ionRi1e66lIwt/fG1m/KW QuDatxhYVZy2bwRt1JbnS2Z0RZzu0g+inuBZXcYl8bcfmyrhDr8EAuX1A3rxHuZ0LDcv ENt0m5iRZJMTZhEQJ9ZqrDNbTKdwviLQFznAYDc7+5IF5TZssQm8W5YIcftM7SMpoBJa PzGq7wrng1F+1loO2BXAE6tu4TF8xLhafxoXilbwtZYroazeskRtfr6IgqrcxYCxo0TB ro2w== X-Forwarded-Encrypted: i=1; AJvYcCUyjlqsvGpDzIomNWwZv5yYqWHMrLXdKnUuE25PFxH4+y95OV1FhT46fYOCn6m0QpiHUBuxIcV6YFhB+O8=@vger.kernel.org X-Gm-Message-State: AOJu0YyCjiAJXorOLnQpQIHvw2VJNeOyPcJDDom9W4oxuN1RAZEqQwmj tauukN55jo0K94tZfyD5ijm9rXmFaViyx4sYrqNT94b+kYJDs25cA2NNMX5sS1xF+mbmydfh2P7 uM9UDhipm2A== X-Received: from dycng19.prod.google.com ([2002:a05:7300:ce13:b0:2c6:6824:b731]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7301:2007:b0:2c3:5dc0:a095 with SMTP id 5a478bee46e88-2c35ddf5c71mr5990797eec.15.1774975932944; Tue, 31 Mar 2026 09:52:12 -0700 (PDT) Date: Tue, 31 Mar 2026 09:52:06 -0700 In-Reply-To: <20260331165207.4016392-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: <20260331165207.4016392-1-irogers@google.com> X-Mailer: git-send-email 2.53.0.1018.g2bb0e51243-goog Message-ID: <20260331165207.4016392-2-irogers@google.com> Subject: [PATCH v2 1/2] perf tests: Add test for uncore event sorting From: Ian Rogers To: namhyung@kernel.org Cc: 9erthalion6@gmail.com, acme@kernel.org, adrian.hunter@intel.com, alexander.shishkin@linux.intel.com, collin.funk1@gmail.com, german.gomez@arm.com, irogers@google.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, zide.chen@intel.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add a test for uncore event sorting matching multiple PMUs. Uncore PMUs may have a common prefix, like the PMUs uncore_imc_free_running_0 and uncore_imc_free_running_1 have a prefix of uncore_imc_free_running. Parsing an event group like "{data_read,data_write}" for those PMUs should result with two groups "{uncore_imc_free_running_0/data_read/,uncore_imc_free_running_0/data_write= /}, {uncore_imc_free_running_1/data_read/,uncore_imc_free_running_1/data_write/= }" which means the evsels need resorting as when initially parsed the evsels are ordered with mixed PMUs: "{uncore_imc_free_running_0/data_read/,uncore_imc_free_running_1/data_read/, uncore_imc_free_running_0/data_write/,uncore_imc_free_running_1/data_write/= }". Signed-off-by: Ian Rogers Tested-by: Zide Chen --- tools/perf/tests/Build | 1 + tools/perf/tests/builtin-test.c | 1 + tools/perf/tests/tests.h | 1 + tools/perf/tests/uncore-event-sorting.c | 122 ++++++++++++++++++++++++ 4 files changed, 125 insertions(+) create mode 100644 tools/perf/tests/uncore-event-sorting.c diff --git a/tools/perf/tests/Build b/tools/perf/tests/Build index c2a67ce45941..66944a4f4968 100644 --- a/tools/perf/tests/Build +++ b/tools/perf/tests/Build @@ -3,6 +3,7 @@ perf-test-y +=3D builtin-test.o perf-test-y +=3D tests-scripts.o perf-test-y +=3D parse-events.o +perf-test-y +=3D uncore-event-sorting.o perf-test-y +=3D dso-data.o perf-test-y +=3D vmlinux-kallsyms.o perf-test-y +=3D openat-syscall.o diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-tes= t.c index 06507066213b..f2c135891477 100644 --- a/tools/perf/tests/builtin-test.c +++ b/tools/perf/tests/builtin-test.c @@ -71,6 +71,7 @@ static struct test_suite *generic_tests[] =3D { &suite__basic_mmap, &suite__mem, &suite__parse_events, + &suite__uncore_event_sorting, &suite__expr, &suite__PERF_RECORD, &suite__pmu, diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h index f5f1238d1f7f..ee00518bf36f 100644 --- a/tools/perf/tests/tests.h +++ b/tools/perf/tests/tests.h @@ -177,6 +177,7 @@ DECLARE_SUITE(sigtrap); DECLARE_SUITE(event_groups); DECLARE_SUITE(symbols); DECLARE_SUITE(util); +DECLARE_SUITE(uncore_event_sorting); DECLARE_SUITE(subcmd_help); DECLARE_SUITE(kallsyms_split); =20 diff --git a/tools/perf/tests/uncore-event-sorting.c b/tools/perf/tests/unc= ore-event-sorting.c new file mode 100644 index 000000000000..7e61e46283d5 --- /dev/null +++ b/tools/perf/tests/uncore-event-sorting.c @@ -0,0 +1,122 @@ +// SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) +#include "tests.h" +#include "debug.h" +#include "parse-events.h" +#include "pmu.h" +#include "pmus.h" +#include "evlist.h" +#include + +struct match_state { + char *event1; + char *event2; +}; + +static int event_cb(void *state, struct pmu_event_info *info) +{ + struct match_state *m =3D state; + + if (!m->event1) { + m->event1 =3D strdup(info->name); + } else if (!m->event2) { + if (strcmp(m->event1, info->name)) { + m->event2 =3D strdup(info->name); + return 1; + } + } + return 0; +} + +static int test__uncore_event_sorting(struct test_suite *test __maybe_unus= ed, + int subtest __maybe_unused) +{ + struct evlist *evlist; + struct parse_events_error err; + struct evsel *evsel; + struct perf_pmu *pmu =3D NULL; + char *pmu_prefix =3D NULL; + struct match_state m =3D { NULL, NULL }; + char buf[1024]; + int ret; + + while ((pmu =3D perf_pmus__scan(pmu)) !=3D NULL) { + size_t len; + struct perf_pmu *sibling; + + if (pmu->is_core) + continue; + + len =3D pmu_name_len_no_suffix(pmu->name); + if (len =3D=3D strlen(pmu->name)) + continue; + + sibling =3D pmu; + while ((sibling =3D perf_pmus__scan(sibling)) !=3D NULL) { + if (sibling->is_core) + continue; + if (pmu_name_len_no_suffix(sibling->name) =3D=3D len && + !strncmp(pmu->name, sibling->name, len)) + break; + } + + if (!sibling) + continue; + + m.event1 =3D m.event2 =3D NULL; + perf_pmu__for_each_event(pmu, false, &m, event_cb); + + if (m.event1 && m.event2) { + pmu_prefix =3D strndup(pmu->name, len); + break; + } + free(m.event1); + } + + if (!pmu_prefix) { + pr_debug("No suitable uncore PMU found\n"); + return TEST_SKIP; + } + + evlist =3D evlist__new(); + if (!evlist) + return TEST_FAIL; + + snprintf(buf, sizeof(buf), "{%s/%s/,%s/%s/}", + pmu_prefix, m.event1, pmu_prefix, m.event2); + pr_debug("Parsing: %s\n", buf); + + parse_events_error__init(&err); + ret =3D parse_events(evlist, buf, &err); + if (ret) { + pr_debug("parse_events failed\n"); + ret =3D TEST_FAIL; + goto out_err; + } + + TEST_ASSERT_VAL("Number of events is > 0", evlist->core.nr_entries > 0); + TEST_ASSERT_EQUAL("Number of events is a multiple of 2", evlist->core.nr_= entries % 2, 0); + + evlist__for_each_entry(evlist, evsel) { + struct evsel *next; + + if (!evsel__is_group_leader(evsel)) + continue; + + next =3D evsel__next(evsel); + TEST_ASSERT_EQUAL("Group size is 2", evsel->core.nr_members, 2); + TEST_ASSERT_VAL("PMU match", evsel->pmu =3D=3D next->pmu); + TEST_ASSERT_VAL("First event name", strstr(evsel__name(evsel), m.event1)= !=3D NULL); + TEST_ASSERT_VAL("Second event name", strstr(evsel__name(next), m.event2)= !=3D NULL); + } + ret =3D TEST_OK; + +out_err: + evlist__delete(evlist); + parse_events_error__exit(&err); + free(pmu_prefix); + free(m.event1); + free(m.event2); + return ret; +} + +DEFINE_SUITE("Uncore event sorting", uncore_event_sorting); --=20 2.53.0.1018.g2bb0e51243-goog