Commit 939ddcfa authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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

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

 into perf/core

Pull in the latest perf/core improvements and fixes.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 96070c83 f8f4b287

tools/perf/Documentation/perf-record.txt

+4 −0
Original line number Diff line number Diff line
@@ -58,6 +58,10 @@ OPTIONS 
--tid=::

        Record events on existing thread ID.



-u::

--uid=::

        Record events in threads owned by uid. Name or number.



-r::

--realtime=::

	Collect data with this RT SCHED_FIFO priority.

tools/perf/Documentation/perf-top.txt

+4 −0
Original line number Diff line number Diff line
@@ -78,6 +78,10 @@ Default is to monitor all CPUS. 
--tid=<tid>::

        Profile events on existing thread ID.



-u::

--uid=::

        Record events in threads owned by uid. Name or number.



-r <priority>::

--realtime=<priority>::

	Collect data with this RT SCHED_FIFO priority.

tools/perf/Makefile

+5 −6
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ ifeq ($(ARCH),x86_64) 
	ifeq (${IS_X86_64}, 1)

		RAW_ARCH := x86_64

		ARCH_CFLAGS := -DARCH_X86_64

		ARCH_INCLUDE = ../../arch/x86/lib/memcpy_64.S

		ARCH_INCLUDE = ../../arch/x86/lib/memcpy_64.S ../../arch/x86/lib/memset_64.S

	endif

endif
@@ -104,7 +104,7 @@ endif 


CFLAGS = -fno-omit-frame-pointer -ggdb3 -Wall -Wextra -std=gnu99 $(CFLAGS_WERROR) $(CFLAGS_OPTIMIZE) -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)

EXTLIBS = -lpthread -lrt -lelf -lm

ALL_CFLAGS = $(CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64

ALL_CFLAGS = $(CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE

ALL_LDFLAGS = $(LDFLAGS)

STRIP ?= strip
@@ -168,10 +168,7 @@ endif 


### --- END CONFIGURATION SECTION ---



# Those must not be GNU-specific; they are shared with perl/ which may

# be built by a different compiler. (Note that this is an artifact now

# but it still might be nice to keep that distinction.)

BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include

BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE

BASIC_LDFLAGS =



# Guard against environment variables
@@ -362,8 +359,10 @@ BUILTIN_OBJS += $(OUTPUT)bench/sched-messaging.o 
BUILTIN_OBJS += $(OUTPUT)bench/sched-pipe.o

ifeq ($(RAW_ARCH),x86_64)

BUILTIN_OBJS += $(OUTPUT)bench/mem-memcpy-x86-64-asm.o

BUILTIN_OBJS += $(OUTPUT)bench/mem-memset-x86-64-asm.o

endif

BUILTIN_OBJS += $(OUTPUT)bench/mem-memcpy.o

BUILTIN_OBJS += $(OUTPUT)bench/mem-memset.o



BUILTIN_OBJS += $(OUTPUT)builtin-diff.o

BUILTIN_OBJS += $(OUTPUT)builtin-evlist.o

tools/perf/bench/bench.h

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
extern int bench_sched_messaging(int argc, const char **argv, const char *prefix);

extern int bench_sched_pipe(int argc, const char **argv, const char *prefix);

extern int bench_mem_memcpy(int argc, const char **argv, const char *prefix __used);

extern int bench_mem_memset(int argc, const char **argv, const char *prefix);



#define BENCH_FORMAT_DEFAULT_STR	"default"

#define BENCH_FORMAT_DEFAULT		0

tools/perf/bench/mem-memcpy-x86-64-asm-def.h

+8 −0
Original line number Diff line number Diff line
@@ -2,3 +2,11 @@ 
MEMCPY_FN(__memcpy,

	"x86-64-unrolled",

	"unrolled memcpy() in arch/x86/lib/memcpy_64.S")



MEMCPY_FN(memcpy_c,

	"x86-64-movsq",

	"movsq-based memcpy() in arch/x86/lib/memcpy_64.S")



MEMCPY_FN(memcpy_c_e,

	"x86-64-movsb",

	"movsb-based memcpy() in arch/x86/lib/memcpy_64.S")