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=-0.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no 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 62122C433E0 for ; Wed, 20 May 2020 13:49:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3BE5B207C4 for ; Wed, 20 May 2020 13:49:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="iXLUJwYx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726545AbgETNtG (ORCPT ); Wed, 20 May 2020 09:49:06 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:20998 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726548AbgETNtB (ORCPT ); Wed, 20 May 2020 09:49:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589982540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=a816W8Z5hp9K0nG+dy2LJ94rdDDToT47/ru3WqNRsNQ=; b=iXLUJwYxYGP/SkkPVywn7SleB/SImDDE7f5MlyAugUmXwJydPQj7YQowJLBM6S9TX3jbg5 d90uCmewab+pxDHd5bxI6HtdBF9p8BNFCIPZ2dzlsIKCdllUO38GQ/MyozFRtD78dzQ6O2 WFE72Ys2vTEVLUxrlcQ6baE6lZqEPYQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-191-Of_ePFwOOx-1njuz7CnsEg-1; Wed, 20 May 2020 09:48:56 -0400 X-MC-Unique: Of_ePFwOOx-1njuz7CnsEg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3300E80B71E; Wed, 20 May 2020 13:48:53 +0000 (UTC) Received: from krava (unknown [10.40.193.10]) by smtp.corp.redhat.com (Postfix) with SMTP id 373567958D; Wed, 20 May 2020 13:48:48 +0000 (UTC) Date: Wed, 20 May 2020 15:48:47 +0200 From: Jiri Olsa To: Ian Rogers Cc: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , 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, netdev@vger.kernel.org, bpf@vger.kernel.org, linux-perf-users@vger.kernel.org, Vince Weaver , Stephane Eranian Subject: Re: [PATCH 5/7] perf metricgroup: Remove duped metric group events Message-ID: <20200520134847.GM157452@krava> References: <20200520072814.128267-1-irogers@google.com> <20200520072814.128267-6-irogers@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200520072814.128267-6-irogers@google.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org On Wed, May 20, 2020 at 12:28:12AM -0700, Ian Rogers wrote: SNIP > > @@ -157,7 +183,7 @@ static int metricgroup__setup_events(struct list_head *groups, > int i = 0; > int ret = 0; > struct egroup *eg; > - struct evsel *evsel; > + struct evsel *evsel, *tmp; > unsigned long *evlist_used; > > evlist_used = bitmap_alloc(perf_evlist->core.nr_entries); > @@ -173,7 +199,8 @@ static int metricgroup__setup_events(struct list_head *groups, > ret = -ENOMEM; > break; > } > - evsel = find_evsel_group(perf_evlist, &eg->pctx, metric_events, > + evsel = find_evsel_group(perf_evlist, &eg->pctx, > + eg->has_constraint, metric_events, > evlist_used); > if (!evsel) { > pr_debug("Cannot resolve %s: %s\n", > @@ -200,6 +227,12 @@ static int metricgroup__setup_events(struct list_head *groups, > list_add(&expr->nd, &me->head); > } > > + evlist__for_each_entry_safe(perf_evlist, tmp, evsel) { > + if (!test_bit(evsel->idx, evlist_used)) { > + evlist__remove(perf_evlist, evsel); > + evsel__delete(evsel); > + } is the groupping still enabled when we merge groups? could part of the metric (events) be now computed in different groups? I was wondering if we could merge all the hasmaps into single one before the parse the evlist.. this way we won't need removing later.. but I did not thought this through completely, so it might not work at some point jirka