Commit b89e7914 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo-4.17-20180403' of... 

Merge tag 'perf-core-for-mingo-4.17-20180403' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

- Show only failing syscalls with 'perf trace --failure' (Arnaldo Carvalho de Melo)

	e.g: See what 'openat' syscalls are failing:

  # perf trace --failure -e openat
   762.323 ( 0.007 ms): VideoCapture/4566 openat(dfd: CWD, filename: /dev/video2) = -1 ENOENT No such file or directory
   <SNIP N /dev/videoN open attempts... sigh, where is that improvised camera lid?!? >
   790.228 ( 0.008 ms): VideoCapture/4566 openat(dfd: CWD, filename: /dev/video63) = -1 ENOENT No such file or directory
  ^C#

- Show information about the event (freq, nr_samples, total period/nr_events) in
  the annotate --tui and --stdio2 'perf annotate' output, similar to the
  first line in the 'perf report --tui', but just for the samples for a
  the annotated symbol (Arnaldo Carvalho de Melo)

- Introduce 'perf version --build-options' to show what features were
  linked, aliased as well as a shorter 'perf -vv' (Jin Yao)

- Add a "dso_size" sort order (Kim Phillips)

- Remove redundant ')' in the tracepoint output in 'perf trace' (Changbin Du)

- Synchronize x86's cpufeatures.h, no effect on toolss (Arnaldo Carvalho de Melo)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 642e7fd2 51125a29

tools/arch/x86/include/asm/cpufeatures.h

+2 −0
Original line number Diff line number Diff line
@@ -316,6 +316,7 @@ 
#define X86_FEATURE_VPCLMULQDQ		(16*32+10) /* Carry-Less Multiplication Double Quadword */

#define X86_FEATURE_AVX512_VNNI		(16*32+11) /* Vector Neural Network Instructions */

#define X86_FEATURE_AVX512_BITALG	(16*32+12) /* Support for VPOPCNT[B,W] and VPSHUF-BITQMB instructions */

#define X86_FEATURE_TME			(16*32+13) /* Intel Total Memory Encryption */

#define X86_FEATURE_AVX512_VPOPCNTDQ	(16*32+14) /* POPCNT for vectors of DW/QW */

#define X86_FEATURE_LA57		(16*32+16) /* 5-level page tables */

#define X86_FEATURE_RDPID		(16*32+22) /* RDPID instruction */
@@ -328,6 +329,7 @@ 
/* Intel-defined CPU features, CPUID level 0x00000007:0 (EDX), word 18 */

#define X86_FEATURE_AVX512_4VNNIW	(18*32+ 2) /* AVX-512 Neural Network Instructions */

#define X86_FEATURE_AVX512_4FMAPS	(18*32+ 3) /* AVX-512 Multiply Accumulation Single precision */

#define X86_FEATURE_PCONFIG		(18*32+18) /* Intel PCONFIG */

#define X86_FEATURE_SPEC_CTRL		(18*32+26) /* "" Speculation Control (IBRS + IBPB) */

#define X86_FEATURE_INTEL_STIBP		(18*32+27) /* "" Single Thread Indirect Branch Predictors */

#define X86_FEATURE_ARCH_CAPABILITIES	(18*32+29) /* IA32_ARCH_CAPABILITIES MSR (Intel) */

tools/include/tools/config.h

0 → 100644
+34 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _TOOLS_CONFIG_H

#define _TOOLS_CONFIG_H



/* Subset of include/linux/kconfig.h */



#define __ARG_PLACEHOLDER_1 0,

#define __take_second_arg(__ignored, val, ...) val



/*

 * Helper macros to use CONFIG_ options in C/CPP expressions. Note that

 * these only work with boolean and tristate options.

 */



/*

 * Getting something that works in C and CPP for an arg that may or may

 * not be defined is tricky.  Here, if we have "#define CONFIG_BOOGER 1"

 * we match on the placeholder define, insert the "0," for arg1 and generate

 * the triplet (0, 1, 0).  Then the last step cherry picks the 2nd arg (a one).

 * When CONFIG_BOOGER is not defined, we generate a (... 1, 0) pair, and when

 * the last step cherry picks the 2nd arg, we get a zero.

 */

#define __is_defined(x)			___is_defined(x)

#define ___is_defined(val)		____is_defined(__ARG_PLACEHOLDER_##val)

#define ____is_defined(arg1_or_junk)	__take_second_arg(arg1_or_junk 1, 0)



/*

 * IS_BUILTIN(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y', 0

 * otherwise. For boolean options, this is equivalent to

 * IS_ENABLED(CONFIG_FOO).

 */

#define IS_BUILTIN(option) __is_defined(option)



#endif /* _TOOLS_CONFIG_H */

tools/perf/Documentation/perf-report.txt

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ OPTIONS 
	- comm: command (name) of the task which can be read via /proc/<pid>/comm

	- pid: command and tid of the task

	- dso: name of library or module executed at the time of sample

	- dso_size: size of library or module executed at the time of sample

	- symbol: name of function executed at the time of sample

	- symbol_size: size of function executed at the time of sample

	- parent: name of function matched to the parent regex filter. Unmatched

tools/perf/Documentation/perf-trace.txt

+3 −0
Original line number Diff line number Diff line
@@ -117,6 +117,9 @@ the thread executes on the designated CPUs. Default is to monitor all CPUs. 
--sched::

	Accrue thread runtime and provide a summary at the end of the session.



--failure::

	Show only syscalls that failed, i.e. that returned < 0.



-i::

--input::

	Process events from a given perf data file.

tools/perf/Documentation/perf-version.txt

0 → 100644
+24 −0
Original line number Diff line number Diff line 
perf-version(1)

===============



NAME

----

perf-version - display the version of perf binary



SYNOPSIS

--------

'perf version' [--build-options]



DESCRIPTION

-----------

With no options given, the 'perf version' prints the perf version

on the standard output.



If the option '--build-options' is given, then the status of

compiled-in libraries are printed on the standard output.



OPTIONS

-------

--build-options::

        Prints the status of compiled-in libraries on the

        standard output.

CRA Git | Maintained and supported by SUSTech CRA and CCSE