From patchwork Thu Feb 1 04:22:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13540646 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 2F1D8C48291 for ; Thu, 1 Feb 2024 04:24:35 +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=gJhwOI2K+/RVJD4Oxec89rMCq4oPwMC7IsHO4HixSBs=; b=sDwxZWjzeZciA8 Q35svqKiOSleGDBJDZXDNk2+w18yWxSeRxYzbth8r6aL/X76GBuaeTiTf9j9FEJp+KakxVbX91rAh bvnE2onWtpBQ/FMkpq3ASIsTUx846q4NEa+evvQyQdn8zu2z4iuy37yCd9YVW6UVBqJCWraNBzxOA /d7H3YdBR8logmFPNhJCjAA6yB0GrkBP4+TCJ1x8Zt8cTUJVpmCSXFXVI5xUDGUPqHaDWo3wo9cm+ gf+CiyLp8E+WZB9+xph3er0Ksv98g4MRxWShbbRj7Z+Oq6miHgi+7YOy1hwovUpn1Lol7/hzpjdBe b3RqJETPC+BMeNgRQykw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rVOch-00000006V8A-2hya; Thu, 01 Feb 2024 04:24:23 +0000 Received: from mail-yw1-x114a.google.com ([2607:f8b0:4864:20::114a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rVObT-00000006UUK-1PKY for linux-arm-kernel@lists.infradead.org; Thu, 01 Feb 2024 04:23:09 +0000 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-6040b27151eso10755797b3.3 for ; Wed, 31 Jan 2024 20:23:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1706761386; x=1707366186; darn=lists.infradead.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=LqZwZ8AsgQZJFdN47MyZTq1RxCf/Pyb95/3gvsK2ot0=; b=xDR7GrfWCWfcD+MpK0cW1YDNpch4HnV8DfY1FQ0WoY2LwrJ7YOZX/zkHJ48dNF4aLT j9qHshO6TeSxFjECnIQrzhyb6BR6T4DbnIfP/y3VWHyr6XOGrlFTsmJcpwNzEQcFcn+g GcMKhVKlYO/L7IEowTHHyyhjTRnTsY2+ErrThZX5ksI15eFN4VPsP82YT2J4RlNEU2NP 0Z0yFnfvsQWZwM3nec8mjo5ypeSINjFC8VwInkB1wgn4LX+ajID9rMWjlWRjVdv2Tjhf jA8hbagQLXcwmekSMUO/99/MblIv7zDoMgBqnor69yn00l8zEQxmIv3Iq67Toawg0lfk ItCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706761386; x=1707366186; 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=LqZwZ8AsgQZJFdN47MyZTq1RxCf/Pyb95/3gvsK2ot0=; b=CkmeebECzNKwndqrT8GsVFL7L/gnTYgGWe2IFcizbY7Xdj7noHcrLMA5Ebr7vOgFth 2+/VCdAEzS76bWkkRt2QEnkwqvqjcYQvS9X6bN/M0bYUVtJ21/K/Z5yaBToRO2m4+uxx vg7+zKJnQAC51qq2DYvBwLXAP7tfey3PzY+51XHapyBfItvUiQF3c9G+SBeGtKYnEiWN B+Kiqy0Otyk03le3DhM48aYOsHCRQRPsK6HCJ8RxyxRoX/37mRHK7G2rfLPOzmWpq82y guPRJNB9d58oKehEK5/n2w7n56K+5LqHRgO/Nv5uUbaSLqv6Gxjao8cMlCcG62rLiDCw dX8g== X-Gm-Message-State: AOJu0YzzXb4oz5WPTsFT+SwUy8MM6QPNWIpxm91SJWBHgEZbdvIXYV2Q E0ddydGkdgygmbjGAqDqbHtUCLWuapbtrtxlf2lsG5IIqc4VMkcZX0/pM/8LEDU96Psi0QEG+tq nSoioBg== X-Google-Smtp-Source: AGHT+IEbBHPoopwAV46hmLodLw8f6XGcENXHUyhMaiQPvtiJ/0/ATGvBJGXoRGEaXvOe810MmKMKo255lWtS X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:16c5:1feb:bf99:a5d1]) (user=irogers job=sendgmr) by 2002:a05:6902:2749:b0:dc6:a29d:e0b7 with SMTP id ea9-20020a056902274900b00dc6a29de0b7mr975743ybb.4.1706761385897; Wed, 31 Jan 2024 20:23:05 -0800 (PST) Date: Wed, 31 Jan 2024 20:22:35 -0800 In-Reply-To: <20240201042236.1538928-1-irogers@google.com> Message-Id: <20240201042236.1538928-8-irogers@google.com> Mime-Version: 1.0 References: <20240201042236.1538928-1-irogers@google.com> X-Mailer: git-send-email 2.43.0.429.g432eaa2c6b-goog Subject: [PATCH v2 7/8] perf stat: Remove duplicate cpus_map_matched function From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , Suzuki K Poulose , Mike Leach , James Clark , Leo Yan , John Garry , Will Deacon , Thomas Gleixner , Darren Hart , Davidlohr Bueso , " =?utf-8?q?Andr=C3=A9_Almeida?= " , Kan Liang , K Prateek Nayak , Sean Christopherson , Paolo Bonzini , Kajol Jain , Athira Rajeev , Andrew Jones , Alexandre Ghiti , Atish Patra , "Steinar H. Gunderson" , Yang Jihong , Yang Li , Changbin Du , Sandipan Das , Ravi Bangoria , Paran Lee , Nick Desaulniers , Huacai Chen , Yanteng Si , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, bpf@vger.kernel.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240131_202307_701926_8F7C4DB1 X-CRM114-Status: GOOD ( 14.46 ) 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 Use libperf's perf_cpu_map__equal that performs the same function. Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/builtin-stat.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 280eb0c99d2b..d80bad7c73e4 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -164,26 +164,6 @@ static struct perf_stat_config stat_config = { .iostat_run = false, }; -static bool cpus_map_matched(struct evsel *a, struct evsel *b) -{ - if (!a->core.cpus && !b->core.cpus) - return true; - - if (!a->core.cpus || !b->core.cpus) - return false; - - if (perf_cpu_map__nr(a->core.cpus) != perf_cpu_map__nr(b->core.cpus)) - return false; - - for (int i = 0; i < perf_cpu_map__nr(a->core.cpus); i++) { - if (perf_cpu_map__cpu(a->core.cpus, i).cpu != - perf_cpu_map__cpu(b->core.cpus, i).cpu) - return false; - } - - return true; -} - static void evlist__check_cpu_maps(struct evlist *evlist) { struct evsel *evsel, *warned_leader = NULL; @@ -194,7 +174,7 @@ static void evlist__check_cpu_maps(struct evlist *evlist) /* Check that leader matches cpus with each member. */ if (leader == evsel) continue; - if (cpus_map_matched(leader, evsel)) + if (perf_cpu_map__equal(leader->core.cpus, evsel->core.cpus)) continue; /* If there's mismatch disable the group and warn user. */