From nobody Thu Oct 2 03:34:10 2025 Received: from mail-oa1-f74.google.com (mail-oa1-f74.google.com [209.85.160.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 B467A31E0E4 for ; Tue, 23 Sep 2025 22:34:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758666848; cv=none; b=bQGVHkt39lOuyLLFzbkx6e0t/6ZepBqEqomsOsgY58vWjw6dOBI16Gg07CHLmWuhhngYYzyLBzeiGtL2iPH6q6VVk+VuBeSiEFEk1cexhOJGy5UbpZGSoHgwtNjN/3COGw6/Jx3ATfvIoeqS9ph7Tgjhmj9wa24hrul14t4bues= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758666848; c=relaxed/simple; bh=Hg7n2W3MJbXr4yfAW1QWep8g55Ur5qoksqjE5SLxwwk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=VozBH0W8lNsaxXEZnkgoe06a39D/aNglTI5DHDtJmw2QxcBm4cvaF+Xe4uDp429hlaKGCEr7W/qeqItUs2B7gToAeTvICr7El0Yd9QnmhUHh3SYEd5GBabrbMrXLlvQDfu5W1EVC1I5ztat9tCJAycoSgzU4w7tGI34t722FB8o= 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=K4z6/omB; arc=none smtp.client-ip=209.85.160.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="K4z6/omB" Received: by mail-oa1-f74.google.com with SMTP id 586e51a60fabf-34550533bd1so1055072fac.3 for ; Tue, 23 Sep 2025 15:34:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1758666845; x=1759271645; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=cyWQosyRoXQiD370+GSPM6BLBnVE6gaC8yLvDCPltkQ=; b=K4z6/omBORmB5lUAwkHs8nr2kZ5yH2c5va+uEKxzYaCPZ2z3X+mGI0zdx5mznAwNPk vtKmiFfk53oHqOXWmQE52FYzHsIRMlM0SFkMy2Cr5iExMnaPBy3yh3VhVPwhZw7FxU9U eAZUDvhwq209MASiiN+2wzF87TVHIeQ+nj8qG4M9D5AzkK0fxf67YXA9MZ6EjYV3ZD1s 4n3tuSDR/b+ojuynpPOJgWuoTQ99Cp0itEYmdP1kXn6cYGsfmPL8JHW81SmwZ7ko5bOE pEqCO9N3n91WLJ6zaDLrtNmqwxiE40nPgpAlpqEW1LZxgaEWDCz5jbGVSmveNvpVPu4G Wp7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758666845; x=1759271645; h=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=cyWQosyRoXQiD370+GSPM6BLBnVE6gaC8yLvDCPltkQ=; b=i8v77683lR8tqsl1h4C6C67h4ZxOfhNe4X/iGkA1ujTJNJ9Xn0Ax0PRuFQc/miMwKd lsJGrrwrok8Q2n3MyKAylgWeUDc2TcHx/uCxWdjDCLjxk4ZC71yigNLsfFcTnkEKXgUK kmctQXkAfYPAop8qDu6Jg6RDhDpv9LCtbZ39303pYtES6oKpn1UJQNMTDnQeKdWq/GvF qyFHo6axIY9NzyuHcpzRd8gK2q3s2i4HJpb3cWgf457nnoXPgpy1E0RVbIL8sR0YGbrp 2NNFgAUEIh6qOjGmSJbifcTiVV16lOlqslC8d0PAH+Z1DyUnw5cbgnGq4fOWx3BascKv piGg== X-Forwarded-Encrypted: i=1; AJvYcCWBG/V+5XIos6f7lzRI8Gc2FhcCIyzhny4mIOR3chUL8cgKhVwSqWTnPu6HUKM3u0c9UUyNw/qEIvNhW+E=@vger.kernel.org X-Gm-Message-State: AOJu0YwoN26R1Ph5k4XB+QMlZSmO53lZeDR5PRMYS4/5SDivDcdyNYcZ SmLlZ3ic6U0SxC7AGpv3uxIPXc8XYyy04JsymCxNjL+JsUSUMQtP+u55uhCdGVuz3DpEJrz3ii7 PeyaHEu87rQ== X-Google-Smtp-Source: AGHT+IEOFTeTWfpE428BTSTuXTO+cfNig+FsqxDm9y1ZeU/ZRquxlNKecZEG8XtX4QBC6EFuHojYS49v2Pd1 X-Received: from oabhp17.prod.google.com ([2002:a05:6870:9a91:b0:34a:7a4c:d100]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6870:330d:b0:31d:8b8b:27d7 with SMTP id 586e51a60fabf-34c7a3cd842mr2578039fac.20.1758666844743; Tue, 23 Sep 2025 15:34:04 -0700 (PDT) Date: Tue, 23 Sep 2025 15:33:08 -0700 In-Reply-To: <20250923223312.238185-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: <20250923223312.238185-1-irogers@google.com> X-Mailer: git-send-email 2.51.0.534.gc79095c0ca-goog Message-ID: <20250923223312.238185-25-irogers@google.com> Subject: [PATCH v6 24/28] perf test parse-events: Remove cpu PMU requirement From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , James Clark , Xu Yang , Thomas Falcon , Andi Kleen , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Atish Patra , Beeman Strong , Leo Yan , Vince Weaver Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In the event parse string, switch "cpu" to "default_core" and then rewrite this to the first core PMU name prior to parsing. This enables testing with a PMU on hybrid x86 and other systems that don't use "cpu" for the core PMU name. The name "default_core" is already used by jevents. Update test expectations to match. Signed-off-by: Ian Rogers --- tools/perf/tests/parse-events.c | 230 +++++++++++++++----------------- 1 file changed, 110 insertions(+), 120 deletions(-) diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-event= s.c index 32981a1e4042..0fb338bf2848 100644 --- a/tools/perf/tests/parse-events.c +++ b/tools/perf/tests/parse-events.c @@ -20,17 +20,24 @@ #define PERF_TP_SAMPLE_TYPE (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME | \ PERF_SAMPLE_CPU | PERF_SAMPLE_PERIOD) =20 -static int num_core_entries(void) +static int num_core_entries(struct evlist *evlist) { /* - * If the kernel supports extended type, expect events to be - * opened once for each core PMU type. Otherwise fall back to the legacy - * behavior of opening only one event even though there are multiple - * PMUs + * Returns number of core PMUs if the evlist has >1 core PMU, otherwise + * returns 1. The number of core PMUs is needed as wild carding can + * open an event for each core PMU. If the events were opened with a + * specified PMU then wild carding won't happen. */ - if (perf_pmus__supports_extended_type()) - return perf_pmus__num_core_pmus(); + struct perf_pmu *core_pmu =3D NULL; + struct evsel *evsel; =20 + evlist__for_each_entry(evlist, evsel) { + if (!evsel->pmu->is_core) + continue; + if (core_pmu !=3D evsel->pmu && core_pmu !=3D NULL) + return perf_pmus__num_core_pmus(); + core_pmu =3D evsel->pmu; + } return 1; } =20 @@ -345,7 +352,7 @@ static int test__checkevent_symbolic_name_modifier(stru= ct evlist *evlist) struct perf_evsel *evsel; =20 TEST_ASSERT_VAL("wrong number of entries", - evlist->core.nr_entries =3D=3D num_core_entries()); + evlist->core.nr_entries =3D=3D num_core_entries(evlist)); =20 perf_evlist__for_each_entry(&evlist->core, evsel) { TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user); @@ -648,19 +655,21 @@ static int test__checkevent_pmu_name(struct evlist *e= vlist) { struct evsel *evsel =3D evlist__first(evlist); struct perf_pmu *core_pmu =3D perf_pmus__find_core_pmu(); + char buf[256]; =20 - /* cpu/config=3D1,name=3Dkrava/u */ + /* default_core/config=3D1,name=3Dkrava/u */ TEST_ASSERT_VAL("wrong number of entries", 2 =3D=3D evlist->core.nr_entri= es); TEST_ASSERT_VAL("wrong type", core_pmu->type =3D=3D evsel->core.attr.type= ); TEST_ASSERT_VAL("wrong config", 1 =3D=3D evsel->core.attr.config); TEST_ASSERT_VAL("wrong name", evsel__name_is(evsel, "krava")); =20 - /* cpu/config=3D2/u" */ + /* default_core/config=3D2/u" */ evsel =3D evsel__next(evsel); TEST_ASSERT_VAL("wrong number of entries", 2 =3D=3D evlist->core.nr_entri= es); TEST_ASSERT_VAL("wrong type", core_pmu->type =3D=3D evsel->core.attr.type= ); TEST_ASSERT_VAL("wrong config", 2 =3D=3D evsel->core.attr.config); - TEST_ASSERT_VAL("wrong name", evsel__name_is(evsel, "cpu/config=3D2/u")); + snprintf(buf, sizeof(buf), "%s/config=3D2/u", core_pmu->name); + TEST_ASSERT_VAL("wrong name", evsel__name_is(evsel, buf)); =20 return TEST_OK; } @@ -670,7 +679,7 @@ static int test__checkevent_pmu_partial_time_callgraph(= struct evlist *evlist) struct evsel *evsel =3D evlist__first(evlist); struct perf_pmu *core_pmu =3D perf_pmus__find_core_pmu(); =20 - /* cpu/config=3D1,call-graph=3Dfp,time,period=3D100000/ */ + /* default_core/config=3D1,call-graph=3Dfp,time,period=3D100000/ */ TEST_ASSERT_VAL("wrong number of entries", 2 =3D=3D evlist->core.nr_entri= es); TEST_ASSERT_VAL("wrong type", core_pmu->type =3D=3D evsel->core.attr.type= ); TEST_ASSERT_VAL("wrong config", 1 =3D=3D evsel->core.attr.config); @@ -682,7 +691,7 @@ static int test__checkevent_pmu_partial_time_callgraph(= struct evlist *evlist) TEST_ASSERT_VAL("wrong callgraph", !evsel__has_callchain(evsel)); TEST_ASSERT_VAL("wrong time", !(PERF_SAMPLE_TIME & evsel->core.attr.samp= le_type)); =20 - /* cpu/config=3D2,call-graph=3Dno,time=3D0,period=3D2000/ */ + /* default_core/config=3D2,call-graph=3Dno,time=3D0,period=3D2000/ */ evsel =3D evsel__next(evsel); TEST_ASSERT_VAL("wrong type", core_pmu->type =3D=3D evsel->core.attr.type= ); TEST_ASSERT_VAL("wrong config", 2 =3D=3D evsel->core.attr.config); @@ -740,7 +749,7 @@ static int test__checkevent_pmu_events_mix(struct evlis= t *evlist) TEST_ASSERT_VAL("wrong pinned", !evsel->core.attr.pinned); TEST_ASSERT_VAL("wrong exclusive", !evsel->core.attr.exclusive); } - /* cpu/pmu-event/u*/ + /* default_core/pmu-event/u*/ evsel =3D evsel__next(evsel); TEST_ASSERT_VAL("wrong type", evsel__find_pmu(evsel)->is_core); TEST_ASSERT_VAL("wrong exclude_user", @@ -840,11 +849,11 @@ static int test__group1(struct evlist *evlist) struct evsel *evsel =3D NULL, *leader; =20 TEST_ASSERT_VAL("wrong number of entries", - evlist->core.nr_entries =3D=3D (num_core_entries() * 2)); + evlist->core.nr_entries =3D=3D (num_core_entries(evlist) * 2)); TEST_ASSERT_VAL("wrong number of groups", - evlist__nr_groups(evlist) =3D=3D num_core_entries()); + evlist__nr_groups(evlist) =3D=3D num_core_entries(evlist)); =20 - for (int i =3D 0; i < num_core_entries(); i++) { + for (int i =3D 0; i < num_core_entries(evlist); i++) { /* instructions:k */ evsel =3D leader =3D (i =3D=3D 0 ? evlist__first(evlist) : evsel__next(e= vsel)); TEST_ASSERT_VAL("unexpected event", evsel__match(evsel, HARDWARE, HW_INS= TRUCTIONS)); @@ -880,7 +889,7 @@ static int test__group2(struct evlist *evlist) struct evsel *evsel, *leader =3D NULL; =20 TEST_ASSERT_VAL("wrong number of entries", - evlist->core.nr_entries =3D=3D (2 * num_core_entries() + 1)); + evlist->core.nr_entries =3D=3D (2 * num_core_entries(evlist) + 1)); /* * TODO: Currently the software event won't be grouped with the hardware * event except for 1 PMU. @@ -1037,11 +1046,11 @@ static int test__group4(struct evlist *evlist __may= be_unused) struct evsel *evsel =3D NULL, *leader; =20 TEST_ASSERT_VAL("wrong number of entries", - evlist->core.nr_entries =3D=3D (num_core_entries() * 2)); + evlist->core.nr_entries =3D=3D (num_core_entries(evlist) * 2)); TEST_ASSERT_VAL("wrong number of groups", - num_core_entries() =3D=3D evlist__nr_groups(evlist)); + num_core_entries(evlist) =3D=3D evlist__nr_groups(evlist)); =20 - for (int i =3D 0; i < num_core_entries(); i++) { + for (int i =3D 0; i < num_core_entries(evlist); i++) { /* cycles:u + p */ evsel =3D leader =3D (i =3D=3D 0 ? evlist__first(evlist) : evsel__next(e= vsel)); TEST_ASSERT_VAL("unexpected event", evsel__match(evsel, HARDWARE, HW_CPU= _CYCLES)); @@ -1078,11 +1087,11 @@ static int test__group5(struct evlist *evlist __may= be_unused) struct evsel *evsel =3D NULL, *leader; =20 TEST_ASSERT_VAL("wrong number of entries", - evlist->core.nr_entries =3D=3D (5 * num_core_entries())); + evlist->core.nr_entries =3D=3D (5 * num_core_entries(evlist))); TEST_ASSERT_VAL("wrong number of groups", - evlist__nr_groups(evlist) =3D=3D (2 * num_core_entries())); + evlist__nr_groups(evlist) =3D=3D (2 * num_core_entries(evlist))); =20 - for (int i =3D 0; i < num_core_entries(); i++) { + for (int i =3D 0; i < num_core_entries(evlist); i++) { /* cycles + G */ evsel =3D leader =3D (i =3D=3D 0 ? evlist__first(evlist) : evsel__next(e= vsel)); TEST_ASSERT_VAL("unexpected event", evsel__match(evsel, HARDWARE, HW_CPU= _CYCLES)); @@ -1111,7 +1120,7 @@ static int test__group5(struct evlist *evlist __maybe= _unused) TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) =3D=3D 1); TEST_ASSERT_VAL("wrong sample_read", !evsel->sample_read); } - for (int i =3D 0; i < num_core_entries(); i++) { + for (int i =3D 0; i < num_core_entries(evlist); i++) { /* cycles:G */ evsel =3D leader =3D evsel__next(evsel); TEST_ASSERT_VAL("unexpected event", evsel__match(evsel, HARDWARE, HW_CPU= _CYCLES)); @@ -1139,7 +1148,7 @@ static int test__group5(struct evlist *evlist __maybe= _unused) TEST_ASSERT_VAL("wrong leader", evsel__has_leader(evsel, leader)); TEST_ASSERT_VAL("wrong group_idx", evsel__group_idx(evsel) =3D=3D 1); } - for (int i =3D 0; i < num_core_entries(); i++) { + for (int i =3D 0; i < num_core_entries(evlist); i++) { /* cycles */ evsel =3D evsel__next(evsel); TEST_ASSERT_VAL("unexpected event", evsel__match(evsel, HARDWARE, HW_CPU= _CYCLES)); @@ -1159,11 +1168,11 @@ static int test__group_gh1(struct evlist *evlist) struct evsel *evsel =3D NULL, *leader; =20 TEST_ASSERT_VAL("wrong number of entries", - evlist->core.nr_entries =3D=3D (2 * num_core_entries())); + evlist->core.nr_entries =3D=3D (2 * num_core_entries(evlist))); TEST_ASSERT_VAL("wrong number of groups", - evlist__nr_groups(evlist) =3D=3D num_core_entries()); + evlist__nr_groups(evlist) =3D=3D num_core_entries(evlist)); =20 - for (int i =3D 0; i < num_core_entries(); i++) { + for (int i =3D 0; i < num_core_entries(evlist); i++) { /* cycles + :H group modifier */ evsel =3D leader =3D (i =3D=3D 0 ? evlist__first(evlist) : evsel__next(e= vsel)); TEST_ASSERT_VAL("unexpected event", evsel__match(evsel, HARDWARE, HW_CPU= _CYCLES)); @@ -1198,11 +1207,11 @@ static int test__group_gh2(struct evlist *evlist) struct evsel *evsel =3D NULL, *leader; =20 TEST_ASSERT_VAL("wrong number of entries", - evlist->core.nr_entries =3D=3D (2 * num_core_entries())); + evlist->core.nr_entries =3D=3D (2 * num_core_entries(evlist))); TEST_ASSERT_VAL("wrong number of groups", - evlist__nr_groups(evlist) =3D=3D num_core_entries()); + evlist__nr_groups(evlist) =3D=3D num_core_entries(evlist)); =20 - for (int i =3D 0; i < num_core_entries(); i++) { + for (int i =3D 0; i < num_core_entries(evlist); i++) { /* cycles + :G group modifier */ evsel =3D leader =3D (i =3D=3D 0 ? evlist__first(evlist) : evsel__next(e= vsel)); TEST_ASSERT_VAL("unexpected event", evsel__match(evsel, HARDWARE, HW_CPU= _CYCLES)); @@ -1237,11 +1246,11 @@ static int test__group_gh3(struct evlist *evlist) struct evsel *evsel =3D NULL, *leader; =20 TEST_ASSERT_VAL("wrong number of entries", - evlist->core.nr_entries =3D=3D (2 * num_core_entries())); + evlist->core.nr_entries =3D=3D (2 * num_core_entries(evlist))); TEST_ASSERT_VAL("wrong number of groups", - evlist__nr_groups(evlist) =3D=3D num_core_entries()); + evlist__nr_groups(evlist) =3D=3D num_core_entries(evlist)); =20 - for (int i =3D 0; i < num_core_entries(); i++) { + for (int i =3D 0; i < num_core_entries(evlist); i++) { /* cycles:G + :u group modifier */ evsel =3D leader =3D (i =3D=3D 0 ? evlist__first(evlist) : evsel__next(e= vsel)); TEST_ASSERT_VAL("unexpected event", evsel__match(evsel, HARDWARE, HW_CPU= _CYCLES)); @@ -1276,11 +1285,11 @@ static int test__group_gh4(struct evlist *evlist) struct evsel *evsel =3D NULL, *leader; =20 TEST_ASSERT_VAL("wrong number of entries", - evlist->core.nr_entries =3D=3D (2 * num_core_entries())); + evlist->core.nr_entries =3D=3D (2 * num_core_entries(evlist))); TEST_ASSERT_VAL("wrong number of groups", - evlist__nr_groups(evlist) =3D=3D num_core_entries()); + evlist__nr_groups(evlist) =3D=3D num_core_entries(evlist)); =20 - for (int i =3D 0; i < num_core_entries(); i++) { + for (int i =3D 0; i < num_core_entries(evlist); i++) { /* cycles:G + :uG group modifier */ evsel =3D leader =3D (i =3D=3D 0 ? evlist__first(evlist) : evsel__next(e= vsel)); TEST_ASSERT_VAL("unexpected event", evsel__match(evsel, HARDWARE, HW_CPU= _CYCLES)); @@ -1315,9 +1324,9 @@ static int test__leader_sample1(struct evlist *evlist) struct evsel *evsel =3D NULL, *leader; =20 TEST_ASSERT_VAL("wrong number of entries", - evlist->core.nr_entries =3D=3D (3 * num_core_entries())); + evlist->core.nr_entries =3D=3D (3 * num_core_entries(evlist))); =20 - for (int i =3D 0; i < num_core_entries(); i++) { + for (int i =3D 0; i < num_core_entries(evlist); i++) { /* cycles - sampling group leader */ evsel =3D leader =3D (i =3D=3D 0 ? evlist__first(evlist) : evsel__next(e= vsel)); TEST_ASSERT_VAL("unexpected event", evsel__match(evsel, HARDWARE, HW_CPU= _CYCLES)); @@ -1365,9 +1374,9 @@ static int test__leader_sample2(struct evlist *evlist= __maybe_unused) struct evsel *evsel =3D NULL, *leader; =20 TEST_ASSERT_VAL("wrong number of entries", - evlist->core.nr_entries =3D=3D (2 * num_core_entries())); + evlist->core.nr_entries =3D=3D (2 * num_core_entries(evlist))); =20 - for (int i =3D 0; i < num_core_entries(); i++) { + for (int i =3D 0; i < num_core_entries(evlist); i++) { /* instructions - sampling group leader */ evsel =3D leader =3D (i =3D=3D 0 ? evlist__first(evlist) : evsel__next(e= vsel)); TEST_ASSERT_VAL("unexpected event", evsel__match(evsel, HARDWARE, HW_INS= TRUCTIONS)); @@ -1403,9 +1412,9 @@ static int test__checkevent_pinned_modifier(struct ev= list *evlist) struct evsel *evsel =3D NULL; =20 TEST_ASSERT_VAL("wrong number of entries", - evlist->core.nr_entries =3D=3D num_core_entries()); + evlist->core.nr_entries =3D=3D num_core_entries(evlist)); =20 - for (int i =3D 0; i < num_core_entries(); i++) { + for (int i =3D 0; i < num_core_entries(evlist); i++) { evsel =3D (i =3D=3D 0 ? evlist__first(evlist) : evsel__next(evsel)); TEST_ASSERT_VAL("wrong exclude_user", !evsel->core.attr.exclude_user); TEST_ASSERT_VAL("wrong exclude_kernel", evsel->core.attr.exclude_kernel); @@ -1421,9 +1430,9 @@ static int test__pinned_group(struct evlist *evlist) struct evsel *evsel =3D NULL, *leader; =20 TEST_ASSERT_VAL("wrong number of entries", - evlist->core.nr_entries =3D=3D (3 * num_core_entries())); + evlist->core.nr_entries =3D=3D (3 * num_core_entries(evlist))); =20 - for (int i =3D 0; i < num_core_entries(); i++) { + for (int i =3D 0; i < num_core_entries(evlist); i++) { /* cycles - group leader */ evsel =3D leader =3D (i =3D=3D 0 ? evlist__first(evlist) : evsel__next(e= vsel)); TEST_ASSERT_VAL("unexpected event", evsel__match(evsel, HARDWARE, HW_CPU= _CYCLES)); @@ -1465,9 +1474,9 @@ static int test__exclusive_group(struct evlist *evlis= t) struct evsel *evsel =3D NULL, *leader; =20 TEST_ASSERT_VAL("wrong number of entries", - evlist->core.nr_entries =3D=3D 3 * num_core_entries()); + evlist->core.nr_entries =3D=3D 3 * num_core_entries(evlist)); =20 - for (int i =3D 0; i < num_core_entries(); i++) { + for (int i =3D 0; i < num_core_entries(evlist); i++) { /* cycles - group leader */ evsel =3D leader =3D (i =3D=3D 0 ? evlist__first(evlist) : evsel__next(e= vsel)); TEST_ASSERT_VAL("unexpected event", evsel__match(evsel, HARDWARE, HW_CPU= _CYCLES)); @@ -1538,7 +1547,7 @@ static int test__checkevent_precise_max_modifier(stru= ct evlist *evlist) struct evsel *evsel =3D evlist__first(evlist); =20 TEST_ASSERT_VAL("wrong number of entries", - evlist->core.nr_entries =3D=3D 1 + num_core_entries()); + evlist->core.nr_entries =3D=3D 1 + num_core_entries(evlist)); TEST_ASSERT_VAL("wrong type/config", evsel__match(evsel, SOFTWARE, SW_TAS= K_CLOCK)); return TEST_OK; } @@ -1575,14 +1584,9 @@ static int test__checkevent_config_cache(struct evli= st *evlist) return test__checkevent_genhw(evlist); } =20 -static bool test__pmu_cpu_valid(void) +static bool test__pmu_default_core_event_valid(void) { - return !!perf_pmus__find("cpu"); -} - -static bool test__pmu_cpu_event_valid(void) -{ - struct perf_pmu *pmu =3D perf_pmus__find("cpu"); + struct perf_pmu *pmu =3D perf_pmus__find_core_pmu(); =20 if (!pmu) return false; @@ -2108,26 +2112,23 @@ static const struct evlist_test test__events[] =3D { =20 static const struct evlist_test test__events_pmu[] =3D { { - .name =3D "cpu/config=3D10,config1=3D1,config2=3D3,period=3D1000/u", - .valid =3D test__pmu_cpu_valid, + .name =3D "default_core/config=3D10,config1=3D1,config2=3D3,period=3D10= 00/u", .check =3D test__checkevent_pmu, /* 0 */ }, { - .name =3D "cpu/config=3D1,name=3Dkrava/u,cpu/config=3D2/u", - .valid =3D test__pmu_cpu_valid, + .name =3D "default_core/config=3D1,name=3Dkrava/u,default_core/config= =3D2/u", .check =3D test__checkevent_pmu_name, /* 1 */ }, { - .name =3D "cpu/config=3D1,call-graph=3Dfp,time,period=3D100000/,cpu/con= fig=3D2,call-graph=3Dno,time=3D0,period=3D2000/", - .valid =3D test__pmu_cpu_valid, + .name =3D "default_core/config=3D1,call-graph=3Dfp,time,period=3D100000= /,default_core/config=3D2,call-graph=3Dno,time=3D0,period=3D2000/", .check =3D test__checkevent_pmu_partial_time_callgraph, /* 2 */ }, { - .name =3D "cpu/name=3D'COMPLEX_CYCLES_NAME:orig=3Dcpu-cycles,desc=3Dchi= p-clock-ticks',period=3D0x1,event=3D0x2/ukp", - .valid =3D test__pmu_cpu_event_valid, + .name =3D "default_core/name=3D'COMPLEX_CYCLES_NAME:orig=3Dcpu-cycles,d= esc=3Dchip-clock-ticks',period=3D0x1,event=3D0x2/ukp", + .valid =3D test__pmu_default_core_event_valid, .check =3D test__checkevent_complex_name, /* 3 */ }, @@ -2142,158 +2143,132 @@ static const struct evlist_test test__events_pmu[= ] =3D { /* 5 */ }, { - .name =3D "cpu/L1-dcache-load-miss/", - .valid =3D test__pmu_cpu_valid, + .name =3D "default_core/L1-dcache-load-miss/", .check =3D test__checkevent_genhw, /* 6 */ }, { - .name =3D "cpu/L1-dcache-load-miss/kp", - .valid =3D test__pmu_cpu_valid, + .name =3D "default_core/L1-dcache-load-miss/kp", .check =3D test__checkevent_genhw_modifier, /* 7 */ }, { - .name =3D "cpu/L1-dcache-misses,name=3Dcachepmu/", - .valid =3D test__pmu_cpu_valid, + .name =3D "default_core/L1-dcache-misses,name=3Dcachepmu/", .check =3D test__checkevent_config_cache, /* 8 */ }, { - .name =3D "cpu/instructions/", - .valid =3D test__pmu_cpu_valid, + .name =3D "default_core/instructions/", .check =3D test__checkevent_symbolic_name, /* 9 */ }, { - .name =3D "cpu/cycles,period=3D100000,config2/", - .valid =3D test__pmu_cpu_valid, + .name =3D "default_core/cycles,period=3D100000,config2/", .check =3D test__checkevent_symbolic_name_config, /* 0 */ }, { - .name =3D "cpu/instructions/h", - .valid =3D test__pmu_cpu_valid, + .name =3D "default_core/instructions/h", .check =3D test__checkevent_symbolic_name_modifier, /* 1 */ }, { - .name =3D "cpu/instructions/G", - .valid =3D test__pmu_cpu_valid, + .name =3D "default_core/instructions/G", .check =3D test__checkevent_exclude_host_modifier, /* 2 */ }, { - .name =3D "cpu/instructions/H", - .valid =3D test__pmu_cpu_valid, + .name =3D "default_core/instructions/H", .check =3D test__checkevent_exclude_guest_modifier, /* 3 */ }, { - .name =3D "{cpu/instructions/k,cpu/cycles/upp}", - .valid =3D test__pmu_cpu_valid, + .name =3D "{default_core/instructions/k,default_core/cycles/upp}", .check =3D test__group1, /* 4 */ }, { - .name =3D "{cpu/cycles/u,cpu/instructions/kp}:p", - .valid =3D test__pmu_cpu_valid, + .name =3D "{default_core/cycles/u,default_core/instructions/kp}:p", .check =3D test__group4, /* 5 */ }, { - .name =3D "{cpu/cycles/,cpu/cache-misses/G}:H", - .valid =3D test__pmu_cpu_valid, + .name =3D "{default_core/cycles/,default_core/cache-misses/G}:H", .check =3D test__group_gh1, /* 6 */ }, { - .name =3D "{cpu/cycles/,cpu/cache-misses/H}:G", - .valid =3D test__pmu_cpu_valid, + .name =3D "{default_core/cycles/,default_core/cache-misses/H}:G", .check =3D test__group_gh2, /* 7 */ }, { - .name =3D "{cpu/cycles/G,cpu/cache-misses/H}:u", - .valid =3D test__pmu_cpu_valid, + .name =3D "{default_core/cycles/G,default_core/cache-misses/H}:u", .check =3D test__group_gh3, /* 8 */ }, { - .name =3D "{cpu/cycles/G,cpu/cache-misses/H}:uG", - .valid =3D test__pmu_cpu_valid, + .name =3D "{default_core/cycles/G,default_core/cache-misses/H}:uG", .check =3D test__group_gh4, /* 9 */ }, { - .name =3D "{cpu/cycles/,cpu/cache-misses/,cpu/branch-misses/}:S", - .valid =3D test__pmu_cpu_valid, + .name =3D "{default_core/cycles/,default_core/cache-misses/,default_cor= e/branch-misses/}:S", .check =3D test__leader_sample1, /* 0 */ }, { - .name =3D "{cpu/instructions/,cpu/branch-misses/}:Su", - .valid =3D test__pmu_cpu_valid, + .name =3D "{default_core/instructions/,default_core/branch-misses/}:Su", .check =3D test__leader_sample2, /* 1 */ }, { - .name =3D "cpu/instructions/uDp", - .valid =3D test__pmu_cpu_valid, + .name =3D "default_core/instructions/uDp", .check =3D test__checkevent_pinned_modifier, /* 2 */ }, { - .name =3D "{cpu/cycles/,cpu/cache-misses/,cpu/branch-misses/}:D", - .valid =3D test__pmu_cpu_valid, + .name =3D "{default_core/cycles/,default_core/cache-misses/,default_cor= e/branch-misses/}:D", .check =3D test__pinned_group, /* 3 */ }, { - .name =3D "cpu/instructions/I", - .valid =3D test__pmu_cpu_valid, + .name =3D "default_core/instructions/I", .check =3D test__checkevent_exclude_idle_modifier, /* 4 */ }, { - .name =3D "cpu/instructions/kIG", - .valid =3D test__pmu_cpu_valid, + .name =3D "default_core/instructions/kIG", .check =3D test__checkevent_exclude_idle_modifier_1, /* 5 */ }, { - .name =3D "cpu/cycles/u", - .valid =3D test__pmu_cpu_valid, + .name =3D "default_core/cycles/u", .check =3D test__sym_event_slash, /* 6 */ }, { - .name =3D "cpu/cycles/k", - .valid =3D test__pmu_cpu_valid, + .name =3D "default_core/cycles/k", .check =3D test__sym_event_dc, /* 7 */ }, { - .name =3D "cpu/instructions/uep", - .valid =3D test__pmu_cpu_valid, + .name =3D "default_core/instructions/uep", .check =3D test__checkevent_exclusive_modifier, /* 8 */ }, { - .name =3D "{cpu/cycles/,cpu/cache-misses/,cpu/branch-misses/}:e", - .valid =3D test__pmu_cpu_valid, + .name =3D "{default_core/cycles/,default_core/cache-misses/,default_cor= e/branch-misses/}:e", .check =3D test__exclusive_group, /* 9 */ }, { - .name =3D "cpu/cycles,name=3Dname/", - .valid =3D test__pmu_cpu_valid, + .name =3D "default_core/cycles,name=3Dname/", .check =3D test__term_equal_term, /* 0 */ }, { - .name =3D "cpu/cycles,name=3Dl1d/", - .valid =3D test__pmu_cpu_valid, + .name =3D "default_core/cycles,name=3Dl1d/", .check =3D test__term_equal_legacy, /* 1 */ }, @@ -2383,15 +2358,30 @@ static int combine_test_results(int existing, int l= atest) static int test_events(const struct evlist_test *events, int cnt) { int ret =3D TEST_OK; + struct perf_pmu *core_pmu =3D perf_pmus__find_core_pmu(); =20 for (int i =3D 0; i < cnt; i++) { - const struct evlist_test *e =3D &events[i]; + struct evlist_test e =3D events[i]; int test_ret; + const char *pos =3D e.name; + char buf[1024], *buf_pos =3D buf, *end; + + while ((end =3D strstr(pos, "default_core"))) { + size_t len =3D end - pos; + + strncpy(buf_pos, pos, len); + pos =3D end + 12; + buf_pos +=3D len; + strcpy(buf_pos, core_pmu->name); + buf_pos +=3D strlen(core_pmu->name); + } + strcpy(buf_pos, pos); =20 - pr_debug("running test %d '%s'\n", i, e->name); - test_ret =3D test_event(e); + e.name =3D buf; + pr_debug("running test %d '%s'\n", i, e.name); + test_ret =3D test_event(&e); if (test_ret !=3D TEST_OK) { - pr_debug("Event test failure: test %d '%s'", i, e->name); + pr_debug("Event test failure: test %d '%s'", i, e.name); ret =3D combine_test_results(ret, test_ret); } } --=20 2.51.0.534.gc79095c0ca-goog