From patchwork Wed Oct 14 12:41:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 54944 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by patches.linaro.org (Postfix) with ESMTPS id 60A7223012 for ; Wed, 14 Oct 2015 12:50:12 +0000 (UTC) Received: by lbcao8 with SMTP id ao8sf25326598lbc.1 for ; Wed, 14 Oct 2015 05:50:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender:precedence :list-id:x-original-sender:x-original-authentication-results :mailing-list:list-post:list-help:list-archive:list-unsubscribe; bh=WJLewWTQkAt1WyTXHR1EPRvELg/1DrL1vOK2O3q0IBg=; b=G1Y0IiigrrsuS8qVCDgKcFH0A0x/TKICbo4zZzx4l55rMFw27NPEE6TfsyMcPZXZYz JQqiJmOEM0ITuX2iR8Fh76R6cYrJFufPyv7wc8O3erixXi17TIQ8ykR6Mv/lkEV0UoZs eJ2x/cU/lj+j5o6RgLcGabbT7tqyXZTO4eR4UBQrr7CziX5WmS87MTGf6B8pP4qe55Fm +SwlNoeANQmogbRId1pJkVr0h6C+e70g0QklR6IxDbeBY1f+K/jfPRXdVCa2um4LYxxw usuPCq8Ej26q8iU35JL+J3GzX+8X5kOL+OjKaaBy+IxNemSPcoHg8AkzsZXovZCvYvfT oyPg== X-Gm-Message-State: ALoCoQl9MEaHtfOZymSCdsNlo0E5qgPg4bZCqHvy4uyhRSuSKLPHnf/vexZxsQlZlpba2sdKyZjj X-Received: by 10.112.198.33 with SMTP id iz1mr730354lbc.8.1444827011364; Wed, 14 Oct 2015 05:50:11 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.156.78 with SMTP id f75ls36555lfe.69.gmail; Wed, 14 Oct 2015 05:50:11 -0700 (PDT) X-Received: by 10.112.139.201 with SMTP id ra9mr1499219lbb.29.1444827011190; Wed, 14 Oct 2015 05:50:11 -0700 (PDT) Received: from mail-lf0-f44.google.com (mail-lf0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id c7si5453453lbd.63.2015.10.14.05.50.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Oct 2015 05:50:11 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by lfaz124 with SMTP id z124so10706323lfa.1 for ; Wed, 14 Oct 2015 05:50:11 -0700 (PDT) X-Received: by 10.25.28.73 with SMTP id c70mr806197lfc.76.1444827011036; Wed, 14 Oct 2015 05:50:11 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp2713194lbq; Wed, 14 Oct 2015 05:50:07 -0700 (PDT) X-Received: by 10.66.150.161 with SMTP id uj1mr3592082pab.148.1444827007628; Wed, 14 Oct 2015 05:50:07 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y9si13120131pbt.46.2015.10.14.05.50.07; Wed, 14 Oct 2015 05:50:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932368AbbJNMuF (ORCPT + 30 others); Wed, 14 Oct 2015 08:50:05 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:27798 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753566AbbJNMmv (ORCPT ); Wed, 14 Oct 2015 08:42:51 -0400 Received: from 172.24.1.49 (EHLO szxeml425-hub.china.huawei.com) ([172.24.1.49]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id BOX06062; Wed, 14 Oct 2015 20:42:43 +0800 (CST) Received: from linux-4hy3.site (10.107.193.248) by szxeml425-hub.china.huawei.com (10.82.67.180) with Microsoft SMTP Server id 14.3.235.1; Wed, 14 Oct 2015 20:42:34 +0800 From: Wang Nan To: , , CC: , , , , , , , , , , , , Wang Nan , Arnaldo Carvalho de Melo Subject: [PATCH 26/31] perf tools: Support perf event alias name Date: Wed, 14 Oct 2015 12:41:37 +0000 Message-ID: <1444826502-49291-27-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1444826502-49291-1-git-send-email-wangnan0@huawei.com> References: <1444826502-49291-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.107.193.248] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020205.561E4DC5.0152, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 4e962c471b68fb2f8b15fc45219f521b Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: wangnan0@huawei.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: He Kuang This patch adds new bison rules for specifying an alias name to a perf event, which allows cmdline refer to previous defined perf event through its name. With this patch user can give alias name to a perf event using following cmdline: # perf record -e mypmu=cycles ... To allow parser refer to existing event selecter, pass event list to 'struct parse_events_evlist'. perf_evlist__find_evsel_by_alias() is introduced to get evsel through its alias. Signed-off-by: He Kuang Signed-off-by: Wang Nan Cc: Arnaldo Carvalho de Melo Cc: Alexei Starovoitov Cc: Brendan Gregg Cc: Daniel Borkmann Cc: David Ahern Cc: He Kuang Cc: Jiri Olsa Cc: Kaixu Xia Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Zefan Li Cc: pi3orama@163.com Link: http://lkml.kernel.org/n/ebpf-7w1s62o0s6ovqlaqwrmx20v9@git.kernel.org --- tools/perf/util/evlist.c | 16 ++++++++++++++++ tools/perf/util/evlist.h | 4 ++++ tools/perf/util/evsel.h | 1 + tools/perf/util/parse-events.c | 31 ++++++++++++++++++++++++++++--- tools/perf/util/parse-events.h | 5 +++++ tools/perf/util/parse-events.y | 15 ++++++++++++++- 6 files changed, 68 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index d139219..8dd59aa 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -1753,3 +1753,19 @@ void perf_evlist__set_tracking_event(struct perf_evlist *evlist, tracking_evsel->tracking = true; } + +struct perf_evsel * +perf_evlist__find_evsel_by_alias(struct perf_evlist *evlist, + const char *alias) +{ + struct perf_evsel *evsel; + + evlist__for_each(evlist, evsel) { + if (!evsel->alias) + continue; + if (strcmp(alias, evsel->alias) == 0) + return evsel; + } + + return NULL; +} diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index a459fe7..4e25342 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -292,4 +292,8 @@ void perf_evlist__set_tracking_event(struct perf_evlist *evlist, struct perf_evsel *tracking_evsel); void perf_event_attr__set_max_precise_ip(struct perf_event_attr *attr); + +struct perf_evsel * +perf_evlist__find_evsel_by_alias(struct perf_evlist *evlist, const char *alias); + #endif /* __PERF_EVLIST_H */ diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index a60b5d5..9a95e73 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -87,6 +87,7 @@ struct perf_evsel { int idx; u32 ids; char *name; + char *alias; double scale; const char *unit; struct event_format *tp_format; diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 4849dbd..06ba5a6 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -1020,6 +1020,30 @@ int parse_events__modifier_group(struct list_head *list, return parse_events__modifier_event(list, event_mod, true); } +int parse_events__set_event_alias(struct parse_events_evlist *data, + struct list_head *list, + const char *str, + void *loc_alias_) +{ + struct perf_evsel *evsel; + YYLTYPE *loc_alias = loc_alias_; + + if (!str) + return 0; + + if (!list_is_singular(list)) { + struct parse_events_error *err = data->error; + + err->idx = loc_alias->first_column; + err->str = strdup("One alias can be applied to one event only"); + return -EINVAL; + } + + evsel = list_first_entry(list, struct perf_evsel, node); + evsel->alias = strdup(str); + return evsel->alias ? 0 : -ENOMEM; +} + void parse_events__set_leader(char *name, struct list_head *list) { struct perf_evsel *leader; @@ -1373,9 +1397,10 @@ int parse_events(struct perf_evlist *evlist, const char *str, struct parse_events_error *err) { struct parse_events_evlist data = { - .list = LIST_HEAD_INIT(data.list), - .idx = evlist->nr_entries, - .error = err, + .list = LIST_HEAD_INIT(data.list), + .idx = evlist->nr_entries, + .error = err, + .evlist = evlist, }; int ret; diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index 8f17c83..b525353 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -96,6 +96,7 @@ struct parse_events_evlist { int idx; int nr_groups; struct parse_events_error *error; + struct perf_evlist *evlist; }; struct parse_events_terms { @@ -168,4 +169,8 @@ extern int is_valid_tracepoint(const char *event_string); int valid_event_mount(const char *eventfs); char *parse_events_formats_error_string(char *additional_terms); +int parse_events__set_event_alias(struct parse_events_evlist *data, + struct list_head *list, + const char *str, + void *loc_alias_); #endif /* __PERF_PARSE_EVENTS_H */ diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index ad37996..90e382f 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -76,6 +76,7 @@ static inc_group_count(struct list_head *list, %type event_bpf_file %type event_def %type event_mod +%type event_alias %type event_name %type event %type events @@ -192,13 +193,25 @@ event_name PE_MODIFIER_EVENT event_name event_name: -PE_EVENT_NAME event_def +PE_EVENT_NAME event_alias { ABORT_ON(parse_events_name($2, $1)); free($1); $$ = $2; } | +event_alias + +event_alias: +PE_NAME '=' event_def +{ + struct list_head *list = $3; + struct parse_events_evlist *data = _data; + + ABORT_ON(parse_events__set_event_alias(data, list, $1, &@1)); + $$ = list; +} +| event_def event_def: event_pmu |