From: Ingo Molnar <mingo@kernel.org>
Date: Sat, 8 Dec 2012 14:25:06 +0000 (+0100)
Subject: Merge branch 'linus' into perf/core
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f0b9abfb044649bc452fb2fb975ff2fd599cc6a3;p=~shefty%2Frdma-dev.git

Merge branch 'linus' into perf/core

Conflicts:
	tools/perf/Makefile
	tools/perf/builtin-test.c
	tools/perf/perf.h
	tools/perf/tests/parse-events.c
	tools/perf/util/evsel.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

f0b9abfb044649bc452fb2fb975ff2fd599cc6a3
diff --cc tools/perf/Makefile
index a7c6aa8d4a8,0a619af5be4..891bc77bdb2
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@@ -169,16 -169,36 +169,44 @@@ endi
  
  ### --- END CONFIGURATION SECTION ---
  
- BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include -I$(OUTPUT)util -Iutil -I. -I$(TRACE_EVENT_DIR) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
+ ifeq ($(srctree),)
+ srctree := $(patsubst %/,%,$(dir $(shell pwd)))
+ srctree := $(patsubst %/,%,$(dir $(srctree)))
+ #$(info Determined 'srctree' to be $(srctree))
+ endif
+ 
+ ifneq ($(objtree),)
+ #$(info Determined 'objtree' to be $(objtree))
+ endif
+ 
+ ifneq ($(OUTPUT),)
+ #$(info Determined 'OUTPUT' to be $(OUTPUT))
+ endif
+ 
+ BASIC_CFLAGS = \
+ 	-Iutil/include \
+ 	-Iarch/$(ARCH)/include \
+ 	$(if $(objtree),-I$(objtree)/arch/$(ARCH)/include/generated/uapi) \
+ 	-I$(srctree)/arch/$(ARCH)/include/uapi \
+ 	-I$(srctree)/arch/$(ARCH)/include \
+ 	$(if $(objtree),-I$(objtree)/include/generated/uapi) \
+ 	-I$(srctree)/include/uapi \
+ 	-I$(srctree)/include \
+ 	-I$(OUTPUT)util \
+ 	-Iutil \
+ 	-I. \
+ 	-I$(TRACE_EVENT_DIR) \
+ 	-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
++
  BASIC_LDFLAGS =
  
 +ifeq ($(call try-cc,$(SOURCE_BIONIC),$(CFLAGS),bionic),y)
 +	BIONIC := 1
 +	EXTLIBS := $(filter-out -lrt,$(EXTLIBS))
 +	EXTLIBS := $(filter-out -lpthread,$(EXTLIBS))
 +	BASIC_CFLAGS += -I.
 +endif
 +
  # Guard against environment variables
  BUILTIN_OBJS =
  LIB_H =
diff --cc tools/perf/builtin-kvm.c
index 836c82f0137,283b4397e39..ca3f80ebc10
--- a/tools/perf/builtin-kvm.c
+++ b/tools/perf/builtin-kvm.c
@@@ -311,11 -312,11 +312,11 @@@ struct vcpu_event_record 
  };
  
  
- static void init_kvm_event_record(struct perf_kvm *kvm)
+ static void init_kvm_event_record(struct perf_kvm_stat *kvm)
  {
 -	int i;
 +	unsigned int i;
  
 -	for (i = 0; i < (int)EVENTS_CACHE_SIZE; i++)
 +	for (i = 0; i < EVENTS_CACHE_SIZE; i++)
  		INIT_LIST_HEAD(&kvm->kvm_events_cache[i]);
  }
  
diff --cc tools/perf/tests/parse-events.c
index 42a0c8cd3cd,00000000000..32ee478905e
mode 100644,000000..100644
--- a/tools/perf/tests/parse-events.c
+++ b/tools/perf/tests/parse-events.c
@@@ -1,1117 -1,0 +1,1117 @@@
 +
 +#include "parse-events.h"
 +#include "evsel.h"
 +#include "evlist.h"
 +#include "sysfs.h"
- #include "../../../include/linux/hw_breakpoint.h"
 +#include "tests.h"
