builtin-diff.c 30.8 KB
Newer Older
1 2 3 4 5 6 7 8 9 10 11
/*
 * builtin-diff.c
 *
 * Builtin diff command: Analyze two perf.data input files, look up and read
 * DSOs and symbol information, sort them and produce a diff.
 */
#include "builtin.h"

#include "util/debug.h"
#include "util/event.h"
#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 17 18
#include "util/sort.h"
#include "util/symbol.h"
#include "util/util.h"
19
#include "util/data.h"
20
#include "util/config.h"
21 22

#include <stdlib.h>
23 24 25 26 27 28 29 30 31 32 33
#include <math.h>

/* Diff command specific HPP columns. */
enum {
	PERF_HPP_DIFF__BASELINE,
	PERF_HPP_DIFF__PERIOD,
	PERF_HPP_DIFF__PERIOD_BASELINE,
	PERF_HPP_DIFF__DELTA,
	PERF_HPP_DIFF__RATIO,
	PERF_HPP_DIFF__WEIGHTED_DIFF,
	PERF_HPP_DIFF__FORMULA,
34
	PERF_HPP_DIFF__DELTA_ABS,
35 36 37 38 39 40 41 42 43 44

	PERF_HPP_DIFF__MAX_INDEX
};

struct diff_hpp_fmt {
	struct perf_hpp_fmt	 fmt;
	int			 idx;
	char			*header;
	int			 header_width;
};
45

46 47
struct data__file {
	struct perf_session	*session;
48
	struct perf_data_file	file;
49
	int			 idx;
50
	struct hists		*hists;
51
	struct diff_hpp_fmt	 fmt[PERF_HPP_DIFF__MAX_INDEX];
52 53 54 55 56 57 58 59 60 61 62
};

static struct data__file *data__files;
static int data__files_cnt;

#define data__for_each_file_start(i, d, s)	\
	for (i = s, d = &data__files[s];	\
	     i < data__files_cnt;		\
	     i++, d = &data__files[i])

#define data__for_each_file(i, d) data__for_each_file_start(i, d, 0)
63
#define data__for_each_file_new(i, d) data__for_each_file_start(i, d, 1)
64 65

static bool force;
66
static bool show_period;
67
static bool show_formula;
68
static bool show_baseline_only;
69
static unsigned int sort_compute = 1;
70

71 72 73
static s64 compute_wdiff_w1;
static s64 compute_wdiff_w2;

74 75 76
enum {
	COMPUTE_DELTA,
	COMPUTE_RATIO,
77
	COMPUTE_WEIGHTED_DIFF,
78
	COMPUTE_DELTA_ABS,
79 80 81 82 83
	COMPUTE_MAX,
};

const char *compute_names[COMPUTE_MAX] = {
	[COMPUTE_DELTA] = "delta",
84
	[COMPUTE_DELTA_ABS] = "delta-abs",
85
	[COMPUTE_RATIO] = "ratio",
86
	[COMPUTE_WEIGHTED_DIFF] = "wdiff",
87 88
};

89
static int compute = COMPUTE_DELTA_ABS;
90

91 92
static int compute_2_hpp[COMPUTE_MAX] = {
	[COMPUTE_DELTA]		= PERF_HPP_DIFF__DELTA,
93
	[COMPUTE_DELTA_ABS]	= PERF_HPP_DIFF__DELTA_ABS,
94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118
	[COMPUTE_RATIO]		= PERF_HPP_DIFF__RATIO,
	[COMPUTE_WEIGHTED_DIFF]	= PERF_HPP_DIFF__WEIGHTED_DIFF,
};

#define MAX_COL_WIDTH 70

static struct header_column {
	const char *name;
	int width;
} columns[PERF_HPP_DIFF__MAX_INDEX] = {
	[PERF_HPP_DIFF__BASELINE] = {
		.name  = "Baseline",
	},
	[PERF_HPP_DIFF__PERIOD] = {
		.name  = "Period",
		.width = 14,
	},
	[PERF_HPP_DIFF__PERIOD_BASELINE] = {
		.name  = "Base period",
		.width = 14,
	},
	[PERF_HPP_DIFF__DELTA] = {
		.name  = "Delta",
		.width = 7,
	},
119 120 121 122
	[PERF_HPP_DIFF__DELTA_ABS] = {
		.name  = "Delta Abs",
		.width = 7,
	},
123 124 125 126 127 128 129 130 131 132 133 134 135 136
	[PERF_HPP_DIFF__RATIO] = {
		.name  = "Ratio",
		.width = 14,
	},
	[PERF_HPP_DIFF__WEIGHTED_DIFF] = {
		.name  = "Weighted diff",
		.width = 14,
	},
	[PERF_HPP_DIFF__FORMULA] = {
		.name  = "Formula",
		.width = MAX_COL_WIDTH,
	}
};

137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185
static int setup_compute_opt_wdiff(char *opt)
{
	char *w1_str = opt;
	char *w2_str;

	int ret = -EINVAL;

	if (!opt)
		goto out;

	w2_str = strchr(opt, ',');
	if (!w2_str)
		goto out;

	*w2_str++ = 0x0;
	if (!*w2_str)
		goto out;

	compute_wdiff_w1 = strtol(w1_str, NULL, 10);
	compute_wdiff_w2 = strtol(w2_str, NULL, 10);

	if (!compute_wdiff_w1 || !compute_wdiff_w2)
		goto out;

	pr_debug("compute wdiff w1(%" PRId64 ") w2(%" PRId64 ")\n",
		  compute_wdiff_w1, compute_wdiff_w2);

	ret = 0;

 out:
	if (ret)
		pr_err("Failed: wrong weight data, use 'wdiff:w1,w2'\n");

	return ret;
}

