Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp3035461rwr; Fri, 28 Apr 2023 22:39:59 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6Wcxb7gFMTpPVfE2eT1P/DG6bezdBJDArwyjJrPML2I42H4r8TaZsBkVd0kO7p1xfi+8K9 X-Received: by 2002:a05:6a20:72a3:b0:c0:2875:9e8c with SMTP id o35-20020a056a2072a300b000c028759e8cmr10315924pzk.1.1682746799670; Fri, 28 Apr 2023 22:39:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682746799; cv=none; d=google.com; s=arc-20160816; b=lgbJO5L3WzHX8750tLTcfd4k9R6QSdbnD1bBdpceRvM5kCf8LClPyHwZnh8pytKVF9 CrHsa115H2QwrvZV8Zt8KLs/pyPGIBcv1F75OXWtrzVU0vZpcgIV5TW/2bu+SfLqn86m CHdKl81x+MtpQJiSGrRbMSR1IVvZ3K4ZIFae0bQ74r1vRBmv4mwusxcmDT//Oq5OJDG3 LA0lfZF1Xo6B9XJrzMxU6U10R0u/36se8ORe9Oq/gaQRNXtGVqSUBAm0BrdafrWz7Uke flKsPYWVd7lV/Y+VcAk1fRIrHV4T7Pz1gQ6s5MTd5FEcG6zXEeeubNWyeDjUzYQhsN7f aPMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=Y7D6E0hATCK7e1RhJ0eODuZwXaDaxrE5gp17wu1kd6s=; b=e5UASxmIWwCMvrG1H/MKpKGKax2udi3Bf5UdBO9dONy6ixoP9ftAk8sQQWrknbbHg1 gpaO/fmSwakCWTfFJKr6rAsE17J4H3yFvJ+gZs+G0X9iknmrMwCFPrXFDMgNif0IMAxv flrbT9TXCstqnQEE/mMqmGaY7YwX6dZSGyqFHsWt8TmeQnyJ5Ggazb6jzwjHXpywxt0y upp4bdaZQksz2JD9JTWj5JiKY/Hq/H/AWHBrybBeVpwC4F9GSLiLTLapc1TRt7BGAqMF nakGn2wXqdz9VZLyZXMEWV7uW23Xjc38W+T2gKDQ/+zDRmWZKfnfpd2GwbusjDzEThJK /Sfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=139kA4q0; 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 l1-20020a63f301000000b0051985ec117bsi23605738pgh.69.2023.04.28.22.39.46; Fri, 28 Apr 2023 22:39:59 -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=139kA4q0; 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 S1347345AbjD2FjV (ORCPT + 99 others); Sat, 29 Apr 2023 01:39:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347349AbjD2FjG (ORCPT ); Sat, 29 Apr 2023 01:39:06 -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 2F5E94221 for ; Fri, 28 Apr 2023 22:38:35 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-b9a7df507c5so997014276.1 for ; Fri, 28 Apr 2023 22:38:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1682746693; x=1685338693; 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=139kA4q02ubjRJRnm6P66WfukEPsn9I9wL+zbPwiH63hHQjcZEidMxyv4tdn/gzBBN kXYOWNoZrCCblw4cCt/V43hGZUhK9moyAHiso+BrRzjP4zGHxlGe9zTdacEl9kiwyAWl 6zfz210wxJC2cppSu7JBi4u5o2EcYwDbBXyqqNafcig6CIsX1N3DdDtL4AvoJUdAEsHW qBkacALi7PUPORmy95PLHmEwptG9l+9kv9RIjin/5yUDH0Vz1/WiU0FGD1a/7XvAMxT1 U6BsGqMb/X/d29puF85Iqk/G1wAZ8CQTmJpl6GXpQj7yRf/NkeIDvsMZvmHsiEf9knyv T50g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682746693; x=1685338693; 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=Y03Enuvy8cKogS3kjsPchba/Aa1nyhfHU/jgHYg4MQraVhMjox5Cz6boSEp4Tljhyx uaLOAp2TOynuv4uWC2EtkPcEqcyBte95Qr2LILRoXZKulsHLTHVw5gLwiFs8bghrvgcs BcO8JYIw3ozHAt1XSKriT15kVob3JFhTnNkHyGPDcUg6lpLLP6+fxfU9fVnKMpmQDTSc mfb04Y4Hhr0GK/HJP5+3ID96xxxDvbSG3mbxL1vXJoJJnhAFaWYsIf2/U4DXItQCSlaA +Z0eqxrXFICV9hHumf7htkGknYfLpDDYkaH3gmO1wVC0ItxQV5V4ZSGMaQ3HaxUpL+uR 7djg== X-Gm-Message-State: AC+VfDxOPxTcYzEx8eQcFvEhEwfPKloGmFZjuM/H/Yu9KIRg/DyRJpR6 m58QPcx2JpqUEERM+M9kJFLHsqL9iTXi X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:c563:7e28:fb7c:bce3]) (user=irogers job=sendgmr) by 2002:a25:c00b:0:b0:b99:4887:c736 with SMTP id c11-20020a25c00b000000b00b994887c736mr4431482ybf.3.1682746693497; Fri, 28 Apr 2023 22:38:13 -0700 (PDT) Date: Fri, 28 Apr 2023 22:34:41 -0700 In-Reply-To: <20230429053506.1962559-1-irogers@google.com> Message-Id: <20230429053506.1962559-22-irogers@google.com> Mime-Version: 1.0 References: <20230429053506.1962559-1-irogers@google.com> X-Mailer: git-send-email 2.40.1.495.gc816e09b53d-goog Subject: [PATCH v3 21/46] 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" 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 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