From patchwork Fri May 26 21:53:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13257418 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 73873C77B73 for ; Fri, 26 May 2023 23:05:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version :Message-Id:In-Reply-To:Date:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=VpmApiLw8ERYYMdox/b6SCfqISnd/zW+OiGjU0+D5Fc=; b=WXkfQyXpFDXhOR ol3noRYS/z/DIO+AWoCDOAKD/9+rYO77zVnP6SpfFYmAiaM49Ax8fEjiZhV1whldcktpY2aeWazK/ NdvSoGb9NNEp2aqn5xdBwuIPpDMgaqj7eWGWDNfTjJWWVoi2NY4/Fn8+UBRrJDJ1wrm1lhjO313+a 8IlZ+0horoBpXV3kFtESyNYbsYXtcivJD9L/PBMYGMjWDWTu2wOmEy6mBbkJZcz+Pr5oX3V8SU0KJ H9cPU/z8FpYR6ppuGt9auwSbmrgAZ3z7Pngk//Olm/JRLq7MawIcVgzrrVDT4weWTpQiUNvhUZdyf sZZyNCTlsNf4lEieUYMw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q2gVB-004EoS-1N; Fri, 26 May 2023 23:05:41 +0000 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q2fO8-0042u6-0N for linux-arm-kernel@lists.infradead.org; Fri, 26 May 2023 21:54:21 +0000 Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-babb53e6952so2678714276.0 for ; Fri, 26 May 2023 14:54:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1685138059; x=1687730059; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=8S0Hv+a/Zvfp18A5nlLX6T7tZ0kZRLdYhlDuYf6C4lU=; b=Ic9P7IyNJyUX8+dGFzOhxlyMJxl5ZCGy2OhS5BWms0QeuJynt2dmm54BBT2HIawiXL 8EirOGt/fHGjWBek/XIMZp3lOa7cypL2GtbHz70XUytSdFl6TzKqB5oB4oWZ1ijvs+Eo G6Sfz1Ae0XVDeVzya5nc6DAsOdl+5RBUQp01L08aF5OrwiLymQmDX5/MQbgK9TL1xXR5 5TiWq11FCHdBO/u9uM6EvRWYuTd6vgw8qZSjG5682B0h7MXnHJVSEAw704mykSJ22Apr zZvRDDxK8+Ooqss5Zg1aYbYMFlJxIKyhM6l/grJIQdyEOmGIsw+Fl2Xy22Py9OV3D+rc bUOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685138059; x=1687730059; 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=8S0Hv+a/Zvfp18A5nlLX6T7tZ0kZRLdYhlDuYf6C4lU=; b=PqVsBbsPM/P8OwNoGj0kef4ezZvlUv6h1CrirOukMteMztYfPVf4oHkJ+pDMx/m0lz 5Cl1rqXAI1VD//loORztFj41GMz1B2srrQgqXAJzLi15h6POsFjgSA+spmhOMYhz8ofW sg4BrV69X0p7IYMJcXfox1jWvd1qYY04J1nNMlRayU/bFr/Wo1uPsQ/gVZ1edCTDt5I/ pMy/YoDVskSNKBycexm3AG4mUDWGzihf43inScaF27CjFRYlz3lbbtFq1BeRnwtcglha /xlI9npZKfTdncXIMJBGaIBEc7/HKuIQVoPBucqrwRunWusTgHoMlXO/Fz55FUhfVqEJ qodg== X-Gm-Message-State: AC+VfDzi1r0gafjkkYxZupJXPeznXlli6k89sXhg+7iAGrDRX2PYpOG6 lNW20bQVLuTEauFZSYJbqU0oaOUDTOSe X-Google-Smtp-Source: ACHHUZ6wlwN1t7qV13GabHWFUElri+i1zZLXEXx4+eZbvTw4JBb5huMJ6Ed5ui05ffjbLI0Ms+DZshJaMdBG X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:3b4e:312c:644:a642]) (user=irogers job=sendgmr) by 2002:a25:ab13:0:b0:ba8:757c:2523 with SMTP id u19-20020a25ab13000000b00ba8757c2523mr1698848ybi.9.1685138058810; Fri, 26 May 2023 14:54:18 -0700 (PDT) Date: Fri, 26 May 2023 14:53:37 -0700 In-Reply-To: <20230526215410.2435674-1-irogers@google.com> Message-Id: <20230526215410.2435674-3-irogers@google.com> Mime-Version: 1.0 References: <20230526215410.2435674-1-irogers@google.com> X-Mailer: git-send-email 2.41.0.rc0.172.g3f132b7071-goog Subject: [PATCH v4 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230526_145420_152082_DE01F82C X-CRM114-Status: GOOD ( 12.56 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Go from 4 suites to a single suite with 4 test cases. Signed-off-by: Ian Rogers Reviewed-by: Kan Liang --- 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-test.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[] = { &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; } -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[] = { + 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 = NULL, } +}; + +struct test_suite suite__cpu_map = { + .desc = "CPU map", + .test_cases = 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);