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 7D73BC7618E for ; Wed, 26 Apr 2023 07:05:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239644AbjDZHFC (ORCPT ); Wed, 26 Apr 2023 03:05:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239824AbjDZHEY (ORCPT ); Wed, 26 Apr 2023 03:04:24 -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 A5D7D44B8 for ; Wed, 26 Apr 2023 00:03:28 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-b999367041aso6725739276.3 for ; Wed, 26 Apr 2023 00:03:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1682492595; x=1685084595; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Y7D6E0hATCK7e1RhJ0eODuZwXaDaxrE5gp17wu1kd6s=; b=z8cQGxheu+DMJewQ2FHIqzYoSrvavrXIpAjOk3OS7CyyD3f40naRFY2J1LOvx6/Olu 72ly0G9EqB3PLNEOq9FCvlTDcUJ1R/fkMYCLRPrsDqLYoYAH6BTKJZDvtMCGJCxG23E4 i0P+JuxZLXbDZKD0cgCL2LbTfUUZYkZ82sG2JJhTnjvfpNKCif6FcazANU7z9eGrr/x0 JBMIq2XeXcEgbZNj7zX6vLJP2ifBUyjAFmTmv0SyFhxb9tpR5+OjrH2+uPPoqvTGGxu9 Z1c2vJFlZJWZIgPY3TXADvtWEUC0fy/87G4P5rxESEzNkwoqXNczxtk54CE/wBuNdVOQ T0ZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682492595; x=1685084595; h=cc: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=Y7D6E0hATCK7e1RhJ0eODuZwXaDaxrE5gp17wu1kd6s=; b=K75RVOGfOvImamSM1+tHhXnK7JcOg9vCTbBVqB/Bv23Ww2kCKmmX814Wdx2KyG0ZIX QOcDVRe/5ffv6SCIn47v5oK4cv18KY5qIDpCFL91ykc6b/JO2FytAAEVwmS/WId+09D/ UYeFVCKZm71K+BoOJLHzGl70kF3p/yqZkvFE5UO+1sKGmYoeBHY6MFr+dWhlAn+Geztb Jd2G//K9eL85D57+DiVaPcnnXFoAHGbAoAyxnr6NJYbiCqzppwCULEY9v7iPKU2X9jJ4 vgfTIcdjNdi507fLxuH/u8kIE8m1c0uGWc2nqFrpZGg/Gx0FRX7913j9cBx7UE+YUxhV jRNA== X-Gm-Message-State: AAQBX9dxjc/lviZ1M3s3frdcUwPIDalhD2MtF4BVjMdEe7yY9GXVX1xx 4/T1Z/DnLB45sRN5oFvNIZKXmGzOVLs7 X-Google-Smtp-Source: AKy350YtpEvrzaryAHEe/JisXIZbzPVDfFCJVa5KR2OxwYn1BzMw2cjE2nzRtyRLahgdZcGyF5nTI7nMHMkl X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:144f:e890:2b29:48d9]) (user=irogers job=sendgmr) by 2002:a25:d0c7:0:b0:b97:2ecf:ff6d with SMTP id h190-20020a25d0c7000000b00b972ecfff6dmr11079097ybg.5.1682492595218; Wed, 26 Apr 2023 00:03:15 -0700 (PDT) Date: Wed, 26 Apr 2023 00:00:27 -0700 In-Reply-To: <20230426070050.1315519-1-irogers@google.com> Message-Id: <20230426070050.1315519-18-irogers@google.com> Mime-Version: 1.0 References: <20230426070050.1315519-1-irogers@google.com> X-Mailer: git-send-email 2.40.1.495.gc816e09b53d-goog Subject: [PATCH v1 17/40] perf evsel: Modify group pmu name for software events From: Ian Rogers To: Arnaldo Carvalho de Melo , Kan Liang , Ahmad Yasin , Peter Zijlstra , Ingo Molnar , Stephane Eranian , Andi Kleen , Perry Taylor , Samantha Alt , Caleb Biggers , Weilin Wang , Edward Baker , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Adrian Hunter , Florian Fischer , Rob Herring , Zhengjun Xing , John Garry , Kajol Jain , Sumanth Korikkar , Thomas Richter , Tiezhu Yang , Ravi Bangoria , Leo Yan , Yang Jihong , James Clark , Suzuki Poulouse , Kang Minchul , Athira Rajeev , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ian Rogers Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org If we have a group of {cycles,faults} then we need the faults software event to appear to be on the same PMU as cycles so that we don't split the group in parse_events__sort_events_and_fix_groups. This case is relatively easy as cycles is the leader and will have a PMU name. In the reverse case, {faults,cycles} we still need faults to appear to have the PMU name of cycles but the old behavior is just to return "cpu". For hybrid this fails as cycles will be on "cpu_core" or "cpu_atom", causing faults to be split into a different group. Change the behavior for software events so that the whole group is searched for the named PMU. Signed-off-by: Ian Rogers --- tools/perf/util/evsel.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 1cd04b5998d2..63522322e118 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -829,23 +829,26 @@ bool evsel__name_is(struct evsel *evsel, const char *name) const char *evsel__group_pmu_name(const struct evsel *evsel) { - const struct evsel *leader; + struct evsel *leader, *pos; /* If the pmu_name is set use it. pmu_name isn't set for CPU and software events. */ if (evsel->pmu_name) return evsel->pmu_name; /* * Software events may be in a group with other uncore PMU events. Use - * the pmu_name of the group leader to avoid breaking the software event - * out of the group. + * the pmu_name of the first non-software event to avoid breaking the + * software event out of the group. * * Aux event leaders, like intel_pt, expect a group with events from * other PMUs, so substitute the AUX event's PMU in this case. */ leader = evsel__leader(evsel); - if ((evsel->core.attr.type == PERF_TYPE_SOFTWARE || evsel__is_aux_event(leader)) && - leader->pmu_name) { - return leader->pmu_name; + if (evsel->core.attr.type == PERF_TYPE_SOFTWARE || evsel__is_aux_event(leader)) { + /* Starting with the leader, find the first event with a named PMU. */ + for_each_group_evsel(pos, leader) { + if (pos->pmu_name) + return pos->pmu_name; + } } return "cpu"; -- 2.40.1.495.gc816e09b53d-goog