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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E875DE6FE47 for ; Sat, 7 Sep 2024 05:15:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:To:From:Subject :References:Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=K446thzmdZyY//9ueXzoZapLMwoJZQ44b1S89B5s8Ac=; b=2qP3543/jVQZbFfWXq9XqTKPd3 ja2hjXrJ9Ii6iSUaR4fTKinDnLj3Po3ZuKuAvwMkqA0zBGZjMXllzruLvP1KM7KwlGyaxiweRbq19 wugQvoMPF9gS0haKxustV6IToWUsXNx1m+JlsicE8nTIG2CItpWXslr/4JtrYLkCc2ak5M7YM5hk9 QfJqwaKjjz/rB0lgTTBryyj14HK1a/CrU0srYZpO53NmuXVphZ1ByG4Xk3eIwL71Ecxf3OQCVJTsG uJIbrCLBthPGQrHJjwVRMYiMnhsd5piF1aJAyw32fTN/b7JnjGrEAeEQPUJJHZUefzIz/TFbwjE4A 4cQ2p/NA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1smnnZ-0000000ENf7-1Onx; Sat, 07 Sep 2024 05:15:49 +0000 Received: from mail-yw1-x114a.google.com ([2607:f8b0:4864:20::114a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1smngt-0000000EMH7-2cs0 for linux-arm-kernel@lists.infradead.org; Sat, 07 Sep 2024 05:08:56 +0000 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-6d34c57a88eso96948477b3.0 for ; Fri, 06 Sep 2024 22:08:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1725685734; x=1726290534; darn=lists.infradead.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=K446thzmdZyY//9ueXzoZapLMwoJZQ44b1S89B5s8Ac=; b=SDe2vmT3LMnhpc8roi6+6UjF8aR9b57Okuj56RyMiO8Zic+6Ki4b7uVcJDh5nP7bJO BhgsppaBXfNxUNLlN3a/jmcElJkZI0BrVhKIWpAKJGwGsAHfhrrcg+L9qmjXFCWUnWCV Os2XP66VPpUtbt8s1CLrBgEcXuvDAt44KPvQNBon8nKUIfQEAB+s+Evb/sjvQD++Mz7a LKD8SPPdMiDm3NDKlNbXIPleNgeMZ/BTGBAwhIgrc2NFrGMa6+0JQHTEJjCqFQy3DEoZ WwpjLoEH4H9QiPkELwBk7nst+NNoRdub8G2M4iVbmD2IIdL0i0PM/iPGI8Ya0l8pVtnA JQiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725685734; x=1726290534; h=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=K446thzmdZyY//9ueXzoZapLMwoJZQ44b1S89B5s8Ac=; b=N3OY77Ni1XdkDEXeOViIKE2OB4itV4hwj2cI3KQtXNNcvooLX11cJPwiOvDcDmoyUf bVi5AvcH+umu+Oj9UYTLYWXOP2trIO8FgQtG4cltYekKD8tQu3SAaGBuLd8Kg1b/aght d/VjTYoMVLP7op/4PpZPRYZP51hISofCC078rtvLFGSplQBarky1orW+kJ5ilZTgR6He nYAhCR1e9Tm/xEhrud8v23tU5gd5Z82UTes4CGzRAgsPdFXNK219a+cDUY8W0EQnZ5OT OvXz9K/Ze0EZUr/1oqDVFR7MtwKvOrR1Hf6AQWpL3Jrnp6WlRj5egnVgguBooDegcgPD OExg== X-Forwarded-Encrypted: i=1; AJvYcCV2QF6g4F9cF9gFnlHm6+2LOsNkENo23kdVH1l/q41P++06jaIXtg7N4D/IuBMZLiCTPuX502etVcHbvFEd/l1T@lists.infradead.org X-Gm-Message-State: AOJu0YzE4EPKqi4NUQ/LZysReNDuejGfF7ibtfn346Ar6SzMsHmlp69c sQR2mQ2QfpQzjagLoVmXMeOe4Bk9T7UuobIBkyufsyqQWfz3Xr56hNJU15pbTwYrNqbLQGwMYYk DSqeAjA== X-Google-Smtp-Source: AGHT+IG5ulMeYZYI+0rmqtyIoRb8/mTAk4z4SLB4POy1XLmQNC5TMS8PJhGseVM70zE/iZ51QJ2+nhNJuJxc X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:90e5:a813:c3d3:daed]) (user=irogers job=sendgmr) by 2002:a05:690c:b1d:b0:61c:89a4:dd5f with SMTP id 00721157ae682-6db44a5d1eamr3228967b3.0.1725685734285; Fri, 06 Sep 2024 22:08:54 -0700 (PDT) Date: Fri, 6 Sep 2024 22:08:21 -0700 In-Reply-To: <20240907050830.6752-1-irogers@google.com> Message-Id: <20240907050830.6752-7-irogers@google.com> Mime-Version: 1.0 References: <20240907050830.6752-1-irogers@google.com> X-Mailer: git-send-email 2.46.0.469.g59c65b2a67-goog Subject: [PATCH v1 06/15] perf parse-events: Expose/rename config_term_name From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Ravi Bangoria , Weilin Wang , Jing Zhang , Xu Yang , Sandipan Das , Benjamin Gray , Athira Jajeev , Howard Chu , Dominique Martinet , Yang Jihong , Colin Ian King , Veronika Molnarova , "Dr. David Alan Gilbert" , Oliver Upton , Changbin Du , Ze Gao , Andi Kleen , "=?UTF-8?q?Cl=C3=A9ment=20Le=20Goffic?=" , Sun Haiyong , Junhao He , Tiezhu Yang , Yicong Yang , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="UTF-8" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240906_220855_707604_F84301D3 X-CRM114-Status: GOOD ( 15.97 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Expose config_term_name as parse_events__term_type_str so that PMUs not in pmu.c may access it. Signed-off-by: Ian Rogers --- tools/perf/util/parse-events.c | 20 +++++++++++--------- tools/perf/util/parse-events.h | 2 ++ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 30b78fe8d704..b68a744f41ba 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -772,7 +772,7 @@ static int check_type_val(struct parse_events_term *term, static bool config_term_shrinked; -static const char *config_term_name(enum parse_events__term_type term_type) +const char *parse_events__term_type_str(enum parse_events__term_type term_type) { /* * Update according to parse-events.l @@ -858,7 +858,7 @@ config_term_avail(enum parse_events__term_type term_type, struct parse_events_er /* term_type is validated so indexing is safe */ if (asprintf(&err_str, "'%s' is not usable in 'perf stat'", - config_term_name(term_type)) >= 0) + parse_events__term_type_str(term_type)) >= 0) parse_events_error__handle(err, -1, err_str, NULL); return false; } @@ -982,7 +982,7 @@ do { \ case PARSE_EVENTS__TERM_TYPE_HARDWARE: default: parse_events_error__handle(err, term->err_term, - strdup(config_term_name(term->type_term)), + strdup(parse_events__term_type_str(term->type_term)), parse_events_formats_error_string(NULL)); return -EINVAL; } @@ -1105,8 +1105,9 @@ static int config_term_tracepoint(struct perf_event_attr *attr, default: if (err) { parse_events_error__handle(err, term->err_term, - strdup(config_term_name(term->type_term)), - strdup("valid terms: call-graph,stack-size\n")); + strdup(parse_events__term_type_str(term->type_term)), + strdup("valid terms: call-graph,stack-size\n") + ); } return -EINVAL; } @@ -2546,7 +2547,7 @@ int parse_events_term__num(struct parse_events_term **term, struct parse_events_term temp = { .type_val = PARSE_EVENTS__TERM_TYPE_NUM, .type_term = type_term, - .config = config ? : strdup(config_term_name(type_term)), + .config = config ? : strdup(parse_events__term_type_str(type_term)), .no_value = no_value, .err_term = loc_term ? loc_term->first_column : 0, .err_val = loc_val ? loc_val->first_column : 0, @@ -2580,7 +2581,7 @@ int parse_events_term__term(struct parse_events_term **term, void *loc_term, void *loc_val) { return parse_events_term__str(term, term_lhs, NULL, - strdup(config_term_name(term_rhs)), + strdup(parse_events__term_type_str(term_rhs)), loc_term, loc_val); } @@ -2687,7 +2688,8 @@ int parse_events_terms__to_strbuf(const struct parse_events_terms *terms, struct if (ret < 0) return ret; } else if ((unsigned int)term->type_term < __PARSE_EVENTS__TERM_TYPE_NR) { - ret = strbuf_addf(sb, "%s=", config_term_name(term->type_term)); + ret = strbuf_addf(sb, "%s=", + parse_events__term_type_str(term->type_term)); if (ret < 0) return ret; } @@ -2707,7 +2709,7 @@ static void config_terms_list(char *buf, size_t buf_sz) buf[0] = '\0'; for (i = 0; i < __PARSE_EVENTS__TERM_TYPE_NR; i++) { - const char *name = config_term_name(i); + const char *name = parse_events__term_type_str(i); if (!config_term_avail(i, NULL)) continue; diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index bfbf391451d9..cf3f07db0295 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -162,6 +162,8 @@ struct parse_events_state { bool wild_card_pmus; }; +const char *parse_events__term_type_str(enum parse_events__term_type term_type); + bool parse_events__filter_pmu(const struct parse_events_state *parse_state, const struct perf_pmu *pmu); void parse_events__shrink_config_terms(void); -- 2.46.0.469.g59c65b2a67-goog