static int setup_compute_opt(char *opt)
{
	if (compute == COMPUTE_WEIGHTED_DIFF)
		return setup_compute_opt_wdiff(opt);

	if (opt) {
		pr_err("Failed: extra option specified '%s'", opt);
		return -EINVAL;
	}

	return 0;
}

186 187 188 189
static int setup_compute(const struct option *opt, const char *str,
			 int unset __maybe_unused)
{
	int *cp = (int *) opt->value;
190 191
	char *cstr = (char *) str;
	char buf[50];
192
	unsigned i;
193
	char *option;
194 195 196 197 198 199

	if (!str) {
		*cp = COMPUTE_DELTA;
		return 0;
	}

200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217
	option = strchr(str, ':');
	if (option) {
		unsigned len = option++ - str;

		/*
		 * The str data are not writeable, so we need
		 * to use another buffer.
		 */

		/* No option value is longer. */
		if (len >= sizeof(buf))
			return -EINVAL;

		strncpy(buf, str, len);
		buf[len] = 0x0;
		cstr = buf;
	}

218
	for (i = 0; i < COMPUTE_MAX; i++)
219
		if (!strcmp(cstr, compute_names[i])) {
220
			*cp = i;
221
			return setup_compute_opt(option);
222 223 224
		}

	pr_err("Failed: '%s' is not computation method "
225
	       "(use 'delta','ratio' or 'wdiff')\n", str);
226 227 228
	return -EINVAL;
}

229
static double period_percent(struct hist_entry *he, u64 period)
230
{
231 232
	u64 total = hists__total_period(he->hists);

233 234 235
	return (period * 100.0) / total;
}

236
static double compute_delta(struct hist_entry *he, struct hist_entry *pair)
237
{
238 239
	double old_percent = period_percent(he, he->stat.period);
	double new_percent = period_percent(pair, pair->stat.period);
240

241 242 243
	pair->diff.period_ratio_delta = new_percent - old_percent;
	pair->diff.computed = true;
	return pair->diff.period_ratio_delta;
244 245
}

246
static double compute_ratio(struct hist_entry *he, struct hist_entry *pair)
247
{
248 249
	double old_period = he->stat.period ?: 1;
	double new_period = pair->stat.period;
250

251 252 253
	pair->diff.computed = true;
	pair->diff.period_ratio = new_period / old_period;
	return pair->diff.period_ratio;
254 255
}

256
static s64 compute_wdiff(struct hist_entry *he, struct hist_entry *pair)
257
{
258 259
	u64 old_period = he->stat.period;
	u64 new_period = pair->stat.period;
260

261 262 263
	pair->diff.computed = true;
	pair->diff.wdiff = new_period * compute_wdiff_w2 -
			   old_period * compute_wdiff_w1;
264

265
	return pair->diff.wdiff;
266 267
}

268 269
static int formula_delta(struct hist_entry *he, struct hist_entry *pair,
			 char *buf, size_t size)
270
{
271 272 273 274 275 276 277
	u64 he_total = he->hists->stats.total_period;
	u64 pair_total = pair->hists->stats.total_period;

	if (symbol_conf.filter_relative) {
		he_total = he->hists->stats.total_non_filtered_period;
		pair_total = pair->hists->stats.total_non_filtered_period;
	}
278 279 280
	return scnprintf(buf, size,
			 "(%" PRIu64 " * 100 / %" PRIu64 ") - "
			 "(%" PRIu64 " * 100 / %" PRIu64 ")",
281 282
			 pair->stat.period, pair_total,
			 he->stat.period, he_total);
283 284
}

285 286
static int formula_ratio(struct hist_entry *he, struct hist_entry *pair,
			 char *buf, size_t size)
287
{
288 289
	double old_period = he->stat.period;
	double new_period = pair->stat.period;
290 291 292 293

	return scnprintf(buf, size, "%.0F / %.0F", new_period, old_period);
}

294 295
static int formula_wdiff(struct hist_entry *he, struct hist_entry *pair,
			 char *buf, size_t size)
296
{
297 298
	u64 old_period = he->stat.period;
	u64 new_period = pair->stat.period;
299 300 301 302 303 304

	return scnprintf(buf, size,
		  "(%" PRIu64 " * " "%" PRId64 ") - (%" PRIu64 " * " "%" PRId64 ")",
		  new_period, compute_wdiff_w2, old_period, compute_wdiff_w1);
}

305 306
static int formula_fprintf(struct hist_entry *he, struct hist_entry *pair,
			   char *buf, size_t size)
307 308 309
{
	switch (compute) {
	case COMPUTE_DELTA:
310
	case COMPUTE_DELTA_ABS:
311
		return formula_delta(he, pair, buf, size);
312
	case COMPUTE_RATIO:
313
		return formula_ratio(he, pair, buf, size);
314
	case COMPUTE_WEIGHTED_DIFF:
315
		return formula_wdiff(he, pair, buf, size);
316 317 318 319 320 321 322
	default:
		BUG_ON(1);
	}

	return -1;
}

323
static 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 335 336 337 338
		pr_warning("problem processing %d event, skipping it.\n",
			   event->header.type);
		return -1;
	}

339
	if (!hists__add_entry(hists, &al, NULL, NULL, NULL, sample, true)) {
340
		pr_warning("problem incrementing symbol period, skipping event\n");
341
		goto out_put;
342 343
	}

344 345 346 347 348 349
	/*
	 * The total_period is updated here before going to the output
	 * tree since normally only the baseline hists will call
	 * hists__output_resort() and precompute needs the total
	 * period in order to sort entries by percentage delta.
	 */
350
	hists->stats.total_period += sample->period;
351
	if (!al.filtered)
352
		hists->stats.total_non_filtered_period += sample->period;
353 354 355 356
	ret = 0;
out_put:
	addr_location__put(&al);
	return ret;
357 358
}

