Linux Audio

Check our new training course

Loading...
v4.6
   1/*
   2 * builtin-diff.c
   3 *
   4 * Builtin diff command: Analyze two perf.data input files, look up and read
   5 * DSOs and symbol information, sort them and produce a diff.
   6 */
   7#include "builtin.h"
   8
   9#include "util/debug.h"
  10#include "util/event.h"
  11#include "util/hist.h"
  12#include "util/evsel.h"
  13#include "util/evlist.h"
  14#include "util/session.h"
  15#include "util/tool.h"
  16#include "util/sort.h"
  17#include "util/symbol.h"
  18#include "util/util.h"
  19#include "util/data.h"
  20
  21#include <stdlib.h>
  22#include <math.h>
  23
  24/* Diff command specific HPP columns. */
  25enum {
  26	PERF_HPP_DIFF__BASELINE,
  27	PERF_HPP_DIFF__PERIOD,
  28	PERF_HPP_DIFF__PERIOD_BASELINE,
  29	PERF_HPP_DIFF__DELTA,
  30	PERF_HPP_DIFF__RATIO,
  31	PERF_HPP_DIFF__WEIGHTED_DIFF,
  32	PERF_HPP_DIFF__FORMULA,
  33
  34	PERF_HPP_DIFF__MAX_INDEX
 
 
  35};
  36
  37struct diff_hpp_fmt {
  38	struct perf_hpp_fmt	 fmt;
  39	int			 idx;
  40	char			*header;
  41	int			 header_width;
  42};
  43
  44struct data__file {
  45	struct perf_session	*session;
  46	struct perf_data_file	file;
  47	int			 idx;
  48	struct hists		*hists;
  49	struct diff_hpp_fmt	 fmt[PERF_HPP_DIFF__MAX_INDEX];
  50};
  51
  52static struct data__file *data__files;
  53static int data__files_cnt;
  54
  55#define data__for_each_file_start(i, d, s)	\
  56	for (i = s, d = &data__files[s];	\
  57	     i < data__files_cnt;		\
  58	     i++, d = &data__files[i])
  59
  60#define data__for_each_file(i, d) data__for_each_file_start(i, d, 0)
  61#define data__for_each_file_new(i, d) data__for_each_file_start(i, d, 1)
  62
  63static bool force;
  64static bool show_period;
  65static bool show_formula;
  66static bool show_baseline_only;
  67static unsigned int sort_compute;
  68
  69static s64 compute_wdiff_w1;
  70static s64 compute_wdiff_w2;
  71
  72enum {
  73	COMPUTE_DELTA,
  74	COMPUTE_RATIO,
  75	COMPUTE_WEIGHTED_DIFF,
  76	COMPUTE_MAX,
  77};
  78
  79const char *compute_names[COMPUTE_MAX] = {
  80	[COMPUTE_DELTA] = "delta",
  81	[COMPUTE_RATIO] = "ratio",
  82	[COMPUTE_WEIGHTED_DIFF] = "wdiff",
  83};
  84
  85static int compute;
  86
  87static int compute_2_hpp[COMPUTE_MAX] = {
  88	[COMPUTE_DELTA]		= PERF_HPP_DIFF__DELTA,
  89	[COMPUTE_RATIO]		= PERF_HPP_DIFF__RATIO,
  90	[COMPUTE_WEIGHTED_DIFF]	= PERF_HPP_DIFF__WEIGHTED_DIFF,
  91};
  92
  93#define MAX_COL_WIDTH 70
  94
  95static struct header_column {
  96	const char *name;
  97	int width;
  98} columns[PERF_HPP_DIFF__MAX_INDEX] = {
  99	[PERF_HPP_DIFF__BASELINE] = {
 100		.name  = "Baseline",
 101	},
 102	[PERF_HPP_DIFF__PERIOD] = {
 103		.name  = "Period",
 104		.width = 14,
 105	},
 106	[PERF_HPP_DIFF__PERIOD_BASELINE] = {
 107		.name  = "Base period",
 108		.width = 14,
 109	},
 110	[PERF_HPP_DIFF__DELTA] = {
 111		.name  = "Delta",
 112		.width = 7,
 113	},
 114	[PERF_HPP_DIFF__RATIO] = {
 115		.name  = "Ratio",
 116		.width = 14,
 117	},
 118	[PERF_HPP_DIFF__WEIGHTED_DIFF] = {
 119		.name  = "Weighted diff",
 120		.width = 14,
 121	},
 122	[PERF_HPP_DIFF__FORMULA] = {
 123		.name  = "Formula",
 124		.width = MAX_COL_WIDTH,
 125	}
 126};
 127
 128static int setup_compute_opt_wdiff(char *opt)
 129{
 130	char *w1_str = opt;
 131	char *w2_str;
 132
 133	int ret = -EINVAL;
 134
 135	if (!opt)
 136		goto out;
 137
 138	w2_str = strchr(opt, ',');
 139	if (!w2_str)
 140		goto out;
 141
 142	*w2_str++ = 0x0;
 143	if (!*w2_str)
 144		goto out;
 145
 146	compute_wdiff_w1 = strtol(w1_str, NULL, 10);
 147	compute_wdiff_w2 = strtol(w2_str, NULL, 10);
 148
 149	if (!compute_wdiff_w1 || !compute_wdiff_w2)
 150		goto out;
 151
 152	pr_debug("compute wdiff w1(%" PRId64 ") w2(%" PRId64 ")\n",
 153		  compute_wdiff_w1, compute_wdiff_w2);
 154
 155	ret = 0;
 156
 157 out:
 158	if (ret)
 159		pr_err("Failed: wrong weight data, use 'wdiff:w1,w2'\n");
 160
 161	return ret;
 162}
 163
 164static int setup_compute_opt(char *opt)
 165{
 166	if (compute == COMPUTE_WEIGHTED_DIFF)
 167		return setup_compute_opt_wdiff(opt);
 168
 169	if (opt) {
 170		pr_err("Failed: extra option specified '%s'", opt);
 171		return -EINVAL;
 172	}
 173
 174	return 0;
 175}
 176
 177static int setup_compute(const struct option *opt, const char *str,
 178			 int unset __maybe_unused)
 179{
 180	int *cp = (int *) opt->value;
 181	char *cstr = (char *) str;
 182	char buf[50];
 183	unsigned i;
 184	char *option;
 185
 186	if (!str) {
 187		*cp = COMPUTE_DELTA;
 188		return 0;
 189	}
 190
 191	option = strchr(str, ':');
 192	if (option) {
 193		unsigned len = option++ - str;
 194
 195		/*
 196		 * The str data are not writeable, so we need
 197		 * to use another buffer.
 198		 */
 199
 200		/* No option value is longer. */
 201		if (len >= sizeof(buf))
 202			return -EINVAL;
 203
 204		strncpy(buf, str, len);
 205		buf[len] = 0x0;
 206		cstr = buf;
 207	}
 208
 209	for (i = 0; i < COMPUTE_MAX; i++)
 210		if (!strcmp(cstr, compute_names[i])) {
 211			*cp = i;
 212			return setup_compute_opt(option);
 213		}
 214
 215	pr_err("Failed: '%s' is not computation method "
 216	       "(use 'delta','ratio' or 'wdiff')\n", str);
 217	return -EINVAL;
 218}
 219
 220static double period_percent(struct hist_entry *he, u64 period)
 221{
 222	u64 total = hists__total_period(he->hists);
 223
 224	return (period * 100.0) / total;
 225}
 226
 227static double compute_delta(struct hist_entry *he, struct hist_entry *pair)
 228{
 229	double old_percent = period_percent(he, he->stat.period);
 230	double new_percent = period_percent(pair, pair->stat.period);
 231
 232	pair->diff.period_ratio_delta = new_percent - old_percent;
 233	pair->diff.computed = true;
 234	return pair->diff.period_ratio_delta;
 235}
 236
 237static double compute_ratio(struct hist_entry *he, struct hist_entry *pair)
 238{
 239	double old_period = he->stat.period ?: 1;
 240	double new_period = pair->stat.period;
 241
 242	pair->diff.computed = true;
 243	pair->diff.period_ratio = new_period / old_period;
 244	return pair->diff.period_ratio;
 245}
 246
 247static s64 compute_wdiff(struct hist_entry *he, struct hist_entry *pair)
 248{
 249	u64 old_period = he->stat.period;
 250	u64 new_period = pair->stat.period;
 251
 252	pair->diff.computed = true;
 253	pair->diff.wdiff = new_period * compute_wdiff_w2 -
 254			   old_period * compute_wdiff_w1;
 255
 256	return pair->diff.wdiff;
 257}
 258
 259static int formula_delta(struct hist_entry *he, struct hist_entry *pair,
 260			 char *buf, size_t size)
 261{
 262	u64 he_total = he->hists->stats.total_period;
 263	u64 pair_total = pair->hists->stats.total_period;
 264
 265	if (symbol_conf.filter_relative) {
 266		he_total = he->hists->stats.total_non_filtered_period;
 267		pair_total = pair->hists->stats.total_non_filtered_period;
 268	}
 269	return scnprintf(buf, size,
 270			 "(%" PRIu64 " * 100 / %" PRIu64 ") - "
 271			 "(%" PRIu64 " * 100 / %" PRIu64 ")",
 272			 pair->stat.period, pair_total,
 273			 he->stat.period, he_total);
 274}
 275
 276static int formula_ratio(struct hist_entry *he, struct hist_entry *pair,
 277			 char *buf, size_t size)
 278{
 279	double old_period = he->stat.period;
 280	double new_period = pair->stat.period;
 281
 282	return scnprintf(buf, size, "%.0F / %.0F", new_period, old_period);
 283}
 284
 285static int formula_wdiff(struct hist_entry *he, struct hist_entry *pair,
 286			 char *buf, size_t size)
 287{
 288	u64 old_period = he->stat.period;
 289	u64 new_period = pair->stat.period;
 290
 291	return scnprintf(buf, size,
 292		  "(%" PRIu64 " * " "%" PRId64 ") - (%" PRIu64 " * " "%" PRId64 ")",
 293		  new_period, compute_wdiff_w2, old_period, compute_wdiff_w1);
 294}
 295
 296static int formula_fprintf(struct hist_entry *he, struct hist_entry *pair,
 297			   char *buf, size_t size)
 298{
 299	switch (compute) {
 300	case COMPUTE_DELTA:
 301		return formula_delta(he, pair, buf, size);
 302	case COMPUTE_RATIO:
 303		return formula_ratio(he, pair, buf, size);
 304	case COMPUTE_WEIGHTED_DIFF:
 305		return formula_wdiff(he, pair, buf, size);
 306	default:
 307		BUG_ON(1);
 308	}
 309
 310	return -1;
 311}
 312
 313static int hists__add_entry(struct hists *hists,
 314			    struct addr_location *al,
 315			    struct perf_sample *sample)
 316{
 317	if (__hists__add_entry(hists, al, NULL, NULL, NULL,
 318			       sample, true) != NULL)
 319		return 0;
 320	return -ENOMEM;
 321}
 322
 323static int diff__process_sample_event(struct perf_tool *tool __maybe_unused,
 324				      union perf_event *event,
 325				      struct perf_sample *sample,
 326				      struct perf_evsel *evsel,
 327				      struct machine *machine)
 328{
 
 
 329	struct addr_location al;
 330	struct hists *hists = evsel__hists(evsel);
 331	int ret = -1;
 332
 333	if (machine__resolve(machine, &al, sample) < 0) {
 334		pr_warning("problem processing %d event, skipping it.\n",
 335			   event->header.type);
 336		return -1;
 337	}
 338
 339	if (hists__add_entry(hists, &al, sample)) {
 
 
 
 340		pr_warning("problem incrementing symbol period, skipping event\n");
 341		goto out_put;
 342	}
 343
 344	/*
 345	 * The total_period is updated here before going to the output
 346	 * tree since normally only the baseline hists will call
 347	 * hists__output_resort() and precompute needs the total
 348	 * period in order to sort entries by percentage delta.
 349	 */
 350	hists->stats.total_period += sample->period;
 351	if (!al.filtered)
 352		hists->stats.total_non_filtered_period += sample->period;
 353	ret = 0;
 354out_put:
 355	addr_location__put(&al);
 356	return ret;
 357}
 358
 359static struct perf_tool tool = {
 360	.sample	= diff__process_sample_event,
 361	.mmap	= perf_event__process_mmap,
 362	.mmap2	= perf_event__process_mmap2,
 363	.comm	= perf_event__process_comm,
 364	.exit	= perf_event__process_exit,
 365	.fork	= perf_event__process_fork,
 366	.lost	= perf_event__process_lost,
 367	.ordered_events = true,
 368	.ordering_requires_timestamps = true,
 
 369};
 370
 371static struct perf_evsel *evsel_match(struct perf_evsel *evsel,
 372				      struct perf_evlist *evlist)
 373{
 374	struct perf_evsel *e;
 375
 376	evlist__for_each(evlist, e) {
 377		if (perf_evsel__match2(evsel, e))
 378			return e;
 379	}
 380
 381	return NULL;
 382}
 383
 384static void perf_evlist__collapse_resort(struct perf_evlist *evlist)
 385{
 386	struct perf_evsel *evsel;
 387
 388	evlist__for_each(evlist, evsel) {
 389		struct hists *hists = evsel__hists(evsel);
 390
 391		hists__collapse_resort(hists, NULL);
 392	}
 393}
 394
 395static struct data__file *fmt_to_data_file(struct perf_hpp_fmt *fmt)
 396{
 397	struct diff_hpp_fmt *dfmt = container_of(fmt, struct diff_hpp_fmt, fmt);
 398	void *ptr = dfmt - dfmt->idx;
 399	struct data__file *d = container_of(ptr, struct data__file, fmt);
 400
 401	return d;
 402}
 403
 404static struct hist_entry*
 405get_pair_data(struct hist_entry *he, struct data__file *d)
 406{
 407	if (hist_entry__has_pairs(he)) {
 408		struct hist_entry *pair;
 
 409
 410		list_for_each_entry(pair, &he->pairs.head, pairs.node)
 411			if (pair->hists == d->hists)
 412				return pair;
 
 
 
 
 413	}
 414
 415	return NULL;
 416}
 417
 418static struct hist_entry*
 419get_pair_fmt(struct hist_entry *he, struct diff_hpp_fmt *dfmt)
 420{
 421	struct data__file *d = fmt_to_data_file(&dfmt->fmt);
 422
 423	return get_pair_data(he, d);
 424}
 425
 426static void hists__baseline_only(struct hists *hists)
 427{
 428	struct rb_root *root;
 429	struct rb_node *next;
 
 430
 431	if (sort__need_collapse)
 432		root = &hists->entries_collapsed;
 433	else
 434		root = hists->entries_in;
 435
 436	next = rb_first(root);
 437	while (next != NULL) {
 438		struct hist_entry *he = rb_entry(next, struct hist_entry, rb_node_in);
 439
 440		next = rb_next(&he->rb_node_in);
 441		if (!hist_entry__next_pair(he)) {
 442			rb_erase(&he->rb_node_in, root);
 443			hist_entry__delete(he);
 444		}
 445	}
 446}
 447
 448static void hists__precompute(struct hists *hists)
 449{
 450	struct rb_root *root;
 451	struct rb_node *next;
 452
 453	if (sort__need_collapse)
 454		root = &hists->entries_collapsed;
 455	else
 456		root = hists->entries_in;
 457
 458	next = rb_first(root);
 459	while (next != NULL) {
 460		struct hist_entry *he, *pair;
 461		struct data__file *d;
 462		int i;
 463
 464		he   = rb_entry(next, struct hist_entry, rb_node_in);
 465		next = rb_next(&he->rb_node_in);
 466
 467		data__for_each_file_new(i, d) {
 468			pair = get_pair_data(he, d);
 469			if (!pair)
 470				continue;
 471
 472			switch (compute) {
 473			case COMPUTE_DELTA:
 474				compute_delta(he, pair);
 475				break;
 476			case COMPUTE_RATIO:
 477				compute_ratio(he, pair);
 478				break;
 479			case COMPUTE_WEIGHTED_DIFF:
 480				compute_wdiff(he, pair);
 481				break;
 482			default:
 483				BUG_ON(1);
 484			}
 485		}
 486	}
 487}
 488
 489static int64_t cmp_doubles(double l, double r)
 
 490{
 491	if (l > r)
 492		return -1;
 493	else if (l < r)
 494		return 1;
 495	else
 496		return 0;
 497}
 498
 499static int64_t
 500__hist_entry__cmp_compute(struct hist_entry *left, struct hist_entry *right,
 501			int c)
 502{
 503	switch (c) {
 504	case COMPUTE_DELTA:
 505	{
 506		double l = left->diff.period_ratio_delta;
 507		double r = right->diff.period_ratio_delta;
 508
 509		return cmp_doubles(l, r);
 510	}
 511	case COMPUTE_RATIO:
 512	{
 513		double l = left->diff.period_ratio;
 514		double r = right->diff.period_ratio;
 515
 516		return cmp_doubles(l, r);
 517	}
 518	case COMPUTE_WEIGHTED_DIFF:
 519	{
 520		s64 l = left->diff.wdiff;
 521		s64 r = right->diff.wdiff;
 522
 523		return r - l;
 524	}
 525	default:
 526		BUG_ON(1);
 527	}
 528
 529	return 0;
 530}
 531
 532static int64_t
 533hist_entry__cmp_compute(struct hist_entry *left, struct hist_entry *right,
 534			int c, int sort_idx)
 535{
 536	bool pairs_left  = hist_entry__has_pairs(left);
 537	bool pairs_right = hist_entry__has_pairs(right);
 538	struct hist_entry *p_right, *p_left;
 539
 540	if (!pairs_left && !pairs_right)
 541		return 0;
 542
 543	if (!pairs_left || !pairs_right)
 544		return pairs_left ? -1 : 1;
 545
 546	p_left  = get_pair_data(left,  &data__files[sort_idx]);
 547	p_right = get_pair_data(right, &data__files[sort_idx]);
 548
 549	if (!p_left && !p_right)
 550		return 0;
 551
 552	if (!p_left || !p_right)
 553		return p_left ? -1 : 1;
 554
 555	/*
 556	 * We have 2 entries of same kind, let's
 557	 * make the data comparison.
 558	 */
 559	return __hist_entry__cmp_compute(p_left, p_right, c);
 560}
 561
 562static int64_t
 563hist_entry__cmp_compute_idx(struct hist_entry *left, struct hist_entry *right,
 564			    int c, int sort_idx)
 565{
 566	struct hist_entry *p_right, *p_left;
 567
 568	p_left  = get_pair_data(left,  &data__files[sort_idx]);
 569	p_right = get_pair_data(right, &data__files[sort_idx]);
 570
 571	if (!p_left && !p_right)
 572		return 0;
 573
 574	if (!p_left || !p_right)
 575		return p_left ? -1 : 1;
 576
 577	if (c != COMPUTE_DELTA) {
 578		/*
 579		 * The delta can be computed without the baseline, but
 580		 * others are not.  Put those entries which have no
 581		 * values below.
 582		 */
 583		if (left->dummy && right->dummy)
 584			return 0;
 585
 586		if (left->dummy || right->dummy)
 587			return left->dummy ? 1 : -1;
 588	}
 589
 590	return __hist_entry__cmp_compute(p_left, p_right, c);
 591}
 592
 593static int64_t
 594hist_entry__cmp_nop(struct perf_hpp_fmt *fmt __maybe_unused,
 595		    struct hist_entry *left __maybe_unused,
 596		    struct hist_entry *right __maybe_unused)
 597{
 598	return 0;
 599}
 600
 601static int64_t
 602hist_entry__cmp_baseline(struct perf_hpp_fmt *fmt __maybe_unused,
 603			 struct hist_entry *left, struct hist_entry *right)
 604{
 605	if (left->stat.period == right->stat.period)
 606		return 0;
 607	return left->stat.period > right->stat.period ? 1 : -1;
 608}
 609
 610static int64_t
 611hist_entry__cmp_delta(struct perf_hpp_fmt *fmt,
 612		      struct hist_entry *left, struct hist_entry *right)
 613{
 614	struct data__file *d = fmt_to_data_file(fmt);
 615
 616	return hist_entry__cmp_compute(right, left, COMPUTE_DELTA, d->idx);
 617}
 618
 619static int64_t
 620hist_entry__cmp_ratio(struct perf_hpp_fmt *fmt,
 621		      struct hist_entry *left, struct hist_entry *right)
 622{
 623	struct data__file *d = fmt_to_data_file(fmt);
 624
 625	return hist_entry__cmp_compute(right, left, COMPUTE_RATIO, d->idx);
 626}
 627
 628static int64_t
 629hist_entry__cmp_wdiff(struct perf_hpp_fmt *fmt,
 630		      struct hist_entry *left, struct hist_entry *right)
 631{
 632	struct data__file *d = fmt_to_data_file(fmt);
 633
 634	return hist_entry__cmp_compute(right, left, COMPUTE_WEIGHTED_DIFF, d->idx);
 635}
 636
 637static int64_t
 638hist_entry__cmp_delta_idx(struct perf_hpp_fmt *fmt __maybe_unused,
 639			  struct hist_entry *left, struct hist_entry *right)
 640{
 641	return hist_entry__cmp_compute_idx(right, left, COMPUTE_DELTA,
 642					   sort_compute);
 643}
 644
 645static int64_t
 646hist_entry__cmp_ratio_idx(struct perf_hpp_fmt *fmt __maybe_unused,
 647			  struct hist_entry *left, struct hist_entry *right)
 648{
 649	return hist_entry__cmp_compute_idx(right, left, COMPUTE_RATIO,
 650					   sort_compute);
 651}
 652
 653static int64_t
 654hist_entry__cmp_wdiff_idx(struct perf_hpp_fmt *fmt __maybe_unused,
 655			  struct hist_entry *left, struct hist_entry *right)
 656{
 657	return hist_entry__cmp_compute_idx(right, left, COMPUTE_WEIGHTED_DIFF,
 658					   sort_compute);
 659}
 660
 661static void hists__process(struct hists *hists)
 662{
 663	if (show_baseline_only)
 664		hists__baseline_only(hists);
 665
 666	hists__precompute(hists);
 667	hists__output_resort(hists, NULL);
 668
 669	hists__fprintf(hists, true, 0, 0, 0, stdout);
 670}
 671
 672static void data__fprintf(void)
 673{
 674	struct data__file *d;
 675	int i;
 676
 677	fprintf(stdout, "# Data files:\n");
 678
 679	data__for_each_file(i, d)
 680		fprintf(stdout, "#  [%d] %s %s\n",
 681			d->idx, d->file.path,
 682			!d->idx ? "(Baseline)" : "");
 683
 684	fprintf(stdout, "#\n");
 685}
 686
 687static void data_process(void)
 688{
 689	struct perf_evlist *evlist_base = data__files[0].session->evlist;
 690	struct perf_evsel *evsel_base;
 691	bool first = true;
 692
 693	evlist__for_each(evlist_base, evsel_base) {
 694		struct hists *hists_base = evsel__hists(evsel_base);
 695		struct data__file *d;
 696		int i;
 697
 698		data__for_each_file_new(i, d) {
 699			struct perf_evlist *evlist = d->session->evlist;
 700			struct perf_evsel *evsel;
 701			struct hists *hists;
 702
 703			evsel = evsel_match(evsel_base, evlist);
 704			if (!evsel)
 705				continue;
 706
 707			hists = evsel__hists(evsel);
 708			d->hists = hists;
 709
 710			hists__match(hists_base, hists);
 711
 712			if (!show_baseline_only)
 713				hists__link(hists_base, hists);
 714		}
 715
 716		fprintf(stdout, "%s# Event '%s'\n#\n", first ? "" : "\n",
 717			perf_evsel__name(evsel_base));
 718
 719		first = false;
 720
 721		if (verbose || data__files_cnt > 2)
 722			data__fprintf();
 723
 724		/* Don't sort callchain for perf diff */
 725		perf_evsel__reset_sample_bit(evsel_base, CALLCHAIN);
 726
 727		hists__process(hists_base);
 728	}
 729}
 730
 731static void data__free(struct data__file *d)
 732{
 733	int col;
 734
 735	for (col = 0; col < PERF_HPP_DIFF__MAX_INDEX; col++) {
 736		struct diff_hpp_fmt *fmt = &d->fmt[col];
 737
 738		zfree(&fmt->header);
 
 
 739	}
 740}
 741
 742static int __cmd_diff(void)
 743{
 744	struct data__file *d;
 745	int ret = -EINVAL, i;
 746
 747	data__for_each_file(i, d) {
 748		d->session = perf_session__new(&d->file, false, &tool);
 749		if (!d->session) {
 750			pr_err("Failed to open %s\n", d->file.path);
 751			ret = -1;
 752			goto out_delete;
 753		}
 
 754
 755		ret = perf_session__process_events(d->session);
 756		if (ret) {
 757			pr_err("Failed to process %s\n", d->file.path);
 
 758			goto out_delete;
 759		}
 760
 761		perf_evlist__collapse_resort(d->session->evlist);
 762	}
 763
 764	data_process();
 765
 766 out_delete:
 767	data__for_each_file(i, d) {
 768		if (d->session)
 769			perf_session__delete(d->session);
 770
 771		data__free(d);
 772	}
 773
 774	free(data__files);
 
 
 775	return ret;
 
 
 776}
 777
 778static const char * const diff_usage[] = {
 779	"perf diff [<options>] [old_file] [new_file]",
 780	NULL,
 781};
 782
 783static const struct option options[] = {
 784	OPT_INCR('v', "verbose", &verbose,
 785		    "be more verbose (show symbol address, etc)"),
 786	OPT_BOOLEAN('b', "baseline-only", &show_baseline_only,
 787		    "Show only items with match in baseline"),
 788	OPT_CALLBACK('c', "compute", &compute,
 789		     "delta,ratio,wdiff:w1,w2 (default delta)",
 790		     "Entries differential computation selection",
 791		     setup_compute),
 792	OPT_BOOLEAN('p', "period", &show_period,
 793		    "Show period values."),
 794	OPT_BOOLEAN('F', "formula", &show_formula,
 795		    "Show formula."),
 796	OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace,
 797		    "dump raw trace in ASCII"),
 798	OPT_BOOLEAN('f', "force", &force, "don't complain, do it"),
 799	OPT_STRING(0, "kallsyms", &symbol_conf.kallsyms_name,
 800		   "file", "kallsyms pathname"),
 801	OPT_BOOLEAN('m', "modules", &symbol_conf.use_modules,
 802		    "load module symbols - WARNING: use only with -k and LIVE kernel"),
 803	OPT_STRING('d', "dsos", &symbol_conf.dso_list_str, "dso[,dso...]",
 804		   "only consider symbols in these dsos"),
 805	OPT_STRING('C', "comms", &symbol_conf.comm_list_str, "comm[,comm...]",
 806		   "only consider symbols in these comms"),
 807	OPT_STRING('S', "symbols", &symbol_conf.sym_list_str, "symbol[,symbol...]",
 808		   "only consider these symbols"),
 809	OPT_STRING('s', "sort", &sort_order, "key[,key2...]",
 810		   "sort by key(s): pid, comm, dso, symbol, parent, cpu, srcline, ..."
 811		   " Please refer the man page for the complete list."),
 812	OPT_STRING_NOEMPTY('t', "field-separator", &symbol_conf.field_sep, "separator",
 813		   "separator for columns, no spaces will be added between "
 814		   "columns '.' is reserved."),
 815	OPT_STRING(0, "symfs", &symbol_conf.symfs, "directory",
 816		    "Look for files with symbols relative to this directory"),
 817	OPT_UINTEGER('o', "order", &sort_compute, "Specify compute sorting."),
 818	OPT_CALLBACK(0, "percentage", NULL, "relative|absolute",
 819		     "How to display percentage of filtered entries", parse_filter_percentage),
 820	OPT_END()
 821};
 822
 823static double baseline_percent(struct hist_entry *he)
 824{
 825	u64 total = hists__total_period(he->hists);
 826
 827	return 100.0 * he->stat.period / total;
 828}
 829
 830static int hpp__color_baseline(struct perf_hpp_fmt *fmt,
 831			       struct perf_hpp *hpp, struct hist_entry *he)
 832{
 833	struct diff_hpp_fmt *dfmt =
 834		container_of(fmt, struct diff_hpp_fmt, fmt);
 835	double percent = baseline_percent(he);
 836	char pfmt[20] = " ";
 837
 838	if (!he->dummy) {
 839		scnprintf(pfmt, 20, "%%%d.2f%%%%", dfmt->header_width - 1);
 840		return percent_color_snprintf(hpp->buf, hpp->size,
 841					      pfmt, percent);
 842	} else
 843		return scnprintf(hpp->buf, hpp->size, "%*s",
 844				 dfmt->header_width, pfmt);
 845}
 846
 847static int hpp__entry_baseline(struct hist_entry *he, char *buf, size_t size)
 848{
 849	double percent = baseline_percent(he);
 850	const char *fmt = symbol_conf.field_sep ? "%.2f" : "%6.2f%%";
 851	int ret = 0;
 852
 853	if (!he->dummy)
 854		ret = scnprintf(buf, size, fmt, percent);
 855
 856	return ret;
 857}
 858
 859static int __hpp__color_compare(struct perf_hpp_fmt *fmt,
 860				struct perf_hpp *hpp, struct hist_entry *he,
 861				int comparison_method)
 862{
 863	struct diff_hpp_fmt *dfmt =
 864		container_of(fmt, struct diff_hpp_fmt, fmt);
 865	struct hist_entry *pair = get_pair_fmt(he, dfmt);
 866	double diff;
 867	s64 wdiff;
 868	char pfmt[20] = " ";
 869
 870	if (!pair)
 871		goto no_print;
 872
 873	switch (comparison_method) {
 874	case COMPUTE_DELTA:
 875		if (pair->diff.computed)
 876			diff = pair->diff.period_ratio_delta;
 877		else
 878			diff = compute_delta(he, pair);
 879
 880		scnprintf(pfmt, 20, "%%%+d.2f%%%%", dfmt->header_width - 1);
 881		return percent_color_snprintf(hpp->buf, hpp->size,
 882					pfmt, diff);
 883	case COMPUTE_RATIO:
 884		if (he->dummy)
 885			goto dummy_print;
 886		if (pair->diff.computed)
 887			diff = pair->diff.period_ratio;
 888		else
 889			diff = compute_ratio(he, pair);
 890
 891		scnprintf(pfmt, 20, "%%%d.6f", dfmt->header_width);
 892		return value_color_snprintf(hpp->buf, hpp->size,
 893					pfmt, diff);
 894	case COMPUTE_WEIGHTED_DIFF:
 895		if (he->dummy)
 896			goto dummy_print;
 897		if (pair->diff.computed)
 898			wdiff = pair->diff.wdiff;
 899		else
 900			wdiff = compute_wdiff(he, pair);
 901
 902		scnprintf(pfmt, 20, "%%14ld", dfmt->header_width);
 903		return color_snprintf(hpp->buf, hpp->size,
 904				get_percent_color(wdiff),
 905				pfmt, wdiff);
 906	default:
 907		BUG_ON(1);
 908	}
 909dummy_print:
 910	return scnprintf(hpp->buf, hpp->size, "%*s",
 911			dfmt->header_width, "N/A");
 912no_print:
 913	return scnprintf(hpp->buf, hpp->size, "%*s",
 914			dfmt->header_width, pfmt);
 915}
 916
 917static int hpp__color_delta(struct perf_hpp_fmt *fmt,
 918			struct perf_hpp *hpp, struct hist_entry *he)
 919{
 920	return __hpp__color_compare(fmt, hpp, he, COMPUTE_DELTA);
 921}
 922
 923static int hpp__color_ratio(struct perf_hpp_fmt *fmt,
 924			struct perf_hpp *hpp, struct hist_entry *he)
 925{
 926	return __hpp__color_compare(fmt, hpp, he, COMPUTE_RATIO);
 927}
 928
 929static int hpp__color_wdiff(struct perf_hpp_fmt *fmt,
 930			struct perf_hpp *hpp, struct hist_entry *he)
 931{
 932	return __hpp__color_compare(fmt, hpp, he, COMPUTE_WEIGHTED_DIFF);
 933}
 934
 935static void
 936hpp__entry_unpair(struct hist_entry *he, int idx, char *buf, size_t size)
 937{
 938	switch (idx) {
 939	case PERF_HPP_DIFF__PERIOD_BASELINE:
 940		scnprintf(buf, size, "%" PRIu64, he->stat.period);
 941		break;
 942
 943	default:
 944		break;
 945	}
 946}
 947
 948static void
 949hpp__entry_pair(struct hist_entry *he, struct hist_entry *pair,
 950		int idx, char *buf, size_t size)
 951{
 952	double diff;
 953	double ratio;
 954	s64 wdiff;
 955
 956	switch (idx) {
 957	case PERF_HPP_DIFF__DELTA:
 958		if (pair->diff.computed)
 959			diff = pair->diff.period_ratio_delta;
 960		else
 961			diff = compute_delta(he, pair);
 962
 963		scnprintf(buf, size, "%+4.2F%%", diff);
 964		break;
 965
 966	case PERF_HPP_DIFF__RATIO:
 967		/* No point for ratio number if we are dummy.. */
 968		if (he->dummy) {
 969			scnprintf(buf, size, "N/A");
 970			break;
 971		}
 972
 973		if (pair->diff.computed)
 974			ratio = pair->diff.period_ratio;
 975		else
 976			ratio = compute_ratio(he, pair);
 977
 978		if (ratio > 0.0)
 979			scnprintf(buf, size, "%14.6F", ratio);
 980		break;
 981
 982	case PERF_HPP_DIFF__WEIGHTED_DIFF:
 983		/* No point for wdiff number if we are dummy.. */
 984		if (he->dummy) {
 985			scnprintf(buf, size, "N/A");
 986			break;
 987		}
 988
 989		if (pair->diff.computed)
 990			wdiff = pair->diff.wdiff;
 991		else
 992			wdiff = compute_wdiff(he, pair);
 993
 994		if (wdiff != 0)
 995			scnprintf(buf, size, "%14ld", wdiff);
 996		break;
 997
 998	case PERF_HPP_DIFF__FORMULA:
 999		formula_fprintf(he, pair, buf, size);
1000		break;
1001
1002	case PERF_HPP_DIFF__PERIOD:
1003		scnprintf(buf, size, "%" PRIu64, pair->stat.period);
1004		break;
1005
1006	default:
1007		BUG_ON(1);
1008	};
1009}
1010
1011static void
1012__hpp__entry_global(struct hist_entry *he, struct diff_hpp_fmt *dfmt,
1013		    char *buf, size_t size)
1014{
1015	struct hist_entry *pair = get_pair_fmt(he, dfmt);
1016	int idx = dfmt->idx;
1017
1018	/* baseline is special */
1019	if (idx == PERF_HPP_DIFF__BASELINE)
1020		hpp__entry_baseline(he, buf, size);
1021	else {
1022		if (pair)
1023			hpp__entry_pair(he, pair, idx, buf, size);
1024		else
1025			hpp__entry_unpair(he, idx, buf, size);
1026	}
1027}
1028
1029static int hpp__entry_global(struct perf_hpp_fmt *_fmt, struct perf_hpp *hpp,
1030			     struct hist_entry *he)
1031{
1032	struct diff_hpp_fmt *dfmt =
1033		container_of(_fmt, struct diff_hpp_fmt, fmt);
1034	char buf[MAX_COL_WIDTH] = " ";
1035
1036	__hpp__entry_global(he, dfmt, buf, MAX_COL_WIDTH);
1037
1038	if (symbol_conf.field_sep)
1039		return scnprintf(hpp->buf, hpp->size, "%s", buf);
1040	else
1041		return scnprintf(hpp->buf, hpp->size, "%*s",
1042				 dfmt->header_width, buf);
1043}
1044
1045static int hpp__header(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,
1046		       struct perf_evsel *evsel __maybe_unused)
1047{
1048	struct diff_hpp_fmt *dfmt =
1049		container_of(fmt, struct diff_hpp_fmt, fmt);
1050
1051	BUG_ON(!dfmt->header);
1052	return scnprintf(hpp->buf, hpp->size, dfmt->header);
1053}
1054
1055static int hpp__width(struct perf_hpp_fmt *fmt,
1056		      struct perf_hpp *hpp __maybe_unused,
1057		      struct perf_evsel *evsel __maybe_unused)
1058{
1059	struct diff_hpp_fmt *dfmt =
1060		container_of(fmt, struct diff_hpp_fmt, fmt);
1061
1062	BUG_ON(dfmt->header_width <= 0);
1063	return dfmt->header_width;
1064}
1065
1066static void init_header(struct data__file *d, struct diff_hpp_fmt *dfmt)
1067{
1068#define MAX_HEADER_NAME 100
1069	char buf_indent[MAX_HEADER_NAME];
1070	char buf[MAX_HEADER_NAME];
1071	const char *header = NULL;
1072	int width = 0;
1073
1074	BUG_ON(dfmt->idx >= PERF_HPP_DIFF__MAX_INDEX);
1075	header = columns[dfmt->idx].name;
1076	width  = columns[dfmt->idx].width;
1077
1078	/* Only our defined HPP fmts should appear here. */
1079	BUG_ON(!header);
1080
1081	if (data__files_cnt > 2)
1082		scnprintf(buf, MAX_HEADER_NAME, "%s/%d", header, d->idx);
1083
1084#define NAME (data__files_cnt > 2 ? buf : header)
1085	dfmt->header_width = width;
1086	width = (int) strlen(NAME);
1087	if (dfmt->header_width < width)
1088		dfmt->header_width = width;
1089
1090	scnprintf(buf_indent, MAX_HEADER_NAME, "%*s",
1091		  dfmt->header_width, NAME);
1092
1093	dfmt->header = strdup(buf_indent);
1094#undef MAX_HEADER_NAME
1095#undef NAME
1096}
1097
1098static void data__hpp_register(struct data__file *d, int idx)
1099{
1100	struct diff_hpp_fmt *dfmt = &d->fmt[idx];
1101	struct perf_hpp_fmt *fmt = &dfmt->fmt;
1102
1103	dfmt->idx = idx;
1104
1105	fmt->header = hpp__header;
1106	fmt->width  = hpp__width;
1107	fmt->entry  = hpp__entry_global;
1108	fmt->cmp    = hist_entry__cmp_nop;
1109	fmt->collapse = hist_entry__cmp_nop;
1110
1111	/* TODO more colors */
1112	switch (idx) {
1113	case PERF_HPP_DIFF__BASELINE:
1114		fmt->color = hpp__color_baseline;
1115		fmt->sort  = hist_entry__cmp_baseline;
1116		break;
1117	case PERF_HPP_DIFF__DELTA:
1118		fmt->color = hpp__color_delta;
1119		fmt->sort  = hist_entry__cmp_delta;
1120		break;
1121	case PERF_HPP_DIFF__RATIO:
1122		fmt->color = hpp__color_ratio;
1123		fmt->sort  = hist_entry__cmp_ratio;
1124		break;
1125	case PERF_HPP_DIFF__WEIGHTED_DIFF:
1126		fmt->color = hpp__color_wdiff;
1127		fmt->sort  = hist_entry__cmp_wdiff;
1128		break;
1129	default:
1130		fmt->sort  = hist_entry__cmp_nop;
1131		break;
1132	}
1133
1134	init_header(d, dfmt);
1135	perf_hpp__column_register(fmt);
1136	perf_hpp__register_sort_field(fmt);
1137}
1138
1139static int ui_init(void)
1140{
1141	struct data__file *d;
1142	struct perf_hpp_fmt *fmt;
1143	int i;
1144
1145	data__for_each_file(i, d) {
1146
1147		/*
1148		 * Baseline or compute realted columns:
1149		 *
1150		 *   PERF_HPP_DIFF__BASELINE
1151		 *   PERF_HPP_DIFF__DELTA
1152		 *   PERF_HPP_DIFF__RATIO
1153		 *   PERF_HPP_DIFF__WEIGHTED_DIFF
1154		 */
1155		data__hpp_register(d, i ? compute_2_hpp[compute] :
1156					  PERF_HPP_DIFF__BASELINE);
1157
1158		/*
1159		 * And the rest:
1160		 *
1161		 * PERF_HPP_DIFF__FORMULA
1162		 * PERF_HPP_DIFF__PERIOD
1163		 * PERF_HPP_DIFF__PERIOD_BASELINE
1164		 */
1165		if (show_formula && i)
1166			data__hpp_register(d, PERF_HPP_DIFF__FORMULA);
1167
1168		if (show_period)
1169			data__hpp_register(d, i ? PERF_HPP_DIFF__PERIOD :
1170						  PERF_HPP_DIFF__PERIOD_BASELINE);
1171	}
1172
1173	if (!sort_compute)
1174		return 0;
1175
1176	/*
1177	 * Prepend an fmt to sort on columns at 'sort_compute' first.
1178	 * This fmt is added only to the sort list but not to the
1179	 * output fields list.
1180	 *
1181	 * Note that this column (data) can be compared twice - one
1182	 * for this 'sort_compute' fmt and another for the normal
1183	 * diff_hpp_fmt.  But it shouldn't a problem as most entries
1184	 * will be sorted out by first try or baseline and comparing
1185	 * is not a costly operation.
1186	 */
1187	fmt = zalloc(sizeof(*fmt));
1188	if (fmt == NULL) {
1189		pr_err("Memory allocation failed\n");
1190		return -1;
1191	}
1192
1193	fmt->cmp      = hist_entry__cmp_nop;
1194	fmt->collapse = hist_entry__cmp_nop;
1195
1196	switch (compute) {
1197	case COMPUTE_DELTA:
1198		fmt->sort = hist_entry__cmp_delta_idx;
1199		break;
1200	case COMPUTE_RATIO:
1201		fmt->sort = hist_entry__cmp_ratio_idx;
1202		break;
1203	case COMPUTE_WEIGHTED_DIFF:
1204		fmt->sort = hist_entry__cmp_wdiff_idx;
1205		break;
1206	default:
1207		BUG_ON(1);
1208	}
1209
1210	perf_hpp__register_sort_field(fmt);
1211	return 0;
1212}
1213
1214static int data_init(int argc, const char **argv)
1215{
1216	struct data__file *d;
1217	static const char *defaults[] = {
1218		"perf.data.old",
1219		"perf.data",
1220	};
1221	bool use_default = true;
1222	int i;
1223
1224	data__files_cnt = 2;
1225
1226	if (argc) {
1227		if (argc == 1)
1228			defaults[1] = argv[0];
1229		else {
1230			data__files_cnt = argc;
1231			use_default = false;
1232		}
1233	} else if (perf_guest) {
1234		defaults[0] = "perf.data.host";
1235		defaults[1] = "perf.data.guest";
1236	}
1237
1238	if (sort_compute >= (unsigned int) data__files_cnt) {
1239		pr_err("Order option out of limit.\n");
1240		return -EINVAL;
1241	}
1242
1243	data__files = zalloc(sizeof(*data__files) * data__files_cnt);
1244	if (!data__files)
1245		return -ENOMEM;
1246
1247	data__for_each_file(i, d) {
1248		struct perf_data_file *file = &d->file;
1249
1250		file->path  = use_default ? defaults[i] : argv[i];
1251		file->mode  = PERF_DATA_MODE_READ,
1252		file->force = force,
1253
1254		d->idx  = i;
1255	}
1256
1257	return 0;
1258}
1259
1260int cmd_diff(int argc, const char **argv, const char *prefix __maybe_unused)
1261{
1262	int ret = hists__init();
1263
1264	if (ret < 0)
1265		return ret;
1266
1267	argc = parse_options(argc, argv, options, diff_usage, 0);
1268
1269	if (symbol__init(NULL) < 0)
1270		return -1;
1271
1272	if (data_init(argc, argv) < 0)
1273		return -1;
1274
1275	if (ui_init() < 0)
1276		return -1;
1277
1278	sort__mode = SORT_MODE__DIFF;
1279
1280	if (setup_sorting(NULL) < 0)
1281		usage_with_options(diff_usage, options);
1282
1283	setup_pager();
1284
1285	sort__setup_elide(NULL);
 
 
1286
1287	return __cmd_diff();
1288}
v3.5.6
  1/*
  2 * builtin-diff.c
  3 *
  4 * Builtin diff command: Analyze two perf.data input files, look up and read
  5 * DSOs and symbol information, sort them and produce a diff.
  6 */
  7#include "builtin.h"
  8
  9#include "util/debug.h"
 10#include "util/event.h"
 11#include "util/hist.h"
 12#include "util/evsel.h"
 
 13#include "util/session.h"
 14#include "util/tool.h"
 15#include "util/sort.h"
 16#include "util/symbol.h"
 17#include "util/util.h"
 
 18
 19#include <stdlib.h>
 
 20
 21static char const *input_old = "perf.data.old",
 22		  *input_new = "perf.data";
 23static char	  diff__default_sort_order[] = "dso,symbol";
 24static bool  force;
 25static bool show_displacement;
 
 
 
 
 26
 27struct perf_diff {
 28	struct perf_tool tool;
 29	struct perf_session *session;
 30};
 31
 32static int hists__add_entry(struct hists *self,
 33			    struct addr_location *al, u64 period)
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 34{
 35	if (__hists__add_entry(self, al, NULL, period) != NULL)
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 36		return 0;
 37	return -ENOMEM;
 38}
 39
 40static int diff__process_sample_event(struct perf_tool *tool,
 41				      union perf_event *event,
 42				      struct perf_sample *sample,
 43				      struct perf_evsel *evsel __used,
 44				      struct machine *machine)
 45{
 46	struct perf_diff *_diff = container_of(tool, struct perf_diff, tool);
 47	struct perf_session *session = _diff->session;
 48	struct addr_location al;
 
 
 49
 50	if (perf_event__preprocess_sample(event, machine, &al, sample, NULL) < 0) {
 51		pr_warning("problem processing %d event, skipping it.\n",
 52			   event->header.type);
 53		return -1;
 54	}
 55
 56	if (al.filtered || al.sym == NULL)
 57		return 0;
 58
 59	if (hists__add_entry(&session->hists, &al, sample->period)) {
 60		pr_warning("problem incrementing symbol period, skipping event\n");
 61		return -1;
 62	}
 63
 64	session->hists.stats.total_period += sample->period;
 65	return 0;
 
 
 
 
 
 
 
 
 
 
 
 66}
 67
 68static struct perf_diff diff = {
 69	.tool = {
 70		.sample	= diff__process_sample_event,
 71		.mmap	= perf_event__process_mmap,
 72		.comm	= perf_event__process_comm,
 73		.exit	= perf_event__process_task,
 74		.fork	= perf_event__process_task,
 75		.lost	= perf_event__process_lost,
 76		.ordered_samples = true,
 77		.ordering_requires_timestamps = true,
 78	},
 79};
 80
 81static void perf_session__insert_hist_entry_by_name(struct rb_root *root,
 82						    struct hist_entry *he)
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 83{
 84	struct rb_node **p = &root->rb_node;
 85	struct rb_node *parent = NULL;
 86	struct hist_entry *iter;
 87
 88	while (*p != NULL) {
 89		parent = *p;
 90		iter = rb_entry(parent, struct hist_entry, rb_node);
 91		if (hist_entry__cmp(he, iter) < 0)
 92			p = &(*p)->rb_left;
 93		else
 94			p = &(*p)->rb_right;
 95	}
 96
 97	rb_link_node(&he->rb_node, parent, p);
 98	rb_insert_color(&he->rb_node, root);
 
 
 
 
 
 
 
 99}
