588e70
commit 23fdf8178cce3c2ec320dd5eca8b544245bcaef0
588e70
Author: Raoni Fassina Firmino <raoni@linux.ibm.com>
588e70
Date:   Fri Apr 30 18:12:08 2021 -0300
588e70
588e70
    powerpc64le: Optimize memset for POWER10
588e70
    
588e70
    This implementation is based on __memset_power8 and integrates a lot
588e70
    of suggestions from Anton Blanchard.
588e70
    
588e70
    The biggest difference is that it makes extensive use of stxvl to
588e70
    alignment and tail code to avoid branches and small stores.  It has
588e70
    three main execution paths:
588e70
    
588e70
    a) "Short lengths" for lengths up to 64 bytes, avoiding as many
588e70
       branches as possible.
588e70
    
588e70
    b) "General case" for larger lengths, it has an alignment section
588e70
       using stxvl to avoid branches, a 128 bytes loop and then a tail
588e70
       code, again using stxvl with few branches.
588e70
    
588e70
    c) "Zeroing cache blocks" for lengths from 256 bytes upwards and set
588e70
       value being zero.  It is mostly the __memset_power8 code but the
588e70
       alignment phase was simplified because, at this point, address is
588e70
       already 16-bytes aligned and also changed to use vector stores.
588e70
       The tail code was also simplified to reuse the general case tail.
588e70
    
588e70
    All unaligned stores use stxvl instructions that do not generate
588e70
    alignment interrupts on POWER10, making it safe to use on
588e70
    caching-inhibited memory.
588e70
    
588e70
    On average, this implementation provides something around 30%
588e70
    improvement when compared to __memset_power8.
588e70
    
588e70
    Reviewed-by: Matheus Castanho <msc@linux.ibm.com>
588e70
    Reviewed-by: Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com>