359 360 361
static struct perf_tool tool = {
	.sample	= diff__process_sample_event,
	.mmap	= perf_event__process_mmap,
362
	.mmap2	= perf_event__process_mmap2,
363
	.comm	= perf_event__process_comm,
364 365
	.exit	= perf_event__process_exit,
	.fork	= perf_event__process_fork,
366
	.lost	= perf_event__process_lost,
367
	.ordered_events = true,
368
	.ordering_requires_timestamps = true,
369 370
};

371 372 373 374 375
static struct perf_evsel *evsel_match(struct perf_evsel *evsel,
				      struct perf_evlist *evlist)
{
	struct perf_evsel *e;

376
	evlist__for_each_entry(evlist, e) {
377 378
		if (perf_evsel__match2(evsel, e))
			return e;
379
	}
380 381 382 383

	return NULL;
}

384
static void perf_evlist__collapse_resort(struct perf_evlist *evlist)
385 386 387
{
	struct perf_evsel *evsel;

388
	evlist__for_each_entry(evlist, evsel) {
389
		struct hists *hists = evsel__hists(evsel);
390

391
		hists__collapse_resort(hists, NULL);
392 393 394
	}
}

395 396 397 398 399 400 401 402 403
static struct data__file *fmt_to_data_file(struct perf_hpp_fmt *fmt)
{
	struct diff_hpp_fmt *dfmt = container_of(fmt, struct diff_hpp_fmt, fmt);
	void *ptr = dfmt - dfmt->idx;
	struct data__file *d = container_of(ptr, struct data__file, fmt);

	return d;
}

404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420
static struct hist_entry*
get_pair_data(struct hist_entry *he, struct data__file *d)
{
	if (hist_entry__has_pairs(he)) {
		struct hist_entry *pair;

		list_for_each_entry(pair, &he->pairs.head, pairs.node)
			if (pair->hists == d->hists)
				return pair;
	}

	return NULL;
}

static struct hist_entry*
get_pair_fmt(struct hist_entry *he, struct diff_hpp_fmt *dfmt)
{
421
	struct data__file *d = fmt_to_data_file(&dfmt->fmt);
422 423 424 425

	return get_pair_data(he, d);
}

426 427
static void hists__baseline_only(struct hists *hists)
{
428 429 430
	struct rb_root *root;
	struct rb_node *next;

431
	if (hists__has(hists, need_collapse))
432 433 434
		root = &hists->entries_collapsed;
	else
		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
		}
	}
}

448 449
static void hists__precompute(struct hists *hists)
{
450 451 452
	struct rb_root *root;
	struct rb_node *next;

453
	if (hists__has(hists, need_collapse))
454 455 456
		root = &hists->entries_collapsed;
	else
		root = hists->entries_in;
457

458
	next = rb_first(root);
459
	while (next != NULL) {
460
		struct hist_entry *he, *pair;
461 462
		struct data__file *d;
		int i;
463

464
		he   = rb_entry(next, struct hist_entry, rb_node_in);
465
		next = rb_next(&he->rb_node_in);
466

467 468 469 470 471 472 473
		data__for_each_file_new(i, d) {
			pair = get_pair_data(he, d);
			if (!pair)
				continue;

			switch (compute) {
			case COMPUTE_DELTA:
474
			case COMPUTE_DELTA_ABS:
475 476 477 478 479 480 481 482 483 484 485
				compute_delta(he, pair);
				break;
			case COMPUTE_RATIO:
				compute_ratio(he, pair);
				break;
			case COMPUTE_WEIGHTED_DIFF:
				compute_wdiff(he, pair);
				break;
			default:
				BUG_ON(1);
			}
486 487 488 489 490 491 492 493 494 495 496 497 498 499 500
		}
	}
}

static int64_t cmp_doubles(double l, double r)
{
	if (l > r)
		return -1;
	else if (l < r)
		return 1;
	else
		return 0;
}

static int64_t
501
__hist_entry__cmp_compute(struct hist_entry *left, struct hist_entry *right,
502 503 504 505 506 507 508 509 510 511
			int c)
{
	switch (c) {
	case COMPUTE_DELTA:
	{
		double l = left->diff.period_ratio_delta;
		double r = right->diff.period_ratio_delta;

		return cmp_doubles(l, r);
	}
512 513 514 515 516 517 518
	case COMPUTE_DELTA_ABS:
	{
		double l = fabs(left->diff.period_ratio_delta);
		double r = fabs(right->diff.period_ratio_delta);

		return cmp_doubles(l, r);
	}
519 520 521 522 523 524 525
	case COMPUTE_RATIO:
	{
		double l = left->diff.period_ratio;
		double r = right->diff.period_ratio;

		return cmp_doubles(l, r);
	}
526 527 528 529 530 531 532
	case COMPUTE_WEIGHTED_DIFF:
	{
		s64 l = left->diff.wdiff;
		s64 r = right->diff.wdiff;

		return r - l;
	}
533 534 535 536 537 538 539
	default:
		BUG_ON(1);
	}

	return 0;
}

540 541
static int64_t
hist_entry__cmp_compute(struct hist_entry *left, struct hist_entry *right,
542
			int c, int sort_idx)
543 544 545 546 547 548 549 550 551 552 553
{
	bool pairs_left  = hist_entry__has_pairs(left);
	bool pairs_right = hist_entry__has_pairs(right);
	struct hist_entry *p_right, *p_left;

	if (!pairs_left && !pairs_right)
		return 0;

	if (!pairs_left || !pairs_right)
		return pairs_left ? -1 : 1;

554 555
	p_left  = get_pair_data(left,  &data__files[sort_idx]);
	p_right = get_pair_data(right, &data__files[sort_idx]);
556 557 558 559 560 561 562 563 564 565 566 567 568 569

	if (!p_left && !p_right)
		return 0;

	if (!p_left || !p_right)
		return p_left ? -1 : 1;

	/*
	 * We have 2 entries of same kind, let's
	 * make the data comparison.
	 */
	return __hist_entry__cmp_compute(p_left, p_right, c);
}

