Commit e6328a7a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf tooling updates from Ingo Molnar:
 "Perf tooling updates and fixes"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf annotate browser: Help for cycling thru hottest instructions with TAB/shift+TAB
  perf stat: Only auto-merge events that are PMU aliases
  perf test: Add test case for PERF_SAMPLE_PHYS_ADDR
  perf script: Support physical address
  perf mem: Support physical address
  perf sort: Add sort option for physical address
  perf tools: Support new sample type for physical address
  perf vendor events powerpc: Remove duplicate events
  perf intel-pt: Fix syntax in documentation of config option
  perf test powerpc: Fix 'Object code reading' test
  perf trace: Support syscall name globbing
  perf syscalltbl: Support glob matching on syscall names
  perf report: Calculate the average cycles of iterations
parents 33f82bda 770e9612

tools/include/uapi/linux/perf_event.h

+3 −1
Original line number Diff line number Diff line
@@ -139,8 +139,9 @@ enum perf_event_sample_format { 
	PERF_SAMPLE_IDENTIFIER			= 1U << 16,

	PERF_SAMPLE_TRANSACTION			= 1U << 17,

	PERF_SAMPLE_REGS_INTR			= 1U << 18,

	PERF_SAMPLE_PHYS_ADDR			= 1U << 19,



	PERF_SAMPLE_MAX = 1U << 19,		/* non-ABI */

	PERF_SAMPLE_MAX = 1U << 20,		/* non-ABI */

};



/*
@@ -814,6 +815,7 @@ enum perf_event_type { 
	 *	{ u64			transaction; } && PERF_SAMPLE_TRANSACTION

	 *	{ u64			abi; # enum perf_sample_regs_abi

	 *	  u64			regs[weight(mask)]; } && PERF_SAMPLE_REGS_INTR

	 *	{ u64			phys_addr;} && PERF_SAMPLE_PHYS_ADDR

	 * };

	 */

	PERF_RECORD_SAMPLE			= 9,

tools/perf/Documentation/intel-pt.txt

+1 −1
Original line number Diff line number Diff line
@@ -873,7 +873,7 @@ amended to take the number of elements as a parameter. 


	$ cat ~/.perfconfig

	[intel-pt]

		mispred-all

		mispred-all = on



	$ perf record -e intel_pt//u ./sort 3000

	Bubble sorting array of 3000 elements

tools/perf/Documentation/perf-mem.txt

+4 −0
Original line number Diff line number Diff line
@@ -59,6 +59,10 @@ OPTIONS 
--ldload::

	Specify desired latency for loads event.



-p::

--phys-data::

	Record/Report sample physical addresses



SEE ALSO

--------

linkperf:perf-record[1], linkperf:perf-report[1]

tools/perf/Documentation/perf-record.txt

+4 −1
Original line number Diff line number Diff line
@@ -249,7 +249,10 @@ OPTIONS 


-d::

--data::

	Record the sample addresses.

	Record the sample virtual addresses.



--phys-data::

	Record the sample physical addresses.



-T::

--timestamp::

tools/perf/Documentation/perf-report.txt

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ OPTIONS 
	- mem: type of memory access for the data at the time of the sample

	- snoop: type of snoop (if any) for the data at the time of the sample

	- dcacheline: the cacheline the data address is on at the time of the sample

	- phys_daddr: physical address of data being executed on at the time of sample



	And the default sort keys are changed to local_weight, mem, sym, dso,

	symbol_daddr, dso_daddr, snoop, tlb, locked, see '--mem-mode'.

CRA Git | Maintained and supported by SUSTech CRA and CCSE