mirror of
				git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
				synced 2025-09-04 20:19:47 +08:00 
			
		
		
		
	 9d2dc632e0
			
		
	
	
		9d2dc632e0
		
	
	
	
	
		
			
			Maintaining the number of groups during event parsing is problematic and since changing to sort/regroup events can only be computed by a linear pass over the evlist. As the value is generally only used in tests, rather than hold it in a variable compute it by passing over the evlist when necessary. This change highlights that libpfm's counting of groups with a single entry disagreed with regular event parsing. The libpfm tests are updated accordingly. Signed-off-by: Ian Rogers <irogers@google.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Florian Fischer <florian.fischer@muhq.space> Cc: Ingo Molnar <mingo@redhat.com> Cc: James Clark <james.clark@arm.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: John Garry <john.g.garry@oracle.com> Cc: Kajol Jain <kjain@linux.ibm.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Kim Phillips <kim.phillips@amd.com> Cc: Leo Yan <leo.yan@linaro.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ravi Bangoria <ravi.bangoria@amd.com> Cc: Sean Christopherson <seanjc@google.com> Cc: Steinar H. Gunderson <sesse@google.com> Cc: Stephane Eranian <eranian@google.com> Cc: Suzuki Poulouse <suzuki.poulose@arm.com> Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com> Link: https://lore.kernel.org/r/20230312021543.3060328-2-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
		
			
				
	
	
		
			195 lines
		
	
	
		
			3.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			195 lines
		
	
	
		
			3.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| // SPDX-License-Identifier: GPL-2.0
 | |
| /*
 | |
|  * Test support for libpfm4 event encodings.
 | |
|  *
 | |
|  * Copyright 2020 Google LLC.
 | |
|  */
 | |
| #include "tests.h"
 | |
| #include "util/debug.h"
 | |
| #include "util/evlist.h"
 | |
| #include "util/pfm.h"
 | |
| 
 | |
| #include <linux/kernel.h>
 | |
| 
 | |
| #ifdef HAVE_LIBPFM
 | |
| static int count_pfm_events(struct perf_evlist *evlist)
 | |
| {
 | |
| 	struct perf_evsel *evsel;
 | |
| 	int count = 0;
 | |
| 
 | |
| 	perf_evlist__for_each_entry(evlist, evsel) {
 | |
| 		count++;
 | |
| 	}
 | |
| 	return count;
 | |
| }
 | |
| 
 | |
| static int test__pfm_events(struct test_suite *test __maybe_unused,
 | |
| 			    int subtest __maybe_unused)
 | |
| {
 | |
| 	struct evlist *evlist;
 | |
| 	struct option opt;
 | |
| 	size_t i;
 | |
| 	const struct {
 | |
| 		const char *events;
 | |
| 		int nr_events;
 | |
| 	} table[] = {
 | |
| 		{
 | |
| 			.events = "",
 | |
| 			.nr_events = 0,
 | |
| 		},
 | |
| 		{
 | |
| 			.events = "instructions",
 | |
| 			.nr_events = 1,
 | |
| 		},
 | |
| 		{
 | |
| 			.events = "instructions,cycles",
 | |
| 			.nr_events = 2,
 | |
| 		},
 | |
| 		{
 | |
| 			.events = "stereolab",
 | |
| 			.nr_events = 0,
 | |
| 		},
 | |
| 		{
 | |
| 			.events = "instructions,instructions",
 | |
| 			.nr_events = 2,
 | |
| 		},
 | |
| 		{
 | |
| 			.events = "stereolab,instructions",
 | |
| 			.nr_events = 0,
 | |
| 		},
 | |
| 		{
 | |
| 			.events = "instructions,stereolab",
 | |
| 			.nr_events = 1,
 | |
| 		},
 | |
| 	};
 | |
| 
 | |
| 	for (i = 0; i < ARRAY_SIZE(table); i++) {
 | |
| 		evlist = evlist__new();
 | |
| 		if (evlist == NULL)
 | |
| 			return -ENOMEM;
 | |
| 
 | |
| 		opt.value = evlist;
 | |
| 		parse_libpfm_events_option(&opt,
 | |
| 					table[i].events,
 | |
| 					0);
 | |
| 		TEST_ASSERT_EQUAL(table[i].events,
 | |
| 				count_pfm_events(&evlist->core),
 | |
| 				table[i].nr_events);
 | |
| 		TEST_ASSERT_EQUAL(table[i].events,
 | |
| 				evlist__nr_groups(evlist),
 | |
| 				0);
 | |
| 
 | |
| 		evlist__delete(evlist);
 | |
| 	}
 | |
| 	return 0;
 | |
| }
 | |
