From mboxrd@z Thu Jan 1 00:00:00 1970 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 5B3DAC77B75 for ; Mon, 22 May 2023 06:43:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230183AbjEVGnn (ORCPT ); Mon, 22 May 2023 02:43:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231758AbjEVGnl (ORCPT ); Mon, 22 May 2023 02:43:41 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E8878E0 for ; Sun, 21 May 2023 23:43:39 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-561abf855afso65925327b3.2 for ; Sun, 21 May 2023 23:43:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1684737819; x=1687329819; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=YoYQrktSOccz718yMhyWafTj7aToTsjoW8qdnpiUZYY=; b=p4E3xAl4XG1dKT000lYOPmwBSht2Qw2MVH35qpYGcnO9gDR1I/yWJmhkM2Y/cdCj+Q zuWQEAmrev+Yx2pU9KoOdGwuAjyfi0QspHLQEHvx3oVAzDsKGOFw2kHAlz4tsnof/O31 yezQYBJcjfWx/N7dtIRCs2X8oq/QyaOvco7lZJytBmbJaljJw5LnGHe4W0mb8IlYxPc5 wU+G/8UUCXSsbloow9Q4ZGdstpRp+gbLed12UVBy+PuecKiTQz9mvgxUofGWJIxg6D32 w/qwzsxMxnGXJV+b7pCmIX3JUCE5wfmnyJ9Y25NvyycPG8Dinxa595ydHwPeJthq4b0u KxsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684737819; x=1687329819; 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=YoYQrktSOccz718yMhyWafTj7aToTsjoW8qdnpiUZYY=; b=E8u6/kWrNkqY9a5jBeURV/JgnDfgUqkJwT5RffS+QhQrSTLgPvMQgcoeKH8oG+4a6L KrBSpdOXQDHzcbZOGHDzcX4gqxAkS7UdE3rCxoIjNuPhsmWxDNEYZPzSZcbgDZ8VmPT4 F3sjWIzPx72sgEyCo2quOcfXko5vecdMSZBsFaO350Z+w6x9Dcn7yjxSOmlgWQ4PAMj3 yN8Xi0v4LhX7F4VPsJmWEvB4PWoS5DMMuw+LGjQM/GKludq8ADbcqJlCHPF8IS8PcALf CQma0CoChvuRLOrqHC8u1jl4vh5o+2ZylLVSOO4y1y7mz4xT//jdsS7A/t5G9iFmc+qf 8iYw== X-Gm-Message-State: AC+VfDzZcHH483zGlZU3OE1kvVHIoD7eSfblBQKlQZPTu+5YI8oA/BTU 3YkEN2fOQk0OfojvMtlHNflsQCkqRZtz X-Google-Smtp-Source: ACHHUZ5zk5F+ezydcSeNEXKAuTWtoOxv1KsUK53ta6Dl2Ey4DOCdRM1cKjKUCN/xLGjgziKs06G4WAqcGHSR X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:48d9:8c21:e099:7301]) (user=irogers job=sendgmr) by 2002:a81:a9c9:0:b0:561:c10b:6ebb with SMTP id g192-20020a81a9c9000000b00561c10b6ebbmr6099609ywh.1.1684737819008; Sun, 21 May 2023 23:43:39 -0700 (PDT) Date: Sun, 21 May 2023 23:43:09 -0700 In-Reply-To: <20230522064330.189127-1-irogers@google.com> Message-Id: <20230522064330.189127-3-irogers@google.com> Mime-Version: 1.0 References: <20230522064330.189127-1-irogers@google.com> X-Mailer: git-send-email 2.40.1.698.g37aff9b760-goog Subject: [PATCH v2 02/23] perf evlist: Remove evlist__warn_hybrid_group 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 Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org Parse events now corrects PMU groups in parse_events__sort_events_and_fix_groups and so this warning is no longer possible. Signed-off-by: Ian Rogers --- tools/perf/builtin-stat.c | 3 --- tools/perf/util/evlist-hybrid.c | 32 -------------------------------- tools/perf/util/evlist-hybrid.h | 1 - 3 files changed, 36 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 612467216306..084cc570b8e8 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -187,9 +187,6 @@ static void evlist__check_cpu_maps(struct evlist *evlist) { struct evsel *evsel, *warned_leader = NULL; - if (evlist__has_hybrid(evlist)) - evlist__warn_hybrid_group(evlist); - evlist__for_each_entry(evlist, evsel) { struct evsel *leader = evsel__leader(evsel); diff --git a/tools/perf/util/evlist-hybrid.c b/tools/perf/util/evlist-hybrid.c index db3f5fbdebe1..0f59c80f27b2 100644 --- a/tools/perf/util/evlist-hybrid.c +++ b/tools/perf/util/evlist-hybrid.c @@ -41,38 +41,6 @@ int evlist__add_default_hybrid(struct evlist *evlist, bool precise) return 0; } -static bool group_hybrid_conflict(struct evsel *leader) -{ - struct evsel *pos, *prev = NULL; - - for_each_group_evsel(pos, leader) { - if (!evsel__is_hybrid(pos)) - continue; - - if (prev && strcmp(prev->pmu_name, pos->pmu_name)) - return true; - - prev = pos; - } - - return false; -} - -void evlist__warn_hybrid_group(struct evlist *evlist) -{ - struct evsel *evsel; - - evlist__for_each_entry(evlist, evsel) { - if (evsel__is_group_leader(evsel) && - evsel->core.nr_members > 1 && - group_hybrid_conflict(evsel)) { - pr_warning("WARNING: events in group from " - "different hybrid PMUs!\n"); - return; - } - } -} - bool evlist__has_hybrid(struct evlist *evlist) { struct evsel *evsel; diff --git a/tools/perf/util/evlist-hybrid.h b/tools/perf/util/evlist-hybrid.h index 19f74b4c340a..4b000eda6626 100644 --- a/tools/perf/util/evlist-hybrid.h +++ b/tools/perf/util/evlist-hybrid.h @@ -8,7 +8,6 @@ #include int evlist__add_default_hybrid(struct evlist *evlist, bool precise); -void evlist__warn_hybrid_group(struct evlist *evlist); bool evlist__has_hybrid(struct evlist *evlist); #endif /* __PERF_EVLIST_HYBRID_H */ -- 2.40.1.698.g37aff9b760-goog