Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 080c2591 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo-20161207' of... 

Merge tag 'perf-core-for-mingo-20161207' 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:

Improvements:

 - Improve error message when analyzing file with required events in
   'perf sched timehist' (David Ahern)

Fixes:

 - Force fixdep compilation to be done at the start of the build, fixing
   some build race conditions in high core count machines (Jiri Olsa)

 - Fix handling a zero sample->tid in 'perf sched timehist', as
   sometimes that isn't the idle thread (Namhyung Kim)

Infrastructure changes:

 - Check minimal accepted LLVM version in its feature check, 3.9 at this
   time (Wang Nan)

Documentation changes:

 - Explicitly document that --children is enabled by default (Yannick Brosseau)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 34c4a427 108a7c10

tools/build/feature/Makefile

+6 −2
Original line number Diff line number Diff line
@@ -237,6 +237,10 @@ $(OUTPUT)test-llvm.bin: 
		$(shell $(LLVM_CONFIG) --libs Core BPF)		\

		$(shell $(LLVM_CONFIG) --system-libs)



$(OUTPUT)test-llvm-version.bin:

	$(BUILDXX) -std=gnu++11 				\

		-I$(shell $(LLVM_CONFIG) --includedir)



$(OUTPUT)test-clang.bin:

	$(BUILDXX) -std=gnu++11 				\

		-I$(shell $(LLVM_CONFIG) --includedir) 		\

tools/build/feature/test-llvm-version.cpp

0 → 100644
+11 −0
Original line number Diff line number Diff line 
#include <cstdio>

#include "llvm/Config/llvm-config.h"



#define NUM_VERSION (((LLVM_VERSION_MAJOR) << 16) + (LLVM_VERSION_MINOR << 8) + LLVM_VERSION_PATCH)

#define pass int main() {printf("%x\n", NUM_VERSION); return 0;}



#if NUM_VERSION >= 0x030900

pass

#else

# error This LLVM is not tested yet.

#endif

tools/build/feature/test-llvm.cpp

+5 −0
Original line number Diff line number Diff line 
#include "llvm/Support/ManagedStatic.h"

#include "llvm/Support/raw_ostream.h"

#define NUM_VERSION (((LLVM_VERSION_MAJOR) << 16) + (LLVM_VERSION_MINOR << 8) + LLVM_VERSION_PATCH)



#if NUM_VERSION < 0x030900

# error "LLVM version too low"

#endif

int main()

{

	llvm::errs() << "Hello World!\n";

tools/perf/Documentation/perf-report.txt

+2 −1
Original line number Diff line number Diff line
@@ -239,7 +239,8 @@ OPTIONS 
	Accumulate callchain of children to parent entry so that then can

	show up in the output.  The output will have a new "Children" column

	and will be sorted on the data.  It requires callchains are recorded.

	See the `overhead calculation' section for more details.

	See the `overhead calculation' section for more details. Enabled by

	default, disable with --no-children.



--max-stack::

	Set the stack depth limit when parsing the callchain, anything

tools/perf/Documentation/perf-top.txt

+1 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ Default is to monitor all CPUS. 
	show up in the output.  The output will have a new "Children" column

	and will be sorted on the data.  It requires -g/--call-graph option

	enabled.  See the `overhead calculation' section for more details.

	Enabled by default, disable with --no-children.



--max-stack::

	Set the stack depth limit when parsing the callchain, anything