target/linux/generic/patches-4.9/306-mips_mem_functions_performance.patch

   1 --- a/arch/mips/include/asm/string.h
   2 +++ b/arch/mips/include/asm/string.h
   3 @@ -140,4 +140,42 @@ extern void *memcpy(void *__to, __const_
   4  #define __HAVE_ARCH_MEMMOVE
   5  extern void *memmove(void *__dest, __const__ void *__src, size_t __n);
   6
   7 +#ifndef __ZBOOT__
   8 +#define memset(__s, __c, len)                                  \
   9 +({                                                             \
  10 +       size_t __len = (len);                                   \
  11 +       void *__ret;                                            \
  12 +       if (__builtin_constant_p(len) && __len >= 64)           \
  13 +               __ret = memset((__s), (__c), __len);            \
  14 +       else                                                    \
  15 +               __ret = __builtin_memset((__s), (__c), __len);  \
  16 +       __ret;                                                  \
  17 +})
  18 +
  19 +#define memcpy(dst, src, len)                                  \
  20 +({                                                             \
  21 +       size_t __len = (len);                                   \
  22 +       void *__ret;                                            \
  23 +       if (__builtin_constant_p(len) && __len >= 64)           \
  24 +               __ret = memcpy((dst), (src), __len);            \
  25 +       else                                                    \
  26 +               __ret = __builtin_memcpy((dst), (src), __len);  \
  27 +       __ret;                                                  \
  28 +})
  29 +
  30 +#define memmove(dst, src, len)                                 \
  31 +({                                                             \
  32 +       size_t __len = (len);                                   \
  33 +       void *__ret;                                            \
  34 +       if (__builtin_constant_p(len) && __len >= 64)           \
  35 +               __ret = memmove((dst), (src), __len);           \
  36 +       else                                                    \
  37 +               __ret = __builtin_memmove((dst), (src), __len); \
  38 +       __ret;                                                  \
  39 +})
  40 +
  41 +#define __HAVE_ARCH_MEMCMP
  42 +#define memcmp(src1, src2, len) __builtin_memcmp((src1), (src2), (len))
  43 +#endif
  44 +
  45  #endif /* _ASM_STRING_H */
  46 --- a/arch/mips/lib/Makefile
  47 +++ b/arch/mips/lib/Makefile
  48 @@ -4,7 +4,7 @@
  49
  50  lib-y  += bitops.o csum_partial.o delay.o memcpy.o memset.o \
  51            mips-atomic.o strlen_user.o strncpy_user.o \
  52 -          strnlen_user.o uncached.o
  53 +          strnlen_user.o uncached.o memcmp.o
  54
  55  obj-y                  += iomap.o
  56  obj-$(CONFIG_PCI)      += iomap-pci.o
  57 --- /dev/null
  58 +++ b/arch/mips/lib/memcmp.c
  59 @@ -0,0 +1,22 @@
  60 +/*
  61 + *  copied from linux/lib/string.c
  62 + *
  63 + *  Copyright (C) 1991, 1992  Linus Torvalds
  64 + */
  65 +
  66 +#include <linux/module.h>
  67 +#include <linux/string.h>
  68 +
  69 +#undef memcmp
  70 +int memcmp(const void *cs, const void *ct, size_t count)
  71 +{
  72 +       const unsigned char *su1, *su2;
  73 +       int res = 0;
  74 +
  75 +       for (su1 = cs, su2 = ct; 0 < count; ++su1, ++su2, count--)
  76 +               if ((res = *su1 - *su2) != 0)
  77 +                       break;
  78 +       return res;
  79 +}
  80 +EXPORT_SYMBOL(memcmp);
  81 +
  82 --- a/arch/mips/boot/compressed/Makefile
  83 +++ b/arch/mips/boot/compressed/Makefile
  84 @@ -23,7 +23,8 @@ KBUILD_CFLAGS := $(shell echo $(KBUILD_C
  85  KBUILD_CFLAGS := $(filter-out -fstack-protector, $(KBUILD_CFLAGS))
  86
  87  KBUILD_CFLAGS := $(LINUXINCLUDE) $(KBUILD_CFLAGS) -D__KERNEL__ \
  88 -       -DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE) -D"VMLINUX_LOAD_ADDRESS_ULL=$(VMLINUX_LOAD_ADDRESS)ull"
  89 +       -DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE) -D"VMLINUX_LOAD_ADDRESS_ULL=$(VMLINUX_LOAD_ADDRESS)ull" \
  90 +       -D__ZBOOT__
  91
  92  KBUILD_AFLAGS := $(LINUXINCLUDE) $(KBUILD_AFLAGS) -D__ASSEMBLY__ \
  93         -DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE) \