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

Commit 0cf55934 authored by Borislav Petkov's avatar Borislav Petkov
Browse files

perf/bench: Fix mem* routines usage after alternatives change 



Adjust perf bench to the new changes in the alternatives code for
memcpy/memset.

Reviewed-by: default avatarHitoshi Mitake <mitake.hitoshi@lab.ntt.co.jp>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
parent e0bc8d17

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

+3 −3
Original line number Diff line number Diff line 


MEMCPY_FN(__memcpy,

MEMCPY_FN(memcpy_orig,

	"x86-64-unrolled",

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



MEMCPY_FN(memcpy_c,

MEMCPY_FN(__memcpy,

	"x86-64-movsq",

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



MEMCPY_FN(memcpy_c_e,

MEMCPY_FN(memcpy_erms,

	"x86-64-movsb",

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

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

+0 −2
Original line number Diff line number Diff line 
#define memcpy MEMCPY /* don't hide glibc's memcpy() */

#define altinstr_replacement text

#define globl p2align 4; .globl

#define Lmemcpy_c globl memcpy_c; memcpy_c

#define Lmemcpy_c_e globl memcpy_c_e; memcpy_c_e

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

/*

 * We need to provide note.GNU-stack section, saying that we want

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

+3 −3
Original line number Diff line number Diff line 


MEMSET_FN(__memset,

MEMSET_FN(memset_orig,

	"x86-64-unrolled",

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



MEMSET_FN(memset_c,

MEMSET_FN(__memset,

	"x86-64-stosq",

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



MEMSET_FN(memset_c_e,

MEMSET_FN(memset_erms,

	"x86-64-stosb",

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

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

+0 −2
Original line number 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"



/*

tools/perf/util/include/asm/alternative-asm.h

+1 −0
Original line number Diff line number Diff line
@@ -4,5 +4,6 @@ 
/* Just disable it so we can build arch/x86/lib/memcpy_64.S for perf bench: */



#define altinstruction_entry #

#define ALTERNATIVE_2 #



#endif