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

perf hist: Remove formats in hierarchy when cancel children 



This is to support hierarchy options with custom output fields.
Currently perf_hpp__cancel_cumulate() only removes accumulated
overhead and latency fields from the global perf_hpp_list.

This is not used in the hierarchy mode because each evsel's hist
has its own separate hpp_list.  So it needs to remove the fields
from the lists too.  Pass evlist to the function so that it can
iterate the evsels.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20250331073722.4695-2-namhyung@kernel.org


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

tools/perf/builtin-report.c

+1 −1
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ static int report__setup_sample_type(struct report *rep) 
		/* Silently ignore if callchain is missing */

		if (!(sample_type & PERF_SAMPLE_CALLCHAIN)) {

			symbol_conf.cumulate_callchain = false;

			perf_hpp__cancel_cumulate();

			perf_hpp__cancel_cumulate(session->evlist);

		}

	}

tools/perf/builtin-top.c

+1 −1
Original line number Diff line number Diff line
@@ -1790,7 +1790,7 @@ int cmd_top(int argc, const char **argv) 


	if (!callchain_param.enabled) {

		symbol_conf.cumulate_callchain = false;

		perf_hpp__cancel_cumulate();

		perf_hpp__cancel_cumulate(top.evlist);

	}



	if (symbol_conf.cumulate_callchain && !callchain_param.order_set)

tools/perf/ui/hist.c

+19 −1
Original line number Diff line number Diff line
@@ -699,9 +699,10 @@ static void perf_hpp__column_unregister(struct perf_hpp_fmt *format) 
	fmt_free(format);

}



void perf_hpp__cancel_cumulate(void)

void perf_hpp__cancel_cumulate(struct evlist *evlist)

{

	struct perf_hpp_fmt *fmt, *acc, *ovh, *acc_lat, *tmp;

	struct evsel *evsel;



	if (is_strict_order(field_order))

		return;
@@ -719,6 +720,23 @@ void perf_hpp__cancel_cumulate(void) 
		if (fmt_equal(ovh, fmt))

			fmt->name = "Overhead";

	}



	evlist__for_each_entry(evlist, evsel) {

		struct hists *hists = evsel__hists(evsel);

		struct perf_hpp_list_node *node;



		list_for_each_entry(node, &hists->hpp_formats, list) {

			perf_hpp_list__for_each_format_safe(&node->hpp, fmt, tmp) {

				if (fmt_equal(acc, fmt) || fmt_equal(acc_lat, fmt)) {

					perf_hpp__column_unregister(fmt);

					continue;

				}



				if (fmt_equal(ovh, fmt))

					fmt->name = "Overhead";

			}

		}

	}

}



void perf_hpp__cancel_latency(void)

tools/perf/util/hist.h

+1 −1
Original line number Diff line number Diff line
@@ -581,7 +581,7 @@ enum { 
};



void perf_hpp__init(void);

void perf_hpp__cancel_cumulate(void);

void perf_hpp__cancel_cumulate(struct evlist *evlist);

void perf_hpp__cancel_latency(void);

void perf_hpp__setup_output_field(struct perf_hpp_list *list);

void perf_hpp__reset_output_field(struct perf_hpp_list *list);