588e70
588e70
diff --git a/sysdeps/powerpc/powerpc64/le/power10/memset.S b/sysdeps/powerpc/powerpc64/le/power10/memset.S
588e70
new file mode 100644
588e70
index 0000000000000000..6b8e2cfdaf25fd30
588e70
--- /dev/null
588e70
+++ b/sysdeps/powerpc/powerpc64/le/power10/memset.S
588e70
@@ -0,0 +1,256 @@
588e70
+/* Optimized memset implementation for POWER10 LE.
588e70
+   Copyright (C) 2021 Free Software Foundation, Inc.
588e70
+   This file is part of the GNU C Library.
588e70
+
588e70
+   The GNU C Library is free software; you can redistribute it and/or
588e70
+   modify it under the terms of the GNU Lesser General Public
588e70
+   License as published by the Free Software Foundation; either
588e70
+   version 2.1 of the License, or (at your option) any later version.
588e70
+
588e70
+   The GNU C Library is distributed in the hope that it will be useful,
588e70
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
588e70
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
588e70
+   Lesser General Public License for more details.
588e70
+
588e70
+   You should have received a copy of the GNU Lesser General Public
588e70
+   License along with the GNU C Library; if not, see
588e70
+   <https://www.gnu.org/licenses/>.  */
588e70
+
588e70
+#include <sysdep.h>
588e70
+
588e70
+/* void * [r3] memset (void *s [r3], int c [r4], size_t n [r5]));
588e70
+   Returns 's'.  */
588e70
+
588e70
+#ifndef MEMSET
588e70
+# define MEMSET memset
588e70
+#endif
588e70
+
588e70
+	.machine  power9
588e70
+ENTRY_TOCLESS (MEMSET, 5)
588e70
+	CALL_MCOUNT 3
588e70
+
588e70
+L(_memset):
588e70
+	/* Assume memset of zero length is uncommon, and just let it go
588e70
+	   through the small path below.  */
588e70
+	cmpldi	r5,64
588e70
+
588e70
+	/* Replicate byte to quad word.  */
588e70
+	mtvsrd	v0+32,r4
588e70
+	vspltb	v0,v0,7
588e70
+
588e70
+	li	r7,16
588e70
+	sldi	r8,r7,56
588e70
+
588e70
+	bgt	L(large)
588e70
+
588e70
+	/* For short lengths we want to avoid as many branches as possible.
588e70
+	   We use store VSX vector with length instructions to do this.
588e70
+	   It takes advantage of the fact that if the length passed to stxvl
588e70
+	   is zero nothing is done, effectively a no-op.  */
588e70
+	sldi	r5,r5,56
588e70
+
588e70
+	addi	r10,r3,16
588e70
+
588e70
+	sub.	r11,r5,r8
588e70
+	isellt	r11,0,r11	/* Saturate the subtraction to zero.  */
588e70
+
588e70
+	stxvl	v0+32,r3,r5
588e70
+	stxvl	v0+32,r10,r11
588e70
+
588e70
+	addi	r9,r3,32
588e70
+	addi	r10,r3,48
588e70
+
588e70
+	sub.	r11,r11,r8
588e70
+	isellt	r11,0,r11
588e70
+
588e70
+	sub.	r5,r11,r8
588e70
+	isellt	r5,0,r5
588e70
+
588e70
+	stxvl	v0+32,r9,r11
588e70
+	stxvl	v0+32,r10,r5
588e70
+
588e70
+	blr
588e70
+
588e70
+	.balign	16
588e70
+L(large):
588e70
+	mr	r6,r3	/* Don't modify r3 since we need to return it.  */
588e70
+
588e70
+	/* Get dest 16B aligned.  */
588e70
+	neg	r0,r3
588e70
+	clrldi.	r7,r0,(64-4)
588e70
+	beq	L(aligned)
588e70
+	rldic	r9,r0,56,4	/* (~X & 0xf)<<56 "clrlsldi r9,r0,64-4,56".  */
588e70
+
588e70
+	stxvl	v0+32,r6,r9	/* Store up to 15B until aligned address.  */
588e70
+
588e70
+	add	r6,r6,r7
588e70
+	sub	r5,r5,r7
588e70
+
588e70
+	/* Go to tail if there is less than 64B left after alignment.  */
588e70
+	cmpldi	r5,64
588e70
+	blt	L(tail_64)
588e70
+
588e70
+	.balign	16
588e70
+L(aligned):
588e70
+	/* Go to tail if there is less than 128B left after alignment.  */
588e70
+	srdi.	r0,r5,7
588e70
+	beq	L(tail_128)
588e70
+
588e70
+	/* If c == 0 && n >= 256 use dcbz to zero out full cache blocks.  */
588e70
+	cmpldi	cr5,r5,255
588e70
+	cmpldi	cr6,r4,0
588e70
+	crand	27,26,21
588e70
+	bt	27,L(dcbz)
588e70
+
588e70
+	mtctr	r0
588e70
+
588e70
+	.balign	32
588e70
+L(loop):
588e70
+	stxv	v0+32,0(r6)
588e70
+	stxv	v0+32,16(r6)
588e70
+	stxv	v0+32,32(r6)
588e70
+	stxv	v0+32,48(r6)
588e70
+	stxv	v0+32,64(r6)
588e70
+	stxv	v0+32,80(r6)
588e70
+	stxv	v0+32,96(r6)
588e70
+	stxv	v0+32,112(r6)
588e70
+	addi	r6,r6,128
588e70
+	bdnz	L(loop)
588e70
+
588e70
+	.balign	16
588e70
+L(tail):
588e70
+	/* 127B or less left, finish the tail or return.  */
588e70
+	andi.	r5,r5,127
588e70
+	beqlr
588e70
+
588e70
+	cmpldi	r5,64
588e70
+	blt	L(tail_64)
588e70
+
588e70
+	.balign	16
588e70
+L(tail_128):
588e70
+	/* Stores a minimum of 64B and up to 128B and return.  */
588e70
+	stxv	v0+32,0(r6)
588e70
+	stxv	v0+32,16(r6)
588e70
+	stxv	v0+32,32(r6)
588e70
+	stxv	v0+32,48(r6)
588e70
+	addi	r6,r6,64
588e70
+	andi.	r5,r5,63
588e70
+	beqlr
588e70
+
588e70
+	.balign	16
588e70
+L(tail_64):
588e70
+	/* Stores up to 64B and return.  */
588e70
+	sldi	r5,r5,56
588e70
+
588e70
+	addi	r10,r6,16
588e70
+
588e70
+	sub.	r11,r5,r8
588e70
+	isellt	r11,0,r11
588e70
+
588e70
+	stxvl	v0+32,r6,r5
588e70
+	stxvl	v0+32,r10,r11
588e70
+
588e70
+	sub.	r11,r11,r8
588e70
+	blelr
588e70
+
588e70
+	addi	r9,r6,32
588e70
+	addi	r10,r6,48
588e70
+
588e70
+	isellt	r11,0,r11
588e70
+
588e70
+	sub.	r5,r11,r8
588e70
+	isellt	r5,0,r5
588e70
+
588e70
+	stxvl	v0+32,r9,r11
588e70
+	stxvl	v0+32,r10,r5
588e70
+
588e70
+	blr
588e70
+
588e70
+	.balign	16
588e70
+L(dcbz):
588e70
+	/* Special case when value is 0 and we have a long length to deal
588e70
+	   with.  Use dcbz to zero out a full cacheline of 128 bytes at a time.
588e70
+	   Before using dcbz though, we need to get the destination 128-byte
588e70
+	   aligned.  */
588e70
+	neg	r0,r6
588e70
+	clrldi.	r0,r0,(64-7)
588e70
+	beq	L(dcbz_aligned)
588e70
+
588e70
+	sub	r5,r5,r0
588e70
+	mtocrf	0x2,r0	/* copying bits 57..59 to cr6. The ones for sizes 64,
588e70
+			   32 and 16 which need to be checked.  */
588e70
+
588e70
+	/* Write 16-128 bytes until DST is aligned to 128 bytes.  */
588e70
+64:	bf	25,32f
588e70
+	stxv	v0+32,0(r6)
588e70
+	stxv	v0+32,16(r6)
588e70
+	stxv	v0+32,32(r6)
588e70
+	stxv	v0+32,48(r6)
588e70
+	addi	r6,r6,64
588e70
+
588e70
+32:	bf	26,16f
588e70
+	stxv	v0+32,0(r6)
588e70
+	stxv	v0+32,16(r6)
588e70
+	addi	r6,r6,32
588e70
+
588e70
+16:	bf	27,L(dcbz_aligned)
588e70
+	stxv	v0+32,0(r6)
588e70
+	addi	r6,r6,16
588e70
+
588e70
+	.balign	16
588e70
+L(dcbz_aligned):
588e70
+	/* Setup dcbz unroll offsets and count numbers.  */
588e70
+	srdi.	r0,r5,9
588e70
+	li	r9,128
588e70
+	beq	L(bcdz_tail)
588e70
+	li	r10,256
588e70
+	li	r11,384
588e70
+	mtctr	r0
588e70
+
588e70
+	.balign	16
588e70
+L(dcbz_loop):
588e70
+	/* Sets 512 bytes to zero in each iteration, the loop unrolling shows
588e70
+	   a throughput boost for large sizes (2048 bytes or higher).  */
588e70
+	dcbz	0,r6
588e70
+	dcbz	r9,r6
588e70
+	dcbz	r10,r6
588e70
+	dcbz	r11,r6
588e70
+	addi	r6,r6,512
588e70
+	bdnz	L(dcbz_loop)
588e70
+
588e70
+	andi.	r5,r5,511
588e70
+	beqlr
588e70
+
588e70
+	.balign	16
588e70
+L(bcdz_tail):
588e70
+	/* We have 1-511 bytes remaining.  */
588e70
+	srdi.	r0,r5,7
588e70
+	beq	L(tail)
588e70
+
588e70
+	mtocrf	0x1,r0
588e70
+
588e70
+256:	bf	30,128f
588e70
+	dcbz	0,r6
588e70
+	dcbz	r9,r6
588e70
+	addi	r6,r6,256
588e70
+
588e70
+128:	bf	31,L(tail)
588e70
+	dcbz	0,r6
588e70
+	addi	r6,r6,128
588e70
+
588e70
+	b	L(tail)
588e70
+
588e70
+END_GEN_TB (MEMSET,TB_TOCLESS)
588e70
+libc_hidden_builtin_def (memset)
588e70
+
588e70
+/* Copied from bzero.S to prevent the linker from inserting a stub
588e70
+   between bzero and memset.  */
588e70
+ENTRY_TOCLESS (__bzero)
588e70
+	CALL_MCOUNT 2
588e70
+	mr	r5,r4
588e70
+	li	r4,0
588e70
+	b	L(_memset)
588e70
+END (__bzero)
588e70
+#ifndef __bzero
588e70
+weak_alias (__bzero, bzero)
588e70
+#endif
588e70
diff --git a/sysdeps/powerpc/powerpc64/multiarch/Makefile b/sysdeps/powerpc/powerpc64/multiarch/Makefile
588e70
index 2e3c8f2e8a81cda4..1d517698429e1230 100644
588e70
--- a/sysdeps/powerpc/powerpc64/multiarch/Makefile
588e70
+++ b/sysdeps/powerpc/powerpc64/multiarch/Makefile
588e70
@@ -32,7 +32,7 @@ sysdep_routines += memcpy-power8-cached memcpy-power7 memcpy-a2 memcpy-power6 \
588e70
 		   strncase-power8