570 571 572 573 574 575 576 577 578 579 580 581 582 583 584
static int64_t
hist_entry__cmp_compute_idx(struct hist_entry *left, struct hist_entry *right,
			    int c, int sort_idx)
{
	struct hist_entry *p_right, *p_left;

	p_left  = get_pair_data(left,  &data__files[sort_idx]);
	p_right = get_pair_data(right, &data__files[sort_idx]);

	if (!p_left && !p_right)
		return 0;

	if (!p_left || !p_right)
		return p_left ? -1 : 1;

585
	if (c != COMPUTE_DELTA && c != COMPUTE_DELTA_ABS) {
586 587 588 589 590 591 592 593 594 595 596 597 598 599 600
		/*
		 * The delta can be computed without the baseline, but
		 * others are not.  Put those entries which have no
		 * values below.
		 */
		if (left->dummy && right->dummy)
			return 0;

		if (left->dummy || right->dummy)
			return left->dummy ? 1 : -1;
	}

	return __hist_entry__cmp_compute(p_left, p_right, c);
}

601
static int64_t
602 603
hist_entry__cmp_nop(struct perf_hpp_fmt *fmt __maybe_unused,
		    struct hist_entry *left __maybe_unused,
604 605 606 607 608 609
		    struct hist_entry *right __maybe_unused)
{
	return 0;
}

static int64_t
610 611
hist_entry__cmp_baseline(struct perf_hpp_fmt *fmt __maybe_unused,
			 struct hist_entry *left, struct hist_entry *right)
612 613 614 615 616 617 618
{
	if (left->stat.period == right->stat.period)
		return 0;
	return left->stat.period > right->stat.period ? 1 : -1;
}

static int64_t
619
hist_entry__cmp_delta(struct perf_hpp_fmt *fmt,
620
		      struct hist_entry *left, struct hist_entry *right)
621
{
622 623 624
	struct data__file *d = fmt_to_data_file(fmt);

	return hist_entry__cmp_compute(right, left, COMPUTE_DELTA, d->idx);
625 626
}

627 628 629 630 631 632 633 634 635
static int64_t
hist_entry__cmp_delta_abs(struct perf_hpp_fmt *fmt,
		      struct hist_entry *left, struct hist_entry *right)
{
	struct data__file *d = fmt_to_data_file(fmt);

	return hist_entry__cmp_compute(right, left, COMPUTE_DELTA_ABS, d->idx);
}

636
static int64_t
637
hist_entry__cmp_ratio(struct perf_hpp_fmt *fmt,
638
		      struct hist_entry *left, struct hist_entry *right)
639
{
640 641 642
	struct data__file *d = fmt_to_data_file(fmt);

	return hist_entry__cmp_compute(right, left, COMPUTE_RATIO, d->idx);
643 644 645
}

static int64_t
646
hist_entry__cmp_wdiff(struct perf_hpp_fmt *fmt,
647
		      struct hist_entry *left, struct hist_entry *right)
648
{
649 650 651
	struct data__file *d = fmt_to_data_file(fmt);

	return hist_entry__cmp_compute(right, left, COMPUTE_WEIGHTED_DIFF, d->idx);
652 653
}

654 655 656 657 658 659 660 661
static int64_t
hist_entry__cmp_delta_idx(struct perf_hpp_fmt *fmt __maybe_unused,
			  struct hist_entry *left, struct hist_entry *right)
{
	return hist_entry__cmp_compute_idx(right, left, COMPUTE_DELTA,
					   sort_compute);
}

662 663 664 665 666 667 668 669
static int64_t
hist_entry__cmp_delta_abs_idx(struct perf_hpp_fmt *fmt __maybe_unused,
			      struct hist_entry *left, struct hist_entry *right)
{
	return hist_entry__cmp_compute_idx(right, left, COMPUTE_DELTA_ABS,
					   sort_compute);
}

670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685
static int64_t
hist_entry__cmp_ratio_idx(struct perf_hpp_fmt *fmt __maybe_unused,
			  struct hist_entry *left, struct hist_entry *right)
{
	return hist_entry__cmp_compute_idx(right, left, COMPUTE_RATIO,
					   sort_compute);
}

static int64_t
hist_entry__cmp_wdiff_idx(struct perf_hpp_fmt *fmt __maybe_unused,
			  struct hist_entry *left, struct hist_entry *right)
{
	return hist_entry__cmp_compute_idx(right, left, COMPUTE_WEIGHTED_DIFF,
					   sort_compute);
}

686
static void hists__process(struct hists *hists)
687 688
{
	if (show_baseline_only)
689
		hists__baseline_only(hists);
690

691
	hists__precompute(hists);
692
	hists__output_resort(hists, NULL);
693

694 695
	hists__fprintf(hists, true, 0, 0, 0, stdout,
		       symbol_conf.use_callchain);
696 697
}

698 699 700 701 702 703 704 705 706
static void data__fprintf(void)
{
	struct data__file *d;
	int i;

	fprintf(stdout, "# Data files:\n");

	data__for_each_file(i, d)
		fprintf(stdout, "#  [%d] %s %s\n",
707
			d->idx, d->file.path,
708 709 710 711 712
			!d->idx ? "(Baseline)" : "");

	fprintf(stdout, "#\n");
}

