Received: by 2002:a25:ca44:0:0:0:0:0 with SMTP id a65csp265653ybg; Tue, 28 Jul 2020 05:37:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyvZIO6act8A4vnBji7z11QJF1N1/vMtcA3EpMDTFPYQ1bmhmNFAvdOJ+3yNLZBpjEMh3cF X-Received: by 2002:a50:ec90:: with SMTP id e16mr9095702edr.234.1595939857070; Tue, 28 Jul 2020 05:37:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595939857; cv=none; d=google.com; s=arc-20160816; b=dUKyktbEPUxPVRIZgyaeGyaikR6S4lNfpDTh0Buefz9lZY8frqlDsiVMlSc58uUlkY LHjPl4PyWMyDsSoVvhM4uFulS3xiQ6+FNMFP8HXAOBrwLBwkyhAk5vtZV1HLoz6vZie4 fcM9/xS0jdT6nvDM1iCgx7QuEaGrfcoCMq3jGmtBkhgulRWov3ouIWm1oHEywGd4nSwf ZXcsCgY1r78FE8jdtRoQlKwRts+mzMZvYJ2suP2730Qk/+q1CF9tkuzq60Pi9AND87c2 aELtRcMAJlAaO2GFZP9OxPkKRkDzxRkuGdB6/ZDiMHMWB55qbL0GJzu2A3MBUbqQVJyj PDTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :dkim-signature; bh=nPj+cu+oIw8jISJrVjbdnShLFlHiG6l+ejEYrfHyJ2E=; b=vk/bAPxyoVLLzQmKc22Lh7w6ENryV6Ut8prNG3dleCpprhR/MdcknujxqyBh//7slZ GZOeX0Ab6mocdoBHPdqgdZyWME59GBlP4VotVl0bcOwT9sWNP/LhU5nrJo/1ha/hskz3 BTQLkmAg49AMKhDgTkDCx2RcTLWjn9OomV+0zsWNfoRjqCaBRqGOpJBOrAGQG5CXzA/1 G9GIRMCSUc7pvyTvPoohswsObX5IQPMO6BqwBVVRzZbLry/MdGOXvSp5+fv6GGpfdB0/ SqCYTmtAnQYyeorGeZUW4L8kUDgaNKG5LL61p5al04JSGR0XOkMgaRZJnVZ3z9kYGcgp trTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=q3HAtjNP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e20si7483298edy.5.2020.07.28.05.37.14; Tue, 28 Jul 2020 05:37:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=q3HAtjNP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729585AbgG1Mgd (ORCPT + 99 others); Tue, 28 Jul 2020 08:36:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:52266 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729334AbgG1Mgd (ORCPT ); Tue, 28 Jul 2020 08:36:33 -0400 Received: from quaco.ghostprotocols.net (179.176.1.55.dynamic.adsl.gvt.net.br [179.176.1.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 04B39206D7; Tue, 28 Jul 2020 12:36:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595939792; bh=Y7EH9B4J3pPvRK+Oiyd+RxJJodgxldJeQhf1yPY4zUA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=q3HAtjNPTZx54UAL4NwcFz9jc44zE5TMgc+W6hjdM+eN9pjKEwlz6GUGao9dQntOJ xvB4EpIbzDl2axDAFSsCj0s628tEb04Ia6ktSgzm2BlSY9q2bnXRvzWt6Y5jPh92TS gKDo/Pk4siUYrXu893FDAKQAOZtlXSvXVzjm9vDk= Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id 7A8B8404B1; Tue, 28 Jul 2020 09:36:29 -0300 (-03) Date: Tue, 28 Jul 2020 09:36:29 -0300 From: Arnaldo Carvalho de Melo To: Jiri Olsa Cc: lkml , Ingo Molnar , Namhyung Kim , Alexander Shishkin , Peter Zijlstra , Michael Petlan , Andi Kleen , Kajol Jain , John Garry , "Paul A. Clarke" , Stephane Eranian , Ian Rogers Subject: Re: [PATCH 16/19] perf metric: Make compute_single function more precise Message-ID: <20200728123629.GW40195@kernel.org> References: <20200719181320.785305-1-jolsa@kernel.org> <20200719181320.785305-17-jolsa@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200719181320.785305-17-jolsa@kernel.org> X-Url: http://acmel.wordpress.com Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Sun, Jul 19, 2020 at 08:13:17PM +0200, Jiri Olsa escreveu: > So far compute_single function relies on the fact, that > there's only single metric defined within evlist in all > tests. In following patch we will add test for metric > group, so we need to be able to compute metric by given > name. > > Adding the name argument to compute_single and iterating > evlist and evsel's expression to find the given metric. Applied, thanks. Ian, Kajol, I didn't notice your Acked-by or Reviewed-by, like for the other patches, can you check? - Arnaldo > Signed-off-by: Jiri Olsa > --- > tools/perf/tests/parse-metric.c | 22 +++++++++++++--------- > 1 file changed, 13 insertions(+), 9 deletions(-) > > diff --git a/tools/perf/tests/parse-metric.c b/tools/perf/tests/parse-metric.c > index 01370ccb9ed9..5ac32f80f8ea 100644 > --- a/tools/perf/tests/parse-metric.c > +++ b/tools/perf/tests/parse-metric.c > @@ -108,17 +108,21 @@ static void load_runtime_stat(struct runtime_stat *st, struct evlist *evlist, > } > > static double compute_single(struct rblist *metric_events, struct evlist *evlist, > - struct runtime_stat *st) > + struct runtime_stat *st, const char *name) > { > - struct evsel *evsel = evlist__first(evlist); > + struct metric_expr *mexp; > struct metric_event *me; > + struct evsel *evsel; > > - me = metricgroup__lookup(metric_events, evsel, false); > - if (me != NULL) { > - struct metric_expr *mexp; > - > - mexp = list_first_entry(&me->head, struct metric_expr, nd); > - return test_generic_metric(mexp, 0, st); > + evlist__for_each_entry(evlist, evsel) { > + me = metricgroup__lookup(metric_events, evsel, false); > + if (me != NULL) { > + list_for_each_entry (mexp, &me->head, nd) { > + if (strcmp(mexp->metric_name, name)) > + continue; > + return test_generic_metric(mexp, 0, st); > + } > + } > } > return 0.; > } > @@ -162,7 +166,7 @@ static int compute_metric(const char *name, struct value *vals, double *ratio) > load_runtime_stat(&st, evlist, vals); > > /* And execute the metric */ > - *ratio = compute_single(&metric_events, evlist, &st); > + *ratio = compute_single(&metric_events, evlist, &st, name); > > /* ... clenup. */ > metricgroup__rblist_exit(&metric_events); > -- > 2.25.4 > -- - Arnaldo