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: Hitoshi Mitake <mitake.hitoshi@lab.ntt.co.jp>
Signed-off-by: Borislav Petkov <bp@suse.de>
This commit is contained in:
Borislav Petkov 2015-02-26 18:38:16 +01:00
parent e0bc8d179e
commit 0cf55934ec
5 changed files with 7 additions and 10 deletions

View file

@ -1,12 +1,12 @@
MEMCPY_FN(__memcpy, MEMCPY_FN(memcpy_orig,
"x86-64-unrolled", "x86-64-unrolled",
"unrolled memcpy() in arch/x86/lib/memcpy_64.S") "unrolled memcpy() in arch/x86/lib/memcpy_64.S")
MEMCPY_FN(memcpy_c, MEMCPY_FN(__memcpy,
"x86-64-movsq", "x86-64-movsq",
"movsq-based memcpy() in arch/x86/lib/memcpy_64.S") "movsq-based memcpy() in arch/x86/lib/memcpy_64.S")
MEMCPY_FN(memcpy_c_e, MEMCPY_FN(memcpy_erms,
"x86-64-movsb", "x86-64-movsb",
"movsb-based memcpy() in arch/x86/lib/memcpy_64.S") "movsb-based memcpy() in arch/x86/lib/memcpy_64.S")

View file

@ -1,8 +1,6 @@
#define memcpy MEMCPY /* don't hide glibc's memcpy() */ #define memcpy MEMCPY /* don't hide glibc's memcpy() */
#define altinstr_replacement text #define altinstr_replacement text
#define globl p2align 4; .globl #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" #include "../../../arch/x86/lib/memcpy_64.S"
/* /*
* We need to provide note.GNU-stack section, saying that we want * We need to provide note.GNU-stack section, saying that we want

View file

@ -1,12 +1,12 @@
MEMSET_FN(__memset, MEMSET_FN(memset_orig,
"x86-64-unrolled", "x86-64-unrolled",
"unrolled memset() in arch/x86/lib/memset_64.S") "unrolled memset() in arch/x86/lib/memset_64.S")
MEMSET_FN(memset_c, MEMSET_FN(__memset,
"x86-64-stosq", "x86-64-stosq",
"movsq-based memset() in arch/x86/lib/memset_64.S") "movsq-based memset() in arch/x86/lib/memset_64.S")
MEMSET_FN(memset_c_e, MEMSET_FN(memset_erms,
"x86-64-stosb", "x86-64-stosb",
"movsb-based memset() in arch/x86/lib/memset_64.S") "movsb-based memset() in arch/x86/lib/memset_64.S")

View file

@ -1,8 +1,6 @@
#define memset MEMSET /* don't hide glibc's memset() */ #define memset MEMSET /* don't hide glibc's memset() */
#define altinstr_replacement text #define altinstr_replacement text
#define globl p2align 4; .globl #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" #include "../../../arch/x86/lib/memset_64.S"
/* /*

View file

@ -4,5 +4,6 @@
/* Just disable it so we can build arch/x86/lib/memcpy_64.S for perf bench: */ /* Just disable it so we can build arch/x86/lib/memcpy_64.S for perf bench: */
#define altinstruction_entry # #define altinstruction_entry #
#define ALTERNATIVE_2 #
#endif #endif