713
static void data_process(void)
714
{
715 716
	struct perf_evlist *evlist_base = data__files[0].session->evlist;
	struct perf_evsel *evsel_base;
717
	bool first = true;
718

719
	evlist__for_each_entry(evlist_base, evsel_base) {
720
		struct hists *hists_base = evsel__hists(evsel_base);
721 722
		struct data__file *d;
		int i;
723

724 725 726
		data__for_each_file_new(i, d) {
			struct perf_evlist *evlist = d->session->evlist;
			struct perf_evsel *evsel;
727
			struct hists *hists;
728 729 730 731 732

			evsel = evsel_match(evsel_base, evlist);
			if (!evsel)
				continue;

733 734
			hists = evsel__hists(evsel);
			d->hists = hists;
735

736
			hists__match(hists_base, hists);
737 738

			if (!show_baseline_only)
739
				hists__link(hists_base, hists);
740
		}
741

742
		fprintf(stdout, "%s# Event '%s'\n#\n", first ? "" : "\n",
743
			perf_evsel__name(evsel_base));
744

745
		first = false;
746

747
		if (verbose > 0 || data__files_cnt > 2)
748 749
			data__fprintf();

750 751 752
		/* Don't sort callchain for perf diff */
		perf_evsel__reset_sample_bit(evsel_base, CALLCHAIN);

753
		hists__process(hists_base);
754 755
	}
}
756

757 758 759 760 761 762 763
static void data__free(struct data__file *d)
{
	int col;

	for (col = 0; col < PERF_HPP_DIFF__MAX_INDEX; col++) {
		struct diff_hpp_fmt *fmt = &d->fmt[col];

764
		zfree(&fmt->header);
765 766 767
	}
}

768 769 770 771 772 773
static int __cmd_diff(void)
{
	struct data__file *d;
	int ret = -EINVAL, i;

	data__for_each_file(i, d) {
774
		d->session = perf_session__new(&d->file, false, &tool);
775
		if (!d->session) {
776
			pr_err("Failed to open %s\n", d->file.path);
777
			ret = -1;
778 779
			goto out_delete;
		}
780

781
		ret = perf_session__process_events(d->session);
782
		if (ret) {
783
			pr_err("Failed to process %s\n", d->file.path);
784 785
			goto out_delete;
		}
786

787 788 789 790
		perf_evlist__collapse_resort(d->session->evlist);
	}

	data_process();
791

792 793
 out_delete:
	data__for_each_file(i, d) {
794
		perf_session__delete(d->session);
795
		data__free(d);
796
	}
797

798
	free(data__files);
799 800 801
	return ret;
}

802
static const char * const diff_usage[] = {
803
	"perf diff [<options>] [old_file] [new_file]",
804
	NULL,
805 806 807
};

static const struct option options[] = {
808
	OPT_INCR('v', "verbose", &verbose,
809
		    "be more verbose (show symbol address, etc)"),
810 811
	OPT_BOOLEAN('b', "baseline-only", &show_baseline_only,
		    "Show only items with match in baseline"),
812
	OPT_CALLBACK('c', "compute", &compute,
813
		     "delta,delta-abs,ratio,wdiff:w1,w2 (default delta-abs)",
814 815
		     "Entries differential computation selection",
		     setup_compute),
816 817
	OPT_BOOLEAN('p', "period", &show_period,
		    "Show period values."),
818 819
	OPT_BOOLEAN('F', "formula", &show_formula,
		    "Show formula."),
820 821 822
	OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace,
		    "dump raw trace in ASCII"),
	OPT_BOOLEAN('f', "force", &force, "don't complain, do it"),
D
David Ahern 已提交
823 824
	OPT_STRING(0, "kallsyms", &symbol_conf.kallsyms_name,
		   "file", "kallsyms pathname"),
825 826
	OPT_BOOLEAN('m', "modules", &symbol_conf.use_modules,
		    "load module symbols - WARNING: use only with -k and LIVE kernel"),
827 828 829 830 831 832
	OPT_STRING('d', "dsos", &symbol_conf.dso_list_str, "dso[,dso...]",
		   "only consider symbols in these dsos"),
	OPT_STRING('C', "comms", &symbol_conf.comm_list_str, "comm[,comm...]",
		   "only consider symbols in these comms"),
	OPT_STRING('S', "symbols", &symbol_conf.sym_list_str, "symbol[,symbol...]",
		   "only consider these symbols"),
833
	OPT_STRING('s', "sort", &sort_order, "key[,key2...]",
834 835
		   "sort by key(s): pid, comm, dso, symbol, parent, cpu, srcline, ..."
		   " Please refer the man page for the complete list."),
836
	OPT_STRING_NOEMPTY('t', "field-separator", &symbol_conf.field_sep, "separator",
837 838
		   "separator for columns, no spaces will be added between "
		   "columns '.' is reserved."),
839 840 841
	OPT_CALLBACK(0, "symfs", NULL, "directory",
		     "Look for files with symbols relative to this directory",
		     symbol__config_symfs),
842
	OPT_UINTEGER('o', "order", &sort_compute, "Specify compute sorting."),
843 844
	OPT_CALLBACK(0, "percentage", NULL, "relative|absolute",
		     "How to display percentage of filtered entries", parse_filter_percentage),
845 846 847
	OPT_END()
};

848
static double baseline_percent(struct hist_entry *he)
849
{
850 851 852
	u64 total = hists__total_period(he->hists);

	return 100.0 * he->stat.period / total;
853
}
854

855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883
static int hpp__color_baseline(struct perf_hpp_fmt *fmt,
			       struct perf_hpp *hpp, struct hist_entry *he)
{
	struct diff_hpp_fmt *dfmt =
		container_of(fmt, struct diff_hpp_fmt, fmt);
	double percent = baseline_percent(he);
	char pfmt[20] = " ";

	if (!he->dummy) {
		scnprintf(pfmt, 20, "%%%d.2f%%%%", dfmt->header_width - 1);
		return percent_color_snprintf(hpp->buf, hpp->size,
					      pfmt, percent);
	} else
		return scnprintf(hpp->buf, hpp->size, "%*s",
				 dfmt->header_width, pfmt);
}

