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

Commit be3de80d authored by Jan Beulich's avatar Jan Beulich Committed by Arnaldo Carvalho de Melo
Browse files

perf bench: Also allow measuring memset() 

This simply clones the respective memcpy() implementation.

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/4F16D743020000780006D735@nat28.tlf.novell.com


Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 800eb014

tools/perf/Makefile

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

	ifeq (${IS_X86_64}, 1)

		RAW_ARCH := x86_64

		RAW_ARCH := x86_64

		ARCH_CFLAGS := -DARCH_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

endif

endif
@@ -362,8 +362,10 @@ BUILTIN_OBJS += $(OUTPUT)bench/sched-messaging.o 
BUILTIN_OBJS += $(OUTPUT)bench/sched-pipe.o

BUILTIN_OBJS += $(OUTPUT)bench/sched-pipe.o

ifeq ($(RAW_ARCH),x86_64)

ifeq ($(RAW_ARCH),x86_64)

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

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

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

endif

endif

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

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

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





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

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

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

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

tools/perf/bench/bench.h

+1 −0
Original line number Original line 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_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_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_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_STR	"default"

#define BENCH_FORMAT_DEFAULT		0

#define BENCH_FORMAT_DEFAULT		0

tools/perf/bench/mem-memset-arch.h

0 → 100644
+12 −0
Original line number Original line Diff line number Diff line 


#ifdef ARCH_X86_64



#define MEMSET_FN(fn, name, desc)		\

	extern void *fn(void *, int, size_t);



#include "mem-memset-x86-64-asm-def.h"



#undef MEMSET_FN



#endif

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

0 → 100644
+12 −0
Original line number Original line Diff line number Diff line 


MEMSET_FN(__memset,

	"x86-64-unrolled",

	"unrolled memset() in arch/x86/lib/memset_64.S")



MEMSET_FN(memset_c,

	"x86-64-stosq",

	"movsq-based memset() in arch/x86/lib/memset_64.S")



MEMSET_FN(memset_c_e,

	"x86-64-stosb",

	"movsb-based memset() in arch/x86/lib/memset_64.S")

tools/perf/bench/mem-memset-x86-64-asm.S

0 → 100644
+6 −0
Original line number Original line Diff line number Diff line 
#define memset MEMSET /* don't hide glibc's memset() */

#define altinstr_replacement text

#define globl p2align 4; .globl

#define Lmemset_c globl memset_c; memset_c

#define Lmemset_c_e globl memset_c_e; memset_c_e

#include "../../../arch/x86/lib/memset_64.S"