100
101static void hists__resort_entries(struct hists *self)
102{
103	unsigned long position = 1;
104	struct rb_root tmp = RB_ROOT;
105	struct rb_node *next = rb_first(&self->entries);
106
 
 
 
 
 
 
107	while (next != NULL) {
108		struct hist_entry *n = rb_entry(next, struct hist_entry, rb_node);
109
110		next = rb_next(&n->rb_node);
111		rb_erase(&n->rb_node, &self->entries);
112		n->position = position++;
113		perf_session__insert_hist_entry_by_name(&tmp, n);
 
114	}
 
 
 
 
 
 
 
 
 
 
 
115
116	self->entries = tmp;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
117}
118
119static struct hist_entry *hists__find_entry(struct hists *self,
120					    struct hist_entry *he)
121{
122	struct rb_node *n = self->entries.rb_node;
 
 
 
 
 
 
123
124	while (n) {
125		struct hist_entry *iter = rb_entry(n, struct hist_entry, rb_node);
126		int64_t cmp = hist_entry__cmp(he, iter);
 
 
 
 
 
 
 
 
 
 
 
 
 
127
128		if (cmp < 0)
129			n = n->rb_left;
130		else if (cmp > 0)
131			n = n->rb_right;
132		else 
133			return iter;
 
 
 
 
 
134	}
135
136	return NULL;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
137}
138
139static void hists__match(struct hists *older, struct hists *newer)
140{
141	struct rb_node *nd;
 
 
 
142
143	for (nd = rb_first(&newer->entries); nd; nd = rb_next(nd)) {
144		struct hist_entry *pos = rb_entry(nd, struct hist_entry, rb_node);
145		pos->pair = hists__find_entry(older, pos);
146	}
147}
148
149static int __cmd_diff(void)
150{
151	int ret, i;
152#define older (session[0])
153#define newer (session[1])
154	struct perf_session *session[2];
155
156	older = perf_session__new(input_old, O_RDONLY, force, false,
157				  &diff.tool);
158	newer = perf_session__new(input_new, O_RDONLY, force, false,
159				  &diff.tool);
160	if (session[0] == NULL || session[1] == NULL)
161		return -ENOMEM;
162
163	for (i = 0; i < 2; ++i) {
164		diff.session = session[i];
165		ret = perf_session__process_events(session[i], &diff.tool);
166		if (ret)
167			goto out_delete;
168		hists__output_resort(&session[i]->hists);
 
 
169	}
170
171	if (show_displacement)
172		hists__resort_entries(&older->hists);
 
 
 
 
173
174	hists__match(&older->hists, &newer->hists);
175	hists__fprintf(&newer->hists, &older->hists,
176		       show_displacement, true, 0, 0, stdout);
177out_delete:
178	for (i = 0; i < 2; ++i)
179		perf_session__delete(session[i]);
180	return ret;
181#undef older
182#undef newer
183}
184
185static const char * const diff_usage[] = {
186	"perf diff [<options>] [old_file] [new_file]",
187	NULL,
188};
189
190static const struct option options[] = {
191	OPT_INCR('v', "verbose", &verbose,
192		    "be more verbose (show symbol address, etc)"),
193	OPT_BOOLEAN('M', "displacement", &show_displacement,
194		    "Show position displacement relative to baseline"),
 
 
 
 
 
 
 
 
195	OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace,
196		    "dump raw trace in ASCII"),
197	OPT_BOOLEAN('f', "force", &force, "don't complain, do it"),
 
 
198	OPT_BOOLEAN('m', "modules", &symbol_conf.use_modules,
199		    "load module symbols - WARNING: use only with -k and LIVE kernel"),
200	OPT_STRING('d', "dsos", &symbol_conf.dso_list_str, "dso[,dso...]",
201		   "only consider symbols in these dsos"),
202	OPT_STRING('C', "comms", &symbol_conf.comm_list_str, "comm[,comm...]",
203		   "only consider symbols in these comms"),
204	OPT_STRING('S', "symbols", &symbol_conf.sym_list_str, "symbol[,symbol...]",
205		   "only consider these symbols"),
206	OPT_STRING('s', "sort", &sort_order, "key[,key2...]",
207		   "sort by key(s): pid, comm, dso, symbol, parent"),
208	OPT_STRING('t', "field-separator", &symbol_conf.field_sep, "separator",
 
209		   "separator for columns, no spaces will be added between "
210		   "columns '.' is reserved."),
211	OPT_STRING(0, "symfs", &symbol_conf.symfs, "directory",
212		    "Look for files with symbols relative to this directory"),
 
 
 
213	OPT_END()
214};
215
216int cmd_diff(int argc, const char **argv, const char *prefix __used)
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
217{
218	sort_order = diff__default_sort_order;
219	argc = parse_options(argc, argv, options, diff_usage, 0);
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
220	if (argc) {
221		if (argc > 2)
222			usage_with_options(diff_usage, options);
223		if (argc == 2) {
224			input_old = argv[0];
225			input_new = argv[1];
226		} else
227			input_new = argv[0];
228	} else if (symbol_conf.default_guest_vmlinux_name ||
229		   symbol_conf.default_guest_kallsyms) {
230		input_old = "perf.data.host";
231		input_new = "perf.data.guest";
 
 
 
232	}
233
234	symbol_conf.exclude_other = false;
235	if (symbol__init() < 0)
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
236		return -1;
237
238	setup_sorting(diff_usage, options);
 
 
 
 
239	setup_pager();
240
241	sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list, "dso", NULL);
242	sort_entry__setup_elide(&sort_comm, symbol_conf.comm_list, "comm", NULL);
243	sort_entry__setup_elide(&sort_sym, symbol_conf.sym_list, "symbol", NULL);
244
245	return __cmd_diff();
246}