From nobody Wed Sep 10 01:57:55 2025 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 32FF7C74A44 for ; Sun, 12 Mar 2023 02:16:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229915AbjCLCQH (ORCPT ); Sat, 11 Mar 2023 21:16:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229836AbjCLCQE (ORCPT ); Sat, 11 Mar 2023 21:16:04 -0500 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 844563C7BB for ; Sat, 11 Mar 2023 18:16:03 -0800 (PST) Received: by mail-yb1-xb49.google.com with SMTP id t25-20020a252d19000000b00b341ad1b626so4128614ybt.19 for ; Sat, 11 Mar 2023 18:16:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678587362; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=LkP3cjlyFBuY4lwBhuPasBEAZ8EXgvKaf+XTugs0ORk=; b=dl6rB5hFHv9SCNUubl2rtwaN/dDMjOatwZ3MmZLo5IRBFOs7mnSBoXwIjFci/ORyq7 5RQDqJSUEQtUyt43HW3aGm/afwWgmb9tIv1ebmxPD92DsCu+t1Lru/Mc9sQ7wVk6Mulk wW/FmCvesK1PQRyVj6vqPrK3lUB3IvkDYwYN9iZthvBapK8LsBFRQ3YM/UJflOZGpTZj 8kT0qzU063vz5qPgqwQvW25/25DUN6fImshKtoY1/uXNE9slZ/+IOO42iNSaBzxzcyYL xV46aDRjr2Hi4tp6bOxFo7QUpVxrATRB32IpvrhXbR+Ic+JzsSKRtbIVp+Kk3DCYptdN wwUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678587362; 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=LkP3cjlyFBuY4lwBhuPasBEAZ8EXgvKaf+XTugs0ORk=; b=Aueqzb0y/MzBnUuOXgmgEaEqfiCRtbrgvbsj21DMprQqbyach0UNcrvyAZg4f5D/8f OFkT63S5yGOX6yAByWoPmRVEiQs0Opdzc+gkGH2UomE4tioZeIeJhb/7eZY+DpSeNKyh woOPC9emR6SUPBdrQ4k/VaXMJ7QHnFW7UpbRSD8d82Nm+Lr3TMQShOa0Ur/woKKHm48g a+kFQv6tmcEKqvFjkHPVEnn0r+WYvLjPmeOplbiDzTyKCBP81QW4fUdo1FPjrBXLjHOj uumeNrAO5s2anBJJbS8ta1O27bTEYjy3IsD7qdng/QmAJM/7MXhE4kIN1nugHD+nnak0 k/zg== X-Gm-Message-State: AO0yUKXFabGhNVMmTsiqopPtvgC9cisI1C837sprDG3y/40acjDY2asb m58kpvLmkVP5ZzQGVFeNyyN5Qte7J+z5 X-Google-Smtp-Source: AK7set/kJBuEV+mbqnhAi0kuxu/g23f1XpN6oLJWkygemzlOuHhNBjhSuYPUA/SjPgoLxUZazwSQajtgf15R X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:b42b:2e07:afb:877e]) (user=irogers job=sendgmr) by 2002:a81:b286:0:b0:533:9185:fc2c with SMTP id q128-20020a81b286000000b005339185fc2cmr20162639ywh.7.1678587362660; Sat, 11 Mar 2023 18:16:02 -0800 (PST) Date: Sat, 11 Mar 2023 18:15:33 -0800 In-Reply-To: <20230312021543.3060328-1-irogers@google.com> Message-Id: <20230312021543.3060328-2-irogers@google.com> Mime-Version: 1.0 References: <20230312021543.3060328-1-irogers@google.com> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog Subject: [PATCH v5 01/11] libperf evlist: Avoid a use of evsel idx From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Mark Rutland , Adrian Hunter , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Kan Liang , Zhengjun Xing , Ravi Bangoria , "Steinar H. Gunderson" , Kim Phillips , Florian Fischer , James Clark , Suzuki Poulouse , Sean Christopherson , Leo Yan , John Garry , Kajol Jain , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Stephane Eranian , Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Setting the leader iterates the list, so rather than use idx (which may be changed through list reordering) just count the elements and set afterwards. Signed-off-by: Ian Rogers --- tools/lib/perf/evlist.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tools/lib/perf/evlist.c b/tools/lib/perf/evlist.c index 61b637f29b82..2d6121e89ccb 100644 --- a/tools/lib/perf/evlist.c +++ b/tools/lib/perf/evlist.c @@ -687,15 +687,14 @@ perf_evlist__next_mmap(struct perf_evlist *evlist, st= ruct perf_mmap *map, =20 void __perf_evlist__set_leader(struct list_head *list, struct perf_evsel *= leader) { - struct perf_evsel *first, *last, *evsel; - - first =3D list_first_entry(list, struct perf_evsel, node); - last =3D list_last_entry(list, struct perf_evsel, node); - - leader->nr_members =3D last->idx - first->idx + 1; + struct perf_evsel *evsel; + int n =3D 0; =20 - __perf_evlist__for_each_entry(list, evsel) + __perf_evlist__for_each_entry(list, evsel) { evsel->leader =3D leader; + n++; + } + leader->nr_members =3D n; } =20 void perf_evlist__set_leader(struct perf_evlist *evlist) --=20 2.40.0.rc1.284.g88254d51c5-goog From nobody Wed Sep 10 01:57:55 2025 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 9353FC74A44 for ; Sun, 12 Mar 2023 02:16:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229910AbjCLCQV (ORCPT ); Sat, 11 Mar 2023 21:16:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42806 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229906AbjCLCQS (ORCPT ); Sat, 11 Mar 2023 21:16:18 -0500 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE99538EBB for ; Sat, 11 Mar 2023 18:16:11 -0800 (PST) Received: by mail-yb1-xb49.google.com with SMTP id d7-20020a25adc7000000b00953ffdfbe1aso10122295ybe.23 for ; Sat, 11 Mar 2023 18:16:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678587370; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=gCy3nPTLL3BzM9vzwEu0uYJt1g84QjoxQ2scYL/5UQQ=; b=GZenkIHqhn+3YGrQcHzj3aX6bW1NryTIU40Mc8cjvA/t592pE3P5uhCYyL4Ca5earh clnmbwuMQ8rQv1Dg6BnNgUdXMzvNQTDjqjutrBe337/0V8IF6cTUC5r17dD1BYhuiLLP AQd0elBDbJf6NJdVfACpwk3PNJD5SHq9SKQXa+LATb5QpP19SEAGk/wX3EO+kkPvRNie FyOoIT2H8QXbxE3J1xHRJekv9HI/KVW28pPyZ/dQAOU/Lp7yR1jdMmXqIZTBqi7qWPTe FaJcl/2uYVRXHuxWPKnnGWbE7x7JeCzcwoR26j0kL0Sn534+6/4YdbTRZ/yYiakRxvxV HX/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678587370; 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=gCy3nPTLL3BzM9vzwEu0uYJt1g84QjoxQ2scYL/5UQQ=; b=hY2IQiZCVTszaPTEyHVwSur1hUp6VSX3DcmtdFvuZGBX4PfX5Q0QMQG6yqD59uVuWG 7KWZcInuV4A5NCO3TYIbN7KvViA/U573ic/WJf1a7LpsgC/gj2kph+GFb3qFugM00xAj OajcCV8Kg0OH1ICJrLZZcYDU2UD2X+ckIniPCRy6x/kRQtAINYRlXzzEv13Xn6W2QGB0 ZQOnDgAq7Hp6Hm7cS0IPjKh3rOjAV3eOeNXNgPOzKsQNRvcIQ68oWP7axhG3YdUUsZoT l8sWCp8v+IwjL6vVZkpJh+jj9S7ltmjvdKXYTNOZHfdVl4kN5ecB5fq+aWgSm4lDsWCu VL0Q== X-Gm-Message-State: AO0yUKVAiFUshC4q4ywedoGAfr7xGrqCfNFSeKLmBbjS5oknFo4KIG2C IR9Zdumn3X5t6IAHbJveH1/UiQT00BSK X-Google-Smtp-Source: AK7set9WL0H7uaR8gnswB0fr2WWJ0r5ebx2D1lniuNixfKkpgOq8ZsiYhWEul//k+sv5pDlh00cx4nFb8QNV X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:b42b:2e07:afb:877e]) (user=irogers job=sendgmr) by 2002:a0d:df95:0:b0:506:6059:e949 with SMTP id i143-20020a0ddf95000000b005066059e949mr5ywe.502.1678587370183; Sat, 11 Mar 2023 18:16:10 -0800 (PST) Date: Sat, 11 Mar 2023 18:15:34 -0800 In-Reply-To: <20230312021543.3060328-1-irogers@google.com> Message-Id: <20230312021543.3060328-3-irogers@google.com> Mime-Version: 1.0 References: <20230312021543.3060328-1-irogers@google.com> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog Subject: [PATCH v5 02/11] perf stat: Don't remove all grouped events when CPU maps disagree From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Mark Rutland , Adrian Hunter , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Kan Liang , Zhengjun Xing , Ravi Bangoria , "Steinar H. Gunderson" , Kim Phillips , Florian Fischer , James Clark , Suzuki Poulouse , Sean Christopherson , Leo Yan , John Garry , Kajol Jain , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Stephane Eranian , Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" If the events in an evlist's CPU map differ then the entire group is removed. For example: ``` $ perf stat -e '{imc_free_running/data_read/,imc_free_running/data_write/,c= s}' -a sleep 1 WARNING: grouped events cpus do not match, disabling group: anon group { imc_free_running/data_read/, imc_free_running/data_write/, c= s } ``` Change the behavior so that just the events not matching the leader are removed. So in the example above, just 'cs' will be removed. Modify the warning so that it is produced once for each group, rather than once for the entire evlist. Shrink the scope and size of the warning text buffer. Signed-off-by: Ian Rogers --- tools/perf/builtin-stat.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index d70b1ec88594..5c12ae5efce5 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -181,14 +181,13 @@ static bool cpus_map_matched(struct evsel *a, struct = evsel *b) =20 static void evlist__check_cpu_maps(struct evlist *evlist) { - struct evsel *evsel, *pos, *leader; - char buf[1024]; + struct evsel *evsel, *warned_leader =3D NULL; =20 if (evlist__has_hybrid(evlist)) evlist__warn_hybrid_group(evlist); =20 evlist__for_each_entry(evlist, evsel) { - leader =3D evsel__leader(evsel); + struct evsel *leader =3D evsel__leader(evsel); =20 /* Check that leader matches cpus with each member. */ if (leader =3D=3D evsel) @@ -197,19 +196,26 @@ static void evlist__check_cpu_maps(struct evlist *evl= ist) continue; =20 /* If there's mismatch disable the group and warn user. */ - WARN_ONCE(1, "WARNING: grouped events cpus do not match, disabling group= :\n"); - evsel__group_desc(leader, buf, sizeof(buf)); - pr_warning(" %s\n", buf); - + if (warned_leader !=3D leader) { + char buf[200]; + + pr_warning("WARNING: grouped events cpus do not match.\n" + "Events with CPUs not matching the leader will " + "be removed from the group.\n"); + evsel__group_desc(leader, buf, sizeof(buf)); + pr_warning(" %s\n", buf); + warned_leader =3D leader; + } if (verbose > 0) { + char buf[200]; + cpu_map__snprint(leader->core.cpus, buf, sizeof(buf)); pr_warning(" %s: %s\n", leader->name, buf); cpu_map__snprint(evsel->core.cpus, buf, sizeof(buf)); pr_warning(" %s: %s\n", evsel->name, buf); } =20 - for_each_group_evsel(pos, leader) - evsel__remove_from_group(pos, leader); + evsel__remove_from_group(evsel, leader); } } =20 --=20 2.40.0.rc1.284.g88254d51c5-goog From nobody Wed Sep 10 01:57:55 2025 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 CFEA0C74A44 for ; Sun, 12 Mar 2023 02:16:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229927AbjCLCQg (ORCPT ); Sat, 11 Mar 2023 21:16:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229469AbjCLCQe (ORCPT ); Sat, 11 Mar 2023 21:16:34 -0500 Received: from mail-pf1-x44a.google.com (mail-pf1-x44a.google.com [IPv6:2607:f8b0:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D0FB546143 for ; Sat, 11 Mar 2023 18:16:18 -0800 (PST) Received: by mail-pf1-x44a.google.com with SMTP id y35-20020a056a00182300b005e8e2c6afe2so4890315pfa.12 for ; Sat, 11 Mar 2023 18:16:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678587378; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=BT/x/3Eyz2BuEqpSdLzkRqcNHW14bzsOIxfh6FRlfxo=; b=lHkf3zlh1pVGSdM1GC3AxnylNDGWw4m4GJlJE4wRPSdCCUFN3He51cJPy0m5AyZ/zv /SzbVozvJfQqUfitexmgUsgWBFu/tkgmcX9cwlr0C6zKLYgTD7CUdX/9kFuEu8xRfD6R VJ6Jh2D0oe3Fhe67mGw5s3OOOHYfh8AsbdG0Y0kRrclYNzMovnQVtBqNXwD2Iv3gKZrY btWan+zTRIHcpSja+4FLQ3WkvJUYnWBExNjhJMbU5/XAOyZySYxySxWh0uVHd2Yut+VL 6VvsruF/H1OzxW6rUp15I4kVz8EWLI9P6ijhJqbYhapqB4RPKk89sA8NKJOlPW3vPnqx HSaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678587378; 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=BT/x/3Eyz2BuEqpSdLzkRqcNHW14bzsOIxfh6FRlfxo=; b=ce9RkvA2K4/nQ6rSN0JViz69vPdJOXW9fLBoKf78/cX6D47Gk0LWxwG8Oho8lsBHcF BEeUJZaQIOoKK/7jmOhYviFOEnpRZ+kwo1ZmxlsCt2z7UCujf9aurEsuqUxS6cVI+SKA qThZv6D2i3grbDDc+W7qJYomLFOruFNWsQAsL45QpXZG7gwNb0d3sfFNLaCv/HoOoqZt bTsU43Z1Fa8pgCW/rgyFJCLAa35IvgK2xVjg0FReIcdfASROGGIGxy278oarIGihd8ba i679BMR1koDu2B4CiCrbBJBXjma0NVhVvwirmNQoTqTNE/gBASZPBYTaIRtunPNyJSZq ZuCA== X-Gm-Message-State: AO0yUKVx5hID8rwNJGEJSP7mZl/5fC4rXQSbvku0xw04eyyqnRI876iS MR8UfhU5AXFAS2a6MmqNAdDjkkusP80r X-Google-Smtp-Source: AK7set+TQZtCja/vps9x30qK//1pOedYZ63oAHSdXRy5p5SUcpJFeG3+UZvcmc6a0VnbQm5HEOvgJz9CyaOl X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:b42b:2e07:afb:877e]) (user=irogers job=sendgmr) by 2002:a17:90b:46cf:b0:23b:517d:beca with SMTP id jx15-20020a17090b46cf00b0023b517dbecamr315230pjb.0.1678587378274; Sat, 11 Mar 2023 18:16:18 -0800 (PST) Date: Sat, 11 Mar 2023 18:15:35 -0800 In-Reply-To: <20230312021543.3060328-1-irogers@google.com> Message-Id: <20230312021543.3060328-4-irogers@google.com> Mime-Version: 1.0 References: <20230312021543.3060328-1-irogers@google.com> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog Subject: [PATCH v5 03/11] perf pmu: Earlier PMU auxtrace initialization From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Mark Rutland , Adrian Hunter , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Kan Liang , Zhengjun Xing , Ravi Bangoria , "Steinar H. Gunderson" , Kim Phillips , Florian Fischer , James Clark , Suzuki Poulouse , Sean Christopherson , Leo Yan , John Garry , Kajol Jain , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Stephane Eranian , Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This allows event parsing to use the evsel__is_aux_event function, which is important when determining event grouping. Suggested-by: Adrian Hunter Acked-by: Adrian Hunter Signed-off-by: Ian Rogers --- tools/perf/arch/x86/util/auxtrace.c | 4 ---- tools/perf/arch/x86/util/pmu.c | 8 ++++++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/perf/arch/x86/util/auxtrace.c b/tools/perf/arch/x86/util= /auxtrace.c index 3da506e13f49..330d03216b0e 100644 --- a/tools/perf/arch/x86/util/auxtrace.c +++ b/tools/perf/arch/x86/util/auxtrace.c @@ -26,11 +26,7 @@ struct auxtrace_record *auxtrace_record__init_intel(stru= ct evlist *evlist, bool found_bts =3D false; =20 intel_pt_pmu =3D perf_pmu__find(INTEL_PT_PMU_NAME); - if (intel_pt_pmu) - intel_pt_pmu->auxtrace =3D true; intel_bts_pmu =3D perf_pmu__find(INTEL_BTS_PMU_NAME); - if (intel_bts_pmu) - intel_bts_pmu->auxtrace =3D true; =20 evlist__for_each_entry(evlist, evsel) { if (intel_pt_pmu && evsel->core.attr.type =3D=3D intel_pt_pmu->type) diff --git a/tools/perf/arch/x86/util/pmu.c b/tools/perf/arch/x86/util/pmu.c index 358340b34243..f73b80dcd8bd 100644 --- a/tools/perf/arch/x86/util/pmu.c +++ b/tools/perf/arch/x86/util/pmu.c @@ -27,10 +27,14 @@ static bool cached_list; struct perf_event_attr *perf_pmu__get_default_config(struct perf_pmu *pmu = __maybe_unused) { #ifdef HAVE_AUXTRACE_SUPPORT - if (!strcmp(pmu->name, INTEL_PT_PMU_NAME)) + if (!strcmp(pmu->name, INTEL_PT_PMU_NAME)) { + pmu->auxtrace =3D true; return intel_pt_pmu_default_config(pmu); - if (!strcmp(pmu->name, INTEL_BTS_PMU_NAME)) + } + if (!strcmp(pmu->name, INTEL_BTS_PMU_NAME)) { + pmu->auxtrace =3D true; pmu->selectable =3D true; + } #endif return NULL; } --=20 2.40.0.rc1.284.g88254d51c5-goog From nobody Wed Sep 10 01:57:55 2025 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 2AFD0C61DA4 for ; Sun, 12 Mar 2023 02:16:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229956AbjCLCQv (ORCPT ); Sat, 11 Mar 2023 21:16:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229929AbjCLCQr (ORCPT ); Sat, 11 Mar 2023 21:16:47 -0500 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 977EA4DBD8 for ; Sat, 11 Mar 2023 18:16:26 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id w200-20020a25c7d1000000b00b3215dc7b87so4947187ybe.4 for ; Sat, 11 Mar 2023 18:16:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678587386; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=uXcDY77l4F8nFJ6IeFtiGZvS8C7nKH2bFLw1W06sHco=; b=hc9HjUv1Duu5eqI32NQsQb957q2Yi5F1MnFUk2WDfyyY6pd6G5MaWOks9wkXQE52+d ywMj3Due6PlliYPGeFp+m5sFAcj8GnV3ZjPcj6blk886sRPPiswr1v0g9y+Wdq3HUFrf WiSRViNbjvcEEdQt+CovLEdwambpkl7F0ohKh1F7veAzmJdtRsBTmlBlqpbjV9MFyG// cYrNO5mWKilWMY8VUnBkLEeUiZf7Y+gPoBPDJooS4TQkAYPj75g4FPN+WQ92ow+DxLDY J+EuT7YN7tFi8EEifKOG4iy48gFtfW8EAZan1zyvrpA4/GPICjjavLeIJOVLna6rZuda rg8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678587386; 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=uXcDY77l4F8nFJ6IeFtiGZvS8C7nKH2bFLw1W06sHco=; b=OK0rqu0823405NdTf9Hv8gV0We8hdnURjzmMB7uHj3m6ymHYKe+E4wXy7uAQ1pV5Ls 0ctvaujxl4aKM5HbpYJlb5tQxUiCD6R3TiP1QTjl4dxFwP2AaEGTjEZjodWLyplh04Lt vIUJsWbk5aE7hv5V0CJlkxac5Wv3frXIzV526IAWwJhNpLuO6KdcqaF9YaxDqSiWpgzn 3U/AAG6e0X3GSZUaJWwsmkFKyDHxTfIfwgLvdTEvCwfY/W4UdBtPPkwoDGjArKmojO8r JKXHuDrCYfw1rwvk1u25902oWfwHaCIt7LKwoIDDcEgduCb8LY9ETHiaClhx+CL4Gj4/ 1cwg== X-Gm-Message-State: AO0yUKXSZpehVOwB918blv+onNFUz2P3GA3w1TobpPYkxzfZAWxIjitr vYtGql0mGTGjQyOAFLrOqbBhNG1C/rTk X-Google-Smtp-Source: AK7set/x/A1I/b0OOUdLh84YVDmwWWkJLj2dgDbD/RHYWhQkb17EHDezeQNnJi1zEVZexigTUEwJYmvjF8xp X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:b42b:2e07:afb:877e]) (user=irogers job=sendgmr) by 2002:a05:6902:188:b0:a99:de9d:d504 with SMTP id t8-20020a056902018800b00a99de9dd504mr18477824ybh.12.1678587385808; Sat, 11 Mar 2023 18:16:25 -0800 (PST) Date: Sat, 11 Mar 2023 18:15:36 -0800 In-Reply-To: <20230312021543.3060328-1-irogers@google.com> Message-Id: <20230312021543.3060328-5-irogers@google.com> Mime-Version: 1.0 References: <20230312021543.3060328-1-irogers@google.com> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog Subject: [PATCH v5 04/11] perf stat: Modify the group test From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Mark Rutland , Adrian Hunter , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Kan Liang , Zhengjun Xing , Ravi Bangoria , "Steinar H. Gunderson" , Kim Phillips , Florian Fischer , James Clark , Suzuki Poulouse , Sean Christopherson , Leo Yan , John Garry , Kajol Jain , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Stephane Eranian , Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently nr_members is 0 for an event with no group, however, they are always a leader of their own group. A later change will make that count 1 because the event is its own leader. Make the find_stat logic consistent with this, an improvement suggested by Namhyung Kim. Suggested-by: Namhyung Kim Signed-off-by: Ian Rogers --- tools/perf/util/stat-shadow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c index ef85f1ae1ab2..eeccab6751d7 100644 --- a/tools/perf/util/stat-shadow.c +++ b/tools/perf/util/stat-shadow.c @@ -163,7 +163,7 @@ static double find_stat(const struct evsel *evsel, int = aggr_idx, enum stat_type continue; =20 /* Ignore evsels that are part of different groups. */ - if (evsel->core.leader->nr_members && + if (evsel->core.leader->nr_members > 1 && evsel->core.leader !=3D cur->core.leader) continue; /* Ignore evsels with mismatched modifiers. */ --=20 2.40.0.rc1.284.g88254d51c5-goog From nobody Wed Sep 10 01:57:55 2025 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 1AED8C61DA4 for ; Sun, 12 Mar 2023 02:17:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229749AbjCLCRB (ORCPT ); Sat, 11 Mar 2023 21:17:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229643AbjCLCQ7 (ORCPT ); Sat, 11 Mar 2023 21:16:59 -0500 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 111F43E61B for ; Sat, 11 Mar 2023 18:16:34 -0800 (PST) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-536cb268ab8so97198537b3.17 for ; Sat, 11 Mar 2023 18:16:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678587393; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=J3Ijn71k8QI4DMQRSrbObFWviYSAeSJjwqU2daJUrts=; b=oWLEA466iP8i3teaQAOcf9qOtSvu06EnaktoId8F6SQqq3DCnsmfqsKDleXJ8BzOND jcdxH/0CFGdvBU2EwdXsFn/TCvrQzT84TaB4mklDOWsshnEmRYvIjVnTGra65Z8Q6bB+ p1DfigrcVSDSYhQNO+2eLI+PMLoHcyGgt+IFQihIdXf7kCEl0ynz9W6CLTMKgWAv+p+A 7Dqecp+/J2rsWGLs5hGWWA/qzaOUVdkeI6GiUZCkrnEJKP7aqLkygPxMmwqPXuQwWD03 t4HSxIGmF8HPsYvp3CksnodqnXokpOHP3ksTuA2PBHwBaDKjKNFNAYcDD4ff6vz1Z5bY jhgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678587393; 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=J3Ijn71k8QI4DMQRSrbObFWviYSAeSJjwqU2daJUrts=; b=ztcYELG/sNdATiEeiKjzOC24WumPvJtf7s1+NrgfEdwpcf3iuUOWlPPYMIUeseP82d NK40R6/uogg4CLbCgkf9qqvNxDLeEURNigrnD5SZfsmINSmxXt7Z6HKckOzYEsqv05/a dqGjeOMb3svxonDdJjNWtSgldLv2g3y/CzrAPexzUW5DbJKoXo6PIOlOemdab9KWDP31 MPvyR9qiYzCCpp0dfV5yNkB4BKIh7LuOdcE9ZPCc6DZ/fkeA/ZR3SUP6XYVH5b9hlTm/ RmJ2Zirgzl0+02mHOXWpB036BVKLZUWk2q9nMcJcgew7zZJRdiXHfRx1QVBo+mv7wqzr iVbg== X-Gm-Message-State: AO0yUKVZe0UT10VKbFBdZMVBVtZAJx31E3nzDVxbHpXKznC+Tc3nBJ4h frmZzHG1QiAmFnKn++A7Bz0T0dbrAnqv X-Google-Smtp-Source: AK7set/4rBlIa3b+mGsFY1+yIPCZf66FBsecqFvck2bZTZtCsbqO36ckQWHaELQFVDqhxJFj+piQzVJkPHid X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:b42b:2e07:afb:877e]) (user=irogers job=sendgmr) by 2002:a5b:e92:0:b0:ab8:1ed9:cfc9 with SMTP id z18-20020a5b0e92000000b00ab81ed9cfc9mr18419708ybr.6.1678587393270; Sat, 11 Mar 2023 18:16:33 -0800 (PST) Date: Sat, 11 Mar 2023 18:15:37 -0800 In-Reply-To: <20230312021543.3060328-1-irogers@google.com> Message-Id: <20230312021543.3060328-6-irogers@google.com> Mime-Version: 1.0 References: <20230312021543.3060328-1-irogers@google.com> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog Subject: [PATCH v5 05/11] perf evsel: Allow const evsel for certain accesses From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Mark Rutland , Adrian Hunter , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Kan Liang , Zhengjun Xing , Ravi Bangoria , "Steinar H. Gunderson" , Kim Phillips , Florian Fischer , James Clark , Suzuki Poulouse , Sean Christopherson , Leo Yan , John Garry , Kajol Jain , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Stephane Eranian , Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" List sorting, added later to evlist, passes const elements requiring helper functions to also be const. Make the argument to evsel__find_pmu, evsel__is_aux_event and evsel__leader const. Signed-off-by: Ian Rogers --- tools/perf/util/evsel.c | 2 +- tools/perf/util/evsel.h | 6 +++--- tools/perf/util/pmu.c | 6 +++--- tools/perf/util/python.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 51e8ce6edddc..2dc2c24252bb 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -3139,7 +3139,7 @@ bool evsel__is_hybrid(const struct evsel *evsel) return evsel->pmu_name && perf_pmu__is_hybrid(evsel->pmu_name); } =20 -struct evsel *evsel__leader(struct evsel *evsel) +struct evsel *evsel__leader(const struct evsel *evsel) { return container_of(evsel->core.leader, struct evsel, core); } diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index 814a49ebb7e3..676c499323e9 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -212,8 +212,8 @@ int evsel__object_config(size_t object_size, int (*init)(struct evsel *evsel), void (*fini)(struct evsel *evsel)); =20 -struct perf_pmu *evsel__find_pmu(struct evsel *evsel); -bool evsel__is_aux_event(struct evsel *evsel); +struct perf_pmu *evsel__find_pmu(const struct evsel *evsel); +bool evsel__is_aux_event(const struct evsel *evsel); =20 struct evsel *evsel__new_idx(struct perf_event_attr *attr, int idx); =20 @@ -505,7 +505,7 @@ int evsel__store_ids(struct evsel *evsel, struct evlist= *evlist); =20 void evsel__zero_per_pkg(struct evsel *evsel); bool evsel__is_hybrid(const struct evsel *evsel); -struct evsel *evsel__leader(struct evsel *evsel); +struct evsel *evsel__leader(const struct evsel *evsel); bool evsel__has_leader(struct evsel *evsel, struct evsel *leader); bool evsel__is_leader(struct evsel *evsel); void evsel__set_leader(struct evsel *evsel, struct evsel *leader); diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 43b6182d96b7..45d9b8e28e16 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -988,7 +988,7 @@ struct perf_pmu *perf_pmu__scan(struct perf_pmu *pmu) return NULL; } =20 -struct perf_pmu *evsel__find_pmu(struct evsel *evsel) +struct perf_pmu *evsel__find_pmu(const struct evsel *evsel) { struct perf_pmu *pmu =3D NULL; =20 @@ -1000,11 +1000,11 @@ struct perf_pmu *evsel__find_pmu(struct evsel *evse= l) break; } =20 - evsel->pmu =3D pmu; + ((struct evsel *)evsel)->pmu =3D pmu; return pmu; } =20 -bool evsel__is_aux_event(struct evsel *evsel) +bool evsel__is_aux_event(const struct evsel *evsel) { struct perf_pmu *pmu =3D evsel__find_pmu(evsel); =20 diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 42e8b813d010..ab48ffbb6448 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -83,7 +83,7 @@ const char *perf_env__arch(struct perf_env *env __maybe_u= nused) * far, for the perf python binding known usecases, revisit if this become * necessary. */ -struct perf_pmu *evsel__find_pmu(struct evsel *evsel __maybe_unused) +struct perf_pmu *evsel__find_pmu(const struct evsel *evsel __maybe_unused) { return NULL; } --=20 2.40.0.rc1.284.g88254d51c5-goog From nobody Wed Sep 10 01:57:55 2025 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 2BCF7C74A44 for ; Sun, 12 Mar 2023 02:17:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229950AbjCLCRN (ORCPT ); Sat, 11 Mar 2023 21:17:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229980AbjCLCRJ (ORCPT ); Sat, 11 Mar 2023 21:17:09 -0500 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 F269E4743C for ; Sat, 11 Mar 2023 18:16:44 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5395c8fc4a1so95709767b3.5 for ; Sat, 11 Mar 2023 18:16:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678587401; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Qyazbe46rOg/i1CEPSqWXRbYnptRPdE6UyDQgiYATTw=; b=IHiifOyhvr6dfYqaZRmzbuNmwYrNgU/Sf8u5McKF/J+58inhWo0wkALDzR811VOgqe eqcylIqeTBd9nrE0csz3mVz0czd6hIWXdNWqVsyLFnfI9OZNkNAQGtlSQpyhN1J0kDQM 6mjsE3Gt5KTy1maWSq6yDO7qCGyoDlRIfnEBgYyiHAwTL/am/o1zxljzxMZi6UfjhbR5 Gz5ASNYfTkEtxbswQBRX/a6a/0n3IjOd8YsAZxTARgR5y3PyKu0bE+gmm7LrAAUvGOf7 LjTdkhaIQKNfzKcZ4e5YOdgM50+baq8E5+B9rK+/dMOl2Ocu/II98PCYve6fmz+qcrOy Tc1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678587401; 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=Qyazbe46rOg/i1CEPSqWXRbYnptRPdE6UyDQgiYATTw=; b=EbpQluaSZ4Blr/pLLRqRPudacSzWRAqKdcTuP5EEhrzOnY600ag/Q8DuyC16+isAgy veklj/+TE/6QOF0UNse7w1N+M+TtYOAKpNzodAzNjamnleWfRJSVYDNwmB3MnX7j9Beh phuRwA4ZAbGhzbowijIeIhgJmtPJP7sUEWtyr0gEKjaSplMKuZxYKUa0EgIssEG8xvme 5FA+R4ktY5hLaFawR1/vcJaWQ4blUf9n9Lfx09IDLFzxJi9z8r7U4IRJU2GJZPfhl9x3 R6QxDLoqT0u9RmgbcVLt22MbGDO6cEIkXR4Hgc3YQVs3cgJjvTReC0N/nPJYjY3fd39Y HVng== X-Gm-Message-State: AO0yUKVggy6EeOySmOeWPC2JI3JteQRC+HGKF1/8L7L+sktAbLkm42R1 YM71dL3fa9qPcRVvvNOzZvqX/CLNMpGB X-Google-Smtp-Source: AK7set/9Pci6ll2S5cvaxvSCPTRJzKo0tu/SmqL1I4hR2HufQBDLnGZDp+NGQCzGzAW0G1YD085drkwR/BUF X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:b42b:2e07:afb:877e]) (user=irogers job=sendgmr) by 2002:a5b:e92:0:b0:ab8:1ed9:cfc9 with SMTP id z18-20020a5b0e92000000b00ab81ed9cfc9mr18419870ybr.6.1678587401195; Sat, 11 Mar 2023 18:16:41 -0800 (PST) Date: Sat, 11 Mar 2023 18:15:38 -0800 In-Reply-To: <20230312021543.3060328-1-irogers@google.com> Message-Id: <20230312021543.3060328-7-irogers@google.com> Mime-Version: 1.0 References: <20230312021543.3060328-1-irogers@google.com> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog Subject: [PATCH v5 06/11] perf evsel: Add function to compute group PMU name From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Mark Rutland , Adrian Hunter , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Kan Liang , Zhengjun Xing , Ravi Bangoria , "Steinar H. Gunderson" , Kim Phillips , Florian Fischer , James Clark , Suzuki Poulouse , Sean Christopherson , Leo Yan , John Garry , Kajol Jain , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Stephane Eranian , Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The computed name respects software events and aux event groups, such that the pmu_name is changed to be that of the aux event leader or group leader for software events. This is done as a later change will split events that are in different PMUs into different groups. Signed-off-by: Ian Rogers --- tools/perf/util/evsel.c | 24 ++++++++++++++++++++++++ tools/perf/util/evsel.h | 1 + 2 files changed, 25 insertions(+) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 2dc2c24252bb..51d9650267d0 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -821,6 +821,30 @@ const char *evsel__name(struct evsel *evsel) return "unknown"; } =20 +const char *evsel__group_pmu_name(const struct evsel *evsel) +{ + const struct evsel *leader; + + /* 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. + * + * 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 =3D evsel__leader(evsel); + if ((evsel->core.attr.type =3D=3D PERF_TYPE_SOFTWARE || evsel__is_aux_eve= nt(leader)) && + leader->pmu_name) { + return leader->pmu_name; + } + + return "cpu"; +} + const char *evsel__metric_id(const struct evsel *evsel) { if (evsel->metric_id) diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index 676c499323e9..d26745ca6147 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -280,6 +280,7 @@ int arch_evsel__hw_name(struct evsel *evsel, char *bf, = size_t size); =20 int __evsel__hw_cache_type_op_res_name(u8 type, u8 op, u8 result, char *bf= , size_t size); const char *evsel__name(struct evsel *evsel); +const char *evsel__group_pmu_name(const struct evsel *evsel); const char *evsel__metric_id(const struct evsel *evsel); =20 static inline bool evsel__is_tool(const struct evsel *evsel) --=20 2.40.0.rc1.284.g88254d51c5-goog From nobody Wed Sep 10 01:57:55 2025 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 25EECC74A4B for ; Sun, 12 Mar 2023 02:17:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230027AbjCLCRb (ORCPT ); Sat, 11 Mar 2023 21:17:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229914AbjCLCRY (ORCPT ); Sat, 11 Mar 2023 21:17:24 -0500 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 43A214E5FD for ; Sat, 11 Mar 2023 18:16:53 -0800 (PST) Received: by mail-pl1-x649.google.com with SMTP id q1-20020a170902dac100b0019f1e3ea83dso1949182plx.4 for ; Sat, 11 Mar 2023 18:16:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678587409; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=rAHr1Ym6m8HDaHWKquUTUVzIVoHfjpMPERLVKzK3KKk=; b=c6h0GsVHgKGDH1bcn7dxWPUgQfME7wApLuocb4Vg1jAr0QTtoPc8e9f0zRcXnzmDDZ xy7Oum6JHYQGP16fOo9sgIa+V6zKtAWjoU8HFlTqpKye6XjeqWwSaRK/3VqzagDG4/wb u4Udxv4YQorgEuOfWfTvH3ymWelcv44KtfMGAAvfqO3NLdFPRNQKHUCdpBFnVkdUAHsQ N7N8OPs6ZvFYSn4+SpJ4VjlV7cmWeIdP3R/g4Ne4dFWN98kzF1yHMcfqxsOGUnIaiOCu NOWWL8IHYQvlGvcWP+HMLRdWvQCWB/uEVWTsTuN/nLgEnHQ5nM1WiaLfxpyxDzPYxEfT buRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678587409; 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=rAHr1Ym6m8HDaHWKquUTUVzIVoHfjpMPERLVKzK3KKk=; b=UNYDweelNtww8qgaN/3ny8xbyI7ihYBIlQ2gBsOn6VuLfJJ+uc4uMihw3gPhdT+n9E yElzCNN2n7sW6hQSqROGhos9yC2mamtdVU2jGRIV7LM6ZYZv7vzAEMcpTc/cYJoX9YNI vVth+sxntkazrl0wfXRpNmhTK+i4L3Hcdfrlz7FAEy+fO0chwoEd3+X9861NR1MMCR2H pwcJk/Akq15M9CGJgmbRA3zFYsTXfQcP1p3N41N0vbNYfPQOsjxww5dk5k/76es8W0zU O4b2cVgeE+8ulhvnvb08PvXL0EADaSt7I3nNvhSft4H90kDmS1T69Q/Bu/dNS0VwBaUk wiUA== X-Gm-Message-State: AO0yUKUUlWC5e9vkysbHWt4P+iP1u0MDfq/sCXDp0l6rboO/uDbZJXFP 45d50110WfMbMHRt+AnehMEwUgpo8Nxp X-Google-Smtp-Source: AK7set89GTn3xlU//DaHxsNTMW5n8cfLHRpRjrEJ4zsc3vMEzoFODRhs4WHPl8Qk3HhTDo7CO2zZ03Wlmv35 X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:b42b:2e07:afb:877e]) (user=irogers job=sendgmr) by 2002:a62:8607:0:b0:619:46b3:7903 with SMTP id x7-20020a628607000000b0061946b37903mr10924410pfd.3.1678587408990; Sat, 11 Mar 2023 18:16:48 -0800 (PST) Date: Sat, 11 Mar 2023 18:15:39 -0800 In-Reply-To: <20230312021543.3060328-1-irogers@google.com> Message-Id: <20230312021543.3060328-8-irogers@google.com> Mime-Version: 1.0 References: <20230312021543.3060328-1-irogers@google.com> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog Subject: [PATCH v5 07/11] perf parse-events: Pass ownership of the group name From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Mark Rutland , Adrian Hunter , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Kan Liang , Zhengjun Xing , Ravi Bangoria , "Steinar H. Gunderson" , Kim Phillips , Florian Fischer , James Clark , Suzuki Poulouse , Sean Christopherson , Leo Yan , John Garry , Kajol Jain , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Stephane Eranian , Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Pass ownership of the group name rather than copying and freeing the original. This saves a memory allocation and copy. Signed-off-by: Ian Rogers --- tools/perf/util/parse-events.c | 3 ++- tools/perf/util/parse-events.y | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 0336ff27c15f..1be454697d57 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -1761,6 +1761,7 @@ parse_events__set_leader_for_uncore_aliase(char *name= , struct list_head *list, =20 handled: ret =3D 1; + free(name); out: free(leaders); return ret; @@ -1786,7 +1787,7 @@ void parse_events__set_leader(char *name, struct list= _head *list, =20 leader =3D arch_evlist__leader(list); __perf_evlist__set_leader(list, &leader->core); - leader->group_name =3D name ? strdup(name) : NULL; + leader->group_name =3D name; list_move(&leader->core.node, list); } =20 diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index be8c51770051..541b8dde2063 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -202,8 +202,8 @@ PE_NAME '{' events '}' struct list_head *list =3D $3; =20 inc_group_count(list, _parse_state); + /* Takes ownership of $1. */ parse_events__set_leader($1, list, _parse_state); - free($1); $$ =3D list; } | --=20 2.40.0.rc1.284.g88254d51c5-goog From nobody Wed Sep 10 01:57:55 2025 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 585C4C74A5B for ; Sun, 12 Mar 2023 02:17:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229996AbjCLCRf (ORCPT ); Sat, 11 Mar 2023 21:17:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229994AbjCLCR0 (ORCPT ); Sat, 11 Mar 2023 21:17:26 -0500 Received: from mail-pl1-x64a.google.com (mail-pl1-x64a.google.com [IPv6:2607:f8b0:4864:20::64a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CC454FF1F for ; Sat, 11 Mar 2023 18:17:01 -0800 (PST) Received: by mail-pl1-x64a.google.com with SMTP id q1-20020a170902dac100b0019f1e3ea83dso1949284plx.4 for ; Sat, 11 Mar 2023 18:17:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678587418; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=R3udvw9vcv+5+rh+rcxeOWhYQLNOoNCFH1Xfp/rqw24=; b=cF2+IYQYYM1nKmsCzSZReJJsG0B3ThwWQAmo/dgqd57QZjBx6wSV+PceKmkDQGJEmh ohkJ2PAH5O0fCcGXn1IC5F5hsOm3Unbua7EwJtTHZEB+n7DYxJDXK8hwuHpilySAHRwv 0p+q3KvQHCbVm8Qcc+IGzIFCVKSHoVfDrGQfa2/YuWY3UQumByFMry6VJAujLMluEI71 ZteeJD+cwtqEmcob2LntoOeGRc1bch53mu55aUIjbbbYd+0/RxWioJve4UAck7S5T0D6 BMMlKzSodJaKCVDF3rrwgYDndQsr1Fydk2VTuKLX5EkQpMMUsZlbdo5G28iy2N5bMK3m vGZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678587418; 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=R3udvw9vcv+5+rh+rcxeOWhYQLNOoNCFH1Xfp/rqw24=; b=f8OAbQbE6irIfxGLjKDI8sk2JrhUc4Jz+7ZOFZFQwijdbUnwzbH/IBhxDjQwEYgGSy G+PdHXbwhoAIxsfCP7mr6bQurwYmbqeJ8K4pHx+yg83EjCu3PCfrYsvgXW3MqeaBSkqg bJma/OPqX0zNmAaPLkzcrCrnH7AM1tc2mc432LtDqB7uruC2zj7fPUcXP4c3XYgfmEfi xwtp1FiJh2HtkgMhWCIFyBc0txUxQttLr+mnvSvsxe8KrX9+Hh3K10K1biX/gjMSKZld KM9qbCNlibcCQAnu5f9PGo4dLxSRaThbF9eVPZsiKjeH+ixozLD/PSqF5GSc6xZbsq+y YdAw== X-Gm-Message-State: AO0yUKXBWTyd2Pl5MNkAU91Gj7Wf+BsFSU5HqrldVsddQg6wGljuUZdP bBWKKvKcYZTvdwg0zfoYUPrCbjvv5l8R X-Google-Smtp-Source: AK7set+KJBGrlYLvi6BoY9aFKVTllTKXAD6/qyPNBKQvi40lVkpIw1BEFl2nGt4yVAwIa+KMbGOPfKgohLvo X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:b42b:2e07:afb:877e]) (user=irogers job=sendgmr) by 2002:a17:903:428a:b0:199:1afc:16ad with SMTP id ju10-20020a170903428a00b001991afc16admr11035857plb.5.1678587417775; Sat, 11 Mar 2023 18:16:57 -0800 (PST) Date: Sat, 11 Mar 2023 18:15:40 -0800 In-Reply-To: <20230312021543.3060328-1-irogers@google.com> Message-Id: <20230312021543.3060328-9-irogers@google.com> Mime-Version: 1.0 References: <20230312021543.3060328-1-irogers@google.com> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog Subject: [PATCH v5 08/11] perf parse-events: Sort and group parsed events From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Mark Rutland , Adrian Hunter , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Kan Liang , Zhengjun Xing , Ravi Bangoria , "Steinar H. Gunderson" , Kim Phillips , Florian Fischer , James Clark , Suzuki Poulouse , Sean Christopherson , Leo Yan , John Garry , Kajol Jain , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Stephane Eranian , Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This change is intended to be a no-op for most current cases, the default sort order is the order the events were parsed. Where it varies is in how groups are handled. Previously an uncore and core event that are grouped would most often cause the group to be removed: ``` $ perf stat -e '{instructions,uncore_imc_free_running_0/data_total/}' -a sl= eep 1 WARNING: grouped events cpus do not match, disabling group: anon group { instructions, uncore_imc_free_running_0/data_total/ } ... ``` However, when wildcards are used the events should be re-sorted and re-grouped in parse_events__set_leader, but this currently fails for simple examples: ``` $ perf stat -e '{uncore_imc_free_running/data_read/,uncore_imc_free_running= /data_write/}' -a sleep 1 Performance counter stats for 'system wide': MiB uncore_imc_free_running/data_read/ MiB uncore_imc_free_running/data_write/ 1.000996992 seconds time elapsed ``` A futher failure mode, fixed in this patch, is to force topdown events into a group. This change moves sorting the evsels in the evlist after parsing. It requires parsing to set up groups. First the evsels are sorted respecting the existing groupings and parse order, but also reordering to ensure evsels of the same PMU and group appear together. So that software and aux events respect groups, their pmu_name is taken from the group leader. The sorting is done with list_sort removing a memory allocation. After sorting a pass is done to correct the group leaders and for topdown events ensuring they have a group leader. This fixes the problems seen before: ``` $ perf stat -e '{uncore_imc_free_running/data_read/,uncore_imc_free_running= /data_write/}' -a sleep 1 Performance counter stats for 'system wide': 727.42 MiB uncore_imc_free_running/data_read/ 81.84 MiB uncore_imc_free_running/data_write/ 1.000948615 seconds time elapsed ``` As well as making groups not fail for cases like: ``` $ perf stat -e '{imc_free_running_0/data_total/,imc_free_running_1/data_tot= al/}' -a sleep 1 Performance counter stats for 'system wide': 256.47 MiB imc_free_running_0/data_total/ 256.48 MiB imc_free_running_1/data_total/ 1.001165442 seconds time elapsed ``` Signed-off-by: Ian Rogers --- tools/perf/arch/x86/util/evlist.c | 39 ++--- tools/perf/util/evlist.h | 2 +- tools/perf/util/parse-events.c | 240 +++++++++++++++--------------- tools/perf/util/parse-events.h | 3 +- tools/perf/util/parse-events.y | 4 +- 5 files changed, 136 insertions(+), 152 deletions(-) diff --git a/tools/perf/arch/x86/util/evlist.c b/tools/perf/arch/x86/util/e= vlist.c index 8a7ae4162563..d4193479a364 100644 --- a/tools/perf/arch/x86/util/evlist.c +++ b/tools/perf/arch/x86/util/evlist.c @@ -65,29 +65,22 @@ int arch_evlist__add_default_attrs(struct evlist *evlis= t, return ___evlist__add_default_attrs(evlist, attrs, nr_attrs); } =20 -struct evsel *arch_evlist__leader(struct list_head *list) +int arch_evlist__cmp(const struct evsel *lhs, const struct evsel *rhs) { - struct evsel *evsel, *first, *slots =3D NULL; - bool has_topdown =3D false; - - first =3D list_first_entry(list, struct evsel, core.node); - - if (!topdown_sys_has_perf_metrics()) - return first; - - /* If there is a slots event and a topdown event then the slots event com= es first. */ - __evlist__for_each_entry(list, evsel) { - if (evsel->pmu_name && !strncmp(evsel->pmu_name, "cpu", 3) && evsel->nam= e) { - if (strcasestr(evsel->name, "slots")) { - slots =3D evsel; - if (slots =3D=3D first) - return first; - } - if (strcasestr(evsel->name, "topdown")) - has_topdown =3D true; - if (slots && has_topdown) - return slots; - } + if (topdown_sys_has_perf_metrics() && + (!lhs->pmu_name || !strncmp(lhs->pmu_name, "cpu", 3))) { + /* Ensure the topdown slots comes first. */ + if (strcasestr(lhs->name, "slots")) + return -1; + if (strcasestr(rhs->name, "slots")) + return 1; + /* Followed by topdown events. */ + if (strcasestr(lhs->name, "topdown") && !strcasestr(rhs->name, "topdown"= )) + return -1; + if (!strcasestr(lhs->name, "topdown") && strcasestr(rhs->name, "topdown"= )) + return 1; } - return first; + + /* Default ordering by insertion index. */ + return lhs->core.idx - rhs->core.idx; } diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index 01fa9d592c5a..d89d8f92802b 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -119,7 +119,7 @@ int arch_evlist__add_default_attrs(struct evlist *evlis= t, #define evlist__add_default_attrs(evlist, array) \ arch_evlist__add_default_attrs(evlist, array, ARRAY_SIZE(array)) =20 -struct evsel *arch_evlist__leader(struct list_head *list); +int arch_evlist__cmp(const struct evsel *lhs, const struct evsel *rhs); =20 int evlist__add_dummy(struct evlist *evlist); struct evsel *evlist__add_aux_dummy(struct evlist *evlist, bool system_wid= e); diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 1be454697d57..394ab23089d0 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include #include +#include #include #include #include @@ -1655,125 +1656,7 @@ int parse_events__modifier_group(struct list_head *= list, return parse_events__modifier_event(list, event_mod, true); } =20 -/* - * Check if the two uncore PMUs are from the same uncore block - * The format of the uncore PMU name is uncore_#blockname_#pmuidx - */ -static bool is_same_uncore_block(const char *pmu_name_a, const char *pmu_n= ame_b) -{ - char *end_a, *end_b; - - end_a =3D strrchr(pmu_name_a, '_'); - end_b =3D strrchr(pmu_name_b, '_'); - - if (!end_a || !end_b) - return false; - - if ((end_a - pmu_name_a) !=3D (end_b - pmu_name_b)) - return false; - - return (strncmp(pmu_name_a, pmu_name_b, end_a - pmu_name_a) =3D=3D 0); -} - -static int -parse_events__set_leader_for_uncore_aliase(char *name, struct list_head *l= ist, - struct parse_events_state *parse_state) -{ - struct evsel *evsel, *leader; - uintptr_t *leaders; - bool is_leader =3D true; - int i, nr_pmu =3D 0, total_members, ret =3D 0; - - leader =3D list_first_entry(list, struct evsel, core.node); - evsel =3D list_last_entry(list, struct evsel, core.node); - total_members =3D evsel->core.idx - leader->core.idx + 1; - - leaders =3D calloc(total_members, sizeof(uintptr_t)); - if (WARN_ON(!leaders)) - return 0; - - /* - * Going through the whole group and doing sanity check. - * All members must use alias, and be from the same uncore block. - * Also, storing the leader events in an array. - */ - __evlist__for_each_entry(list, evsel) { - - /* Only split the uncore group which members use alias */ - if (!evsel->use_uncore_alias) - goto out; - - /* The events must be from the same uncore block */ - if (!is_same_uncore_block(leader->pmu_name, evsel->pmu_name)) - goto out; - - if (!is_leader) - continue; - /* - * If the event's PMU name starts to repeat, it must be a new - * event. That can be used to distinguish the leader from - * other members, even they have the same event name. - */ - if ((leader !=3D evsel) && - !strcmp(leader->pmu_name, evsel->pmu_name)) { - is_leader =3D false; - continue; - } - - /* Store the leader event for each PMU */ - leaders[nr_pmu++] =3D (uintptr_t) evsel; - } - - /* only one event alias */ - if (nr_pmu =3D=3D total_members) { - parse_state->nr_groups--; - goto handled; - } - - /* - * An uncore event alias is a joint name which means the same event - * runs on all PMUs of a block. - * Perf doesn't support mixed events from different PMUs in the same - * group. The big group has to be split into multiple small groups - * which only include the events from the same PMU. - * - * Here the uncore event aliases must be from the same uncore block. - * The number of PMUs must be same for each alias. The number of new - * small groups equals to the number of PMUs. - * Setting the leader event for corresponding members in each group. - */ - i =3D 0; - __evlist__for_each_entry(list, evsel) { - if (i >=3D nr_pmu) - i =3D 0; - evsel__set_leader(evsel, (struct evsel *) leaders[i++]); - } - - /* The number of members and group name are same for each group */ - for (i =3D 0; i < nr_pmu; i++) { - evsel =3D (struct evsel *) leaders[i]; - evsel->core.nr_members =3D total_members / nr_pmu; - evsel->group_name =3D name ? strdup(name) : NULL; - } - - /* Take the new small groups into account */ - parse_state->nr_groups +=3D nr_pmu - 1; - -handled: - ret =3D 1; - free(name); -out: - free(leaders); - return ret; -} - -__weak struct evsel *arch_evlist__leader(struct list_head *list) -{ - return list_first_entry(list, struct evsel, core.node); -} - -void parse_events__set_leader(char *name, struct list_head *list, - struct parse_events_state *parse_state) +void parse_events__set_leader(char *name, struct list_head *list) { struct evsel *leader; =20 @@ -1782,13 +1665,9 @@ void parse_events__set_leader(char *name, struct lis= t_head *list, return; } =20 - if (parse_events__set_leader_for_uncore_aliase(name, list, parse_state)) - return; - - leader =3D arch_evlist__leader(list); + leader =3D list_first_entry(list, struct evsel, core.node); __perf_evlist__set_leader(list, &leader->core); leader->group_name =3D name; - list_move(&leader->core.node, list); } =20 /* list_event is assumed to point to malloc'ed memory */ @@ -2245,6 +2124,117 @@ static int parse_events__with_hybrid_pmu(struct par= se_events_state *parse_state, return ret; } =20 +__weak int arch_evlist__cmp(const struct evsel *lhs, const struct evsel *r= hs) +{ + /* Order by insertion index. */ + return lhs->core.idx - rhs->core.idx; +} + +static int evlist__cmp(void *state, const struct list_head *l, const struc= t list_head *r) +{ + const struct perf_evsel *lhs_core =3D container_of(l, struct perf_evsel, = node); + const struct evsel *lhs =3D container_of(lhs_core, struct evsel, core); + const struct perf_evsel *rhs_core =3D container_of(r, struct perf_evsel, = node); + const struct evsel *rhs =3D container_of(rhs_core, struct evsel, core); + int *leader_idx =3D state; + int lhs_leader_idx =3D *leader_idx, rhs_leader_idx =3D *leader_idx, ret; + const char *lhs_pmu_name, *rhs_pmu_name; + + /* + * First sort by grouping/leader. Read the leader idx only if the evsel + * is part of a group, as -1 indicates no group. + */ + if (lhs_core->leader !=3D lhs_core || lhs_core->nr_members > 1) + lhs_leader_idx =3D lhs_core->leader->idx; + if (rhs_core->leader !=3D rhs_core || rhs_core->nr_members > 1) + rhs_leader_idx =3D rhs_core->leader->idx; + + if (lhs_leader_idx !=3D rhs_leader_idx) + return lhs_leader_idx - rhs_leader_idx; + + /* Group by PMU. Groups can't span PMUs. */ + lhs_pmu_name =3D evsel__group_pmu_name(lhs); + rhs_pmu_name =3D evsel__group_pmu_name(rhs); + ret =3D strcmp(lhs_pmu_name, rhs_pmu_name); + if (ret) + return ret; + + /* Architecture specific sorting. */ + return arch_evlist__cmp(lhs, rhs); +} + +static void parse_events__sort_events_and_fix_groups(struct list_head *lis= t) +{ + int idx =3D -1; + struct evsel *pos, *cur_leader =3D NULL; + struct perf_evsel *cur_leaders_grp =3D NULL; + + /* + * Compute index to insert ungrouped events at. Place them where the + * first ungrouped event appears. + */ + list_for_each_entry(pos, list, core.node) { + const struct evsel *pos_leader =3D evsel__leader(pos); + + if (pos !=3D pos_leader || pos->core.nr_members > 1) + continue; + + idx =3D pos->core.idx; + break; + } + + /* Sort events. */ + list_sort(&idx, list, evlist__cmp); + + /* + * Recompute groups, splitting for PMUs and adding groups for events + * that require them. + */ + idx =3D 0; + list_for_each_entry(pos, list, core.node) { + const struct evsel *pos_leader =3D evsel__leader(pos); + const char *pos_pmu_name =3D evsel__group_pmu_name(pos); + const char *cur_leader_pmu_name, *pos_leader_pmu_name; + bool force_grouped =3D arch_evsel__must_be_in_group(pos); + + /* Reset index and nr_members. */ + pos->core.idx =3D idx++; + pos->core.nr_members =3D 0; + + /* + * Set the group leader respecting the given groupings and that + * groups can't span PMUs. + */ + if (!cur_leader) + cur_leader =3D pos; + + cur_leader_pmu_name =3D evsel__group_pmu_name(cur_leader); + if ((cur_leaders_grp !=3D pos->core.leader && !force_grouped) || + strcmp(cur_leader_pmu_name, pos_pmu_name)) { + /* Event is for a different group/PMU than last. */ + cur_leader =3D pos; + /* + * Remember the leader's group before it is overwritten, + * so that later events match as being in the same + * group. + */ + cur_leaders_grp =3D pos->core.leader; + } + pos_leader_pmu_name =3D evsel__group_pmu_name(pos_leader); + if (strcmp(pos_leader_pmu_name, pos_pmu_name) || force_grouped) { + /* + * Event's PMU differs from its leader's. Groups can't + * span PMUs, so update leader from the group/PMU + * tracker. + */ + evsel__set_leader(pos, cur_leader); + } + } + list_for_each_entry(pos, list, core.node) { + pos->core.leader->nr_members++; + } +} + int __parse_events(struct evlist *evlist, const char *str, struct parse_events_error *err, struct perf_pmu *fake_pmu) { @@ -2266,6 +2256,8 @@ int __parse_events(struct evlist *evlist, const char = *str, return -1; } =20 + parse_events__sort_events_and_fix_groups(&parse_state.list); + /* * Add list to the evlist even with errors to allow callers to clean up. */ diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index 428e72eaafcc..22fc11b0bd59 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -200,8 +200,7 @@ int parse_events_copy_term_list(struct list_head *old, =20 enum perf_pmu_event_symbol_type perf_pmu__parse_check(const char *name); -void parse_events__set_leader(char *name, struct list_head *list, - struct parse_events_state *parse_state); +void parse_events__set_leader(char *name, struct list_head *list); void parse_events_update_lists(struct list_head *list_event, struct list_head *list_all); void parse_events_evlist_error(struct parse_events_state *parse_state, diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index 541b8dde2063..90d12f2bc8be 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -203,7 +203,7 @@ PE_NAME '{' events '}' =20 inc_group_count(list, _parse_state); /* Takes ownership of $1. */ - parse_events__set_leader($1, list, _parse_state); + parse_events__set_leader($1, list); $$ =3D list; } | @@ -212,7 +212,7 @@ PE_NAME '{' events '}' struct list_head *list =3D $2; =20 inc_group_count(list, _parse_state); - parse_events__set_leader(NULL, list, _parse_state); + parse_events__set_leader(NULL, list); $$ =3D list; } =20 --=20 2.40.0.rc1.284.g88254d51c5-goog From nobody Wed Sep 10 01:57:55 2025 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 AB219C74A44 for ; Sun, 12 Mar 2023 02:17:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230045AbjCLCRl (ORCPT ); Sat, 11 Mar 2023 21:17:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229983AbjCLCRd (ORCPT ); Sat, 11 Mar 2023 21:17:33 -0500 Received: from mail-pf1-x449.google.com (mail-pf1-x449.google.com [IPv6:2607:f8b0:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CE6A4B818 for ; Sat, 11 Mar 2023 18:17:09 -0800 (PST) Received: by mail-pf1-x449.google.com with SMTP id fb7-20020a056a002d8700b0061c7b700c6dso4897040pfb.13 for ; Sat, 11 Mar 2023 18:17:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678587425; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=2AGCkxH0J5hJXgJ2KAwhFby6uOM/s466C03vSdWsUgU=; b=PAmYSgWcag9OXEjvfWJYJ4KTTHXvGFVDxzzMsll0Am//Jd3kq3xzEmjcrtMwPoON7T A3Esx4jGnvaVco7P+vL0SCi394t+tELbsNz0G1ftx1KN3HppEzCCMTu3IjnENnRFahxi LGzSVW2Ev5IWPAD4Lct2O42vDYPf1vpVBf91X1akpnZ5xy3C50mRIhsm5WT8P/RpHkGa tHGwDw6UEGZsfSkG0z5zLRMJuM+z3iZx7t6ptMOJygtMH+9+Kj/b2nEh/O4QMqnlwgD+ A5jhcF+Zgx2aC+QF8EwOdnHtzKUO1WcB1zGawJlo2byprv95M5xZD80Q6VUAlb3ZIgVt O7ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678587425; 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=2AGCkxH0J5hJXgJ2KAwhFby6uOM/s466C03vSdWsUgU=; b=n268F4XvJ6ciNoCK74VK8BcHCJR+O0VOv+/r71TKCNgOcI1TA0Rz5iC2/CWPrNK1hn RltiOVQXvcqVxs3KP+WpSm9cHzhEC/dMcsEoNwDuHwGiDZlvc9GA75+chnRjZcdYyf9t BClrw8NZtHmA6/loUqfhNO7xXZPGTZYv/nVGPVwc/w9zKhggWiSdrZdBS7lM3eEO7Sr2 bIzf/ziO+MEMT7utBjj7luqF/Qnbu2XKza2Z54Rh/e/jaFhst4/hyaB6jvD0eBykFLZt QKLkgC1h7cZXF8LX9r0wNMWOaZg5IvYBO3K2d2Wt7MlZY4EB3SxM3hIcnZ1Gti4UjSSx AAzQ== X-Gm-Message-State: AO0yUKUdWEBqm8F3wSbZDputc+1Rt1TFyykEbFpI+venAu+Up555GIFE k12BEm52loG6SvFyI70KBRmAiuivxPXd X-Google-Smtp-Source: AK7set/AQ2JWf27aS94uSXYlunQ3aMwvEvyEnDCGdkk5QjvQu/z8dAdl8fm5gVu2LhWb4PVOOOu+S2vYSqo/ X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:b42b:2e07:afb:877e]) (user=irogers job=sendgmr) by 2002:a17:90a:ea0b:b0:237:5e4c:7d78 with SMTP id w11-20020a17090aea0b00b002375e4c7d78mr10925156pjy.9.1678587425539; Sat, 11 Mar 2023 18:17:05 -0800 (PST) Date: Sat, 11 Mar 2023 18:15:41 -0800 In-Reply-To: <20230312021543.3060328-1-irogers@google.com> Message-Id: <20230312021543.3060328-10-irogers@google.com> Mime-Version: 1.0 References: <20230312021543.3060328-1-irogers@google.com> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog Subject: [PATCH v5 09/11] perf evsel: Remove use_uncore_alias From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Mark Rutland , Adrian Hunter , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Kan Liang , Zhengjun Xing , Ravi Bangoria , "Steinar H. Gunderson" , Kim Phillips , Florian Fischer , James Clark , Suzuki Poulouse , Sean Christopherson , Leo Yan , John Garry , Kajol Jain , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Stephane Eranian , Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This flag used to be used when regrouping uncore events in particular due to wildcard matches. This is now handled by sorting evlist and so the flag is redundant. Signed-off-by: Ian Rogers --- tools/perf/util/evsel.c | 1 - tools/perf/util/evsel.h | 1 - tools/perf/util/parse-events.c | 12 +++--------- tools/perf/util/parse-events.h | 3 +-- tools/perf/util/parse-events.y | 11 +++++++---- 5 files changed, 11 insertions(+), 17 deletions(-) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 51d9650267d0..b9b05091bc8f 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -458,7 +458,6 @@ struct evsel *evsel__clone(struct evsel *orig) evsel->per_pkg =3D orig->per_pkg; evsel->percore =3D orig->percore; evsel->precise_max =3D orig->precise_max; - evsel->use_uncore_alias =3D orig->use_uncore_alias; evsel->is_libpfm_event =3D orig->is_libpfm_event; =20 evsel->exclude_GH =3D orig->exclude_GH; diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index d26745ca6147..c272c06565c0 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -89,7 +89,6 @@ struct evsel { bool per_pkg; bool percore; bool precise_max; - bool use_uncore_alias; bool is_libpfm_event; bool auto_merge_stats; bool collect_stat; diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 394ab23089d0..93a90651266f 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -1445,15 +1445,13 @@ static int parse_events__inside_hybrid_pmu(struct p= arse_events_state *parse_stat int parse_events_add_pmu(struct parse_events_state *parse_state, struct list_head *list, char *name, struct list_head *head_config, - bool auto_merge_stats, - bool use_alias) + bool auto_merge_stats) { struct perf_event_attr attr; struct perf_pmu_info info; struct perf_pmu *pmu; struct evsel *evsel; struct parse_events_error *err =3D parse_state->error; - bool use_uncore_alias; LIST_HEAD(config_terms); =20 pmu =3D parse_state->fake_pmu ?: perf_pmu__find(name); @@ -1488,8 +1486,6 @@ int parse_events_add_pmu(struct parse_events_state *p= arse_state, memset(&attr, 0, sizeof(attr)); } =20 - use_uncore_alias =3D (pmu->is_uncore && use_alias); - if (!head_config) { attr.type =3D pmu->type; evsel =3D __add_event(list, &parse_state->idx, &attr, @@ -1499,7 +1495,6 @@ int parse_events_add_pmu(struct parse_events_state *p= arse_state, /*cpu_list=3D*/NULL); if (evsel) { evsel->pmu_name =3D name ? strdup(name) : NULL; - evsel->use_uncore_alias =3D use_uncore_alias; return 0; } else { return -ENOMEM; @@ -1560,7 +1555,6 @@ int parse_events_add_pmu(struct parse_events_state *p= arse_state, evsel->use_config_name =3D true; =20 evsel->pmu_name =3D name ? strdup(name) : NULL; - evsel->use_uncore_alias =3D use_uncore_alias; evsel->percore =3D config_term_percore(&evsel->config_terms); =20 if (parse_state->fake_pmu) @@ -1622,7 +1616,7 @@ int parse_events_multi_pmu_add(struct parse_events_st= ate *parse_state, parse_events_copy_term_list(head, &orig_head); if (!parse_events_add_pmu(parse_state, list, pmu->name, orig_head, - true, true)) { + /*auto_merge_stats=3D*/true)) { pr_debug("%s -> %s/%s/\n", str, pmu->name, alias->str); ok++; @@ -1634,7 +1628,7 @@ int parse_events_multi_pmu_add(struct parse_events_st= ate *parse_state, =20 if (parse_state->fake_pmu) { if (!parse_events_add_pmu(parse_state, list, str, head, - true, true)) { + /*auto_merge_stats=3D*/true)) { pr_debug("%s -> %s/%s/\n", str, "fake_pmu", str); ok++; } diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index 22fc11b0bd59..fdac44dc696b 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -183,8 +183,7 @@ int parse_events_add_breakpoint(struct list_head *list,= int *idx, int parse_events_add_pmu(struct parse_events_state *parse_state, struct list_head *list, char *name, struct list_head *head_config, - bool auto_merge_stats, - bool use_alias); + bool auto_merge_stats); =20 struct evsel *parse_events__add_event(int idx, struct perf_event_attr *att= r, const char *name, const char *metric_id, diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index 90d12f2bc8be..f1b153c72d67 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -313,7 +313,7 @@ event_pmu_name opt_pmu_config list =3D alloc_list(); if (!list) CLEANUP_YYABORT; - if (parse_events_add_pmu(_parse_state, list, $1, $2, false, false)) { + if (parse_events_add_pmu(_parse_state, list, $1, $2, /*auto_merge_stats= =3D*/false)) { struct perf_pmu *pmu =3D NULL; int ok =3D 0; =20 @@ -330,8 +330,10 @@ event_pmu_name opt_pmu_config !perf_pmu__match(pattern, pmu->alias_name, $1)) { if (parse_events_copy_term_list(orig_terms, &terms)) CLEANUP_YYABORT; - if (!parse_events_add_pmu(_parse_state, list, pmu->name, terms, true, = false)) + if (!parse_events_add_pmu(_parse_state, list, pmu->name, terms, + /*auto_merge_stats=3D*/true)) { ok++; + } parse_events_terms__delete(terms); } } @@ -407,7 +409,8 @@ PE_PMU_EVENT_FAKE sep_dc if (!list) YYABORT; =20 - err =3D parse_events_add_pmu(_parse_state, list, $1, NULL, false, false); + err =3D parse_events_add_pmu(_parse_state, list, $1, /*head_config=3D*/NU= LL, + /*auto_merge_stats=3D*/false); free($1); if (err < 0) { free(list); @@ -425,7 +428,7 @@ PE_PMU_EVENT_FAKE opt_pmu_config if (!list) YYABORT; =20 - err =3D parse_events_add_pmu(_parse_state, list, $1, $2, false, false); + err =3D parse_events_add_pmu(_parse_state, list, $1, $2, /*auto_merge_sta= ts=3D*/false); free($1); parse_events_terms__delete($2); if (err < 0) { --=20 2.40.0.rc1.284.g88254d51c5-goog From nobody Wed Sep 10 01:57:55 2025 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 1294AC61DA4 for ; Sun, 12 Mar 2023 02:17:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230048AbjCLCRt (ORCPT ); Sat, 11 Mar 2023 21:17:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230038AbjCLCRh (ORCPT ); Sat, 11 Mar 2023 21:17:37 -0500 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 844C94DBE9 for ; Sat, 11 Mar 2023 18:17:13 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id w200-20020a25c7d1000000b00b3215dc7b87so4948533ybe.4 for ; Sat, 11 Mar 2023 18:17:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678587433; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=7wBN6kOg1n+q3+bF/95Ea+KPTQzf/X12Cj3eCZI6a8o=; b=NKLUv7GEbOI99SCLfcPT3EMuBG2FtYBhAnRlQRk1jKGWi8EVBqZgTCAeO3/cjnICBm 69Z12UAsCCyjvtIrF5JHv/HSL4+LNS+bwlh35Rpp/pdMIV8LQ+y3iLECHg69/QFYDX+k aAayIwycKGu5DMgZOP+dagFujN5XCnErWDL7niaRTO3U/cHOorzrr01cNg3BDVp0Wq4v 0d+znAw4/yrdekd+kNVavJifm+gnwM00moEWAco9dBmKj5+KehOhIC/909/fRqidCAoY hybs9/8hGBDS9Zk5/fQIiYRcEY8439DB757UPRVa8U8ym1U8lJWPp6sNCB07x1BXhhHJ rAXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678587433; 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=7wBN6kOg1n+q3+bF/95Ea+KPTQzf/X12Cj3eCZI6a8o=; b=GIJlI1J0nMwRwoo5tw2+z9qjtk6IjPNvA2yZcRcG2RuyDg4hLF1lOB050ugkfuXkOs oMyOyS+q7bAnM7Q0JE+v7bI1CpDx6gsafEFV2txMqxFe1454B44HRCYOsnqM5syuVl0U awdew1RETl3Yp+yIR5p5gNC3hKEOrFU/GCzlyePx4sbecEpsYz3oMOyooaMzq6+9512d R9C7Tk31L+3mivWugoBjUfY2WtN0W9k9cqT2xrnEa0hx2FdBtG7sjtDhid+z7r+FWdxv PK6acsYnVW/2A0nRE2DILuQAiDnElZz9zO+CnKlxrGuS1q9hZLOJ1UjuAB5xaUy9lTvs Hmiw== X-Gm-Message-State: AO0yUKUcVzFv53/KebT+CUlVJyO51207Ifjd0jISgSNdcBjdn5NQncZI t2H+Fi7rtpDE7yI75DSfGyUkCIhP+ojE X-Google-Smtp-Source: AK7set8dle2bnf4VmVFwWjoNIzi0P41W2RqDzM7t8DLsLhKPKk+4jNUQFAiMZqWXlwqIp8Vn47nWDye+VNlW X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:b42b:2e07:afb:877e]) (user=irogers job=sendgmr) by 2002:a5b:384:0:b0:a65:8cd3:fc4 with SMTP id k4-20020a5b0384000000b00a658cd30fc4mr18430629ybp.5.1678587433215; Sat, 11 Mar 2023 18:17:13 -0800 (PST) Date: Sat, 11 Mar 2023 18:15:42 -0800 In-Reply-To: <20230312021543.3060328-1-irogers@google.com> Message-Id: <20230312021543.3060328-11-irogers@google.com> Mime-Version: 1.0 References: <20230312021543.3060328-1-irogers@google.com> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog Subject: [PATCH v5 10/11] perf evlist: Remove nr_groups From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Mark Rutland , Adrian Hunter , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Kan Liang , Zhengjun Xing , Ravi Bangoria , "Steinar H. Gunderson" , Kim Phillips , Florian Fischer , James Clark , Suzuki Poulouse , Sean Christopherson , Leo Yan , John Garry , Kajol Jain , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Stephane Eranian , Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Maintaining the number of groups during event parsing is problematic and since changing to sort/regroup events can only be computed by a linear pass over the evlist. As the value is generally only used in tests, rather than hold it in a variable compute it by passing over the evlist when necessary. This change highlights that libpfm's counting of groups with a single entry disagreed with regular event parsing. The libpfm tests are updated accordingly. Signed-off-by: Ian Rogers --- tools/lib/perf/evlist.c | 18 +++++++++++++++++- tools/lib/perf/include/internal/evlist.h | 1 - tools/lib/perf/include/perf/evlist.h | 1 + tools/perf/builtin-record.c | 2 +- tools/perf/builtin-report.c | 2 +- tools/perf/tests/bpf.c | 1 - tools/perf/tests/parse-events.c | 22 +++++++++++----------- tools/perf/tests/pfm.c | 12 ++++++------ tools/perf/util/evlist.c | 2 +- tools/perf/util/evlist.h | 6 ++++++ tools/perf/util/header.c | 3 +-- tools/perf/util/parse-events.c | 1 - tools/perf/util/parse-events.h | 1 - tools/perf/util/parse-events.y | 10 ---------- tools/perf/util/pfm.c | 1 - 15 files changed, 45 insertions(+), 38 deletions(-) diff --git a/tools/lib/perf/evlist.c b/tools/lib/perf/evlist.c index 2d6121e89ccb..81e8b5fcd8ba 100644 --- a/tools/lib/perf/evlist.c +++ b/tools/lib/perf/evlist.c @@ -703,7 +703,23 @@ void perf_evlist__set_leader(struct perf_evlist *evlis= t) struct perf_evsel *first =3D list_entry(evlist->entries.next, struct perf_evsel, node); =20 - evlist->nr_groups =3D evlist->nr_entries > 1 ? 1 : 0; __perf_evlist__set_leader(&evlist->entries, first); } } + +int perf_evlist__nr_groups(struct perf_evlist *evlist) +{ + struct perf_evsel *evsel; + int nr_groups =3D 0; + + perf_evlist__for_each_evsel(evlist, evsel) { + /* + * evsels by default have a nr_members of 1, and they are their + * own leader. If the nr_members is >1 then this is an + * indication of a group. + */ + if (evsel->leader =3D=3D evsel && evsel->nr_members > 1) + nr_groups++; + } + return nr_groups; +} diff --git a/tools/lib/perf/include/internal/evlist.h b/tools/lib/perf/incl= ude/internal/evlist.h index 850f07070036..3339bc2f1765 100644 --- a/tools/lib/perf/include/internal/evlist.h +++ b/tools/lib/perf/include/internal/evlist.h @@ -17,7 +17,6 @@ struct perf_mmap_param; struct perf_evlist { struct list_head entries; int nr_entries; - int nr_groups; bool has_user_cpus; bool needs_map_propagation; /** diff --git a/tools/lib/perf/include/perf/evlist.h b/tools/lib/perf/include/= perf/evlist.h index 9ca399d49bb4..e894b770779e 100644 --- a/tools/lib/perf/include/perf/evlist.h +++ b/tools/lib/perf/include/perf/evlist.h @@ -47,4 +47,5 @@ LIBPERF_API struct perf_mmap *perf_evlist__next_mmap(stru= ct perf_evlist *evlist, (pos) =3D perf_evlist__next_mmap((evlist), (pos), overwrite)) =20 LIBPERF_API void perf_evlist__set_leader(struct perf_evlist *evlist); +LIBPERF_API int perf_evlist__nr_groups(struct perf_evlist *evlist); #endif /* __LIBPERF_EVLIST_H */ diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 8374117e66f6..e71c110a0cd4 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -2474,7 +2474,7 @@ static int __cmd_record(struct record *rec, int argc,= const char **argv) rec->tool.ordered_events =3D false; } =20 - if (!rec->evlist->core.nr_groups) + if (evlist__nr_groups(rec->evlist) =3D=3D 0) perf_header__clear_feat(&session->header, HEADER_GROUP_DESC); =20 if (data->is_pipe) { diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 2ee2ecca208e..6400615b5e98 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -1481,7 +1481,7 @@ int cmd_report(int argc, const char **argv) =20 setup_forced_leader(&report, session->evlist); =20 - if (symbol_conf.group_sort_idx && !session->evlist->core.nr_groups) { + if (symbol_conf.group_sort_idx && evlist__nr_groups(session->evlist) =3D= =3D 0) { parse_options_usage(NULL, options, "group-sort-idx", 0); ret =3D -EINVAL; goto error; diff --git a/tools/perf/tests/bpf.c b/tools/perf/tests/bpf.c index ae9223f27cfb..8beb46066034 100644 --- a/tools/perf/tests/bpf.c +++ b/tools/perf/tests/bpf.c @@ -153,7 +153,6 @@ static int do_test(struct bpf_object *obj, int (*func)(= void), } =20 evlist__splice_list_tail(evlist, &parse_state.list); - evlist->core.nr_groups =3D parse_state.nr_groups; =20 evlist__config(evlist, &opts, NULL); =20 diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-event= s.c index 71a5cb343311..ffa6f0a90741 100644 --- a/tools/perf/tests/parse-events.c +++ b/tools/perf/tests/parse-events.c @@ -53,7 +53,7 @@ static int test__checkevent_tracepoint(struct evlist *evl= ist) struct evsel *evsel =3D evlist__first(evlist); =20 TEST_ASSERT_VAL("wrong number of entries", 1 =3D=3D evlist->core.nr_entri= es); - TEST_ASSERT_VAL("wrong number of groups", 0 =3D=3D evlist->core.nr_groups= ); + TEST_ASSERT_VAL("wrong number of groups", 0 =3D=3D evlist__nr_groups(evli= st)); TEST_ASSERT_VAL("wrong type", PERF_TYPE_TRACEPOINT =3D=3D evsel->core.att= r.type); TEST_ASSERT_VAL("wrong sample_type", PERF_TP_SAMPLE_TYPE =3D=3D evsel->core.attr.sample_type); @@ -66,7 +66,7 @@ static int test__checkevent_tracepoint_multi(struct evlis= t *evlist) struct evsel *evsel; =20 TEST_ASSERT_VAL("wrong number of entries", evlist->core.nr_entries > 1); - TEST_ASSERT_VAL("wrong number of groups", 0 =3D=3D evlist->core.nr_groups= ); + TEST_ASSERT_VAL("wrong number of groups", 0 =3D=3D evlist__nr_groups(evli= st)); =20 evlist__for_each_entry(evlist, evsel) { TEST_ASSERT_VAL("wrong type", @@ -677,7 +677,7 @@ static int test__group1(struct evlist *evlist) struct evsel *evsel, *leader; =20 TEST_ASSERT_VAL("wrong number of entries", 2 =3D=3D evlist->core.nr_entri= es); - TEST_ASSERT_VAL("wrong number of groups", 1 =3D=3D evlist->core.nr_groups= ); + TEST_ASSERT_VAL("wrong number of groups", 1 =3D=3D evlist__nr_groups(evli= st)); =20 /* instructions:k */ evsel =3D leader =3D evlist__first(evlist); @@ -719,7 +719,7 @@ static int test__group2(struct evlist *evlist) struct evsel *evsel, *leader; =20 TEST_ASSERT_VAL("wrong number of entries", 3 =3D=3D evlist->core.nr_entri= es); - TEST_ASSERT_VAL("wrong number of groups", 1 =3D=3D evlist->core.nr_groups= ); + TEST_ASSERT_VAL("wrong number of groups", 1 =3D=3D evlist__nr_groups(evli= st)); =20 /* faults + :ku modifier */ evsel =3D leader =3D evlist__first(evlist); @@ -775,7 +775,7 @@ static int test__group3(struct evlist *evlist __maybe_u= nused) struct evsel *evsel, *leader; =20 TEST_ASSERT_VAL("wrong number of entries", 5 =3D=3D evlist->core.nr_entri= es); - TEST_ASSERT_VAL("wrong number of groups", 2 =3D=3D evlist->core.nr_groups= ); + TEST_ASSERT_VAL("wrong number of groups", 2 =3D=3D evlist__nr_groups(evli= st)); =20 /* group1 syscalls:sys_enter_openat:H */ evsel =3D leader =3D evlist__first(evlist); @@ -868,7 +868,7 @@ static int test__group4(struct evlist *evlist __maybe_u= nused) struct evsel *evsel, *leader; =20 TEST_ASSERT_VAL("wrong number of entries", 2 =3D=3D evlist->core.nr_entri= es); - TEST_ASSERT_VAL("wrong number of groups", 1 =3D=3D evlist->core.nr_groups= ); + TEST_ASSERT_VAL("wrong number of groups", 1 =3D=3D evlist__nr_groups(evli= st)); =20 /* cycles:u + p */ evsel =3D leader =3D evlist__first(evlist); @@ -912,7 +912,7 @@ static int test__group5(struct evlist *evlist __maybe_u= nused) struct evsel *evsel, *leader; =20 TEST_ASSERT_VAL("wrong number of entries", 5 =3D=3D evlist->core.nr_entri= es); - TEST_ASSERT_VAL("wrong number of groups", 2 =3D=3D evlist->core.nr_groups= ); + TEST_ASSERT_VAL("wrong number of groups", 2 =3D=3D evlist__nr_groups(evli= st)); =20 /* cycles + G */ evsel =3D leader =3D evlist__first(evlist); @@ -998,7 +998,7 @@ static int test__group_gh1(struct evlist *evlist) struct evsel *evsel, *leader; =20 TEST_ASSERT_VAL("wrong number of entries", 2 =3D=3D evlist->core.nr_entri= es); - TEST_ASSERT_VAL("wrong number of groups", 1 =3D=3D evlist->core.nr_groups= ); + TEST_ASSERT_VAL("wrong number of groups", 1 =3D=3D evlist__nr_groups(evli= st)); =20 /* cycles + :H group modifier */ evsel =3D leader =3D evlist__first(evlist); @@ -1038,7 +1038,7 @@ static int test__group_gh2(struct evlist *evlist) struct evsel *evsel, *leader; =20 TEST_ASSERT_VAL("wrong number of entries", 2 =3D=3D evlist->core.nr_entri= es); - TEST_ASSERT_VAL("wrong number of groups", 1 =3D=3D evlist->core.nr_groups= ); + TEST_ASSERT_VAL("wrong number of groups", 1 =3D=3D evlist__nr_groups(evli= st)); =20 /* cycles + :G group modifier */ evsel =3D leader =3D evlist__first(evlist); @@ -1078,7 +1078,7 @@ static int test__group_gh3(struct evlist *evlist) struct evsel *evsel, *leader; =20 TEST_ASSERT_VAL("wrong number of entries", 2 =3D=3D evlist->core.nr_entri= es); - TEST_ASSERT_VAL("wrong number of groups", 1 =3D=3D evlist->core.nr_groups= ); + TEST_ASSERT_VAL("wrong number of groups", 1 =3D=3D evlist__nr_groups(evli= st)); =20 /* cycles:G + :u group modifier */ evsel =3D leader =3D evlist__first(evlist); @@ -1118,7 +1118,7 @@ static int test__group_gh4(struct evlist *evlist) struct evsel *evsel, *leader; =20 TEST_ASSERT_VAL("wrong number of entries", 2 =3D=3D evlist->core.nr_entri= es); - TEST_ASSERT_VAL("wrong number of groups", 1 =3D=3D evlist->core.nr_groups= ); + TEST_ASSERT_VAL("wrong number of groups", 1 =3D=3D evlist__nr_groups(evli= st)); =20 /* cycles:G + :uG group modifier */ evsel =3D leader =3D evlist__first(evlist); diff --git a/tools/perf/tests/pfm.c b/tools/perf/tests/pfm.c index 71b76deb1f92..2e38dfa34b6c 100644 --- a/tools/perf/tests/pfm.c +++ b/tools/perf/tests/pfm.c @@ -76,7 +76,7 @@ static int test__pfm_events(struct test_suite *test __may= be_unused, count_pfm_events(&evlist->core), table[i].nr_events); TEST_ASSERT_EQUAL(table[i].events, - evlist->core.nr_groups, + evlist__nr_groups(evlist), 0); =20 evlist__delete(evlist); @@ -103,22 +103,22 @@ static int test__pfm_group(struct test_suite *test __= maybe_unused, { .events =3D "{instructions}", .nr_events =3D 1, - .nr_groups =3D 1, + .nr_groups =3D 0, }, { .events =3D "{instructions},{}", .nr_events =3D 1, - .nr_groups =3D 1, + .nr_groups =3D 0, }, { .events =3D "{},{instructions}", .nr_events =3D 1, - .nr_groups =3D 1, + .nr_groups =3D 0, }, { .events =3D "{instructions},{instructions}", .nr_events =3D 2, - .nr_groups =3D 2, + .nr_groups =3D 0, }, { .events =3D "{instructions,cycles},{instructions,cycles}", @@ -161,7 +161,7 @@ static int test__pfm_group(struct test_suite *test __ma= ybe_unused, count_pfm_events(&evlist->core), table[i].nr_events); TEST_ASSERT_EQUAL(table[i].events, - evlist->core.nr_groups, + evlist__nr_groups(evlist), table[i].nr_groups); =20 evlist__delete(evlist); diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 817df2504a1e..a5f406c468f8 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -1777,7 +1777,7 @@ bool evlist__exclude_kernel(struct evlist *evlist) */ void evlist__force_leader(struct evlist *evlist) { - if (!evlist->core.nr_groups) { + if (evlist__nr_groups(evlist) =3D=3D 0) { struct evsel *leader =3D evlist__first(evlist); =20 evlist__set_leader(evlist); diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index d89d8f92802b..46cf402add93 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -9,6 +9,7 @@ #include #include #include +#include #include "events_stats.h" #include "evsel.h" #include @@ -255,6 +256,11 @@ static inline struct evsel *evlist__last(struct evlist= *evlist) return container_of(evsel, struct evsel, core); } =20 +static inline int evlist__nr_groups(struct evlist *evlist) +{ + return perf_evlist__nr_groups(&evlist->core); +} + int evlist__strerror_open(struct evlist *evlist, int err, char *buf, size_= t size); int evlist__strerror_mmap(struct evlist *evlist, int err, char *buf, size_= t size); =20 diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 404d816ca124..276870221ce0 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -786,7 +786,7 @@ static int write_pmu_mappings(struct feat_fd *ff, static int write_group_desc(struct feat_fd *ff, struct evlist *evlist) { - u32 nr_groups =3D evlist->core.nr_groups; + u32 nr_groups =3D evlist__nr_groups(evlist); struct evsel *evsel; int ret; =20 @@ -2807,7 +2807,6 @@ static int process_group_desc(struct feat_fd *ff, voi= d *data __maybe_unused) * Rebuild group relationship based on the group_desc */ session =3D container_of(ff->ph, struct perf_session, header); - session->evlist->core.nr_groups =3D nr_groups; =20 i =3D nr =3D 0; evlist__for_each_entry(session->evlist, evsel) { diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 93a90651266f..9ec3c1dc81e0 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -2260,7 +2260,6 @@ int __parse_events(struct evlist *evlist, const char = *str, if (!ret) { struct evsel *last; =20 - evlist->core.nr_groups +=3D parse_state.nr_groups; last =3D evlist__last(evlist); last->cmdline_group_boundary =3D true; =20 diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index fdac44dc696b..767ad1729228 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -122,7 +122,6 @@ struct parse_events_error { struct parse_events_state { struct list_head list; int idx; - int nr_groups; struct parse_events_error *error; struct evlist *evlist; struct list_head *terms; diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index f1b153c72d67..3a04602d2982 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -49,14 +49,6 @@ static void free_list_evsel(struct list_head* list_evsel) free(list_evsel); } =20 -static void inc_group_count(struct list_head *list, - struct parse_events_state *parse_state) -{ - /* Count groups only have more than 1 members */ - if (!list_is_last(list->next, list)) - parse_state->nr_groups++; -} - %} =20 %token PE_START_EVENTS PE_START_TERMS @@ -201,7 +193,6 @@ PE_NAME '{' events '}' { struct list_head *list =3D $3; =20 - inc_group_count(list, _parse_state); /* Takes ownership of $1. */ parse_events__set_leader($1, list); $$ =3D list; @@ -211,7 +202,6 @@ PE_NAME '{' events '}' { struct list_head *list =3D $2; =20 - inc_group_count(list, _parse_state); parse_events__set_leader(NULL, list); $$ =3D list; } diff --git a/tools/perf/util/pfm.c b/tools/perf/util/pfm.c index b59ba825ddc9..6c11914c179f 100644 --- a/tools/perf/util/pfm.c +++ b/tools/perf/util/pfm.c @@ -112,7 +112,6 @@ int parse_libpfm_events_option(const struct option *opt= , const char *str, "cannot close a non-existing event group\n"); goto error; } - evlist->core.nr_groups++; grp_leader =3D NULL; grp_evt =3D -1; } --=20 2.40.0.rc1.284.g88254d51c5-goog From nobody Wed Sep 10 01:57:55 2025 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 55CD9C61DA4 for ; Sun, 12 Mar 2023 02:18:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230111AbjCLCSE (ORCPT ); Sat, 11 Mar 2023 21:18:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230087AbjCLCRr (ORCPT ); Sat, 11 Mar 2023 21:17:47 -0500 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 24299570B2 for ; Sat, 11 Mar 2023 18:17:22 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5416a07498dso26787727b3.13 for ; Sat, 11 Mar 2023 18:17:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678587440; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=XftaVtT6DBaR6TmU1BfUjZFS2j5Dv53zloyEU1YN4Tc=; b=EBIRD4BvBs5N1uLmenNLq6Q0KHywSkUXNiV9JBr63KlvUkcScAgxamWWEGYgAqoQX8 btnNSUTDtI5NTTsA6iuLtocZEOduFAA3ruNB1i5rHpdgYgz5FHADZx0r3qzCPciO9R1x YJGYVNIgh5VF/CnlfHmpxRweCFdfZwRudW5TUAcxFgi2tq0W6OVONJBiwP39ga3Pt3Qo HYB+p+B00hHpG2OF65oRzgnqeflOeLhCY9/KLKkwoVtnXKqaEFl5jxtL0mlvO5Ozr14I BXNSMFUiszBDbYbZtm06mweCd+UkxkM9rVQYprDrdx9CqvR5suuisKwR+wNrs2DCxsDb NXtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678587440; 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=XftaVtT6DBaR6TmU1BfUjZFS2j5Dv53zloyEU1YN4Tc=; b=3EYHaOQgbQCbjNKjhR2Mvd6MqYtt4dKgCe8p40/PhqlP01WumrqqG2EOApdXbPJFDH vHlgyr+WRjDcNmcyglRtIi0LgzafYzxD1xtxkHj+5iAcErho6Ek9lXongl3RaKyY70jT bBxOL/VfxoEKoeWDHUHmwvgEXY8TGdUNXU750mzVjJMKWeh25sV5BzFpMS4VjZC0O6fP WVdiM6ToUpnBnUKBjdKzojt7+GuM2wW9osAel2g2fipI1kt9kdUOvYf/uxVAIEG3cK/h EDNcjU+eiK6aG8+Htx5LR+8I130BulFsQvH4fC533TjxXOimR1DbWtZ52oJdFroNy+l3 6N6g== X-Gm-Message-State: AO0yUKVTRqNsJsg2bL9WqpmFTjPlzM7TRWKWA/Q43G30oLRvTGk75M1W 8BKvNawZq7qCVCfurUaUN3yuRADhUcpS X-Google-Smtp-Source: AK7set8mDjxcyITu3npZkWCgchptcXmCcdHmOK3V6cpZLYMuIA1g+7UeIT8WVkaT9+MW0Q1jvz2rE0VAZIjn X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:b42b:2e07:afb:877e]) (user=irogers job=sendgmr) by 2002:a81:ac67:0:b0:541:753d:32f9 with SMTP id z39-20020a81ac67000000b00541753d32f9mr1633136ywj.9.1678587440627; Sat, 11 Mar 2023 18:17:20 -0800 (PST) Date: Sat, 11 Mar 2023 18:15:43 -0800 In-Reply-To: <20230312021543.3060328-1-irogers@google.com> Message-Id: <20230312021543.3060328-12-irogers@google.com> Mime-Version: 1.0 References: <20230312021543.3060328-1-irogers@google.com> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog Subject: [PATCH v5 11/11] perf parse-events: Warn when events are regrouped From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Mark Rutland , Adrian Hunter , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Kan Liang , Zhengjun Xing , Ravi Bangoria , "Steinar H. Gunderson" , Kim Phillips , Florian Fischer , James Clark , Suzuki Poulouse , Sean Christopherson , Leo Yan , John Garry , Kajol Jain , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Stephane Eranian , Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use if an event is reordered or the number of groups increases to signal that regrouping has happened and warn about it. Disable the warning in the case wild card PMU names are used and for metrics. Signed-off-by: Ian Rogers --- tools/perf/tests/parse-events.c | 2 +- tools/perf/tests/pmu-events.c | 2 +- tools/perf/util/metricgroup.c | 3 ++- tools/perf/util/parse-events.c | 39 ++++++++++++++++++++++++--------- tools/perf/util/parse-events.h | 7 +++--- tools/perf/util/parse-events.y | 1 + 6 files changed, 38 insertions(+), 16 deletions(-) diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-event= s.c index ffa6f0a90741..b1c2f0a20306 100644 --- a/tools/perf/tests/parse-events.c +++ b/tools/perf/tests/parse-events.c @@ -2103,7 +2103,7 @@ static int test_event_fake_pmu(const char *str) =20 parse_events_error__init(&err); perf_pmu__test_parse_init(); - ret =3D __parse_events(evlist, str, &err, &perf_pmu__fake); + ret =3D __parse_events(evlist, str, &err, &perf_pmu__fake, /*warn_if_reor= dered=3D*/true); if (ret) { pr_debug("failed to parse event '%s', err %d, str '%s'\n", str, ret, err.str); diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c index 6ccd413b5983..7f8e86452527 100644 --- a/tools/perf/tests/pmu-events.c +++ b/tools/perf/tests/pmu-events.c @@ -785,7 +785,7 @@ static int check_parse_id(const char *id, struct parse_= events_error *error, */ perf_pmu__test_parse_init(); } - ret =3D __parse_events(evlist, dup, error, fake_pmu); + ret =3D __parse_events(evlist, dup, error, fake_pmu, /*warn_if_reordered= =3D*/true); free(dup); =20 evlist__delete(evlist); diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index de6dd527a2ba..5783f4c2d1ef 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -1441,7 +1441,8 @@ static int parse_ids(bool metric_no_merge, struct per= f_pmu *fake_pmu, } pr_debug("Parsing metric events '%s'\n", events.buf); parse_events_error__init(&parse_error); - ret =3D __parse_events(parsed_evlist, events.buf, &parse_error, fake_pmu); + ret =3D __parse_events(parsed_evlist, events.buf, &parse_error, fake_pmu, + /*warn_if_reordered=3D*/false); if (ret) { parse_events_error__print(&parse_error, events.buf); goto err_out; diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 9ec3c1dc81e0..3b2e5bb3e852 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -2157,11 +2157,13 @@ static int evlist__cmp(void *state, const struct li= st_head *l, const struct list return arch_evlist__cmp(lhs, rhs); } =20 -static void parse_events__sort_events_and_fix_groups(struct list_head *lis= t) +static bool parse_events__sort_events_and_fix_groups(struct list_head *lis= t) { - int idx =3D -1; + int idx =3D 0, unsorted_idx =3D -1; struct evsel *pos, *cur_leader =3D NULL; struct perf_evsel *cur_leaders_grp =3D NULL; + bool idx_changed =3D false; + int orig_num_leaders =3D 0, num_leaders =3D 0; =20 /* * Compute index to insert ungrouped events at. Place them where the @@ -2170,15 +2172,22 @@ static void parse_events__sort_events_and_fix_group= s(struct list_head *list) list_for_each_entry(pos, list, core.node) { const struct evsel *pos_leader =3D evsel__leader(pos); =20 - if (pos !=3D pos_leader || pos->core.nr_members > 1) - continue; + if (pos =3D=3D pos_leader) + orig_num_leaders++; =20 - idx =3D pos->core.idx; - break; + /* + * Ensure indexes are sequential, in particular for multiple + * event lists being merged. The indexes are used to detect when + * the user order is modified. + */ + pos->core.idx =3D idx++; + + if (unsorted_idx =3D=3D -1 && pos =3D=3D pos_leader && pos->core.nr_memb= ers < 2) + unsorted_idx =3D pos->core.idx; } =20 /* Sort events. */ - list_sort(&idx, list, evlist__cmp); + list_sort(&unsorted_idx, list, evlist__cmp); =20 /* * Recompute groups, splitting for PMUs and adding groups for events @@ -2192,6 +2201,8 @@ static void parse_events__sort_events_and_fix_groups(= struct list_head *list) bool force_grouped =3D arch_evsel__must_be_in_group(pos); =20 /* Reset index and nr_members. */ + if (pos->core.idx !=3D idx) + idx_changed =3D true; pos->core.idx =3D idx++; pos->core.nr_members =3D 0; =20 @@ -2225,12 +2236,18 @@ static void parse_events__sort_events_and_fix_group= s(struct list_head *list) } } list_for_each_entry(pos, list, core.node) { - pos->core.leader->nr_members++; + struct evsel *pos_leader =3D evsel__leader(pos); + + if (pos =3D=3D pos_leader) + num_leaders++; + pos_leader->core.nr_members++; } + return idx_changed || num_leaders !=3D orig_num_leaders; } =20 int __parse_events(struct evlist *evlist, const char *str, - struct parse_events_error *err, struct perf_pmu *fake_pmu) + struct parse_events_error *err, struct perf_pmu *fake_pmu, + bool warn_if_reordered) { struct parse_events_state parse_state =3D { .list =3D LIST_HEAD_INIT(parse_state.list), @@ -2250,7 +2267,9 @@ int __parse_events(struct evlist *evlist, const char = *str, return -1; } =20 - parse_events__sort_events_and_fix_groups(&parse_state.list); + if (parse_events__sort_events_and_fix_groups(&parse_state.list) && + warn_if_reordered && !parse_state.wild_card_pmus) + pr_warning("WARNING: events were regrouped to match PMUs\n"); =20 /* * Add list to the evlist even with errors to allow callers to clean up. diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index 767ad1729228..46204c1a7916 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -26,13 +26,13 @@ int parse_events_option(const struct option *opt, const= char *str, int unset); int parse_events_option_new_evlist(const struct option *opt, const char *s= tr, int unset); __attribute__((nonnull(1, 2, 3))) int __parse_events(struct evlist *evlist, const char *str, struct parse_ev= ents_error *error, - struct perf_pmu *fake_pmu); + struct perf_pmu *fake_pmu, bool warn_if_reordered); =20 -__attribute__((nonnull)) +__attribute__((nonnull(1, 2, 3))) static inline int parse_events(struct evlist *evlist, const char *str, struct parse_events_error *err) { - return __parse_events(evlist, str, err, NULL); + return __parse_events(evlist, str, err, /*fake_pmu=3D*/NULL, /*warn_if_re= ordered=3D*/true); } =20 int parse_event(struct evlist *evlist, const char *str); @@ -128,6 +128,7 @@ struct parse_events_state { int stoken; struct perf_pmu *fake_pmu; char *hybrid_pmu_name; + bool wild_card_pmus; }; =20 void parse_events__shrink_config_terms(void); diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index 3a04602d2982..4488443e506e 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -323,6 +323,7 @@ event_pmu_name opt_pmu_config if (!parse_events_add_pmu(_parse_state, list, pmu->name, terms, /*auto_merge_stats=3D*/true)) { ok++; + parse_state->wild_card_pmus =3D true; } parse_events_terms__delete(terms); } --=20 2.40.0.rc1.284.g88254d51c5-goog