static int hpp__entry_baseline(struct hist_entry *he, char *buf, size_t size)
{
	double percent = baseline_percent(he);
	const char *fmt = symbol_conf.field_sep ? "%.2f" : "%6.2f%%";
	int ret = 0;

	if (!he->dummy)
		ret = scnprintf(buf, size, fmt, percent);

	return ret;
}

884 885 886 887 888 889 890 891
static int __hpp__color_compare(struct perf_hpp_fmt *fmt,
				struct perf_hpp *hpp, struct hist_entry *he,
				int comparison_method)
{
	struct diff_hpp_fmt *dfmt =
		container_of(fmt, struct diff_hpp_fmt, fmt);
	struct hist_entry *pair = get_pair_fmt(he, dfmt);
	double diff;
892
	s64 wdiff;
893 894 895
	char pfmt[20] = " ";

	if (!pair)
896
		goto no_print;
897 898 899 900 901 902 903 904 905 906 907

	switch (comparison_method) {
	case COMPUTE_DELTA:
		if (pair->diff.computed)
			diff = pair->diff.period_ratio_delta;
		else
			diff = compute_delta(he, pair);

		scnprintf(pfmt, 20, "%%%+d.2f%%%%", dfmt->header_width - 1);
		return percent_color_snprintf(hpp->buf, hpp->size,
					pfmt, diff);
908 909 910 911 912 913 914 915 916 917 918
	case COMPUTE_RATIO:
		if (he->dummy)
			goto dummy_print;
		if (pair->diff.computed)
			diff = pair->diff.period_ratio;
		else
			diff = compute_ratio(he, pair);

		scnprintf(pfmt, 20, "%%%d.6f", dfmt->header_width);
		return value_color_snprintf(hpp->buf, hpp->size,
					pfmt, diff);
919 920 921 922 923 924 925 926 927 928 929 930
	case COMPUTE_WEIGHTED_DIFF:
		if (he->dummy)
			goto dummy_print;
		if (pair->diff.computed)
			wdiff = pair->diff.wdiff;
		else
			wdiff = compute_wdiff(he, pair);

		scnprintf(pfmt, 20, "%%14ld", dfmt->header_width);
		return color_snprintf(hpp->buf, hpp->size,
				get_percent_color(wdiff),
				pfmt, wdiff);
931 932 933 934
	default:
		BUG_ON(1);
	}
dummy_print:
935 936 937
	return scnprintf(hpp->buf, hpp->size, "%*s",
			dfmt->header_width, "N/A");
no_print:
938 939 940 941 942 943 944 945 946 947
	return scnprintf(hpp->buf, hpp->size, "%*s",
			dfmt->header_width, pfmt);
}

static int hpp__color_delta(struct perf_hpp_fmt *fmt,
			struct perf_hpp *hpp, struct hist_entry *he)
{
	return __hpp__color_compare(fmt, hpp, he, COMPUTE_DELTA);
}

948 949 950 951 952 953
static int hpp__color_ratio(struct perf_hpp_fmt *fmt,
			struct perf_hpp *hpp, struct hist_entry *he)
{
	return __hpp__color_compare(fmt, hpp, he, COMPUTE_RATIO);
}

954 955 956 957 958 959
static int hpp__color_wdiff(struct perf_hpp_fmt *fmt,
			struct perf_hpp *hpp, struct hist_entry *he)
{
	return __hpp__color_compare(fmt, hpp, he, COMPUTE_WEIGHTED_DIFF);
}

960 961 962 963 964 965
static void
hpp__entry_unpair(struct hist_entry *he, int idx, char *buf, size_t size)
{
	switch (idx) {
	case PERF_HPP_DIFF__PERIOD_BASELINE:
		scnprintf(buf, size, "%" PRIu64, he->stat.period);
966
		break;
967 968

	default:
969
		break;
970 971 972 973 974 975 976 977 978 979 980 981 982
	}
}

static void
hpp__entry_pair(struct hist_entry *he, struct hist_entry *pair,
		int idx, char *buf, size_t size)
{
	double diff;
	double ratio;
	s64 wdiff;

	switch (idx) {
	case PERF_HPP_DIFF__DELTA:
983
	case PERF_HPP_DIFF__DELTA_ABS:
984 985 986
		if (pair->diff.computed)
			diff = pair->diff.period_ratio_delta;
		else
987
			diff = compute_delta(he, pair);
988

989
		scnprintf(buf, size, "%+4.2F%%", diff);
990 991 992 993
		break;

	case PERF_HPP_DIFF__RATIO:
		/* No point for ratio number if we are dummy.. */
994 995
		if (he->dummy) {
			scnprintf(buf, size, "N/A");
996
			break;
997
		}
998 999 1000 1001

		if (pair->diff.computed)
			ratio = pair->diff.period_ratio;
		else
1002
			ratio = compute_ratio(he, pair);
1003 1004 1005 1006 1007 1008 1009

		if (ratio > 0.0)
			scnprintf(buf, size, "%14.6F", ratio);
		break;

	case PERF_HPP_DIFF__WEIGHTED_DIFF:
		/* No point for wdiff number if we are dummy.. */
1010 1011
		if (he->dummy) {
			scnprintf(buf, size, "N/A");
1012
			break;
1013
		}
1014 1015 1016 1017

		if (pair->diff.computed)
			wdiff = pair->diff.wdiff;
		else
1018
			wdiff = compute_wdiff(he, pair);
1019 1020 1021 1022 1023 1024

		if (wdiff != 0)
			scnprintf(buf, size, "%14ld", wdiff);
		break;

	case PERF_HPP_DIFF__FORMULA:
1025
		formula_fprintf(he, pair, buf, size);
1026
		break;
1027 1028 1029 1030 1031

	case PERF_HPP_DIFF__PERIOD:
		scnprintf(buf, size, "%" PRIu64, pair->stat.period);
		break;

1032 1033 1034
	default:
		BUG_ON(1);
	};
1035 1036 1037
}

