From nobody Mon Feb 9 05:59:28 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21025C7EE2C for ; Wed, 24 May 2023 22:18:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236522AbjEXWSu (ORCPT ); Wed, 24 May 2023 18:18:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236244AbjEXWSl (ORCPT ); Wed, 24 May 2023 18:18:41 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C543189 for ; Wed, 24 May 2023 15:18:40 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-babb78a3daaso1870342276.1 for ; Wed, 24 May 2023 15:18:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1684966719; x=1687558719; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=057e7HsRfrUjB66n+MyXVmP8dOuM02fcMdiEZVZgYrU=; b=dvNFdxGwO9BK6xjIp7teO+7XWdJt0dgU7vf5V7rd/YsFOhzIgMpFrbrtDFBFtxoVTC IXUMA5Snqk6STJbRPnPC6NRUCVN/XKKpoPSYYPkizRP2ZrWjLp57I8/bVgtryxfYjWmM 3gGWsnyzMbe/2RHSI49yEeWAHdSDRtLXMF+yz+MToG4z7LOL8qSOISIDYynJHTmGFLpz reyoa3oidSBF2UpYsmeuVhyDrldlpdotnyeVJUHIt0KjHKthIf0RvOZXWJr2znegOq+4 SDWOnBIM2nwCMKkFD/OlkiNH6Rt3jAaNbZM/TFKjwodoDtJqWQTxIqcJFfB8c4NuS08+ h5Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684966719; x=1687558719; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=057e7HsRfrUjB66n+MyXVmP8dOuM02fcMdiEZVZgYrU=; b=BuBdePmU0tYdwfwHPRJoHVhiB7UONytTT5WFbys4XmX1CibqPDiuzbAY6/UvPzxSKa /S3BAkqn2rwuSFD1L+D4xxf+RGPSUYVj9wTUAbl7NcX2FDNjyXAIk8898cZrGE8s2rST wZQfuuz+nGa3OTf826+iwU3SYRcLnr2q/bJNsjws6sN2l59QiUOOEIsqPUVr4nZ3gndG FyysqaEb2z6P31fJ18wwCWX8sjs6vYN0R02/C6Xbi0I6uJWq8oVPhwqQlJJj0JumesRf r9ZAbnvV87YRh2pUFxcC1yOo7ern0pQXXSAZRijcyqkR9vPZ+GQOwWjQ83gmMIfVyY7m j2ew== X-Gm-Message-State: AC+VfDwYCEiYRMuBL4eRExvSMub9MVwnxP7OPO1fT/WIXGSk6Aoyxvlw Hy+5j3g9A9FMSWXTzcEgPLvuiqqdehrh X-Google-Smtp-Source: ACHHUZ4nZ3QY3W3yj3bCT/LKMCbuUt+ei31h9EkO/cLy/9wr8TKW2dnJI7BNr9GOkD6EIhYQ/DP+/8mE3Upv X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:7aa7:3d2d:76ae:8e96]) (user=irogers job=sendgmr) by 2002:a25:6702:0:b0:ba7:4dda:f858 with SMTP id b2-20020a256702000000b00ba74ddaf858mr745406ybc.10.1684966719719; Wed, 24 May 2023 15:18:39 -0700 (PDT) Date: Wed, 24 May 2023 15:17:58 -0700 In-Reply-To: <20230524221831.1741381-1-irogers@google.com> Message-Id: <20230524221831.1741381-3-irogers@google.com> Mime-Version: 1.0 References: <20230524221831.1741381-1-irogers@google.com> X-Mailer: git-send-email 2.40.1.698.g37aff9b760-goog Subject: [PATCH v3 02/35] perf tests: Organize cpu_map tests into a single suite From: Ian Rogers To: Suzuki K Poulose , Mike Leach , Leo Yan , John Garry , Will Deacon , James Clark , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , Kajol Jain , Jing Zhang , Kan Liang , Zhengjun Xing , Ravi Bangoria , Madhavan Srinivasan , Athira Rajeev , Ming Wang , Huacai Chen , Sandipan Das , Dmitrii Dolgov <9erthalion6@gmail.com>, Sean Christopherson , Ali Saidi , Rob Herring , Thomas Richter , Kang Minchul , linux-kernel@vger.kernel.org, coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Go from 4 suites to a single suite with 4 test cases. Signed-off-by: Ian Rogers --- tools/perf/tests/builtin-test.c | 5 +---- tools/perf/tests/cpumap.c | 16 ++++++++++++---- tools/perf/tests/tests.h | 5 +---- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-tes= t.c index eef400025fca..aa44fdc84763 100644 --- a/tools/perf/tests/builtin-test.c +++ b/tools/perf/tests/builtin-test.c @@ -88,16 +88,13 @@ static struct test_suite *generic_tests[] =3D { &suite__bpf, &suite__thread_map_synthesize, &suite__thread_map_remove, - &suite__cpu_map_synthesize, + &suite__cpu_map, &suite__synthesize_stat_config, &suite__synthesize_stat, &suite__synthesize_stat_round, &suite__event_update, &suite__event_times, &suite__backward_ring_buffer, - &suite__cpu_map_print, - &suite__cpu_map_merge, - &suite__cpu_map_intersect, &suite__sdt_event, &suite__is_printable_array, &suite__bitmap_print, diff --git a/tools/perf/tests/cpumap.c b/tools/perf/tests/cpumap.c index 92232978fe5e..83805690c209 100644 --- a/tools/perf/tests/cpumap.c +++ b/tools/perf/tests/cpumap.c @@ -211,7 +211,15 @@ static int test__cpu_map_intersect(struct test_suite *= test __maybe_unused, return ret; } =20 -DEFINE_SUITE("Synthesize cpu map", cpu_map_synthesize); -DEFINE_SUITE("Print cpu map", cpu_map_print); -DEFINE_SUITE("Merge cpu map", cpu_map_merge); -DEFINE_SUITE("Intersect cpu map", cpu_map_intersect); +static struct test_case tests__cpu_map[] =3D { + TEST_CASE("Synthesize cpu map", cpu_map_synthesize), + TEST_CASE("Print cpu map", cpu_map_print), + TEST_CASE("Merge cpu map", cpu_map_merge), + TEST_CASE("Intersect cpu map", cpu_map_intersect), + { .name =3D NULL, } +}; + +struct test_suite suite__cpu_map =3D { + .desc =3D "CPU map", + .test_cases =3D tests__cpu_map, +}; diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h index b4e54f08bc39..f424c0b7f43f 100644 --- a/tools/perf/tests/tests.h +++ b/tools/perf/tests/tests.h @@ -118,16 +118,13 @@ DECLARE_SUITE(bpf); DECLARE_SUITE(session_topology); DECLARE_SUITE(thread_map_synthesize); DECLARE_SUITE(thread_map_remove); -DECLARE_SUITE(cpu_map_synthesize); +DECLARE_SUITE(cpu_map); DECLARE_SUITE(synthesize_stat_config); DECLARE_SUITE(synthesize_stat); DECLARE_SUITE(synthesize_stat_round); DECLARE_SUITE(event_update); DECLARE_SUITE(event_times); DECLARE_SUITE(backward_ring_buffer); -DECLARE_SUITE(cpu_map_print); -DECLARE_SUITE(cpu_map_merge); -DECLARE_SUITE(cpu_map_intersect); DECLARE_SUITE(sdt_event); DECLARE_SUITE(is_printable_array); DECLARE_SUITE(bitmap_print); --=20 2.40.1.698.g37aff9b760-goog