| 
 | |
| static int test__pfm_group(struct test_suite *test __maybe_unused,
 | |
| 			   int subtest __maybe_unused)
 | |
| {
 | |
| 	struct evlist *evlist;
 | |
| 	struct option opt;
 | |
| 	size_t i;
 | |
| 	const struct {
 | |
| 		const char *events;
 | |
| 		int nr_events;
 | |
| 		int nr_groups;
 | |
| 	} table[] = {
 | |
| 		{
 | |
| 			.events = "{},",
 | |
| 			.nr_events = 0,
 | |
| 			.nr_groups = 0,
 | |
| 		},
 | |
| 		{
 | |
| 			.events = "{instructions}",
 | |
| 			.nr_events = 1,
 | |
| 			.nr_groups = 0,
 | |
| 		},
 | |
| 		{
 | |
| 			.events = "{instructions},{}",
 | |
| 			.nr_events = 1,
 | |
| 			.nr_groups = 0,
 | |
| 		},
 | |
| 		{
 | |
| 			.events = "{},{instructions}",
 | |
| 			.nr_events = 1,
 | |
| 			.nr_groups = 0,
 | |
| 		},
 | |
| 		{
 | |
| 			.events = "{instructions},{instructions}",
 | |
| 			.nr_events = 2,
 | |
| 			.nr_groups = 0,
 | |
| 		},
 | |
| 		{
 | |
| 			.events = "{instructions,cycles},{instructions,cycles}",
 | |
| 			.nr_events = 4,
 | |
| 			.nr_groups = 2,
 | |
| 		},
 | |
| 		{
 | |
| 			.events = "{stereolab}",
 | |
| 			.nr_events = 0,
 | |
| 			.nr_groups = 0,
 | |
| 		},
 | |
| 		{
 | |
| 			.events =
 | |
| 			"{instructions,cycles},{instructions,stereolab}",
 | |
| 			.nr_events = 3,
 | |
| 			.nr_groups = 1,
 | |
| 		},
 | |
| 		{
 | |
| 			.events = "instructions}",
 | |
| 			.nr_events = 1,
 | |
| 			.nr_groups = 0,
 | |
| 		},
 | |
| 		{
 | |
| 			.events = "{{instructions}}",
 | |
| 			.nr_events = 0,
 | |
| 			.nr_groups = 0,
 | |
| 		},
 | |
| 	};
 | |
| 
 | |
| 	for (i = 0; i < ARRAY_SIZE(table); i++) {
 | |
| 		evlist = evlist__new();
 | |
| 		if (evlist == NULL)
 | |
| 			return -ENOMEM;
 | |
| 
 | |
| 		opt.value = evlist;
 | |
| 		parse_libpfm_events_option(&opt,
 | |
| 					table[i].events,
 | |
| 					0);
 | |
| 		TEST_ASSERT_EQUAL(table[i].events,
 | |
| 				count_pfm_events(&evlist->core),
 | |
| 				table[i].nr_events);
 | |
| 		TEST_ASSERT_EQUAL(table[i].events,
 | |
| 				evlist__nr_groups(evlist),
 | |
| 				table[i].nr_groups);
 | |
| 
 | |
| 		evlist__delete(evlist);
 | |
| 	}
 | |
| 	return 0;
 | |
| }
 | |
| #else
 | |
| static int test__pfm_events(struct test_suite *test __maybe_unused,
 | |
| 			    int subtest __maybe_unused)
 | |
| {
 | |
| 	return TEST_SKIP;
 | |
| }
 | |
| 
 | |
| static int test__pfm_group(struct test_suite *test __maybe_unused,
 | |
| 			   int subtest __maybe_unused)
 | |
| {
 | |
| 	return TEST_SKIP;
 | |
| }
 | |
| #endif
 | |
| 
 | |
| static struct test_case pfm_tests[] = {
 | |
| 	TEST_CASE_REASON("test of individual --pfm-events", pfm_events, "not compiled in"),
 | |
| 	TEST_CASE_REASON("test groups of --pfm-events", pfm_group, "not compiled in"),
 | |
| 	{ .name = NULL, }
 | |
| };
 | |
| 
 | |
| struct test_suite suite__pfm = {
 | |
| 	.desc = "Test libpfm4 support",
 | |
| 	.test_cases = pfm_tests,
 | |
| };
 |