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

perf sort: Fix the 'ins_lat' sort key behavior 



Handle 'ins_lat' (for instruction latency) and 'local_ins_lat' sort keys
with the same rationale as for the 'weight' and 'local_weight', see the
previous fix in this series for a full explanation.

But I couldn't test it actually, so only build tested.

Reviewed-by: default avatarAthira Jajeev <atrajeev@linux.vnet.ibm.com>
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Tested-by: default avatarAthira Jajeev <atrajeev@linux.vnet.ibm.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Athira Jajeev <atrajeev@linux.vnet.ibm.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: https://lore.kernel.org/r/20211105225617.151364-2-namhyung@kernel.org


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

tools/perf/util/hist.c

+4 −7
Original line number Diff line number Diff line
@@ -290,11 +290,10 @@ static long hist_time(unsigned long htime) 
}



static void he_stat__add_period(struct he_stat *he_stat, u64 period,

				u64 ins_lat, u64 p_stage_cyc)

				u64 p_stage_cyc)

{

	he_stat->period		+= period;

	he_stat->nr_events	+= 1;

	he_stat->ins_lat	+= ins_lat;

	he_stat->p_stage_cyc	+= p_stage_cyc;

}
@@ -306,7 +305,6 @@ static void he_stat__add_stat(struct he_stat *dest, struct he_stat *src) 
	dest->period_guest_sys	+= src->period_guest_sys;

	dest->period_guest_us	+= src->period_guest_us;

	dest->nr_events		+= src->nr_events;

	dest->ins_lat		+= src->ins_lat;

	dest->p_stage_cyc	+= src->p_stage_cyc;

}
@@ -595,7 +593,6 @@ static struct hist_entry *hists__findnew_entry(struct hists *hists, 
	struct hist_entry *he;

	int64_t cmp;

	u64 period = entry->stat.period;

	u64 ins_lat = entry->stat.ins_lat;

	u64 p_stage_cyc = entry->stat.p_stage_cyc;

	bool leftmost = true;
@@ -615,11 +612,11 @@ static struct hist_entry *hists__findnew_entry(struct hists *hists, 


		if (!cmp) {

			if (sample_self) {

				he_stat__add_period(&he->stat, period, ins_lat, p_stage_cyc);

				he_stat__add_period(&he->stat, period, p_stage_cyc);

				hist_entry__add_callchain_period(he, period);

			}

			if (symbol_conf.cumulate_callchain)

				he_stat__add_period(he->stat_acc, period, ins_lat, p_stage_cyc);

				he_stat__add_period(he->stat_acc, period, p_stage_cyc);



			/*

			 * This mem info was allocated from sample__resolve_mem
@@ -729,7 +726,6 @@ __hists__add_entry(struct hists *hists, 
		.stat = {

			.nr_events = 1,

			.period	= sample->period,

			.ins_lat = sample->ins_lat,

			.p_stage_cyc = sample->p_stage_cyc,

		},

		.parent = sym_parent,
@@ -744,6 +740,7 @@ __hists__add_entry(struct hists *hists, 
		.ops = ops,

		.time = hist_time(sample->time),

		.weight = sample->weight,

		.ins_lat = sample->ins_lat,

	}, *he = hists__findnew_entry(hists, &entry, al, sample_self);



	if (!hists->has_callchains && he && he->callchain_size != 0)

tools/perf/util/sort.c

+7 −17
Original line number Diff line number Diff line
@@ -1358,45 +1358,35 @@ struct sort_entry sort_global_weight = { 
	.se_width_idx	= HISTC_GLOBAL_WEIGHT,

};



static u64 he_ins_lat(struct hist_entry *he)

{

		return he->stat.nr_events ? he->stat.ins_lat / he->stat.nr_events : 0;

}



static int64_t

sort__local_ins_lat_cmp(struct hist_entry *left, struct hist_entry *right)

sort__ins_lat_cmp(struct hist_entry *left, struct hist_entry *right)

{

		return he_ins_lat(left) - he_ins_lat(right);

	return left->ins_lat - right->ins_lat;

}



static int hist_entry__local_ins_lat_snprintf(struct hist_entry *he, char *bf,

					      size_t size, unsigned int width)

{

		return repsep_snprintf(bf, size, "%-*u", width, he_ins_lat(he));

	return repsep_snprintf(bf, size, "%-*u", width, he->ins_lat);

}



struct sort_entry sort_local_ins_lat = {

	.se_header	= "Local INSTR Latency",

	.se_cmp		= sort__local_ins_lat_cmp,

	.se_cmp		= sort__ins_lat_cmp,

	.se_snprintf	= hist_entry__local_ins_lat_snprintf,

	.se_width_idx	= HISTC_LOCAL_INS_LAT,

};



static int64_t

sort__global_ins_lat_cmp(struct hist_entry *left, struct hist_entry *right)

{

		return left->stat.ins_lat - right->stat.ins_lat;

}



static int hist_entry__global_ins_lat_snprintf(struct hist_entry *he, char *bf,

					       size_t size, unsigned int width)

{

		return repsep_snprintf(bf, size, "%-*u", width, he->stat.ins_lat);

	return repsep_snprintf(bf, size, "%-*u", width,

			       he->ins_lat * he->stat.nr_events);

}



struct sort_entry sort_global_ins_lat = {

	.se_header	= "INSTR Latency",

	.se_cmp		= sort__global_ins_lat_cmp,

	.se_cmp		= sort__ins_lat_cmp,

	.se_snprintf	= hist_entry__global_ins_lat_snprintf,

	.se_width_idx	= HISTC_GLOBAL_INS_LAT,

};

tools/perf/util/sort.h

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ struct he_stat { 
	u64			period_us;

	u64			period_guest_sys;

	u64			period_guest_us;

	u64			ins_lat;

	u64			p_stage_cyc;

	u32			nr_events;

};
@@ -109,6 +108,7 @@ struct hist_entry { 
	s32			cpu;

	u64			code_page_size;

	u64			weight;

	u64			ins_lat;

	u8			cpumode;

	u8			depth;