588e70
 
588e70
 ifneq (,$(filter %le,$(config-machine)))
588e70
-sysdep_routines += memcpy-power10 memmove-power10 \
588e70
+sysdep_routines += memcpy-power10 memmove-power10 memset-power10 \
588e70
 		   strcmp-power9 strncmp-power9 strcpy-power9 stpcpy-power9 \
588e70
 		   rawmemchr-power9 strlen-power9 strncpy-power9 stpncpy-power9 \
588e70
 		   strlen-power10
588e70
diff --git a/sysdeps/powerpc/powerpc64/multiarch/bzero.c b/sysdeps/powerpc/powerpc64/multiarch/bzero.c
588e70
index f8cb05bea8a3505b..4ce98e324d12a31e 100644
588e70
--- a/sysdeps/powerpc/powerpc64/multiarch/bzero.c
588e70
+++ b/sysdeps/powerpc/powerpc64/multiarch/bzero.c
588e70
@@ -27,8 +27,16 @@ extern __typeof (bzero) __bzero_power4 attribute_hidden;
588e70
 extern __typeof (bzero) __bzero_power6 attribute_hidden;
588e70
 extern __typeof (bzero) __bzero_power7 attribute_hidden;
588e70
 extern __typeof (bzero) __bzero_power8 attribute_hidden;
