From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932167AbaCETvo (ORCPT ); Wed, 5 Mar 2014 14:51:44 -0500 Received: from mga11.intel.com ([192.55.52.93]:42534 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757204AbaCETtr (ORCPT ); Wed, 5 Mar 2014 14:49:47 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,594,1389772800"; d="scan'208";a="486652909" From: Andi Kleen To: acme@infradead.org Cc: mingo@kernel.org, linux-kernel@vger.kernel.org, peterz@infradead.org, eranian@google.com, namhyung@kernel.org, jolsa@redhat.com, Andi Kleen Subject: [PATCH 8/8] perf, tools, test: Add test case for alias and JSON parsing Date: Wed, 5 Mar 2014 11:49:38 -0800 Message-Id: <1394048978-15909-9-git-send-email-andi@firstfloor.org> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1394048978-15909-1-git-send-email-andi@firstfloor.org> References: <1394048978-15909-1-git-send-email-andi@firstfloor.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andi Kleen Add a simple test case to perf test that runs perf download and parses all the events. This needs adding an all event iterator to pmu.c Signed-off-by: Andi Kleen --- tools/perf/Makefile.perf | 1 + tools/perf/tests/aliases.c | 41 +++++++++++++++++++++++++++++++++++++++++ tools/perf/tests/builtin-test.c | 4 ++++ tools/perf/tests/tests.h | 1 + tools/perf/util/pmu.c | 18 ++++++++++++++++++ tools/perf/util/pmu.h | 2 ++ 6 files changed, 67 insertions(+) create mode 100644 tools/perf/tests/aliases.c diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 8c4cc73..51bb490 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -416,6 +416,7 @@ endif LIB_OBJS += $(OUTPUT)tests/code-reading.o LIB_OBJS += $(OUTPUT)tests/sample-parsing.o LIB_OBJS += $(OUTPUT)tests/parse-no-sample-id-all.o +LIB_OBJS += $(OUTPUT)tests/aliases.o ifndef NO_DWARF_UNWIND ifeq ($(ARCH),x86) LIB_OBJS += $(OUTPUT)tests/dwarf-unwind.o diff --git a/tools/perf/tests/aliases.c b/tools/perf/tests/aliases.c new file mode 100644 index 0000000..acded28 --- /dev/null +++ b/tools/perf/tests/aliases.c @@ -0,0 +1,41 @@ +/* Check if we can set up all aliases and can read JSON files */ +#include +#include "tests.h" +#include "pmu.h" +#include "evlist.h" +#include "parse-events.h" + +static struct perf_evlist *evlist; + +static int num_events; + +static int test_event(const char *name) +{ + int ret = parse_events(evlist, name); + + if (ret) + fprintf(stderr, "invalid or unsupported event: '%s'\n", name); + else + num_events++; + return ret; +} + +int test__aliases(void) +{ + int err; + + /* Download JSON files */ + /* XXX assumes perf is installed */ + if (system("perf download > /dev/null") < 0) { + /* Don't error out for this for now */ + fprintf(stderr, "perf download failed\n"); + } + + evlist = perf_evlist__new(); + if (evlist == NULL) + return -ENOMEM; + + err = pmu_iterate_events(test_event); + fprintf(stderr, " Parsed %d events: ", num_events); + return err; +} diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c index b11bf8a..b77468d 100644 --- a/tools/perf/tests/builtin-test.c +++ b/tools/perf/tests/builtin-test.c @@ -115,6 +115,10 @@ static struct test { .desc = "Test parsing with no sample_id_all bit set", .func = test__parse_no_sample_id_all, }, + { + .desc = "Test parsing JSON aliases", + .func = test__aliases, + }, #if defined(__x86_64__) || defined(__i386__) #ifdef HAVE_DWARF_UNWIND_SUPPORT { diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h index a24795c..d090866 100644 --- a/tools/perf/tests/tests.h +++ b/tools/perf/tests/tests.h @@ -41,6 +41,7 @@ int test__sample_parsing(void); int test__keep_tracking(void); int test__parse_no_sample_id_all(void); int test__dwarf_unwind(void); +int test__aliases(void); #if defined(__x86_64__) || defined(__i386__) #ifdef HAVE_DWARF_UNWIND_SUPPORT diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index a26ec85..652b025 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -879,3 +879,21 @@ bool pmu_have_event(const char *pname, const char *name) } return false; } + +int pmu_iterate_events(int (*func)(const char *name)) +{ + int ret = 0; + struct perf_pmu *pmu; + struct perf_pmu_alias *alias; + + perf_pmu__find("cpu"); /* Load PMUs */ + pmu = NULL; + while ((pmu = perf_pmu__scan(pmu)) != NULL) { + list_for_each_entry(alias, &pmu->aliases, list) { + ret = func(alias->name); + if (ret != 0) + break; + } + } + return ret; +} diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h index 62255bb..b885c55 100644 --- a/tools/perf/util/pmu.h +++ b/tools/perf/util/pmu.h @@ -47,5 +47,7 @@ bool pmu_have_event(const char *pname, const char *name); int perf_pmu__test(void); +int pmu_iterate_events(int (*func)(const char *name)); + extern const char *json_file; #endif /* __PMU_H */ -- 1.8.5.3