libc: update arm-m memset function

Use the memset function in bionic for better performance.

Signed-off-by: zhangyuan21 <zhangyuan21@xiaomi.com>
This commit is contained in:
zhangyuan21
2023-06-09 03:39:10 +08:00
committed by Xiang Xiao
parent 5d1536c5e3
commit 699c401889
2 changed files with 174 additions and 158 deletions
+83 -88
View File
@@ -1,31 +1,31 @@
/**************************************************************************** /****************************************************************************
* libs/libc/machine/arm/armv7-m/gnu/arch_memset.S * libs/libc/machine/arm/armv7-m/gnu/arch_memset.S
* *
* Copyright (c) 2015 ARM Ltd * Copyright (C) 2008 The Android Open Source Project
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
* are met: * are met:
* 1. Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in
* documentation and/or other materials provided with the distribution. * the documentation and/or other materials provided with the
* 3. The name of the company may not be used to endorse or promote * distribution.
* products derived from this software without specific prior written
* permission.
* *
* THIS SOFTWARE IS PROVIDED BY ARM LTD ``AS IS'' AND ANY EXPRESS OR IMPLIED * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* IN NO EVENT SHALL ARM LTD BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* *
****************************************************************************/ ****************************************************************************/
@@ -38,77 +38,72 @@
.global memset .global memset
.type memset, %function .type memset, %function
memset: memset:
push {r4, r5, r6} stmfd sp!, {r0, r4-r7, lr}
lsls r4, r0, #30 rsb r3, r0, #0
beq 10f ands r3, r3, #3
subs r4, r2, #1 cmp r3, r2
cmp r2, #0 movhi r3, r2
beq 9f
uxtb r5, r1 /* splat r1 */
mov r3, r0
b 2f mov r1, r1, lsl #24
1: orr r1, r1, r1, lsr #8
subs r2, r4, #1 orr r1, r1, r1, lsr #16
cbz r4, 9f
mov r4, r2 movs r12, r3, lsl #31
2: strbcs r1, [r0], #1
strb r5, [r3], #1 strbcs r1, [r0], #1
lsls r2, r3, #30 strbmi r1, [r0], #1
bne 1b subs r2, r2, r3
popls {r0, r4-r7, pc}
/* align the destination to a cache-line */
mov r12, r1
mov lr, r1
mov r4, r1
mov r5, r1
mov r6, r1
mov r7, r1
rsb r3, r0, #0
ands r3, r3, #0x1C
beq 3f
cmp r3, r2
andhi r3, r2, #0x1C
sub r2, r2, r3
/* conditionally writes 0 to 7 words (length in r3) */
movs r3, r3, lsl #28
stmcs r0!, {r1, lr}
stmcs r0!, {r1, lr}
stmmi r0!, {r1, lr}
movs r3, r3, lsl #2
strcs r1, [r0], #4
3: 3:
cmp r4, #3 subs r2, r2, #32
bls 7f mov r3, r1
uxtb r5, r1 bmi 2f
orr r5, r5, r5, lsl #8 1:
cmp r4, #15 subs r2, r2, #32
orr r5, r5, r5, lsl #16 stmia r0!, {r1,r3,r4,r5,r6,r7,r12,lr}
bls 5f bhs 1b
mov r6, r4 2:
add r2, r3, #16 add r2, r2, #32
4:
subs r6, r6, #16 /* conditionally stores 0 to 31 bytes */
cmp r6, #15
str r5, [r2, #-16] movs r2, r2, lsl #28
str r5, [r2, #-12] stmcs r0!, {r1,r3,r12,lr}
str r5, [r2, #-8] stmmi r0!, {r1, lr}
str r5, [r2, #-4] movs r2, r2, lsl #2
add r2, r2, #16 strcs r1, [r0], #4
bhi 4b strhmi r1, [r0], #2
sub r2, r4, #16 movs r2, r2, lsl #2
bic r2, r2, #15 strbcs r1, [r0]
and r4, r4, #15 ldmfd sp!, {r0, r4-r7, pc}
adds r2, r2, #16
cmp r4, #3
add r3, r3, r2
bls 7f
5:
mov r6, r3
mov r2, r4
6:
subs r2, r2, #4
cmp r2, #3
str r5, [r6], #4
bhi 6b
subs r2, r4, #4
bic r2, r2, #3
adds r2, r2, #4
add r3, r3, r2
and r4, r4, #3
7:
cbz r4, 9f
uxtb r1, r1
add r4, r4, r3
8:
strb r1, [r3], #1
cmp r3, r4
bne 8b
9:
pop {r4, r5, r6}
bx lr
10:
mov r4, r2
mov r3, r0
b 3b
.size memset, . - memset .size memset, . - memset
#endif #endif
+91 -70
View File
@@ -27,6 +27,32 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* Copyright (C) 2008 The Android Open Source Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
****************************************************************************/ ****************************************************************************/
#include "libc.h" #include "libc.h"
@@ -49,77 +75,72 @@ memset:
2: 2:
bx r3 bx r3
#else #else
push {r4, r5, r6} stmfd sp!, {r0, r4-r7, lr}
lsls r4, r0, #30 rsb r3, r0, #0
beq 10f ands r3, r3, #3
subs r4, r2, #1 cmp r3, r2
cmp r2, #0 movhi r3, r2
beq 9f
uxtb r5, r1 /* splat r1 */
mov r3, r0
b 2f mov r1, r1, lsl #24
1: orr r1, r1, r1, lsr #8
subs r2, r4, #1 orr r1, r1, r1, lsr #16
cbz r4, 9f
mov r4, r2 movs r12, r3, lsl #31
2: strbcs r1, [r0], #1
strb r5, [r3], #1 strbcs r1, [r0], #1
lsls r2, r3, #30 strbmi r1, [r0], #1
bne 1b subs r2, r2, r3
popls {r0, r4-r7, pc}
/* align the destination to a cache-line */
mov r12, r1
mov lr, r1
mov r4, r1
mov r5, r1
mov r6, r1
mov r7, r1
rsb r3, r0, #0
ands r3, r3, #0x1C
beq 3f
cmp r3, r2
andhi r3, r2, #0x1C
sub r2, r2, r3
/* conditionally writes 0 to 7 words (length in r3) */
movs r3, r3, lsl #28
stmcs r0!, {r1, lr}
stmcs r0!, {r1, lr}
stmmi r0!, {r1, lr}
movs r3, r3, lsl #2
strcs r1, [r0], #4
3: 3:
cmp r4, #3 subs r2, r2, #32
bls 7f mov r3, r1
uxtb r5, r1 bmi 2f
orr r5, r5, r5, lsl #8 1:
cmp r4, #15 subs r2, r2, #32
orr r5, r5, r5, lsl #16 stmia r0!, {r1,r3,r4,r5,r6,r7,r12,lr}
bls 5f bhs 1b
mov r6, r4 2:
add r2, r3, #16 add r2, r2, #32
4:
subs r6, r6, #16 /* conditionally stores 0 to 31 bytes */
cmp r6, #15
str r5, [r2, #-16] movs r2, r2, lsl #28
str r5, [r2, #-12] stmcs r0!, {r1,r3,r12,lr}
str r5, [r2, #-8] stmmi r0!, {r1, lr}
str r5, [r2, #-4] movs r2, r2, lsl #2
add r2, r2, #16 strcs r1, [r0], #4
bhi 4b strhmi r1, [r0], #2
sub r2, r4, #16 movs r2, r2, lsl #2
bic r2, r2, #15 strbcs r1, [r0]
and r4, r4, #15 ldmfd sp!, {r0, r4-r7, pc}
adds r2, r2, #16
cmp r4, #3
add r3, r3, r2
bls 7f
5:
mov r6, r3
mov r2, r4
6:
subs r2, r2, #4
cmp r2, #3
str r5, [r6], #4
bhi 6b
subs r2, r4, #4
bic r2, r2, #3
adds r2, r2, #4
add r3, r3, r2
and r4, r4, #3
7:
cbz r4, 9f
uxtb r1, r1
add r4, r4, r3
8:
strb r1, [r3], #1
cmp r3, r4
bne 8b
9:
pop {r4, r5, r6}
bx lr
10:
mov r4, r2
mov r3, r0
b 3b
#endif #endif
.size memset, . - memset .size memset, . - memset