588e70
+# ifdef __LITTLE_ENDIAN__
588e70
+extern __typeof (bzero) __bzero_power10 attribute_hidden;
588e70
+# endif
588e70
 
588e70
 libc_ifunc (__bzero,
588e70
+# ifdef __LITTLE_ENDIAN__
588e70
+	    (hwcap2 & (PPC_FEATURE2_ARCH_3_1 | PPC_FEATURE2_HAS_ISEL)
588e70
+	     && hwcap & PPC_FEATURE_HAS_VSX)
588e70
+	    ? __bzero_power10 :
588e70
+# endif
588e70
             (hwcap2 & PPC_FEATURE2_ARCH_2_07)
588e70
             ? __bzero_power8 :
588e70
 	      (hwcap & PPC_FEATURE_HAS_VSX)
588e70
diff --git a/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c b/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
588e70
index 9d5a14e480c02171..11532f77d4d03b2a 100644
588e70
--- a/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
588e70
+++ b/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c
588e70
@@ -86,6 +86,13 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
588e70
 
588e70
   /* Support sysdeps/powerpc/powerpc64/multiarch/memset.c.  */
588e70
   IFUNC_IMPL (i, name, memset,
588e70
+#ifdef __LITTLE_ENDIAN__
588e70
+	      IFUNC_IMPL_ADD (array, i, memset,
588e70
+			      hwcap2 & (PPC_FEATURE2_ARCH_3_1 |
588e70
+					PPC_FEATURE2_HAS_ISEL)
588e70
+			      && hwcap & PPC_FEATURE_HAS_VSX,
588e70
+			      __memset_power10)
588e70
+#endif
588e70
 	      IFUNC_IMPL_ADD (array, i, memset, hwcap2 & PPC_FEATURE2_ARCH_2_07,
588e70
 			      __memset_power8)
588e70
 	      IFUNC_IMPL_ADD (array, i, memset, hwcap & PPC_FEATURE_HAS_VSX,
588e70
@@ -187,6 +194,13 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
588e70
 
588e70
   /* Support sysdeps/powerpc/powerpc64/multiarch/bzero.c.  */
588e70
   IFUNC_IMPL (i, name, bzero,
588e70
+#ifdef __LITTLE_ENDIAN__
588e70
+	      IFUNC_IMPL_ADD (array, i, bzero,
588e70
+			      hwcap2 & (PPC_FEATURE2_ARCH_3_1 |
588e70
+					PPC_FEATURE2_HAS_ISEL)
588e70
+			      && hwcap & PPC_FEATURE_HAS_VSX,
588e70
+			      __bzero_power10)
588e70
+#endif
588e70
 	      IFUNC_IMPL_ADD (array, i, bzero, hwcap2 & PPC_FEATURE2_ARCH_2_07,
588e70
 			      __bzero_power8)
588e70
 	      IFUNC_IMPL_ADD (array, i, bzero, hwcap & PPC_FEATURE_HAS_VSX,
588e70
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memset-power10.S b/sysdeps/powerpc/powerpc64/multiarch/memset-power10.S
588e70
new file mode 100644
588e70
index 0000000000000000..548e99789735296c
588e70
--- /dev/null
588e70
+++ b/sysdeps/powerpc/powerpc64/multiarch/memset-power10.S
588e70
@@ -0,0 +1,27 @@
588e70
+/* Optimized memset implementation for POWER10 LE.
588e70
+   Copyright (C) 2021 Free Software Foundation, Inc.
588e70
+   This file is part of the GNU C Library.
588e70
+
588e70
+   The GNU C Library is free software; you can redistribute it and/or
588e70
+   modify it under the terms of the GNU Lesser General Public
588e70
+   License as published by the Free Software Foundation; either
588e70
+   version 2.1 of the License, or (at your option) any later version.
588e70
+
588e70
+   The GNU C Library is distributed in the hope that it will be useful,
588e70
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
588e70
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
588e70
+   Lesser General Public License for more details.
588e70
+
588e70
+   You should have received a copy of the GNU Lesser General Public
588e70
+   License along with the GNU C Library; if not, see
588e70
+   <https://www.gnu.org/licenses/>.  */
588e70
+
588e70
+#define MEMSET __memset_power10
588e70
+
588e70
+#undef libc_hidden_builtin_def
588e70
+#define libc_hidden_builtin_def(name)
588e70
+
588e70
+#undef __bzero
588e70
+#define __bzero __bzero_power10
588e70
+
588e70
+#include <sysdeps/powerpc/powerpc64/le/power10/memset.S>
588e70
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memset.c b/sysdeps/powerpc/powerpc64/multiarch/memset.c
588e70
index 1a7c46fecf78ab1f..4c97622c7d7eb8aa 100644
588e70
--- a/sysdeps/powerpc/powerpc64/multiarch/memset.c
588e70
+++ b/sysdeps/powerpc/powerpc64/multiarch/memset.c
588e70
@@ -33,10 +33,18 @@ extern __typeof (__redirect_memset) __memset_power4 attribute_hidden;
588e70
 extern __typeof (__redirect_memset) __memset_power6 attribute_hidden;
588e70
 extern __typeof (__redirect_memset) __memset_power7 attribute_hidden;
588e70
 extern __typeof (__redirect_memset) __memset_power8 attribute_hidden;
588e70
+# ifdef __LITTLE_ENDIAN__
588e70
+extern __typeof (__redirect_memset) __memset_power10 attribute_hidden;
588e70
+# endif
588e70
 
588e70
 /* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle
588e70
    ifunc symbol properly.  */
588e70
 libc_ifunc (__libc_memset,
588e70
+# ifdef __LITTLE_ENDIAN__
588e70
+	    (hwcap2 & (PPC_FEATURE2_ARCH_3_1 | PPC_FEATURE2_HAS_ISEL)
588e70
+	     && hwcap & PPC_FEATURE_HAS_VSX)
588e70
+	    ? __memset_power10 :
588e70
+# endif
588e70
             (hwcap2 & PPC_FEATURE2_ARCH_2_07)
588e70
             ? __memset_power8 :
588e70
 	      (hwcap & PPC_FEATURE_HAS_VSX)