From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E52B1C433E0 for ; Wed, 20 May 2020 18:20:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B35BF206C3 for ; Wed, 20 May 2020 18:20:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="dzBNCrel" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727004AbgETSUd (ORCPT ); Wed, 20 May 2020 14:20:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726846AbgETSU1 (ORCPT ); Wed, 20 May 2020 14:20:27 -0400 Received: from mail-qt1-x849.google.com (mail-qt1-x849.google.com [IPv6:2607:f8b0:4864:20::849]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A2B3C061A0E for ; Wed, 20 May 2020 11:20:26 -0700 (PDT) Received: by mail-qt1-x849.google.com with SMTP id x30so4709027qte.14 for ; Wed, 20 May 2020 11:20:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=KKQUK0ht2kaKDrQ/rdrxhZMGnz6XCmJO5hA8GPHu2yA=; b=dzBNCrelUrT1JxAQv8vNvpOAWP6S6LumYmJircB+N3/gszxbhqSdn8q233fNWA60eX kg44zXMH51b77C43kXXKjg1IeO236183xY/tsmVczZ0ZFwxJoWGiEjG6vnU/U6yJyUvA Ec9aceakvgFlmtKypStS2qo0XIq51G/SfOw251x/GZFIuzIeckOvaDZUA890WzTuwn5U vxDzw2A8cnQNg6STnrQQcNDtUTtVJqdp113A3RnqOhCincW5i76Tb5GMQ0POIMKPVcCa tHGwpafAyhI/1EeRXorSP/bjo+8T81IX0KW0n4PZvL27oi6XAENG0QjZBR7xFUN8UnzY 8D0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=KKQUK0ht2kaKDrQ/rdrxhZMGnz6XCmJO5hA8GPHu2yA=; b=OPyPDiMzPlM36TG2FgIZEMHdJdLnXUqB/CobKIj2cMQkg1HK/Cw6CIS3AkrVwpKZto On9WTllRCrajQLjtJEwIU8PwCgip0iM+MzP5Gu+C2wKFcT3LXC7ckPbGr8gmFZQzDzjQ 6iHzzWbxMQ9jHvLiNfNx/AMRPEZS8ymljSaKSmKRK7pJXYp1HggbHSgORQH+rdmOR4WL 2U35zcWtXGC/AUvm3iAfdlDJIigqfx0Z7oAlv1/rvrrZeFv6I/FTsoBuE3PaQUDBiW/r BRtYmvkFePIE0fijN4k2bgHgmIW1geXMwc342XGY+8ydSHVhgUFLvaWU/2Kpga0houww HgZw== X-Gm-Message-State: AOAM532F7+GwrGC+uTpNv18hQdikyzVadvEp7CXIECqt5zBMTxtn2Tse 0LJZXXaBQ8r0NUMBmjN/lTv32Emy7gdH X-Google-Smtp-Source: ABdhPJxs3av1fJD8WsF76BuWXwHu5sAYT+IWWJCwS+9YgSKfRnU38Sm2Lt9qWQzaPsCtKzaoQ1TjJ8FINtIE X-Received: by 2002:ad4:47c8:: with SMTP id p8mr6022353qvw.93.1589998825230; Wed, 20 May 2020 11:20:25 -0700 (PDT) Date: Wed, 20 May 2020 11:20:07 -0700 In-Reply-To: <20200520182011.32236-1-irogers@google.com> Message-Id: <20200520182011.32236-4-irogers@google.com> Mime-Version: 1.0 References: <20200520182011.32236-1-irogers@google.com> X-Mailer: git-send-email 2.26.2.761.g0e0b3e54be-goog Subject: [PATCH v2 3/7] perf metricgroup: Delay events string creation From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Song Liu , Andrii Nakryiko , Kajol Jain , Andi Kleen , John Garry , Jin Yao , Kan Liang , Cong Wang , Kim Phillips , Paul Clarke , Srikar Dronamraju , linux-kernel@vger.kernel.org Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, linux-perf-users@vger.kernel.org, Vince Weaver , Stephane Eranian , Ian Rogers Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently event groups are placed into groups_list at the same time as the events string containing the events is built. Separate these two operations and build the groups_list first, then the event string from the groups_list. This adds an ability to reorder the groups_list that will be used in a later patch. Signed-off-by: Ian Rogers --- tools/perf/util/metricgroup.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index 5c0603ef4c75..dca433520b92 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -90,6 +90,7 @@ struct egroup { const char *metric_expr; const char *metric_unit; int runtime; + bool has_constraint; }; static struct evsel *find_evsel_group(struct evlist *perf_evlist, @@ -485,8 +486,8 @@ int __weak arch_get_runtimeparam(void) return 1; } -static int __metricgroup__add_metric(struct strbuf *events, - struct list_head *group_list, struct pmu_event *pe, int runtime) +static int __metricgroup__add_metric(struct list_head *group_list, + struct pmu_event *pe, int runtime) { struct egroup *eg; @@ -499,6 +500,7 @@ static int __metricgroup__add_metric(struct strbuf *events, eg->metric_expr = pe->metric_expr; eg->metric_unit = pe->unit; eg->runtime = runtime; + eg->has_constraint = metricgroup__has_constraint(pe); if (expr__find_other(pe->metric_expr, NULL, &eg->pctx, runtime) < 0) { expr__ctx_clear(&eg->pctx); @@ -506,14 +508,6 @@ static int __metricgroup__add_metric(struct strbuf *events, return -EINVAL; } - if (events->len > 0) - strbuf_addf(events, ","); - - if (metricgroup__has_constraint(pe)) - metricgroup__add_metric_non_group(events, &eg->pctx); - else - metricgroup__add_metric_weak_group(events, &eg->pctx); - list_add_tail(&eg->nd, group_list); return 0; @@ -524,6 +518,7 @@ static int metricgroup__add_metric(const char *metric, struct strbuf *events, { struct pmu_events_map *map = perf_pmu__find_map(NULL); struct pmu_event *pe; + struct egroup *eg; int i, ret; bool has_match = false; @@ -547,7 +542,8 @@ static int metricgroup__add_metric(const char *metric, struct strbuf *events, pr_debug("metric expr %s for %s\n", pe->metric_expr, pe->metric_name); if (!strstr(pe->metric_expr, "?")) { - ret = __metricgroup__add_metric(events, group_list, pe, 1); + ret = __metricgroup__add_metric(group_list, + pe, 1); if (ret) return ret; } else { @@ -561,13 +557,26 @@ static int metricgroup__add_metric(const char *metric, struct strbuf *events, */ for (j = 0; j < count; j++) { - ret = __metricgroup__add_metric(events, group_list, pe, j); + ret = __metricgroup__add_metric( + group_list, pe, j); if (ret) return ret; } } } } + list_for_each_entry(eg, group_list, nd) { + if (events->len > 0) + strbuf_addf(events, ","); + + if (eg->has_constraint) { + metricgroup__add_metric_non_group(events, + &eg->pctx); + } else { + metricgroup__add_metric_weak_group(events, + &eg->pctx); + } + } return 0; } -- 2.26.2.761.g0e0b3e54be-goog