++#include <linux/hw_breakpoint.h>
 +
 +#define TEST_ASSERT_VAL(text, cond) \
 +do { \
 +	if (!(cond)) { \
 +		pr_debug("FAILED %s:%d %s\n", __FILE__, __LINE__, text); \
 +		return -1; \
 +	} \
 +} while (0)
 +
 +#define PERF_TP_SAMPLE_TYPE (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME | \
 +			     PERF_SAMPLE_CPU | PERF_SAMPLE_PERIOD)
 +
 +static int test__checkevent_tracepoint(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel = perf_evlist__first(evlist);
 +
 +	TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
 +	TEST_ASSERT_VAL("wrong type", PERF_TYPE_TRACEPOINT == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong sample_type",
 +		PERF_TP_SAMPLE_TYPE == evsel->attr.sample_type);
 +	TEST_ASSERT_VAL("wrong sample_period", 1 == evsel->attr.sample_period);
 +	return 0;
 +}
 +
 +static int test__checkevent_tracepoint_multi(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel;
 +
 +	TEST_ASSERT_VAL("wrong number of entries", evlist->nr_entries > 1);
 +
 +	list_for_each_entry(evsel, &evlist->entries, node) {
 +		TEST_ASSERT_VAL("wrong type",
 +			PERF_TYPE_TRACEPOINT == evsel->attr.type);
 +		TEST_ASSERT_VAL("wrong sample_type",
 +			PERF_TP_SAMPLE_TYPE == evsel->attr.sample_type);
 +		TEST_ASSERT_VAL("wrong sample_period",
 +			1 == evsel->attr.sample_period);
 +	}
 +	return 0;
 +}
 +
 +static int test__checkevent_raw(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel = perf_evlist__first(evlist);
 +
 +	TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
 +	TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config", 0x1a == evsel->attr.config);
 +	return 0;
 +}
 +
 +static int test__checkevent_numeric(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel = perf_evlist__first(evlist);
 +
 +	TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
 +	TEST_ASSERT_VAL("wrong type", 1 == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config", 1 == evsel->attr.config);
 +	return 0;
 +}
 +
 +static int test__checkevent_symbolic_name(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel = perf_evlist__first(evlist);
 +
 +	TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
 +	TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config",
 +			PERF_COUNT_HW_INSTRUCTIONS == evsel->attr.config);
 +	return 0;
 +}
 +
 +static int test__checkevent_symbolic_name_config(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel = perf_evlist__first(evlist);
 +
 +	TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
 +	TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config",
 +			PERF_COUNT_HW_CPU_CYCLES == evsel->attr.config);
 +	TEST_ASSERT_VAL("wrong period",
 +			100000 == evsel->attr.sample_period);
 +	TEST_ASSERT_VAL("wrong config1",
 +			0 == evsel->attr.config1);
 +	TEST_ASSERT_VAL("wrong config2",
 +			1 == evsel->attr.config2);
 +	return 0;
 +}
 +
 +static int test__checkevent_symbolic_alias(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel = perf_evlist__first(evlist);
 +
 +	TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
 +	TEST_ASSERT_VAL("wrong type", PERF_TYPE_SOFTWARE == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config",
 +			PERF_COUNT_SW_PAGE_FAULTS == evsel->attr.config);
 +	return 0;
 +}
 +
 +static int test__checkevent_genhw(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel = perf_evlist__first(evlist);
 +
 +	TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
 +	TEST_ASSERT_VAL("wrong type", PERF_TYPE_HW_CACHE == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config", (1 << 16) == evsel->attr.config);
 +	return 0;
 +}
 +
 +static int test__checkevent_breakpoint(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel = perf_evlist__first(evlist);
 +
 +	TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
 +	TEST_ASSERT_VAL("wrong type", PERF_TYPE_BREAKPOINT == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config", 0 == evsel->attr.config);
 +	TEST_ASSERT_VAL("wrong bp_type", (HW_BREAKPOINT_R | HW_BREAKPOINT_W) ==
 +					 evsel->attr.bp_type);
 +	TEST_ASSERT_VAL("wrong bp_len", HW_BREAKPOINT_LEN_4 ==
 +					evsel->attr.bp_len);
 +	return 0;
 +}
 +
 +static int test__checkevent_breakpoint_x(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel = perf_evlist__first(evlist);
 +
 +	TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
 +	TEST_ASSERT_VAL("wrong type", PERF_TYPE_BREAKPOINT == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config", 0 == evsel->attr.config);
 +	TEST_ASSERT_VAL("wrong bp_type",
 +			HW_BREAKPOINT_X == evsel->attr.bp_type);
 +	TEST_ASSERT_VAL("wrong bp_len", sizeof(long) == evsel->attr.bp_len);
 +	return 0;
 +}
 +
 +static int test__checkevent_breakpoint_r(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel = perf_evlist__first(evlist);
 +
 +	TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
 +	TEST_ASSERT_VAL("wrong type",
 +			PERF_TYPE_BREAKPOINT == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config", 0 == evsel->attr.config);
 +	TEST_ASSERT_VAL("wrong bp_type",
 +			HW_BREAKPOINT_R == evsel->attr.bp_type);
 +	TEST_ASSERT_VAL("wrong bp_len",
 +			HW_BREAKPOINT_LEN_4 == evsel->attr.bp_len);
 +	return 0;
 +}
 +
 +static int test__checkevent_breakpoint_w(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel = perf_evlist__first(evlist);
 +
 +	TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
 +	TEST_ASSERT_VAL("wrong type",
 +			PERF_TYPE_BREAKPOINT == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config", 0 == evsel->attr.config);
 +	TEST_ASSERT_VAL("wrong bp_type",
 +			HW_BREAKPOINT_W == evsel->attr.bp_type);
 +	TEST_ASSERT_VAL("wrong bp_len",
 +			HW_BREAKPOINT_LEN_4 == evsel->attr.bp_len);
 +	return 0;
 +}
 +
 +static int test__checkevent_breakpoint_rw(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel = perf_evlist__first(evlist);
 +
 +	TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
 +	TEST_ASSERT_VAL("wrong type",
 +			PERF_TYPE_BREAKPOINT == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config", 0 == evsel->attr.config);
 +	TEST_ASSERT_VAL("wrong bp_type",
 +		(HW_BREAKPOINT_R|HW_BREAKPOINT_W) == evsel->attr.bp_type);
 +	TEST_ASSERT_VAL("wrong bp_len",
 +			HW_BREAKPOINT_LEN_4 == evsel->attr.bp_len);
 +	return 0;
 +}
 +
 +static int test__checkevent_tracepoint_modifier(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel = perf_evlist__first(evlist);
 +
 +	TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
 +	TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
 +
 +	return test__checkevent_tracepoint(evlist);
 +}
 +
 +static int
 +test__checkevent_tracepoint_multi_modifier(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel;
 +
 +	TEST_ASSERT_VAL("wrong number of entries", evlist->nr_entries > 1);
 +
 +	list_for_each_entry(evsel, &evlist->entries, node) {
 +		TEST_ASSERT_VAL("wrong exclude_user",
 +				!evsel->attr.exclude_user);
 +		TEST_ASSERT_VAL("wrong exclude_kernel",
 +				evsel->attr.exclude_kernel);
 +		TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
 +		TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
 +	}
 +
 +	return test__checkevent_tracepoint_multi(evlist);
 +}
 +
 +static int test__checkevent_raw_modifier(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel = perf_evlist__first(evlist);
 +
 +	TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
 +	TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip);
 +
 +	return test__checkevent_raw(evlist);
 +}
 +
 +static int test__checkevent_numeric_modifier(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel = perf_evlist__first(evlist);
 +
 +	TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", !evsel->attr.exclude_hv);
 +	TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip);
 +
 +	return test__checkevent_numeric(evlist);
 +}
 +
 +static int test__checkevent_symbolic_name_modifier(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel = perf_evlist__first(evlist);
 +
 +	TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", !evsel->attr.exclude_hv);
 +	TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
 +
 +	return test__checkevent_symbolic_name(evlist);
 +}
 +
 +static int test__checkevent_exclude_host_modifier(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel = perf_evlist__first(evlist);
 +
 +	TEST_ASSERT_VAL("wrong exclude guest", !evsel->attr.exclude_guest);
 +	TEST_ASSERT_VAL("wrong exclude host", evsel->attr.exclude_host);
 +
 +	return test__checkevent_symbolic_name(evlist);
 +}
 +
 +static int test__checkevent_exclude_guest_modifier(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel = perf_evlist__first(evlist);
 +
 +	TEST_ASSERT_VAL("wrong exclude guest", evsel->attr.exclude_guest);
 +	TEST_ASSERT_VAL("wrong exclude host", !evsel->attr.exclude_host);
 +
 +	return test__checkevent_symbolic_name(evlist);
 +}
 +
 +static int test__checkevent_symbolic_alias_modifier(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel = perf_evlist__first(evlist);
 +
 +	TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
 +	TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
 +
 +	return test__checkevent_symbolic_alias(evlist);
 +}
 +
 +static int test__checkevent_genhw_modifier(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel = perf_evlist__first(evlist);
 +
 +	TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
 +	TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip);
 +
 +	return test__checkevent_genhw(evlist);
 +}
 +
 +static int test__checkevent_breakpoint_modifier(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel = perf_evlist__first(evlist);
 +
 +
 +	TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
 +	TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
 +	TEST_ASSERT_VAL("wrong name",
 +			!strcmp(perf_evsel__name(evsel), "mem:0:u"));
 +
 +	return test__checkevent_breakpoint(evlist);
 +}
 +
 +static int test__checkevent_breakpoint_x_modifier(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel = perf_evlist__first(evlist);
 +
 +	TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
 +	TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
 +	TEST_ASSERT_VAL("wrong name",
 +			!strcmp(perf_evsel__name(evsel), "mem:0:x:k"));
 +
 +	return test__checkevent_breakpoint_x(evlist);
 +}
 +
 +static int test__checkevent_breakpoint_r_modifier(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel = perf_evlist__first(evlist);
 +
 +	TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", !evsel->attr.exclude_hv);
 +	TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip);
 +	TEST_ASSERT_VAL("wrong name",
 +			!strcmp(perf_evsel__name(evsel), "mem:0:r:hp"));
 +
 +	return test__checkevent_breakpoint_r(evlist);
 +}
 +
 +static int test__checkevent_breakpoint_w_modifier(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel = perf_evlist__first(evlist);
 +
 +	TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
 +	TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip);
 +	TEST_ASSERT_VAL("wrong name",
 +			!strcmp(perf_evsel__name(evsel), "mem:0:w:up"));
 +
 +	return test__checkevent_breakpoint_w(evlist);
 +}
 +
 +static int test__checkevent_breakpoint_rw_modifier(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel = perf_evlist__first(evlist);
 +
 +	TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
 +	TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip);
 +	TEST_ASSERT_VAL("wrong name",
 +			!strcmp(perf_evsel__name(evsel), "mem:0:rw:kp"));
 +
 +	return test__checkevent_breakpoint_rw(evlist);
 +}
 +
 +static int test__checkevent_pmu(struct perf_evlist *evlist)
 +{
 +
 +	struct perf_evsel *evsel = perf_evlist__first(evlist);
 +
 +	TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
 +	TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config",    10 == evsel->attr.config);
 +	TEST_ASSERT_VAL("wrong config1",    1 == evsel->attr.config1);
 +	TEST_ASSERT_VAL("wrong config2",    3 == evsel->attr.config2);
 +	TEST_ASSERT_VAL("wrong period",  1000 == evsel->attr.sample_period);
 +
 +	return 0;
 +}
 +
 +static int test__checkevent_list(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel = perf_evlist__first(evlist);
 +
 +	TEST_ASSERT_VAL("wrong number of entries", 3 == evlist->nr_entries);
 +
 +	/* r1 */
 +	TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config", 1 == evsel->attr.config);
 +	TEST_ASSERT_VAL("wrong config1", 0 == evsel->attr.config1);
 +	TEST_ASSERT_VAL("wrong config2", 0 == evsel->attr.config2);
 +	TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", !evsel->attr.exclude_hv);
 +	TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
 +
 +	/* syscalls:sys_enter_open:k */
 +	evsel = perf_evsel__next(evsel);
 +	TEST_ASSERT_VAL("wrong type", PERF_TYPE_TRACEPOINT == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong sample_type",
 +		PERF_TP_SAMPLE_TYPE == evsel->attr.sample_type);
 +	TEST_ASSERT_VAL("wrong sample_period", 1 == evsel->attr.sample_period);
 +	TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
 +	TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
 +
 +	/* 1:1:hp */
 +	evsel = perf_evsel__next(evsel);
 +	TEST_ASSERT_VAL("wrong type", 1 == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config", 1 == evsel->attr.config);
 +	TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", !evsel->attr.exclude_hv);
 +	TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip);
 +
 +	return 0;
 +}
 +
 +static int test__checkevent_pmu_name(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel = perf_evlist__first(evlist);
 +
 +	/* cpu/config=1,name=krava/u */
 +	TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->nr_entries);
 +	TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config",  1 == evsel->attr.config);
 +	TEST_ASSERT_VAL("wrong name", !strcmp(perf_evsel__name(evsel), "krava"));
 +
 +	/* cpu/config=2/u" */
 +	evsel = perf_evsel__next(evsel);
 +	TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->nr_entries);
 +	TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config",  2 == evsel->attr.config);
 +	TEST_ASSERT_VAL("wrong name",
 +			!strcmp(perf_evsel__name(evsel), "cpu/config=2/u"));
 +
 +	return 0;
 +}
 +
 +static int test__checkevent_pmu_events(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel;
 +
 +	evsel = list_entry(evlist->entries.next, struct perf_evsel, node);
 +	TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
 +	TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong exclude_user",
 +			!evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel",
 +			evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
 +	TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
 +
 +	return 0;
 +}
 +
 +static int test__checkterms_simple(struct list_head *terms)
 +{
 +	struct parse_events__term *term;
 +
 +	/* config=10 */
 +	term = list_entry(terms->next, struct parse_events__term, list);
 +	TEST_ASSERT_VAL("wrong type term",
 +			term->type_term == PARSE_EVENTS__TERM_TYPE_CONFIG);
 +	TEST_ASSERT_VAL("wrong type val",
 +			term->type_val == PARSE_EVENTS__TERM_TYPE_NUM);
 +	TEST_ASSERT_VAL("wrong val", term->val.num == 10);
 +	TEST_ASSERT_VAL("wrong config", !term->config);
 +
 +	/* config1 */
 +	term = list_entry(term->list.next, struct parse_events__term, list);
 +	TEST_ASSERT_VAL("wrong type term",
 +			term->type_term == PARSE_EVENTS__TERM_TYPE_CONFIG1);
 +	TEST_ASSERT_VAL("wrong type val",
 +			term->type_val == PARSE_EVENTS__TERM_TYPE_NUM);
 +	TEST_ASSERT_VAL("wrong val", term->val.num == 1);
 +	TEST_ASSERT_VAL("wrong config", !term->config);
 +
 +	/* config2=3 */
 +	term = list_entry(term->list.next, struct parse_events__term, list);
 +	TEST_ASSERT_VAL("wrong type term",
 +			term->type_term == PARSE_EVENTS__TERM_TYPE_CONFIG2);
 +	TEST_ASSERT_VAL("wrong type val",
 +			term->type_val == PARSE_EVENTS__TERM_TYPE_NUM);
 +	TEST_ASSERT_VAL("wrong val", term->val.num == 3);
 +	TEST_ASSERT_VAL("wrong config", !term->config);
 +
 +	/* umask=1*/
 +	term = list_entry(term->list.next, struct parse_events__term, list);
 +	TEST_ASSERT_VAL("wrong type term",
 +			term->type_term == PARSE_EVENTS__TERM_TYPE_USER);
 +	TEST_ASSERT_VAL("wrong type val",
 +			term->type_val == PARSE_EVENTS__TERM_TYPE_NUM);
 +	TEST_ASSERT_VAL("wrong val", term->val.num == 1);
 +	TEST_ASSERT_VAL("wrong config", !strcmp(term->config, "umask"));
 +
 +	return 0;
 +}
 +
 +static int test__group1(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel, *leader;
 +
 +	TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->nr_entries);
 +
 +	/* instructions:k */
 +	evsel = leader = perf_evlist__first(evlist);
 +	TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config",
 +			PERF_COUNT_HW_INSTRUCTIONS == evsel->attr.config);
 +	TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
 +	TEST_ASSERT_VAL("wrong exclude guest", !evsel->attr.exclude_guest);
 +	TEST_ASSERT_VAL("wrong exclude host", !evsel->attr.exclude_host);
 +	TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
 +	TEST_ASSERT_VAL("wrong leader", !perf_evsel__is_group_member(evsel));
 +
 +	/* cycles:upp */
 +	evsel = perf_evsel__next(evsel);
 +	TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config",
 +			PERF_COUNT_HW_CPU_CYCLES == evsel->attr.config);
 +	TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
 +	/* use of precise requires exclude_guest */
 +	TEST_ASSERT_VAL("wrong exclude guest", evsel->attr.exclude_guest);
 +	TEST_ASSERT_VAL("wrong exclude host", !evsel->attr.exclude_host);
 +	TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip == 2);
 +	TEST_ASSERT_VAL("wrong leader", evsel->leader == leader);
 +
 +	return 0;
 +}
 +
 +static int test__group2(struct perf_evlist *evlist)
 +{
 +	struct perf_evsel *evsel, *leader;
 +
 +	TEST_ASSERT_VAL("wrong number of entries", 3 == evlist->nr_entries);
 +
 +	/* faults + :ku modifier */
 +	evsel = leader = perf_evlist__first(evlist);
 +	TEST_ASSERT_VAL("wrong type", PERF_TYPE_SOFTWARE == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config",
 +			PERF_COUNT_SW_PAGE_FAULTS == evsel->attr.config);
 +	TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
 +	TEST_ASSERT_VAL("wrong exclude guest", !evsel->attr.exclude_guest);
 +	TEST_ASSERT_VAL("wrong exclude host", !evsel->attr.exclude_host);
 +	TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
 +	TEST_ASSERT_VAL("wrong leader", !perf_evsel__is_group_member(evsel));
 +
 +	/* cache-references + :u modifier */
 +	evsel = perf_evsel__next(evsel);
 +	TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config",
 +			PERF_COUNT_HW_CACHE_REFERENCES == evsel->attr.config);
 +	TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
 +	TEST_ASSERT_VAL("wrong exclude guest", !evsel->attr.exclude_guest);
 +	TEST_ASSERT_VAL("wrong exclude host", !evsel->attr.exclude_host);
 +	TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
 +	TEST_ASSERT_VAL("wrong leader", evsel->leader == leader);
 +
 +	/* cycles:k */
 +	evsel = perf_evsel__next(evsel);
 +	TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config",
 +			PERF_COUNT_HW_CPU_CYCLES == evsel->attr.config);
 +	TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
 +	TEST_ASSERT_VAL("wrong exclude guest", !evsel->attr.exclude_guest);
 +	TEST_ASSERT_VAL("wrong exclude host", !evsel->attr.exclude_host);
 +	TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
 +	TEST_ASSERT_VAL("wrong leader", !perf_evsel__is_group_member(evsel));
 +
 +	return 0;
 +}
 +
 +static int test__group3(struct perf_evlist *evlist __maybe_unused)
 +{
 +	struct perf_evsel *evsel, *leader;
 +
 +	TEST_ASSERT_VAL("wrong number of entries", 5 == evlist->nr_entries);
 +
 +	/* group1 syscalls:sys_enter_open:H */
 +	evsel = leader = perf_evlist__first(evlist);
 +	TEST_ASSERT_VAL("wrong type", PERF_TYPE_TRACEPOINT == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong sample_type",
 +		PERF_TP_SAMPLE_TYPE == evsel->attr.sample_type);
 +	TEST_ASSERT_VAL("wrong sample_period", 1 == evsel->attr.sample_period);
 +	TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", !evsel->attr.exclude_hv);
 +	TEST_ASSERT_VAL("wrong exclude guest", evsel->attr.exclude_guest);
 +	TEST_ASSERT_VAL("wrong exclude host", !evsel->attr.exclude_host);
 +	TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
 +	TEST_ASSERT_VAL("wrong leader", !perf_evsel__is_group_member(evsel));
 +	TEST_ASSERT_VAL("wrong group name",
 +		!strcmp(leader->group_name, "group1"));
 +
 +	/* group1 cycles:kppp */
 +	evsel = perf_evsel__next(evsel);
 +	TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config",
 +			PERF_COUNT_HW_CPU_CYCLES == evsel->attr.config);
 +	TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
 +	/* use of precise requires exclude_guest */
 +	TEST_ASSERT_VAL("wrong exclude guest", evsel->attr.exclude_guest);
 +	TEST_ASSERT_VAL("wrong exclude host", !evsel->attr.exclude_host);
 +	TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip == 3);
 +	TEST_ASSERT_VAL("wrong leader", evsel->leader == leader);
 +	TEST_ASSERT_VAL("wrong group name", !evsel->group_name);
 +
 +	/* group2 cycles + G modifier */
 +	evsel = leader = perf_evsel__next(evsel);
 +	TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config",
 +			PERF_COUNT_HW_CPU_CYCLES == evsel->attr.config);
 +	TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", !evsel->attr.exclude_hv);
 +	TEST_ASSERT_VAL("wrong exclude guest", !evsel->attr.exclude_guest);
 +	TEST_ASSERT_VAL("wrong exclude host", evsel->attr.exclude_host);
 +	TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
 +	TEST_ASSERT_VAL("wrong leader", !perf_evsel__is_group_member(evsel));
 +	TEST_ASSERT_VAL("wrong group name",
 +		!strcmp(leader->group_name, "group2"));
 +
 +	/* group2 1:3 + G modifier */
 +	evsel = perf_evsel__next(evsel);
 +	TEST_ASSERT_VAL("wrong type", 1 == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config", 3 == evsel->attr.config);
 +	TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", !evsel->attr.exclude_hv);
 +	TEST_ASSERT_VAL("wrong exclude guest", !evsel->attr.exclude_guest);
 +	TEST_ASSERT_VAL("wrong exclude host", evsel->attr.exclude_host);
 +	TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
 +	TEST_ASSERT_VAL("wrong leader", evsel->leader == leader);
 +
 +	/* instructions:u */
 +	evsel = perf_evsel__next(evsel);
 +	TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config",
 +			PERF_COUNT_HW_INSTRUCTIONS == evsel->attr.config);
 +	TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
 +	TEST_ASSERT_VAL("wrong exclude guest", !evsel->attr.exclude_guest);
 +	TEST_ASSERT_VAL("wrong exclude host", !evsel->attr.exclude_host);
 +	TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
 +	TEST_ASSERT_VAL("wrong leader", !perf_evsel__is_group_member(evsel));
 +
 +	return 0;
 +}
 +
 +static int test__group4(struct perf_evlist *evlist __maybe_unused)
 +{
 +	struct perf_evsel *evsel, *leader;
 +
 +	TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->nr_entries);
 +
 +	/* cycles:u + p */
 +	evsel = leader = perf_evlist__first(evlist);
 +	TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config",
 +			PERF_COUNT_HW_CPU_CYCLES == evsel->attr.config);
 +	TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
 +	/* use of precise requires exclude_guest */
 +	TEST_ASSERT_VAL("wrong exclude guest", evsel->attr.exclude_guest);
 +	TEST_ASSERT_VAL("wrong exclude host", !evsel->attr.exclude_host);
 +	TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip == 1);
 +	TEST_ASSERT_VAL("wrong group name", !evsel->group_name);
 +	TEST_ASSERT_VAL("wrong leader", !perf_evsel__is_group_member(evsel));
 +
 +	/* instructions:kp + p */
 +	evsel = perf_evsel__next(evsel);
 +	TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config",
 +			PERF_COUNT_HW_INSTRUCTIONS == evsel->attr.config);
 +	TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);
 +	/* use of precise requires exclude_guest */
 +	TEST_ASSERT_VAL("wrong exclude guest", evsel->attr.exclude_guest);
 +	TEST_ASSERT_VAL("wrong exclude host", !evsel->attr.exclude_host);
 +	TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip == 2);
 +	TEST_ASSERT_VAL("wrong leader", evsel->leader == leader);
 +
 +	return 0;
 +}
 +
 +static int test__group5(struct perf_evlist *evlist __maybe_unused)
 +{
 +	struct perf_evsel *evsel, *leader;
 +
 +	TEST_ASSERT_VAL("wrong number of entries", 5 == evlist->nr_entries);
 +
 +	/* cycles + G */
 +	evsel = leader = perf_evlist__first(evlist);
 +	TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config",
 +			PERF_COUNT_HW_CPU_CYCLES == evsel->attr.config);
 +	TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", !evsel->attr.exclude_hv);
 +	TEST_ASSERT_VAL("wrong exclude guest", !evsel->attr.exclude_guest);
 +	TEST_ASSERT_VAL("wrong exclude host", evsel->attr.exclude_host);
 +	TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
 +	TEST_ASSERT_VAL("wrong group name", !evsel->group_name);
 +	TEST_ASSERT_VAL("wrong leader", !perf_evsel__is_group_member(evsel));
 +
 +	/* instructions + G */
 +	evsel = perf_evsel__next(evsel);
 +	TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config",
 +			PERF_COUNT_HW_INSTRUCTIONS == evsel->attr.config);
 +	TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", !evsel->attr.exclude_hv);
 +	TEST_ASSERT_VAL("wrong exclude guest", !evsel->attr.exclude_guest);
 +	TEST_ASSERT_VAL("wrong exclude host", evsel->attr.exclude_host);
 +	TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
 +	TEST_ASSERT_VAL("wrong leader", evsel->leader == leader);
 +
 +	/* cycles:G */
 +	evsel = leader = perf_evsel__next(evsel);
 +	TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config",
 +			PERF_COUNT_HW_CPU_CYCLES == evsel->attr.config);
 +	TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", !evsel->attr.exclude_hv);
 +	TEST_ASSERT_VAL("wrong exclude guest", !evsel->attr.exclude_guest);
 +	TEST_ASSERT_VAL("wrong exclude host", evsel->attr.exclude_host);
 +	TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
 +	TEST_ASSERT_VAL("wrong group name", !evsel->group_name);
 +	TEST_ASSERT_VAL("wrong leader", !perf_evsel__is_group_member(evsel));
 +
 +	/* instructions:G */
 +	evsel = perf_evsel__next(evsel);
 +	TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config",
 +			PERF_COUNT_HW_INSTRUCTIONS == evsel->attr.config);
 +	TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", !evsel->attr.exclude_hv);
 +	TEST_ASSERT_VAL("wrong exclude guest", !evsel->attr.exclude_guest);
 +	TEST_ASSERT_VAL("wrong exclude host", evsel->attr.exclude_host);
 +	TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
 +	TEST_ASSERT_VAL("wrong leader", evsel->leader == leader);
 +
 +	/* cycles */
 +	evsel = perf_evsel__next(evsel);
 +	TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE == evsel->attr.type);
 +	TEST_ASSERT_VAL("wrong config",
 +			PERF_COUNT_HW_CPU_CYCLES == evsel->attr.config);
 +	TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user);
 +	TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);
 +	TEST_ASSERT_VAL("wrong exclude_hv", !evsel->attr.exclude_hv);
 +	TEST_ASSERT_VAL("wrong exclude guest", evsel->attr.exclude_guest);
 +	TEST_ASSERT_VAL("wrong exclude host", !evsel->attr.exclude_host);
 +	TEST_ASSERT_VAL("wrong precise_ip", !evsel->attr.precise_ip);
 +	TEST_ASSERT_VAL("wrong leader", !perf_evsel__is_group_member(evsel));
 +
 +	return 0;
 +}
 +
 +struct test__event_st {
 +	const char *name;
 +	__u32 type;
 +	int (*check)(struct perf_evlist *evlist);
 +};
 +
 +static struct test__event_st test__events[] = {
 +	[0] = {
 +		.name  = "syscalls:sys_enter_open",
 +		.check = test__checkevent_tracepoint,
 +	},
 +	[1] = {
 +		.name  = "syscalls:*",
 +		.check = test__checkevent_tracepoint_multi,
 +	},
 +	[2] = {
 +		.name  = "r1a",
 +		.check = test__checkevent_raw,
 +	},
 +	[3] = {
 +		.name  = "1:1",
 +		.check = test__checkevent_numeric,
 +	},
 +	[4] = {
 +		.name  = "instructions",
 +		.check = test__checkevent_symbolic_name,
 +	},
 +	[5] = {
 +		.name  = "cycles/period=100000,config2/",
 +		.check = test__checkevent_symbolic_name_config,
 +	},
 +	[6] = {
 +		.name  = "faults",
 +		.check = test__checkevent_symbolic_alias,
 +	},
 +	[7] = {
 +		.name  = "L1-dcache-load-miss",
 +		.check = test__checkevent_genhw,
 +	},
 +	[8] = {
 +		.name  = "mem:0",
 +		.check = test__checkevent_breakpoint,
 +	},
 +	[9] = {
 +		.name  = "mem:0:x",
 +		.check = test__checkevent_breakpoint_x,
 +	},
 +	[10] = {
 +		.name  = "mem:0:r",
 +		.check = test__checkevent_breakpoint_r,
 +	},
 +	[11] = {
 +		.name  = "mem:0:w",
 +		.check = test__checkevent_breakpoint_w,
 +	},
 +	[12] = {
 +		.name  = "syscalls:sys_enter_open:k",
 +		.check = test__checkevent_tracepoint_modifier,
 +	},
 +	[13] = {
 +		.name  = "syscalls:*:u",
 +		.check = test__checkevent_tracepoint_multi_modifier,
 +	},
 +	[14] = {
 +		.name  = "r1a:kp",
 +		.check = test__checkevent_raw_modifier,
 +	},
 +	[15] = {
 +		.name  = "1:1:hp",
 +		.check = test__checkevent_numeric_modifier,
 +	},
 +	[16] = {
 +		.name  = "instructions:h",
 +		.check = test__checkevent_symbolic_name_modifier,
 +	},
 +	[17] = {
 +		.name  = "faults:u",
 +		.check = test__checkevent_symbolic_alias_modifier,
 +	},
 +	[18] = {
 +		.name  = "L1-dcache-load-miss:kp",
 +		.check = test__checkevent_genhw_modifier,
 +	},
 +	[19] = {
 +		.name  = "mem:0:u",
 +		.check = test__checkevent_breakpoint_modifier,
 +	},
 +	[20] = {
 +		.name  = "mem:0:x:k",
 +		.check = test__checkevent_breakpoint_x_modifier,
 +	},
 +	[21] = {
 +		.name  = "mem:0:r:hp",
 +		.check = test__checkevent_breakpoint_r_modifier,
 +	},
 +	[22] = {
 +		.name  = "mem:0:w:up",
 +		.check = test__checkevent_breakpoint_w_modifier,
 +	},
 +	[23] = {
 +		.name  = "r1,syscalls:sys_enter_open:k,1:1:hp",
 +		.check = test__checkevent_list,
 +	},
 +	[24] = {
 +		.name  = "instructions:G",
 +		.check = test__checkevent_exclude_host_modifier,
 +	},
 +	[25] = {
 +		.name  = "instructions:H",
 +		.check = test__checkevent_exclude_guest_modifier,
 +	},
 +	[26] = {
 +		.name  = "mem:0:rw",
 +		.check = test__checkevent_breakpoint_rw,
 +	},
 +	[27] = {
 +		.name  = "mem:0:rw:kp",
 +		.check = test__checkevent_breakpoint_rw_modifier,
 +	},
 +	[28] = {
 +		.name  = "{instructions:k,cycles:upp}",
 +		.check = test__group1,
 +	},
 +	[29] = {
 +		.name  = "{faults:k,cache-references}:u,cycles:k",
 +		.check = test__group2,
 +	},
 +	[30] = {
 +		.name  = "group1{syscalls:sys_enter_open:H,cycles:kppp},group2{cycles,1:3}:G,instructions:u",
 +		.check = test__group3,
 +	},
 +	[31] = {
 +		.name  = "{cycles:u,instructions:kp}:p",
 +		.check = test__group4,
 +	},
 +	[32] = {
 +		.name  = "{cycles,instructions}:G,{cycles:G,instructions:G},cycles",
 +		.check = test__group5,
 +	},
 +};
 +
 +static struct test__event_st test__events_pmu[] = {
 +	[0] = {
 +		.name  = "cpu/config=10,config1,config2=3,period=1000/u",
 +		.check = test__checkevent_pmu,
 +	},
 +	[1] = {
 +		.name  = "cpu/config=1,name=krava/u,cpu/config=2/u",
 +		.check = test__checkevent_pmu_name,
 +	},
 +};
 +
 +struct test__term {
 +	const char *str;
 +	__u32 type;
 +	int (*check)(struct list_head *terms);
 +};
 +
 +static struct test__term test__terms[] = {
 +	[0] = {
 +		.str   = "config=10,config1,config2=3,umask=1",
 +		.check = test__checkterms_simple,
 +	},
 +};
 +
 +static int test_event(struct test__event_st *e)
 +{
 +	struct perf_evlist *evlist;
 +	int ret;
 +
 +	evlist = perf_evlist__new(NULL, NULL);
 +	if (evlist == NULL)
 +		return -ENOMEM;
 +
 +	ret = parse_events(evlist, e->name, 0);
 +	if (ret) {
 +		pr_debug("failed to parse event '%s', err %d\n",
 +			 e->name, ret);
 +		return ret;
 +	}
 +
 +	ret = e->check(evlist);
 +	perf_evlist__delete(evlist);
 +
 +	return ret;
 +}
 +
 +static int test_events(struct test__event_st *events, unsigned cnt)
 +{
 +	int ret1, ret2 = 0;
 +	unsigned i;
 +
 +	for (i = 0; i < cnt; i++) {
 +		struct test__event_st *e = &events[i];
 +
 +		pr_debug("running test %d '%s'\n", i, e->name);
 +		ret1 = test_event(e);
 +		if (ret1)
 +			ret2 = ret1;
 +	}
 +
 +	return ret2;
 +}
 +
 +static int test_term(struct test__term *t)
 +{
 +	struct list_head *terms;
 +	int ret;
 +
 +	terms = malloc(sizeof(*terms));
 +	if (!terms)
 +		return -ENOMEM;
 +
 +	INIT_LIST_HEAD(terms);
 +
 +	ret = parse_events_terms(terms, t->str);
 +	if (ret) {
 +		pr_debug("failed to parse terms '%s', err %d\n",
 +			 t->str , ret);
 +		return ret;
 +	}
 +
 +	ret = t->check(terms);
 +	parse_events__free_terms(terms);
 +
 +	return ret;
 +}
 +
 +static int test_terms(struct test__term *terms, unsigned cnt)
 +{
 +	int ret = 0;
 +	unsigned i;
 +
 +	for (i = 0; i < cnt; i++) {
 +		struct test__term *t = &terms[i];
 +
 +		pr_debug("running test %d '%s'\n", i, t->str);
 +		ret = test_term(t);
 +		if (ret)
 +			break;
 +	}
 +
 +	return ret;
 +}
 +
 +static int test_pmu(void)
 +{
 +	struct stat st;
 +	char path[PATH_MAX];
 +	int ret;
 +
 +	snprintf(path, PATH_MAX, "%s/bus/event_source/devices/cpu/format/",
 +		 sysfs_find_mountpoint());
 +
 +	ret = stat(path, &st);
 +	if (ret)
 +		pr_debug("omitting PMU cpu tests\n");
 +	return !ret;
 +}
 +
 +static int test_pmu_events(void)
 +{
 +	struct stat st;
 +	char path[PATH_MAX];
 +	struct dirent *ent;
 +	DIR *dir;
 +	int ret;
 +
 +	snprintf(path, PATH_MAX, "%s/bus/event_source/devices/cpu/events/",
 +		 sysfs_find_mountpoint());
 +
 +	ret = stat(path, &st);
 +	if (ret) {
 +		pr_debug("ommiting PMU cpu events tests\n");
 +		return 0;
 +	}
 +
 +	dir = opendir(path);
 +	if (!dir) {
 +		pr_debug("can't open pmu event dir");
 +		return -1;
 +	}
 +
 +	while (!ret && (ent = readdir(dir))) {
 +#define MAX_NAME 100
 +		struct test__event_st e;
 +		char name[MAX_NAME];
 +
 +		if (!strcmp(ent->d_name, ".") ||
 +		    !strcmp(ent->d_name, ".."))
 +			continue;
 +
 +		snprintf(name, MAX_NAME, "cpu/event=%s/u", ent->d_name);
 +
 +		e.name  = name;
 +		e.check = test__checkevent_pmu_events;
 +
 +		ret = test_event(&e);
 +#undef MAX_NAME
 +	}
 +
 +	closedir(dir);
 +	return ret;
 +}
 +
 +int test__parse_events(void)
 +{
 +	int ret1, ret2 = 0;
 +
 +#define TEST_EVENTS(tests)				\
 +do {							\
 +	ret1 = test_events(tests, ARRAY_SIZE(tests));	\
 +	if (!ret2)					\
 +		ret2 = ret1;				\
 +} while (0)
 +
 +	TEST_EVENTS(test__events);
 +
 +	if (test_pmu())
 +		TEST_EVENTS(test__events_pmu);
 +
 +	if (test_pmu()) {
 +		int ret = test_pmu_events();
 +		if (ret)
 +			return ret;
 +	}
 +
 +	ret1 = test_terms(test__terms, ARRAY_SIZE(test__terms));
 +	if (!ret2)
 +		ret2 = ret1;
 +
 +	return ret2;
 +}