static void
1038 1039
__hpp__entry_global(struct hist_entry *he, struct diff_hpp_fmt *dfmt,
		    char *buf, size_t size)
1040
{
1041
	struct hist_entry *pair = get_pair_fmt(he, dfmt);
1042
	int idx = dfmt->idx;
1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061

	/* baseline is special */
	if (idx == PERF_HPP_DIFF__BASELINE)
		hpp__entry_baseline(he, buf, size);
	else {
		if (pair)
			hpp__entry_pair(he, pair, idx, buf, size);
		else
			hpp__entry_unpair(he, idx, buf, size);
	}
}

static int hpp__entry_global(struct perf_hpp_fmt *_fmt, struct perf_hpp *hpp,
			     struct hist_entry *he)
{
	struct diff_hpp_fmt *dfmt =
		container_of(_fmt, struct diff_hpp_fmt, fmt);
	char buf[MAX_COL_WIDTH] = " ";

1062
	__hpp__entry_global(he, dfmt, buf, MAX_COL_WIDTH);
1063 1064 1065 1066 1067 1068 1069 1070

	if (symbol_conf.field_sep)
		return scnprintf(hpp->buf, hpp->size, "%s", buf);
	else
		return scnprintf(hpp->buf, hpp->size, "%*s",
				 dfmt->header_width, buf);
}

1071
static int hpp__header(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,
1072
		       struct hists *hists __maybe_unused,
1073 1074
		       int line __maybe_unused,
		       int *span __maybe_unused)
1075 1076 1077 1078 1079 1080 1081 1082 1083
{
	struct diff_hpp_fmt *dfmt =
		container_of(fmt, struct diff_hpp_fmt, fmt);

	BUG_ON(!dfmt->header);
	return scnprintf(hpp->buf, hpp->size, dfmt->header);
}

static int hpp__width(struct perf_hpp_fmt *fmt,
1084
		      struct perf_hpp *hpp __maybe_unused,
1085
		      struct hists *hists __maybe_unused)
1086 1087 1088 1089 1090 1091 1092 1093
{
	struct diff_hpp_fmt *dfmt =
		container_of(fmt, struct diff_hpp_fmt, fmt);

	BUG_ON(dfmt->header_width <= 0);
	return dfmt->header_width;
}

1094
static void init_header(struct data__file *d, struct diff_hpp_fmt *dfmt)
1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108
{
#define MAX_HEADER_NAME 100
	char buf_indent[MAX_HEADER_NAME];
	char buf[MAX_HEADER_NAME];
	const char *header = NULL;
	int width = 0;

	BUG_ON(dfmt->idx >= PERF_HPP_DIFF__MAX_INDEX);
	header = columns[dfmt->idx].name;
	width  = columns[dfmt->idx].width;

	/* Only our defined HPP fmts should appear here. */
	BUG_ON(!header);

1109 1110 1111
	if (data__files_cnt > 2)
		scnprintf(buf, MAX_HEADER_NAME, "%s/%d", header, d->idx);

1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125
#define NAME (data__files_cnt > 2 ? buf : header)
	dfmt->header_width = width;
	width = (int) strlen(NAME);
	if (dfmt->header_width < width)
		dfmt->header_width = width;

	scnprintf(buf_indent, MAX_HEADER_NAME, "%*s",
		  dfmt->header_width, NAME);

	dfmt->header = strdup(buf_indent);
#undef MAX_HEADER_NAME
#undef NAME
}

1126
static void data__hpp_register(struct data__file *d, int idx)
1127
{
1128 1129 1130 1131 1132 1133 1134 1135
	struct diff_hpp_fmt *dfmt = &d->fmt[idx];
	struct perf_hpp_fmt *fmt = &dfmt->fmt;

	dfmt->idx = idx;

	fmt->header = hpp__header;
	fmt->width  = hpp__width;
	fmt->entry  = hpp__entry_global;
1136 1137
	fmt->cmp    = hist_entry__cmp_nop;
	fmt->collapse = hist_entry__cmp_nop;
1138 1139

	/* TODO more colors */
1140 1141
	switch (idx) {
	case PERF_HPP_DIFF__BASELINE:
1142
		fmt->color = hpp__color_baseline;
1143
		fmt->sort  = hist_entry__cmp_baseline;
1144 1145 1146
		break;
	case PERF_HPP_DIFF__DELTA:
		fmt->color = hpp__color_delta;
1147
		fmt->sort  = hist_entry__cmp_delta;
1148
		break;
1149 1150
	case PERF_HPP_DIFF__RATIO:
		fmt->color = hpp__color_ratio;
1151
		fmt->sort  = hist_entry__cmp_ratio;
1152
		break;
1153 1154
	case PERF_HPP_DIFF__WEIGHTED_DIFF:
		fmt->color = hpp__color_wdiff;
1155
		fmt->sort  = hist_entry__cmp_wdiff;
1156
		break;
1157 1158 1159 1160
	case PERF_HPP_DIFF__DELTA_ABS:
		fmt->color = hpp__color_delta;
		fmt->sort  = hist_entry__cmp_delta_abs;
		break;
1161
	default:
1162
		fmt->sort  = hist_entry__cmp_nop;
1163 1164
		break;
	}
1165

1166
	init_header(d, dfmt);
1167
	perf_hpp__column_register(fmt);
1168
	perf_hpp__register_sort_field(fmt);
1169 1170
}

