Received: by 2002:a25:2c96:0:0:0:0:0 with SMTP id s144csp613345ybs; Sun, 24 May 2020 15:45:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzCH5x7EXTH1QJntH1kVVKLQUBjNpzcx6qMXRVtYu3dX9hyNJSsIn0lDzN5CEwliZd1QA4A X-Received: by 2002:a17:906:379a:: with SMTP id n26mr16293176ejc.513.1590360300714; Sun, 24 May 2020 15:45:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590360300; cv=none; d=google.com; s=arc-20160816; b=uYwcMkWnll9wU6Z95aTlecZ/109bB1BNVQcboML2AjFBIfRzSRmkw7WE5jK7RWNK03 eIMe8JtiiQgWu6pAZiI9FKMHOeFk9qm6C/a6Vt1E3dbrOLYhKjcA9jbk00W0jfqtgpGE aDM9rQk/owKkwjnWnlGkr9FH4VM2CnGHRbd1M+FC+pSgAu8ggbwhpDtghPcTyypPY2ZW 91/a7lB6+c9HLqv0y9DkBzxmcqOPlhxWerz8NKCyY2ss/McYwt5NVWjk2Ikgs1Oc8Sih pFe6HHPlRbV6OZ0SPMLaeq9+pJe9rh5+pUVTlizba732dr4cjxC4dN42IpSf8D6xKs1p /EEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=IobP8s3z3ZaH+9/7Ko6nWA5K1EJX7S+xNfEBJ1vWS6I=; b=s5Olpse/8UHkGY9HMiA8pZ8uOcrzay9x4fJS2EI0sHA3J4k2FK4qC1Ubgl5dtD5FWl YbDfeySV14a9fiK1ugvAx/CXOAq5IYnbnAjb3aqsJ5dym/pzZxZB9RXSgfwy+37cgbcy yqpO7sSx8KO0Af7sdc8Zptp03VnW9dLOp7ToLhzxJWApIcl+asvvfI7n4xhl4msMhfuq qvh5lzLZHVaD8WePLQVoZVVUR28d53aIh4cvokCjGU9kmzYI8YFxbFBl1XTJQlwT2Li3 /NSpxt7YMjj/Sg/8rLEpEBJpu9U+Rs7ZGcE1wWKJoo9leS7AAbDSZY4ToyjSlSUH0GHk TtUQ== ARC-Authentication-Results: i=1; mx.google.com; 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 t24si8939066edc.342.2020.05.24.15.44.38; Sun, 24 May 2020 15:45:00 -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; 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 S2388552AbgEXWmp convert rfc822-to-8bit (ORCPT + 99 others); Sun, 24 May 2020 18:42:45 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:34922 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2388289AbgEXWmo (ORCPT ); Sun, 24 May 2020 18:42:44 -0400 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-461-tsxnaSIUPwGHuReF4FWSKg-1; Sun, 24 May 2020 18:42:38 -0400 X-MC-Unique: tsxnaSIUPwGHuReF4FWSKg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F34FD1005512; Sun, 24 May 2020 22:42:36 +0000 (UTC) Received: from krava.redhat.com (unknown [10.40.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id A8C565D788; Sun, 24 May 2020 22:42:34 +0000 (UTC) From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: lkml , Ingo Molnar , Namhyung Kim , Alexander Shishkin , Peter Zijlstra , Michael Petlan , Ian Rogers , Stephane Eranian , Andi Kleen Subject: [PATCH 04/14] perf tools: Add fake pmu support Date: Mon, 25 May 2020 00:42:09 +0200 Message-Id: <20200524224219.234847-5-jolsa@kernel.org> In-Reply-To: <20200524224219.234847-1-jolsa@kernel.org> References: <20200524224219.234847-1-jolsa@kernel.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kernel.org Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Adding the way to create pmu event without the actual PMU being in place. This way we can test metrics defined for any processors. The interface is to define fake_pmu in struct parse_events_state data. It will be used only in tests via special interface function added in following changes. Signed-off-by: Jiri Olsa --- tools/perf/util/parse-events.c | 14 ++++++++++--- tools/perf/util/parse-events.h | 3 ++- tools/perf/util/parse-events.l | 8 ++++++-- tools/perf/util/parse-events.y | 37 ++++++++++++++++++++++++++++++++-- 4 files changed, 54 insertions(+), 8 deletions(-) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 27b8e49d690e..8304f9b6e6be 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -1415,6 +1415,7 @@ int parse_events_add_pmu(struct parse_events_state *parse_state, bool auto_merge_stats, bool use_alias) { + bool is_fake = parse_state->fake_pmu; struct perf_event_attr attr; struct perf_pmu_info info; struct perf_pmu *pmu; @@ -1436,7 +1437,14 @@ int parse_events_add_pmu(struct parse_events_state *parse_state, fprintf(stderr, "' that may result in non-fatal errors\n"); } - pmu = perf_pmu__find(name); + if (is_fake) { + static struct perf_pmu fake_pmu = { }; + + pmu = &fake_pmu; + } else { + pmu = perf_pmu__find(name); + } + if (!pmu) { char *err_str; @@ -1469,7 +1477,7 @@ int parse_events_add_pmu(struct parse_events_state *parse_state, } } - if (perf_pmu__check_alias(pmu, head_config, &info)) + if (!is_fake && perf_pmu__check_alias(pmu, head_config, &info)) return -EINVAL; if (verbose > 1) { @@ -1502,7 +1510,7 @@ int parse_events_add_pmu(struct parse_events_state *parse_state, if (pmu->default_config && get_config_chgs(pmu, head_config, &config_terms)) return -ENOMEM; - if (perf_pmu__config(pmu, &attr, head_config, parse_state->error)) { + if (!is_fake && perf_pmu__config(pmu, &attr, head_config, parse_state->error)) { struct evsel_config_term *pos, *tmp; list_for_each_entry_safe(pos, tmp, &config_terms, list) { diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index d60510e0609f..963b0ea6c448 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -126,9 +126,10 @@ struct parse_events_state { int idx; int nr_groups; struct parse_events_error *error; - struct evlist *evlist; + struct evlist *evlist; struct list_head *terms; int stoken; + bool fake_pmu; }; void parse_events__handle_error(struct parse_events_error *err, int idx, diff --git a/tools/perf/util/parse-events.l b/tools/perf/util/parse-events.l index 002802e17059..56912c9641f5 100644 --- a/tools/perf/util/parse-events.l +++ b/tools/perf/util/parse-events.l @@ -129,12 +129,16 @@ do { \ yyless(0); \ } while (0) -static int pmu_str_check(yyscan_t scanner) +static int pmu_str_check(yyscan_t scanner, struct parse_events_state *parse_state) { YYSTYPE *yylval = parse_events_get_lval(scanner); char *text = parse_events_get_text(scanner); yylval->str = strdup(text); + + if (parse_state->fake_pmu) + return PE_PMU_EVENT_FAKE; + switch (perf_pmu__parse_check(text)) { case PMU_EVENT_SYMBOL_PREFIX: return PE_PMU_EVENT_PRE; @@ -376,7 +380,7 @@ r{num_raw_hex} { return raw(yyscanner); } {modifier_event} { return str(yyscanner, PE_MODIFIER_EVENT); } {bpf_object} { if (!isbpf(yyscanner)) { USER_REJECT }; return str(yyscanner, PE_BPF_OBJECT); } {bpf_source} { if (!isbpf(yyscanner)) { USER_REJECT }; return str(yyscanner, PE_BPF_SOURCE); } -{name} { return pmu_str_check(yyscanner); } +{name} { return pmu_str_check(yyscanner, _parse_state); } {name_tag} { return str(yyscanner, PE_NAME); } "/" { BEGIN(config); return '/'; } - { return '-'; } diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index c4ca932d092d..d1b04b8d81ea 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -69,7 +69,7 @@ static void inc_group_count(struct list_head *list, %token PE_NAME_CACHE_TYPE PE_NAME_CACHE_OP_RESULT %token PE_PREFIX_MEM PE_PREFIX_RAW PE_PREFIX_GROUP %token PE_ERROR -%token PE_PMU_EVENT_PRE PE_PMU_EVENT_SUF PE_KERNEL_PMU_EVENT +%token PE_PMU_EVENT_PRE PE_PMU_EVENT_SUF PE_KERNEL_PMU_EVENT PE_PMU_EVENT_FAKE %token PE_ARRAY_ALL PE_ARRAY_RANGE %token PE_DRV_CFG_TERM %type PE_VALUE @@ -87,7 +87,7 @@ static void inc_group_count(struct list_head *list, %type PE_MODIFIER_EVENT %type PE_MODIFIER_BP %type PE_EVENT_NAME -%type PE_PMU_EVENT_PRE PE_PMU_EVENT_SUF PE_KERNEL_PMU_EVENT +%type PE_PMU_EVENT_PRE PE_PMU_EVENT_SUF PE_KERNEL_PMU_EVENT PE_PMU_EVENT_FAKE %type PE_DRV_CFG_TERM %destructor { free ($$); } %type event_term @@ -356,6 +356,39 @@ PE_PMU_EVENT_PRE '-' PE_PMU_EVENT_SUF sep_dc YYABORT; $$ = list; } +| +PE_PMU_EVENT_FAKE sep_dc +{ + struct list_head *list; + int err; + + list = alloc_list(); + if (!list) + YYABORT; + + err = parse_events_add_pmu(_parse_state, list, $1, NULL, false, false); + free($1); + if (err < 0) + YYABORT; + $$ = list; +} +| +PE_PMU_EVENT_FAKE opt_pmu_config +{ + struct list_head *list; + int err; + + list = alloc_list(); + if (!list) + YYABORT; + + err = parse_events_add_pmu(_parse_state, list, $1, $2, false, false); + free($1); + parse_events_terms__delete($2); + if (err < 0) + YYABORT; + $$ = list; +} value_sym: PE_VALUE_SYM_HW -- 2.25.4