From nobody Thu Oct 2 03:34:11 2025 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.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 8D775320382 for ; Tue, 23 Sep 2025 22:34:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758666854; cv=none; b=Y1R1A0d620c5SCGzZWL7A5SIA6tZYNlZnF1Hpzxq31/xPBMNG9avZhqjV1Qy0kbpdkHiV3DREXRKTeW2D8+jmxznYGa7f2VS/nHHDvJp20Rpf2x+W290y97IPIK3BnDV/Nyd8gquVCuuj/FuCEx8XGqXkMIV6+Oqc0Ty35BKClQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758666854; c=relaxed/simple; bh=RSqOOOxo2G8WJ3Q6u3A/qEUITI5NAmi34otlxw5uvIM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=TwhkE3rLClAp02mKbRv36gD3JujxenaJzWIn2HG52lOgVf8AOZzAISVokJS3/aTptxRAsqibWZivRCe4G/mZyTiGnTDSD5uyi6vqO46RbuYbuU4hK0V4/Ienl3mm9CCS80yOSXyd22fgtFAmYdBvARhhM7a1Sl1yAKgoWXLR/yU= 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=qMtGx3Yb; arc=none smtp.client-ip=209.85.216.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="qMtGx3Yb" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-32eb18b5500so9727845a91.2 for ; Tue, 23 Sep 2025 15:34:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1758666850; x=1759271650; 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=d4XZd7WT5Fg2aYG3+qR6VCPykqBFpM9YpU6kt0fn++E=; b=qMtGx3Ybez4fdZ0+1O4s5d7wqQhmQnvlRLgu8PBqbxFpyszSv1IVNgoLOwRLHaoFxf ZGaTNvYFQtO4Ck5CEPGuDqM6EWtVSfdhKHsaF+OQe+2xiWiY5XhR+fqiSc1m+D9+Nb/C cIiyDLl3RcXnnTI/hdhG4MYVhz0l4W83ju4dmVGY8L1l0IziwknaanfyM6UbUZc1RHP2 F/C6VYRXUucb/KIgQ1DU28m/4XQjba3PU48E2VedvSG98bsAIVKObvtSHcpzWJZxV9Dm eN2EXwIeoT8qsssSiLYGh3App4UCXD6iw9j+PIqUq6JagzjpvaxzboLXyqD4th08KUZ1 868Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758666850; x=1759271650; 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=d4XZd7WT5Fg2aYG3+qR6VCPykqBFpM9YpU6kt0fn++E=; b=ZG74lI+tvjpPJPWpgRpu+N0sFAi1fjQbWfkkNmi07Iw6Q2bBIx/5WfCoIZPaGaLZ2m durW83eJ2orW8eNa2JYSKXPTsKAyRchc9I8Zl4HZHtefKRXUWL54cIip10wxBaAb9gCd zaaui5tRrhHVZ+wLt2kWH6Xns1cEWbW4qCgrDS1MGVeTd9BOASESBxKDxXEQCXqA0ZGQ u5wmc/L2qLXi0kRlyuqIHOapZZXQ8+ERixso7XkswC73y1u+MO6QmhWRJWv5IR78ix7S t+9fa9A9fnZYNMECf/Z30HVbVtFERg8ee9G0coU0Unk+fq7q+73b/Xpin1Y/ldGW+d7x h3gw== X-Forwarded-Encrypted: i=1; AJvYcCVtI4+N8bhAI8F1cbM0w9ngsS4QIBKX6EX+9rUA2Srt5754BnRBzakGXlWZ61+fo2Lnm2dWUMKxt3nTuaY=@vger.kernel.org X-Gm-Message-State: AOJu0YzTj8J4KvayB5FPfz8B7TvDsUuticS5ipmyl7AiD1pm5GfF9+Df NsfTVlUo+b9dsL1Qr+gMbAF8fY4wPLkMvmk7GMDlMcnKCeTPyj9h8NVxXoxgXIIeiHBK6W9UEcb RtqtLRttm/g== X-Google-Smtp-Source: AGHT+IFDhvHUbwkezXKQd/e0m8z0HZrc3a67BZWjg/Ff0FEB2Pt+Cegmx02M1hcrrkQ12X3fDWYRN2gH1rYQ X-Received: from pjg14.prod.google.com ([2002:a17:90b:3f4e:b0:330:8b1f:c4e7]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:3fcc:b0:32e:5d79:64f4 with SMTP id 98e67ed59e1d1-332a96f7a8amr4470422a91.25.1758666850047; Tue, 23 Sep 2025 15:34:10 -0700 (PDT) Date: Tue, 23 Sep 2025 15:33:11 -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-28-irogers@google.com> Subject: [PATCH v6 27/28] perf test parse-events: Add evlist test helper 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" Add TEST_ASSERT_EVLIST to dump the failing evlist in the event of a failure. Add the macro to a number of tests not currently checking the evlist length. Signed-off-by: Ian Rogers --- tools/perf/tests/parse-events.c | 236 ++++++++++++++++++++++---------- 1 file changed, 165 insertions(+), 71 deletions(-) diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-event= s.c index b48580f43ff3..8950677ead15 100644 --- a/tools/perf/tests/parse-events.c +++ b/tools/perf/tests/parse-events.c @@ -7,6 +7,7 @@ #include "debug.h" #include "pmu.h" #include "pmus.h" +#include "strbuf.h" #include #include #include "fncache.h" @@ -20,6 +21,22 @@ #define PERF_TP_SAMPLE_TYPE (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME | \ PERF_SAMPLE_CPU | PERF_SAMPLE_PERIOD) =20 +static bool check_evlist(const char *test, int line, bool cond, struct evl= ist *evlist) +{ + struct strbuf sb =3D STRBUF_INIT; + + if (cond) + return true; + + evlist__format_evsels(evlist, &sb, 2048); + pr_debug("FAILED %s:%d: %s\nFor evlist: %s\n", __FILE__, line, test, sb.b= uf); + strbuf_release(&sb); + return false; +} +#define TEST_ASSERT_EVLIST(test, cond, evlist) \ + if (!check_evlist(test, __LINE__, cond, evlist)) \ + return TEST_FAIL + static int num_core_entries(struct evlist *evlist) { /* @@ -76,8 +93,8 @@ static int test__checkevent_tracepoint(struct evlist *evl= ist) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_VAL("wrong number of entries", 1 =3D=3D evlist->core.nr_entri= es); - TEST_ASSERT_VAL("wrong number of groups", 0 =3D=3D evlist__nr_groups(evli= st)); + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); + TEST_ASSERT_EVLIST("wrong number of groups", 0 =3D=3D evlist__nr_groups(e= vlist), evlist); TEST_ASSERT_VAL("wrong type", PERF_TYPE_TRACEPOINT =3D=3D evsel->core.att= r.type); TEST_ASSERT_VAL("wrong sample_type", PERF_TP_SAMPLE_TYPE =3D=3D evsel->core.attr.sample_type); @@ -89,8 +106,8 @@ static int test__checkevent_tracepoint_multi(struct evli= st *evlist) { struct evsel *evsel; =20 - TEST_ASSERT_VAL("wrong number of entries", evlist->core.nr_entries > 1); - TEST_ASSERT_VAL("wrong number of groups", 0 =3D=3D evlist__nr_groups(evli= st)); + TEST_ASSERT_EVLIST("wrong number of entries", evlist->core.nr_entries > 1= , evlist); + TEST_ASSERT_EVLIST("wrong number of groups", 0 =3D=3D evlist__nr_groups(e= vlist), evlist); =20 evlist__for_each_entry(evlist, evsel) { TEST_ASSERT_VAL("wrong type", @@ -108,7 +125,7 @@ static int test__checkevent_raw(struct evlist *evlist) struct perf_evsel *evsel; bool raw_type_match =3D false; =20 - TEST_ASSERT_VAL("wrong number of entries", 0 !=3D evlist->core.nr_entries= ); + TEST_ASSERT_EVLIST("wrong number of entries", 0 !=3D evlist->core.nr_entr= ies, evlist); =20 perf_evlist__for_each_evsel(&evlist->core, evsel) { struct perf_pmu *pmu __maybe_unused =3D NULL; @@ -145,7 +162,7 @@ static int test__checkevent_numeric(struct evlist *evli= st) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_VAL("wrong number of entries", 1 =3D=3D evlist->core.nr_entri= es); + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); TEST_ASSERT_VAL("wrong type", 1 =3D=3D evsel->core.attr.type); TEST_ASSERT_VAL("wrong config", 1 =3D=3D evsel->core.attr.config); return TEST_OK; @@ -156,7 +173,7 @@ static int test__checkevent_symbolic_name(struct evlist= *evlist) { struct evsel *evsel; =20 - TEST_ASSERT_VAL("wrong number of entries", 0 !=3D evlist->core.nr_entries= ); + TEST_ASSERT_EVLIST("wrong number of entries", 0 !=3D evlist->core.nr_entr= ies, evlist); =20 evlist__for_each_entry(evlist, evsel) TEST_ASSERT_VAL("unexpected event", evsel__match(evsel, HARDWARE, HW_INS= TRUCTIONS)); @@ -168,7 +185,7 @@ static int test__checkevent_symbolic_name_config(struct= evlist *evlist) { struct evsel *evsel; =20 - TEST_ASSERT_VAL("wrong number of entries", 0 !=3D evlist->core.nr_entries= ); + TEST_ASSERT_EVLIST("wrong number of entries", 0 !=3D evlist->core.nr_entr= ies, evlist); =20 evlist__for_each_entry(evlist, evsel) { TEST_ASSERT_VAL("unexpected event", evsel__match(evsel, HARDWARE, HW_CPU= _CYCLES)); @@ -187,7 +204,7 @@ static int test__checkevent_symbolic_alias(struct evlis= t *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_VAL("wrong number of entries", 1 =3D=3D evlist->core.nr_entri= es); + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); TEST_ASSERT_VAL("wrong type/config", evsel__match(evsel, SOFTWARE, SW_PAG= E_FAULTS)); return TEST_OK; } @@ -196,7 +213,7 @@ static int test__checkevent_genhw(struct evlist *evlist) { struct perf_evsel *evsel; =20 - TEST_ASSERT_VAL("wrong number of entries", 0 !=3D evlist->core.nr_entries= ); + TEST_ASSERT_EVLIST("wrong number of entries", 0 !=3D evlist->core.nr_entr= ies, evlist); =20 perf_evlist__for_each_entry(&evlist->core, evsel) { TEST_ASSERT_VAL("wrong type", PERF_TYPE_HW_CACHE =3D=3D evsel->attr.type= ); @@ -209,7 +226,7 @@ static int test__checkevent_breakpoint(struct evlist *e= vlist) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_VAL("wrong number of entries", 1 =3D=3D evlist->core.nr_entri= es); + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); TEST_ASSERT_VAL("wrong type", PERF_TYPE_BREAKPOINT =3D=3D evsel->core.att= r.type); TEST_ASSERT_VAL("wrong config", 0 =3D=3D evsel->core.attr.config); TEST_ASSERT_VAL("wrong bp_type", (HW_BREAKPOINT_R | HW_BREAKPOINT_W) =3D= =3D @@ -223,7 +240,7 @@ static int test__checkevent_breakpoint_x(struct evlist = *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_VAL("wrong number of entries", 1 =3D=3D evlist->core.nr_entri= es); + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); TEST_ASSERT_VAL("wrong type", PERF_TYPE_BREAKPOINT =3D=3D evsel->core.att= r.type); TEST_ASSERT_VAL("wrong config", 0 =3D=3D evsel->core.attr.config); TEST_ASSERT_VAL("wrong bp_type", @@ -236,7 +253,7 @@ static int test__checkevent_breakpoint_r(struct evlist = *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_VAL("wrong number of entries", 1 =3D=3D evlist->core.nr_entri= es); + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); TEST_ASSERT_VAL("wrong type", PERF_TYPE_BREAKPOINT =3D=3D evsel->core.attr.type); TEST_ASSERT_VAL("wrong config", 0 =3D=3D evsel->core.attr.config); @@ -251,7 +268,7 @@ static int test__checkevent_breakpoint_w(struct evlist = *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_VAL("wrong number of entries", 1 =3D=3D evlist->core.nr_entri= es); + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); TEST_ASSERT_VAL("wrong type", PERF_TYPE_BREAKPOINT =3D=3D evsel->core.attr.type); TEST_ASSERT_VAL("wrong config", 0 =3D=3D evsel->core.attr.config); @@ -266,7 +283,7 @@ static int test__checkevent_breakpoint_rw(struct evlist= *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_VAL("wrong number of entries", 1 =3D=3D evlist->core.nr_entri= es); + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); TEST_ASSERT_VAL("wrong type", PERF_TYPE_BREAKPOINT =3D=3D evsel->core.attr.type); TEST_ASSERT_VAL("wrong config", 0 =3D=3D evsel->core.attr.config); @@ -281,6 +298,7 @@ static int test__checkevent_tracepoint_modifier(struct = evlist *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); TEST_ASSERT_VAL("wrong exclude_user", evsel->core.attr.exclude_user); TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->core.attr.exclude_kernel); TEST_ASSERT_VAL("wrong exclude_hv", evsel->core.attr.exclude_hv); @@ -294,7 +312,7 @@ test__checkevent_tracepoint_multi_modifier(struct evlis= t *evlist) { struct perf_evsel *evsel; =20 - TEST_ASSERT_VAL("wrong number of entries", evlist->core.nr_entries > 1); + TEST_ASSERT_EVLIST("wrong number of entries", evlist->core.nr_entries > 1= , evlist); =20 perf_evlist__for_each_entry(&evlist->core, evsel) { TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user); @@ -310,6 +328,8 @@ static int test__checkevent_raw_modifier(struct evlist = *evlist) { struct perf_evsel *evsel; =20 + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); + perf_evlist__for_each_entry(&evlist->core, evsel) { TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user); TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel); @@ -323,6 +343,8 @@ static int test__checkevent_numeric_modifier(struct evl= ist *evlist) { struct perf_evsel *evsel; =20 + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); + perf_evlist__for_each_entry(&evlist->core, evsel) { TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user); TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel); @@ -336,8 +358,9 @@ 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)); + TEST_ASSERT_EVLIST("wrong number of entries", + evlist->core.nr_entries =3D=3D num_core_entries(evlist), + evlist); =20 perf_evlist__for_each_entry(&evlist->core, evsel) { TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user); @@ -352,6 +375,10 @@ static int test__checkevent_exclude_host_modifier(stru= ct evlist *evlist) { struct perf_evsel *evsel; =20 + TEST_ASSERT_EVLIST("wrong number of entries", + evlist->core.nr_entries =3D=3D num_core_entries(evlist), + evlist); + perf_evlist__for_each_entry(&evlist->core, evsel) { TEST_ASSERT_VAL("wrong exclude guest", !evsel->attr.exclude_guest); TEST_ASSERT_VAL("wrong exclude host", evsel->attr.exclude_host); @@ -363,6 +390,10 @@ static int test__checkevent_exclude_guest_modifier(str= uct evlist *evlist) { struct perf_evsel *evsel; =20 + TEST_ASSERT_EVLIST("wrong number of entries", + evlist->core.nr_entries =3D=3D num_core_entries(evlist), + evlist); + perf_evlist__for_each_entry(&evlist->core, evsel) { TEST_ASSERT_VAL("wrong exclude guest", evsel->attr.exclude_guest); TEST_ASSERT_VAL("wrong exclude host", !evsel->attr.exclude_host); @@ -374,6 +405,7 @@ static int test__checkevent_symbolic_alias_modifier(str= uct evlist *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); TEST_ASSERT_VAL("wrong exclude_user", !evsel->core.attr.exclude_user); TEST_ASSERT_VAL("wrong exclude_kernel", evsel->core.attr.exclude_kernel); TEST_ASSERT_VAL("wrong exclude_hv", evsel->core.attr.exclude_hv); @@ -386,6 +418,10 @@ static int test__checkevent_genhw_modifier(struct evli= st *evlist) { struct perf_evsel *evsel; =20 + TEST_ASSERT_EVLIST("wrong number of entries", + evlist->core.nr_entries =3D=3D num_core_entries(evlist), + evlist); + perf_evlist__for_each_entry(&evlist->core, evsel) { TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user); TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel); @@ -399,6 +435,10 @@ static int test__checkevent_exclude_idle_modifier(stru= ct evlist *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 + TEST_ASSERT_EVLIST("wrong number of entries", + evlist->core.nr_entries =3D=3D num_core_entries(evlist), + evlist); + TEST_ASSERT_VAL("wrong exclude idle", evsel->core.attr.exclude_idle); TEST_ASSERT_VAL("wrong exclude guest", !evsel->core.attr.exclude_guest); TEST_ASSERT_VAL("wrong exclude host", !evsel->core.attr.exclude_host); @@ -414,6 +454,10 @@ static int test__checkevent_exclude_idle_modifier_1(st= ruct evlist *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 + TEST_ASSERT_EVLIST("wrong number of entries", + evlist->core.nr_entries =3D=3D num_core_entries(evlist), + evlist); + TEST_ASSERT_VAL("wrong exclude idle", evsel->core.attr.exclude_idle); TEST_ASSERT_VAL("wrong exclude guest", !evsel->core.attr.exclude_guest); TEST_ASSERT_VAL("wrong exclude host", evsel->core.attr.exclude_host); @@ -643,7 +687,7 @@ static int test__checkevent_pmu_name(struct evlist *evl= ist) char buf[256]; =20 /* default_core/config=3D1,name=3Dkrava/u */ - TEST_ASSERT_VAL("wrong number of entries", 2 =3D=3D evlist->core.nr_entri= es); + TEST_ASSERT_EVLIST("wrong number of entries", 2 =3D=3D evlist->core.nr_en= tries, evlist); 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")); @@ -665,7 +709,7 @@ static int test__checkevent_pmu_partial_time_callgraph(= struct evlist *evlist) struct perf_pmu *core_pmu =3D perf_pmus__find_core_pmu(); =20 /* 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_EVLIST("wrong number of entries", 2 =3D=3D evlist->core.nr_en= tries, evlist); 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); /* @@ -696,7 +740,7 @@ static int test__checkevent_pmu_events(struct evlist *e= vlist) struct evsel *evsel; struct perf_pmu *core_pmu =3D perf_pmus__find_core_pmu(); =20 - TEST_ASSERT_VAL("wrong number of entries", 1 <=3D evlist->core.nr_entries= ); + TEST_ASSERT_EVLIST("wrong number of entries", 1 <=3D evlist->core.nr_entr= ies, evlist); =20 evlist__for_each_entry(evlist, evsel) { TEST_ASSERT_VAL("wrong type", core_pmu->type =3D=3D evsel->core.attr.typ= e || @@ -721,7 +765,7 @@ static int test__checkevent_pmu_events_mix(struct evlis= t *evlist) * The wild card event will be opened at least once, but it may be * opened on each core PMU. */ - TEST_ASSERT_VAL("wrong number of entries", evlist->core.nr_entries >=3D 2= ); + TEST_ASSERT_EVLIST("wrong number of entries", evlist->core.nr_entries >= =3D 2, evlist); for (int i =3D 0; i < evlist->core.nr_entries - 1; i++) { evsel =3D (i =3D=3D 0 ? evlist__first(evlist) : evsel__next(evsel)); /* pmu-event:u */ @@ -833,10 +877,12 @@ 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(evlist) * 2)); - TEST_ASSERT_VAL("wrong number of groups", - evlist__nr_groups(evlist) =3D=3D num_core_entries(evlist)); + TEST_ASSERT_EVLIST("wrong number of entries", + evlist->core.nr_entries =3D=3D (num_core_entries(evlist) * 2), + evlist); + TEST_ASSERT_EVLIST("wrong number of groups", + evlist__nr_groups(evlist) =3D=3D num_core_entries(evlist), + evlist); =20 for (int i =3D 0; i < num_core_entries(evlist); i++) { /* instructions:k */ @@ -873,13 +919,14 @@ 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(evlist) + 1)); + TEST_ASSERT_EVLIST("wrong number of entries", + evlist->core.nr_entries =3D=3D (2 * num_core_entries(evlist) + 1), + evlist); /* * TODO: Currently the software event won't be grouped with the hardware * event except for 1 PMU. */ - TEST_ASSERT_VAL("wrong number of groups", 1 =3D=3D evlist__nr_groups(evli= st)); + TEST_ASSERT_EVLIST("wrong number of groups", 1 =3D=3D evlist__nr_groups(e= vlist), evlist); =20 evlist__for_each_entry(evlist, evsel) { if (evsel__match(evsel, SOFTWARE, SW_PAGE_FAULTS)) { @@ -928,14 +975,15 @@ static int test__group3(struct evlist *evlist __maybe= _unused) { struct evsel *evsel, *group1_leader =3D NULL, *group2_leader =3D NULL; =20 - TEST_ASSERT_VAL("wrong number of entries", - evlist->core.nr_entries =3D=3D (3 * perf_pmus__num_core_pmus() + 2)); + TEST_ASSERT_EVLIST("wrong number of entries", + evlist->core.nr_entries =3D=3D (3 * perf_pmus__num_core_pmus() + 2), + evlist); /* * Currently the software event won't be grouped with the hardware event * except for 1 PMU. This means there are always just 2 groups * regardless of the number of core PMUs. */ - TEST_ASSERT_VAL("wrong number of groups", 2 =3D=3D evlist__nr_groups(evli= st)); + TEST_ASSERT_EVLIST("wrong number of groups", 2 =3D=3D evlist__nr_groups(e= vlist), evlist); =20 evlist__for_each_entry(evlist, evsel) { if (evsel->core.attr.type =3D=3D PERF_TYPE_TRACEPOINT) { @@ -1030,10 +1078,12 @@ 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(evlist) * 2)); - TEST_ASSERT_VAL("wrong number of groups", - num_core_entries(evlist) =3D=3D evlist__nr_groups(evlist)); + TEST_ASSERT_EVLIST("wrong number of entries", + evlist->core.nr_entries =3D=3D (num_core_entries(evlist) * 2), + evlist); + TEST_ASSERT_EVLIST("wrong number of groups", + num_core_entries(evlist) =3D=3D evlist__nr_groups(evlist), + evlist); =20 for (int i =3D 0; i < num_core_entries(evlist); i++) { /* cycles:u + p */ @@ -1071,10 +1121,12 @@ 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))); - TEST_ASSERT_VAL("wrong number of groups", - evlist__nr_groups(evlist) =3D=3D (2 * num_core_entries(evlist))); + TEST_ASSERT_EVLIST("wrong number of entries", + evlist->core.nr_entries =3D=3D (5 * num_core_entries(evlist)), + evlist); + TEST_ASSERT_EVLIST("wrong number of groups", + evlist__nr_groups(evlist) =3D=3D (2 * num_core_entries(evlist)), + evlist); =20 for (int i =3D 0; i < num_core_entries(evlist); i++) { /* cycles + G */ @@ -1152,10 +1204,12 @@ 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))); - TEST_ASSERT_VAL("wrong number of groups", - evlist__nr_groups(evlist) =3D=3D num_core_entries(evlist)); + TEST_ASSERT_EVLIST("wrong number of entries", + evlist->core.nr_entries =3D=3D (2 * num_core_entries(evlist)), + evlist); + TEST_ASSERT_EVLIST("wrong number of groups", + evlist__nr_groups(evlist) =3D=3D num_core_entries(evlist), + evlist); =20 for (int i =3D 0; i < num_core_entries(evlist); i++) { /* cycles + :H group modifier */ @@ -1191,10 +1245,12 @@ 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))); - TEST_ASSERT_VAL("wrong number of groups", - evlist__nr_groups(evlist) =3D=3D num_core_entries(evlist)); + TEST_ASSERT_EVLIST("wrong number of entries", + evlist->core.nr_entries =3D=3D (2 * num_core_entries(evlist)), + evlist); + TEST_ASSERT_EVLIST("wrong number of groups", + evlist__nr_groups(evlist) =3D=3D num_core_entries(evlist), + evlist); =20 for (int i =3D 0; i < num_core_entries(evlist); i++) { /* cycles + :G group modifier */ @@ -1230,10 +1286,12 @@ 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))); - TEST_ASSERT_VAL("wrong number of groups", - evlist__nr_groups(evlist) =3D=3D num_core_entries(evlist)); + TEST_ASSERT_EVLIST("wrong number of entries", + evlist->core.nr_entries =3D=3D (2 * num_core_entries(evlist)), + evlist); + TEST_ASSERT_EVLIST("wrong number of groups", + evlist__nr_groups(evlist) =3D=3D num_core_entries(evlist), + evlist); =20 for (int i =3D 0; i < num_core_entries(evlist); i++) { /* cycles:G + :u group modifier */ @@ -1269,10 +1327,12 @@ 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))); - TEST_ASSERT_VAL("wrong number of groups", - evlist__nr_groups(evlist) =3D=3D num_core_entries(evlist)); + TEST_ASSERT_EVLIST("wrong number of entries", + evlist->core.nr_entries =3D=3D (2 * num_core_entries(evlist)), + evlist); + TEST_ASSERT_EVLIST("wrong number of groups", + evlist__nr_groups(evlist) =3D=3D num_core_entries(evlist), + evlist); =20 for (int i =3D 0; i < num_core_entries(evlist); i++) { /* cycles:G + :uG group modifier */ @@ -1308,8 +1368,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))); + TEST_ASSERT_EVLIST("wrong number of entries", + evlist->core.nr_entries =3D=3D (3 * num_core_entries(evlist)), + evlist); =20 for (int i =3D 0; i < num_core_entries(evlist); i++) { /* cycles - sampling group leader */ @@ -1358,8 +1419,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))); + TEST_ASSERT_EVLIST("wrong number of entries", + evlist->core.nr_entries =3D=3D (2 * num_core_entries(evlist)), + evlist); =20 for (int i =3D 0; i < num_core_entries(evlist); i++) { /* instructions - sampling group leader */ @@ -1396,8 +1458,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)); + TEST_ASSERT_EVLIST("wrong number of entries", + evlist->core.nr_entries =3D=3D num_core_entries(evlist), + evlist); =20 for (int i =3D 0; i < num_core_entries(evlist); i++) { evsel =3D (i =3D=3D 0 ? evlist__first(evlist) : evsel__next(evsel)); @@ -1414,8 +1477,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))); + TEST_ASSERT_EVLIST("wrong number of entries", + evlist->core.nr_entries =3D=3D (3 * num_core_entries(evlist)), + evlist); =20 for (int i =3D 0; i < num_core_entries(evlist); i++) { /* cycles - group leader */ @@ -1445,6 +1509,9 @@ static int test__checkevent_exclusive_modifier(struct= evlist *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 + TEST_ASSERT_EVLIST("wrong number of entries", + evlist->core.nr_entries =3D=3D num_core_entries(evlist), + evlist); TEST_ASSERT_VAL("wrong exclude_user", !evsel->core.attr.exclude_user); TEST_ASSERT_VAL("wrong exclude_kernel", evsel->core.attr.exclude_kernel); TEST_ASSERT_VAL("wrong exclude_hv", evsel->core.attr.exclude_hv); @@ -1458,8 +1525,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)); + TEST_ASSERT_EVLIST("wrong number of entries", + evlist->core.nr_entries =3D=3D 3 * num_core_entries(evlist), + evlist); =20 for (int i =3D 0; i < num_core_entries(evlist); i++) { /* cycles - group leader */ @@ -1488,7 +1556,7 @@ static int test__checkevent_breakpoint_len(struct evl= ist *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_VAL("wrong number of entries", 1 =3D=3D evlist->core.nr_entri= es); + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); TEST_ASSERT_VAL("wrong type", PERF_TYPE_BREAKPOINT =3D=3D evsel->core.att= r.type); TEST_ASSERT_VAL("wrong config", 0 =3D=3D evsel->core.attr.config); TEST_ASSERT_VAL("wrong bp_type", (HW_BREAKPOINT_R | HW_BREAKPOINT_W) =3D= =3D @@ -1503,7 +1571,7 @@ static int test__checkevent_breakpoint_len_w(struct e= vlist *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_VAL("wrong number of entries", 1 =3D=3D evlist->core.nr_entri= es); + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); TEST_ASSERT_VAL("wrong type", PERF_TYPE_BREAKPOINT =3D=3D evsel->core.att= r.type); TEST_ASSERT_VAL("wrong config", 0 =3D=3D evsel->core.attr.config); TEST_ASSERT_VAL("wrong bp_type", HW_BREAKPOINT_W =3D=3D @@ -1519,6 +1587,7 @@ test__checkevent_breakpoint_len_rw_modifier(struct ev= list *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); TEST_ASSERT_VAL("wrong exclude_user", !evsel->core.attr.exclude_user); TEST_ASSERT_VAL("wrong exclude_kernel", evsel->core.attr.exclude_kernel); TEST_ASSERT_VAL("wrong exclude_hv", evsel->core.attr.exclude_hv); @@ -1531,8 +1600,9 @@ 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)); + TEST_ASSERT_EVLIST("wrong number of entries", + evlist->core.nr_entries =3D=3D 1 + num_core_entries(evlist), + evlist); TEST_ASSERT_VAL("wrong type/config", evsel__match(evsel, SOFTWARE, SW_TAS= K_CLOCK)); return TEST_OK; } @@ -1541,6 +1611,9 @@ static int test__checkevent_config_symbol(struct evli= st *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 + TEST_ASSERT_EVLIST("wrong number of entries", + evlist->core.nr_entries =3D=3D num_core_entries(evlist), + evlist); TEST_ASSERT_VAL("wrong name setting", evsel__name_is(evsel, "insn")); return TEST_OK; } @@ -1549,6 +1622,7 @@ static int test__checkevent_config_raw(struct evlist = *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); TEST_ASSERT_VAL("wrong name setting", evsel__name_is(evsel, "rawpmu")); return TEST_OK; } @@ -1557,6 +1631,7 @@ static int test__checkevent_config_num(struct evlist = *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); TEST_ASSERT_VAL("wrong name setting", evsel__name_is(evsel, "numpmu")); return TEST_OK; } @@ -1565,6 +1640,9 @@ static int test__checkevent_config_cache(struct evlis= t *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 + TEST_ASSERT_EVLIST("wrong number of entries", + evlist->core.nr_entries =3D=3D num_core_entries(evlist), + evlist); TEST_ASSERT_VAL("wrong name setting", evsel__name_is(evsel, "cachepmu")); return test__checkevent_genhw(evlist); } @@ -1588,6 +1666,7 @@ static int test__intel_pt(struct evlist *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); TEST_ASSERT_VAL("wrong name setting", evsel__name_is(evsel, "intel_pt//u"= )); return TEST_OK; } @@ -1596,6 +1675,9 @@ static int test__checkevent_complex_name(struct evlis= t *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 + TEST_ASSERT_EVLIST("wrong number of entries", + evlist->core.nr_entries =3D=3D num_core_entries(evlist), + evlist); TEST_ASSERT_VAL("wrong complex name parsing", evsel__name_is(evsel, "COMPLEX_CYCLES_NAME:orig=3Dcpu-cycles,desc=3Dchip-clock-ticks"= )); @@ -1606,7 +1688,7 @@ static int test__checkevent_raw_pmu(struct evlist *ev= list) { struct evsel *evsel =3D evlist__first(evlist); =20 - TEST_ASSERT_VAL("wrong number of entries", 1 =3D=3D evlist->core.nr_entri= es); + TEST_ASSERT_EVLIST("wrong number of entries", 1 =3D=3D evlist->core.nr_en= tries, evlist); TEST_ASSERT_VAL("wrong type", PERF_TYPE_SOFTWARE =3D=3D evsel->core.attr.= type); TEST_ASSERT_VAL("wrong config", 0x1a =3D=3D evsel->core.attr.config); return TEST_OK; @@ -1616,6 +1698,9 @@ static int test__sym_event_slash(struct evlist *evlis= t) { struct evsel *evsel =3D evlist__first(evlist); =20 + TEST_ASSERT_EVLIST("wrong number of entries", + evlist->core.nr_entries =3D=3D num_core_entries(evlist), + evlist); TEST_ASSERT_VAL("unexpected event", evsel__match(evsel, HARDWARE, HW_CPU_= CYCLES)); TEST_ASSERT_VAL("wrong exclude_kernel", evsel->core.attr.exclude_kernel); return TEST_OK; @@ -1625,6 +1710,9 @@ static int test__sym_event_dc(struct evlist *evlist) { struct evsel *evsel =3D evlist__first(evlist); =20 + TEST_ASSERT_EVLIST("wrong number of entries", + evlist->core.nr_entries =3D=3D num_core_entries(evlist), + evlist); TEST_ASSERT_VAL("unexpected event", evsel__match(evsel, HARDWARE, HW_CPU_= CYCLES)); TEST_ASSERT_VAL("wrong exclude_user", evsel->core.attr.exclude_user); return TEST_OK; @@ -1634,6 +1722,9 @@ static int test__term_equal_term(struct evlist *evlis= t) { struct evsel *evsel =3D evlist__first(evlist); =20 + TEST_ASSERT_EVLIST("wrong number of entries", + evlist->core.nr_entries =3D=3D num_core_entries(evlist), + evlist); TEST_ASSERT_VAL("unexpected event", evsel__match(evsel, HARDWARE, HW_CPU_= CYCLES)); TEST_ASSERT_VAL("wrong name setting", strcmp(evsel->name, "name") =3D=3D = 0); return TEST_OK; @@ -1643,6 +1734,9 @@ static int test__term_equal_legacy(struct evlist *evl= ist) { struct evsel *evsel =3D evlist__first(evlist); =20 + TEST_ASSERT_EVLIST("wrong number of entries", + evlist->core.nr_entries =3D=3D num_core_entries(evlist), + evlist); TEST_ASSERT_VAL("unexpected event", evsel__match(evsel, HARDWARE, HW_CPU_= CYCLES)); TEST_ASSERT_VAL("wrong name setting", strcmp(evsel->name, "l1d") =3D=3D 0= ); return TEST_OK; --=20 2.51.0.534.gc79095c0ca-goog