Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp478905rwd; Sat, 27 May 2023 00:44:34 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4lifQ6i1q94zG6yDlxQvIPkD1yKktzycCVpnrPcAj0dLkmgoqNV+xDutBGoTPzGl7tBtxz X-Received: by 2002:a05:6a00:21c9:b0:64f:7c9d:9c09 with SMTP id t9-20020a056a0021c900b0064f7c9d9c09mr7760884pfj.32.1685173474132; Sat, 27 May 2023 00:44:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685173474; cv=none; d=google.com; s=arc-20160816; b=uNb7GgurLEo4z5kA+bhId8GjmvtFGVDraw8yCYrWr4E0K4M2czkfxy1Nfs5OssOLAB /bLsLyuV01SvTPhz6pinH7yOF6348gJS6GT4UMIPJOFlYuz90b9TcxnjRc6m2vCSNc7B FLrWHYcdJCHANzxdDgdn4yvcjzast8+jx9E/zmpyBysIKW3BgKNhvH/CokDFvxxwlXBJ qeIx3dVIbrvuwWGs/e4rex5UoqLzzzKyW16vBgwqkC/N0GaDDmFLHoiQALMz6Mdfz2YH iyZAPhqWQUEHo3MdNlyyPVmwg4JN1X09oFF9PlpWjfo17UjEOmUSZW/f2F/6jjrQo5HZ kGEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=OB5DwHaFliMtpjMaDk6VQJIJ/vYpJ6gF1J8Li4H573U=; b=IJXK9cx+gcYaemEkKfJnFfPJoKZAT29XXHq5fw0ImZ+JXh6GfpElozKM5sTXYWvUQF eMumoMdFJctnQiom31gmFkbxcmiDyJU7jmMq3nZtGIQqFOGh8lFVLyVQeYAG7KqTCMr9 0PzGE/dd9BoRf5uiHU51KbyA1y6T8p6Rw7ozKs8ueG6AiV7dEMnwheNbFlq8rfWuR7S5 dgDdjeUOwGWaenskkHlGpXHP22Oszgagg1P30RC3sw9/rBPQUF1wiLDbqIUAuDH0zYCu j0XBaGDYx4Fzynk4O2H1Ft7eFNmEs01kptRCzzxaY5U5hCjWQjlbtVh4peSfbmP+k+db RZOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=1q3O3kOR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e21-20020a637455000000b0053087bce16esi6019493pgn.830.2023.05.27.00.44.19; Sat, 27 May 2023 00:44:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=1q3O3kOR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231583AbjE0HXh (ORCPT + 99 others); Sat, 27 May 2023 03:23:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230133AbjE0HXZ (ORCPT ); Sat, 27 May 2023 03:23:25 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 653BE10DD for ; Sat, 27 May 2023 00:23:01 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-565c380565dso18761027b3.1 for ; Sat, 27 May 2023 00:23:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1685172181; x=1687764181; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=OB5DwHaFliMtpjMaDk6VQJIJ/vYpJ6gF1J8Li4H573U=; b=1q3O3kORw3mhrv9r+5Zm+HmDwQqwJv+99w5JzN0QUUC/TY9In8fPqaMUipHqJgvX7/ Uprm0cd9ycrLByMipQKENNw5PyVP28q5fEl8Y+a8f4XKFtBza21OB7LUrbsDgdJs0e3t BS5yJlC2UJUlXCX+n9MZ4smc9T26Gv9RCzCzzYBQIPgXMinE+7qy+vhLuKCdo0ROIVPd K/Am4jtggtE2HVG+DyNxNGSm3Ahgt7138kB/lZSRTOjLhQ4XpB6sws4fq9KZ35AvOKmn /JgY49Dovg2sPZDURVmLjmE5KAFM4AvPvh3WM7wsCWZh3CcrZC6/RfkcxHP1nvm/TfBj rAmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685172181; x=1687764181; 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=OB5DwHaFliMtpjMaDk6VQJIJ/vYpJ6gF1J8Li4H573U=; b=c7nxQqeTlerpSLBqWGv4om6MMHuCybglRPGCj2+6Oq66g8Adt17XZcwvI2CBsW8IWX weJ8i6djcgEYNnwrp0WL7ZVUhe0xMQ5Q4DLbyrcEFLTrhlBEo+YEfHxqi/goJpI63tGy oeThKz6tUhmcE1gAyTiPlWPsNNo38W150AIBs4QKbFiKakslSMC0XLC02C39JztPyASG 0+asLaVJrZHSSgYG1HZa9D+bJpsHfxqK8fxSivX80WhpMLfYNRBSjBwairmCcGkvbFUX b1Ox13JH4f34IRImgKjG1o1uyiAkJS3MUV+ApgTCMkSJ4TmM+GfMmHAWafEf7M5m1/dC hs+g== X-Gm-Message-State: AC+VfDxgKVFMw/YMrhPLDwGg8HxuPDPqLsbAMAgzPhLnYwfCje77eqpe CUsAqalEzZt8e4e6j0oVb+uCGT6flH0d X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:3b4e:312c:644:a642]) (user=irogers job=sendgmr) by 2002:a81:b71d:0:b0:565:ab24:ef3 with SMTP id v29-20020a81b71d000000b00565ab240ef3mr1032326ywh.0.1685172181086; Sat, 27 May 2023 00:23:01 -0700 (PDT) Date: Sat, 27 May 2023 00:21:48 -0700 In-Reply-To: <20230527072210.2900565-1-irogers@google.com> Message-Id: <20230527072210.2900565-13-irogers@google.com> Mime-Version: 1.0 References: <20230527072210.2900565-1-irogers@google.com> X-Mailer: git-send-email 2.41.0.rc0.172.g3f132b7071-goog Subject: [PATCH v5 12/34] 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" X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 84d304cffd2c..d414ee30dcf9 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -189,9 +189,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