Commit 0f0abbac authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf hists: Split hists_stats from events_stats 



Each struct hists have events_stats but most of the fields were not
used.  It's to count number of samples and periods whether filtered or
not.  And other fields are used only by evlist.

So it'd be better to split hists_stats and events_stats to reduce
wasted memory in the struct hists.  This makes the output of event
statistics in the perf report compact by skipping 0 events in each
evsel/hists.

Reviewed-by: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20210427013717.1651674-3-namhyung@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent bf8f8587

tools/perf/builtin-annotate.c

+1 −1
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ static int __cmd_annotate(struct perf_annotate *ann) 
	total_nr_samples = 0;

	evlist__for_each_entry(session->evlist, pos) {

		struct hists *hists = evsel__hists(pos);

		u32 nr_samples = hists->stats.nr_events[PERF_RECORD_SAMPLE];

		u32 nr_samples = hists->stats.nr_samples;



		if (nr_samples > 0) {

			total_nr_samples += nr_samples;

tools/perf/builtin-report.c

+2 −2
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ static size_t hists__fprintf_nr_sample_events(struct hists *hists, struct report 
{

	size_t ret;

	char unit;

	unsigned long nr_samples = hists->stats.nr_events[PERF_RECORD_SAMPLE];

	unsigned long nr_samples = hists->stats.nr_samples;

	u64 nr_events = hists->stats.total_period;

	struct evsel *evsel = hists_to_evsel(hists);

	char buf[512];
@@ -464,7 +464,7 @@ static size_t hists__fprintf_nr_sample_events(struct hists *hists, struct report 
				nr_samples += pos_hists->stats.nr_non_filtered_samples;

				nr_events += pos_hists->stats.total_non_filtered_period;

			} else {

				nr_samples += pos_hists->stats.nr_events[PERF_RECORD_SAMPLE];

				nr_samples += pos_hists->stats.nr_samples;

				nr_events += pos_hists->stats.total_period;

			}

		}

tools/perf/tests/hists_filter.c

+7 −7
Original line number Diff line number Diff line
@@ -150,13 +150,13 @@ int test__hists_filter(struct test *test __maybe_unused, int subtest __maybe_unu 
		}



		TEST_ASSERT_VAL("Invalid nr samples",

				hists->stats.nr_events[PERF_RECORD_SAMPLE] == 10);

				hists->stats.nr_samples == 10);

		TEST_ASSERT_VAL("Invalid nr hist entries",

				hists->nr_entries == 9);

		TEST_ASSERT_VAL("Invalid total period",

				hists->stats.total_period == 1000);

		TEST_ASSERT_VAL("Unmatched nr samples",

				hists->stats.nr_events[PERF_RECORD_SAMPLE] ==

				hists->stats.nr_samples ==

				hists->stats.nr_non_filtered_samples);

		TEST_ASSERT_VAL("Unmatched nr hist entries",

				hists->nr_entries == hists->nr_non_filtered_entries);
@@ -175,7 +175,7 @@ int test__hists_filter(struct test *test __maybe_unused, int subtest __maybe_unu 


		/* normal stats should be invariant */

		TEST_ASSERT_VAL("Invalid nr samples",

				hists->stats.nr_events[PERF_RECORD_SAMPLE] == 10);

				hists->stats.nr_samples == 10);

		TEST_ASSERT_VAL("Invalid nr hist entries",

				hists->nr_entries == 9);

		TEST_ASSERT_VAL("Invalid total period",
@@ -204,7 +204,7 @@ int test__hists_filter(struct test *test __maybe_unused, int subtest __maybe_unu 


		/* normal stats should be invariant */

		TEST_ASSERT_VAL("Invalid nr samples",

				hists->stats.nr_events[PERF_RECORD_SAMPLE] == 10);

				hists->stats.nr_samples == 10);

		TEST_ASSERT_VAL("Invalid nr hist entries",

				hists->nr_entries == 9);

		TEST_ASSERT_VAL("Invalid total period",
@@ -239,7 +239,7 @@ int test__hists_filter(struct test *test __maybe_unused, int subtest __maybe_unu 


		/* normal stats should be invariant */

		TEST_ASSERT_VAL("Invalid nr samples",

				hists->stats.nr_events[PERF_RECORD_SAMPLE] == 10);

				hists->stats.nr_samples == 10);

		TEST_ASSERT_VAL("Invalid nr hist entries",

				hists->nr_entries == 9);

		TEST_ASSERT_VAL("Invalid total period",
@@ -268,7 +268,7 @@ int test__hists_filter(struct test *test __maybe_unused, int subtest __maybe_unu 


		/* normal stats should be invariant */

		TEST_ASSERT_VAL("Invalid nr samples",

				hists->stats.nr_events[PERF_RECORD_SAMPLE] == 10);

				hists->stats.nr_samples == 10);

		TEST_ASSERT_VAL("Invalid nr hist entries",

				hists->nr_entries == 9);

		TEST_ASSERT_VAL("Invalid total period",
@@ -299,7 +299,7 @@ int test__hists_filter(struct test *test __maybe_unused, int subtest __maybe_unu 


		/* normal stats should be invariant */

		TEST_ASSERT_VAL("Invalid nr samples",

				hists->stats.nr_events[PERF_RECORD_SAMPLE] == 10);

				hists->stats.nr_samples == 10);

		TEST_ASSERT_VAL("Invalid nr hist entries",

				hists->nr_entries == 9);

		TEST_ASSERT_VAL("Invalid total period",

tools/perf/ui/browsers/hists.c

+9 −8
Original line number Diff line number Diff line
@@ -682,6 +682,7 @@ static int hist_browser__handle_hotkey(struct hist_browser *browser, bool warn_l 
	switch (key) {

	case K_TIMER: {

		struct hist_browser_timer *hbt = browser->hbt;

		struct evsel *evsel = hists_to_evsel(browser->hists);

		u64 nr_entries;



		WARN_ON_ONCE(!hbt);
@@ -696,10 +697,10 @@ static int hist_browser__handle_hotkey(struct hist_browser *browser, bool warn_l 
		ui_browser__update_nr_entries(&browser->b, nr_entries);



		if (warn_lost_event &&

		    (browser->hists->stats.nr_lost_warned !=

		    browser->hists->stats.nr_events[PERF_RECORD_LOST])) {

			browser->hists->stats.nr_lost_warned =

				browser->hists->stats.nr_events[PERF_RECORD_LOST];

		    (evsel->evlist->stats.nr_lost_warned !=

		     evsel->evlist->stats.nr_events[PERF_RECORD_LOST])) {

			evsel->evlist->stats.nr_lost_warned =

				evsel->evlist->stats.nr_events[PERF_RECORD_LOST];

			ui_browser__warn_lost_events(&browser->b);

		}
@@ -3416,7 +3417,7 @@ static void perf_evsel_menu__write(struct ui_browser *browser, 
	struct evsel *evsel = list_entry(entry, struct evsel, core.node);

	struct hists *hists = evsel__hists(evsel);

	bool current_entry = ui_browser__is_current_entry(browser, row);

	unsigned long nr_events = hists->stats.nr_events[PERF_RECORD_SAMPLE];

	unsigned long nr_events = hists->stats.nr_samples;

	const char *ev_name = evsel__name(evsel);

	char bf[256], unit;

	const char *warn = " ";
@@ -3432,7 +3433,7 @@ static void perf_evsel_menu__write(struct ui_browser *browser, 


		for_each_group_member(pos, evsel) {

			struct hists *pos_hists = evsel__hists(pos);

			nr_events += pos_hists->stats.nr_events[PERF_RECORD_SAMPLE];

			nr_events += pos_hists->stats.nr_samples;

		}

	}
@@ -3441,7 +3442,7 @@ static void perf_evsel_menu__write(struct ui_browser *browser, 
			   unit, unit == ' ' ? "" : " ", ev_name);

	ui_browser__printf(browser, "%s", bf);



	nr_events = hists->stats.nr_events[PERF_RECORD_LOST];

	nr_events = evsel->evlist->stats.nr_events[PERF_RECORD_LOST];

	if (nr_events != 0) {

		menu->lost_events = true;

		if (!current_entry)
@@ -3647,7 +3648,7 @@ static int block_hists_browser__title(struct hist_browser *browser, char *bf, 
{

	struct hists *hists = evsel__hists(browser->block_evsel);

	const char *evname = evsel__name(browser->block_evsel);

	unsigned long nr_samples = hists->stats.nr_events[PERF_RECORD_SAMPLE];

	unsigned long nr_samples = hists->stats.nr_samples;

	int ret;



	ret = scnprintf(bf, size, "# Samples: %lu", nr_samples);

tools/perf/util/events_stats.h

+7 −3
Original line number Diff line number Diff line
@@ -26,15 +26,12 @@ 
 * perf_record_sample.period and stash the result in total_period.

 */

struct events_stats {

	u64 total_period;

	u64 total_non_filtered_period;

	u64 total_lost;

	u64 total_lost_samples;

	u64 total_aux_lost;

	u64 total_aux_partial;

	u64 total_invalid_chains;

	u32 nr_events[PERF_RECORD_HEADER_MAX];

	u32 nr_non_filtered_samples;

	u32 nr_lost_warned;

	u32 nr_unknown_events;

	u32 nr_invalid_chains;
@@ -44,6 +41,13 @@ struct events_stats { 
	u32 nr_proc_map_timeout;

};



struct hists_stats {

	u64 total_period;

	u64 total_non_filtered_period;

	u32 nr_samples;

	u32 nr_non_filtered_samples;

};



void events_stats__inc(struct events_stats *stats, u32 type);



size_t events_stats__fprintf(struct events_stats *stats, FILE *fp);