1171
static int ui_init(void)
1172
{
1173
	struct data__file *d;
1174
	struct perf_hpp_fmt *fmt;
1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188
	int i;

	data__for_each_file(i, d) {

		/*
		 * Baseline or compute realted columns:
		 *
		 *   PERF_HPP_DIFF__BASELINE
		 *   PERF_HPP_DIFF__DELTA
		 *   PERF_HPP_DIFF__RATIO
		 *   PERF_HPP_DIFF__WEIGHTED_DIFF
		 */
		data__hpp_register(d, i ? compute_2_hpp[compute] :
					  PERF_HPP_DIFF__BASELINE);
1189

1190 1191 1192 1193 1194 1195 1196 1197 1198
		/*
		 * And the rest:
		 *
		 * PERF_HPP_DIFF__FORMULA
		 * PERF_HPP_DIFF__PERIOD
		 * PERF_HPP_DIFF__PERIOD_BASELINE
		 */
		if (show_formula && i)
			data__hpp_register(d, PERF_HPP_DIFF__FORMULA);
1199

1200 1201 1202
		if (show_period)
			data__hpp_register(d, i ? PERF_HPP_DIFF__PERIOD :
						  PERF_HPP_DIFF__PERIOD_BASELINE);
1203
	}
1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237

	if (!sort_compute)
		return 0;

	/*
	 * Prepend an fmt to sort on columns at 'sort_compute' first.
	 * This fmt is added only to the sort list but not to the
	 * output fields list.
	 *
	 * Note that this column (data) can be compared twice - one
	 * for this 'sort_compute' fmt and another for the normal
	 * diff_hpp_fmt.  But it shouldn't a problem as most entries
	 * will be sorted out by first try or baseline and comparing
	 * is not a costly operation.
	 */
	fmt = zalloc(sizeof(*fmt));
	if (fmt == NULL) {
		pr_err("Memory allocation failed\n");
		return -1;
	}

	fmt->cmp      = hist_entry__cmp_nop;
	fmt->collapse = hist_entry__cmp_nop;

	switch (compute) {
	case COMPUTE_DELTA:
		fmt->sort = hist_entry__cmp_delta_idx;
		break;
	case COMPUTE_RATIO:
		fmt->sort = hist_entry__cmp_ratio_idx;
		break;
	case COMPUTE_WEIGHTED_DIFF:
		fmt->sort = hist_entry__cmp_wdiff_idx;
		break;
1238 1239 1240
	case COMPUTE_DELTA_ABS:
		fmt->sort = hist_entry__cmp_delta_abs_idx;
		break;
1241 1242 1243 1244
	default:
		BUG_ON(1);
	}

1245
	perf_hpp__prepend_sort_field(fmt);
1246
	return 0;
1247 1248
}

1249
static int data_init(int argc, const char **argv)
1250
{
1251 1252 1253 1254 1255
	struct data__file *d;
	static const char *defaults[] = {
		"perf.data.old",
		"perf.data",
	};
1256
	bool use_default = true;
1257 1258 1259 1260
	int i;

	data__files_cnt = 2;

1261
	if (argc) {
1262
		if (argc == 1)
1263
			defaults[1] = argv[0];
1264 1265 1266 1267
		else {
			data__files_cnt = argc;
			use_default = false;
		}
1268
	} else if (perf_guest) {
1269 1270
		defaults[0] = "perf.data.host";
		defaults[1] = "perf.data.guest";
1271 1272
	}

1273 1274 1275 1276 1277
	if (sort_compute >= (unsigned int) data__files_cnt) {
		pr_err("Order option out of limit.\n");
		return -EINVAL;
	}

1278 1279 1280 1281 1282
	data__files = zalloc(sizeof(*data__files) * data__files_cnt);
	if (!data__files)
		return -ENOMEM;

	data__for_each_file(i, d) {
1283 1284 1285 1286 1287 1288
		struct perf_data_file *file = &d->file;

		file->path  = use_default ? defaults[i] : argv[i];
		file->mode  = PERF_DATA_MODE_READ,
		file->force = force,

1289 1290 1291 1292 1293 1294
		d->idx  = i;
	}

	return 0;
}

1295 1296 1297 1298 1299 1300 1301
static int diff__config(const char *var, const char *value,
			void *cb __maybe_unused)
{
	if (!strcmp(var, "diff.order")) {
		sort_compute = perf_config_int(var, value);
		return 0;
	}
1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315
	if (!strcmp(var, "diff.compute")) {
		if (!strcmp(value, "delta")) {
			compute = COMPUTE_DELTA;
		} else if (!strcmp(value, "delta-abs")) {
			compute = COMPUTE_DELTA_ABS;
		} else if (!strcmp(value, "ratio")) {
			compute = COMPUTE_RATIO;
		} else if (!strcmp(value, "wdiff")) {
			compute = COMPUTE_WEIGHTED_DIFF;
		} else {
			pr_err("Invalid compute method: %s\n", value);
			return -1;
		}
	}
1316 1317 1318 1319

	return 0;
}

1320 1321
int cmd_diff(int argc, const char **argv, const char *prefix __maybe_unused)
{
1322 1323 1324 1325 1326
	int ret = hists__init();

	if (ret < 0)
		return ret;

1327 1328
	perf_config(diff__config, NULL);

1329 1330
	argc = parse_options(argc, argv, options, diff_usage, 0);

1331
	if (symbol__init(NULL) < 0)
1332 1333
		return -1;

1334 1335 1336
	if (data_init(argc, argv) < 0)
		return -1;

1337 1338
	if (ui_init() < 0)
		return -1;
1339

1340 1341
	sort__mode = SORT_MODE__DIFF;

1342
	if (setup_sorting(NULL) < 0)
1343 1344
		usage_with_options(diff_usage, options);

1345
	setup_pager();
1346

1347
	sort__setup_elide(NULL);
1348

1349 1350
	return __cmd_diff();
}