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 386BCC77B75 for ; Wed, 17 May 2023 14:58:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231940AbjEQO6r (ORCPT ); Wed, 17 May 2023 10:58:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231721AbjEQO6p (ORCPT ); Wed, 17 May 2023 10:58:45 -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 BD60A40CE for ; Wed, 17 May 2023 07:58:40 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-b9a25f6aa0eso1474470276.1 for ; Wed, 17 May 2023 07:58:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1684335520; x=1686927520; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=co4J+RLQCrSsAkDbz+O0JQN5mf/3HC6cUdD7SOOuvnw=; b=KdRTZhvOJomjWjIy1icXpBmC245/59/sRUbHHt+KQUTyK7w6Yq+vR0TRAv3ybdI5OG TPKAdklu/9GchHUfMhrjwzE/2gk+b5odq2C0RdCfgi4V8plv6OCPfwJpk9ecrXuNxtJg Q/X5O4+GJ3RlbgXiLznCywRf7fRqCokSHUsclUyGIfiTOCVOFfoyyXXTnn2pPJwUzqK1 1cutCf5Tyd+VjNLNAR/pZATVHkIAI/R2SGAyBZ4v2hqbjXPm2CUKX/cUFzaGrqpklj58 ND3Hi/19GNwv+arcdVULoqX6unerqdZgvV/T4g/xhNO0txuiBEceokB9eQxUoHzY3cIV DpAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684335520; x=1686927520; 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=co4J+RLQCrSsAkDbz+O0JQN5mf/3HC6cUdD7SOOuvnw=; b=DqL5qgmcS7eaIGR4ViwrhTJgIF/HBLdefPKKVgqmmd80hD3UJUjpi5i/fqWKseiVBP 8Ul0Yg3Pf0oD4BeQVSQd8B616tCDNIHyx7NVXJ2eTPKRmREhBzZ0oA8Uqimi9t2gm3js ZCi61psIBuO3BtGN+IU1vWJ/NQn3WD55c3JLAA5lnX1CLwqyaCLIQHEEVFC3xXABJeyN D3ghpeJTsnW4RH6YiGwGIBRKqlBTdndKA4doAuIazEtZ0DM4Y0k59M24Ufzu8QTqFcis wP3H83Y80O9a1Cg480gVBPnK/2ohvviN3ZDLI9rsnCjHfVK4Nfc0DmaWpf/kk545ExM9 2gzg== X-Gm-Message-State: AC+VfDwwtXam2Owd+hZEF6oJBGj6uG/e3GZlvE2DEAkRbLDYu7E/vBXV o1FBMzVPrSTz3m3An3jpFcQjrA5KUEZK X-Google-Smtp-Source: ACHHUZ6XUS995g82GPvS4dREMZj76DbvNdtPUZXP+4TKIsfpmu0mHvVd9YjkhzjZA6P40Xi31dE98BouBXNt X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:628b:7e78:d09b:39b]) (user=irogers job=sendgmr) by 2002:a5b:5c8:0:b0:ba1:919a:8f08 with SMTP id w8-20020a5b05c8000000b00ba1919a8f08mr17403057ybp.2.1684335519983; Wed, 17 May 2023 07:58:39 -0700 (PDT) Date: Wed, 17 May 2023 07:57:42 -0700 In-Reply-To: <20230517145803.559429-1-irogers@google.com> Message-Id: <20230517145803.559429-3-irogers@google.com> Mime-Version: 1.0 References: <20230517145803.559429-1-irogers@google.com> X-Mailer: git-send-email 2.40.1.606.ga4b1b128d6-goog Subject: [PATCH v1 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 , Raul Silvera , 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.606.ga4b1b128d6-goog