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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6E316EE14A0 for ; Wed, 6 Sep 2023 15:51:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242605AbjIFPv2 (ORCPT ); Wed, 6 Sep 2023 11:51:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229804AbjIFPvZ (ORCPT ); Wed, 6 Sep 2023 11:51:25 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 989DABC; Wed, 6 Sep 2023 08:51:21 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0F39CC433C7; Wed, 6 Sep 2023 15:51:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694015481; bh=ZTx1V9SBRgyay3CMxakat22dukdFU6Xt0g57zO9x/g0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=AE6XxU75ThI9ffjE9QXI6OKjbmc8MOfOmxyKEa3H2p9X3yplkfiFWbcn9AF90eQan Xitp8bSAAmwb1owUCyv4Yj8h+fz0NEx906OwuOp5QHYSkcWAaQYXBGc9QCS0EtJZYB MR0IZ0hwu2ttSCZg4APmxRb7DMO53Ty3Gb1CV78dVsqL1ZPvjbbIAhgz/yLVOKEb1p DTzZxOdYa3L3ot3LraQIwz2r72kX3sx7yddrOAkigZQNWssO9/6J58qjB0pFZtSVgE uKIsbJUOTmnSb3suYrm5tqZ3UvkNYUnQ4K4M9Y6hQvrB8uaMnaJzC9Gy5hHKmNP30g kZ4fNwCPAS17w== Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id 5A5F6403F4; Wed, 6 Sep 2023 12:51:18 -0300 (-03) Date: Wed, 6 Sep 2023 12:51:18 -0300 From: Arnaldo Carvalho de Melo To: James Clark Cc: Ian Rogers , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Adrian Hunter , Kan Liang , Rob Herring , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v1 1/6] perf parse-events: Fixes relating to no_value terms Message-ID: References: <20230901233949.2930562-1-irogers@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Url: http://acmel.wordpress.com Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org Em Tue, Sep 05, 2023 at 10:39:38AM +0100, James Clark escreveu: > > > On 02/09/2023 00:39, Ian Rogers wrote: > > A term may have no value in which case it is assumed to have a value > > of 1. It doesn't just apply to alias/event terms so change the > > parse_events_term__to_strbuf assert. > > > > Commit 99e7138eb789 ("perf tools: Fail on using multiple bits long > > terms without value") made it so that no_value terms could only be for > > a single bit. Prior to commit 64199ae4b8a3 ("perf parse-events: Fix > > propagation of term's no_value when cloning") this missed a test case > > where config1 had no_value. > > > > Fixes: 64199ae4b8a3 ("perf parse-events: Fix propagation of term's no_value when cloning") > > Signed-off-by: Ian Rogers > > For the whole set: > > Reviewed-by: James Clark Thanks, applied. - Arnaldo > > --- > > tools/perf/tests/parse-events.c | 2 +- > > tools/perf/util/parse-events.c | 2 +- > > tools/perf/util/parse-events.h | 4 ++-- > > 3 files changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c > > index d86076d575ed..d47f1f871164 100644 > > --- a/tools/perf/tests/parse-events.c > > +++ b/tools/perf/tests/parse-events.c > > @@ -2170,7 +2170,7 @@ static const struct evlist_test test__events[] = { > > > > static const struct evlist_test test__events_pmu[] = { > > { > > - .name = "cpu/config=10,config1,config2=3,period=1000/u", > > + .name = "cpu/config=10,config1=1,config2=3,period=1000/u", > > .valid = test__pmu_cpu_valid, > > .check = test__checkevent_pmu, > > /* 0 */ > > diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c > > index 68fe2c4ff49f..65608a3cba81 100644 > > --- a/tools/perf/util/parse-events.c > > +++ b/tools/perf/util/parse-events.c > > @@ -2607,7 +2607,7 @@ int parse_events_term__to_strbuf(struct list_head *term_list, struct strbuf *sb) > > > > if (term->type_val == PARSE_EVENTS__TERM_TYPE_NUM) > > if (term->no_value) { > > - assert(term->type_term == PARSE_EVENTS__TERM_TYPE_USER); > > + assert(term->val.num == 1); > > ret = strbuf_addf(sb, "%s", term->config); > > } else > > ret = strbuf_addf(sb, "%s=%#"PRIx64, term->config, term->val.num); > > diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h > > index 855b0725c5d4..594e5d2dc67f 100644 > > --- a/tools/perf/util/parse-events.h > > +++ b/tools/perf/util/parse-events.h > > @@ -124,8 +124,8 @@ struct parse_events_term { > > */ > > bool weak; > > /** > > - * @no_value: Is there no value. TODO: this should really be part of > > - * type_val. > > + * @no_value: Is there no value. If a numeric term has no value then the > > + * value is assumed to be 1. An event name also has no value. > > */ > > bool no_value; > > }; -- - Arnaldo