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 60EA5C77B73 for ; Fri, 26 May 2023 21:55:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244182AbjEZVzh (ORCPT ); Fri, 26 May 2023 17:55:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244238AbjEZVzS (ORCPT ); Fri, 26 May 2023 17:55:18 -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 4E70A1700 for ; Fri, 26 May 2023 14:54:45 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-ba69d93a6b5so2682290276.1 for ; Fri, 26 May 2023 14:54:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1685138083; x=1687730083; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=/FcwIRq48w1Sf/R9CE2AphWh51MG88ZTSOWgLdzsHyk=; b=Uh5akTdq29pZff6ceV4rl8xs+mTml+nXZjtVIPH8f32evyaLbdScpekkk2pmk8Dv+s kBpAkX/wKN4t7KDE2YUfHdKHOZSuDBgAxIPQf7+oTP4jOrdGNcyl+gU301ABNsly+tgO M0+zs/hjh876bF5DHQc+vPewDR8I9cLXaHMTQkTiD99IK8JxjRLWGTmXECnp4Nb4ynz8 VPIGGjt2pBNptgDa7WmWZ2kJW+Qlvnh+8PVvlch+fISFbjR5+0gD2Za9wt162wY8e9M7 R3SyKDj+Fr53spLWKzz/RpxRkCJ1kq6djrscuTQxMwViRlkJ+rbFm+VJJDa5VLBAyBur qnEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685138083; x=1687730083; 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=/FcwIRq48w1Sf/R9CE2AphWh51MG88ZTSOWgLdzsHyk=; b=ltwdN272N+IxTnDi4+8n+g97A/FqGjniIDMgLsFiLHYdGfiQomkH8fjp+0nsH1XPOD 9lNV3Z8k9IuT/R1XpO4pO6IVS6+lw4bsapm24PUmgpanyqgvQrIj1WDGGolz3fSwBeIF f78T/ooGFHwg2f4h2eAKPfE6UoIaOEJd1Qpqfm9A7YO3tA1n2oLyrjMPJD0Ci70wrobJ EJ73ad5qtYrBTJXUlbw4lrPjuFmBAsQDdzsGT/qQoYU8dNxGepgVLFKHYZpv5EVVdMDr vdWJKGzGbqIrRu4VGY/PG7JkJviG+pOGxUBiKP+UsgwGEItGcLtUPIQk10pUv1cbBJj1 cu6A== X-Gm-Message-State: AC+VfDzgWa8zuDkXGGTezubUEWKhsSFzksnGkMJItPRXQgrrVxNF38N9 TDLlcMuhI3WqwSi4Bd8tAS8aAOs5dw4/ X-Google-Smtp-Source: ACHHUZ6eAuZsXc9qLxGI9ElZR/aTTmZ3hTUd+YiyFW6ubTVHa8WZgjpxAOf0CaXJRD5Hs/bWBEZHOwOiFkai X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:3b4e:312c:644:a642]) (user=irogers job=sendgmr) by 2002:a25:aaf2:0:b0:bad:99d:f088 with SMTP id t105-20020a25aaf2000000b00bad099df088mr1716635ybi.11.1685138083607; Fri, 26 May 2023 14:54:43 -0700 (PDT) Date: Fri, 26 May 2023 14:53:48 -0700 In-Reply-To: <20230526215410.2435674-1-irogers@google.com> Message-Id: <20230526215410.2435674-14-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 13/35] 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 Reviewed-by: Kan Liang --- 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 04c9289e6ceb..cc4d96de1851 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.41.0.rc0.172.g3f132b7071-goog