From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-x431.google.com (mail-pf1-x431.google.com [IPv6:2607:f8b0:4864:20::431]) by sourceware.org (Postfix) with ESMTPS id 436B83857C42 for ; Thu, 14 Apr 2022 18:06:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 436B83857C42 Received: by mail-pf1-x431.google.com with SMTP id j17so5521496pfi.9 for ; Thu, 14 Apr 2022 11:06:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Bt++gEi8FFR5t2BUdd9XXLfhlUP05EeDYFi7IkLq5Ak=; b=wVUS/dErqrFEO696CwyDlxxvIrTiB3WiDD4wSaPaSobLENq1f3tF4uL9/OP6aEjHoB QGCH0BlwOFmY4NR8UOQVzwBqrMT4cNEXQTsGeQKSUPVpt1EiISSI4ZUapd80YGs3Rm5X 9R8L31q+dSLMmNbYJfPTfe3nSU0JYnjwQStO7VsvJXhN+E4iR5JS7r8uWL88jqorxnQn 95dyN+npU7k96K2oNvdfZ2riGSa4skUm0+/jsyYu4+LeZCg3jD6rnejsybEsweIufx8E DCJigBdhSJqEbam948GOPROz0L0970PIGDp+D5kPqtmuJo66TxT7TxVLhwx9F8gYjKYT qvjw== X-Gm-Message-State: AOAM5325XSB2JZslq7X0r41IvXCMDrtvLfrCBm1sGyTeDRsyJUVYkCxk 2X/dqB9JplLXHP59boRZA/EfB8cwkD8uEdvvMb2JxRo/s9k= X-Google-Smtp-Source: ABdhPJzjcN68JPk80yIer/qoZTomtBXox8Sw7ppaHIgQVd5KAMjyp7VmfcwoHBZvfi/gmAzDVjh1B440JAr/99cVzdU= X-Received: by 2002:aa7:8d54:0:b0:4e0:bd6:cfb9 with SMTP id s20-20020aa78d54000000b004e00bd6cfb9mr5073115pfe.60.1649959603042; Thu, 14 Apr 2022 11:06:43 -0700 (PDT) MIME-Version: 1.0 References: <20220325183625.1170867-2-goldstein.w.n@gmail.com> <20220414164739.3146735-1-goldstein.w.n@gmail.com> <20220414164739.3146735-3-goldstein.w.n@gmail.com> In-Reply-To: <20220414164739.3146735-3-goldstein.w.n@gmail.com> From: "H.J. Lu" Date: Thu, 14 Apr 2022 11:06:06 -0700 Message-ID: Subject: Re: [PATCH v5 3/6] x86: Remove str{n}cat-ssse3 To: Noah Goldstein Cc: GNU C Library , "Carlos O'Donell" Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-3025.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_NUMSUBJECT, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Apr 2022 18:06:47 -0000 On Thu, Apr 14, 2022 at 9:47 AM Noah Goldstein wrote: > > With SSE2, SSE4.1, AVX2, and EVEX versions very few targets prefer > SSSE3. As a result it is no longer worth it to keep the SSSE3 > versions given the code size cost. > --- > sysdeps/x86_64/multiarch/Makefile | 2 - > sysdeps/x86_64/multiarch/ifunc-impl-list.c | 4 - > sysdeps/x86_64/multiarch/ifunc-strcpy.h | 4 - > sysdeps/x86_64/multiarch/strcat-ssse3.S | 866 --------------------- > sysdeps/x86_64/multiarch/strncat-ssse3.S | 3 - > 5 files changed, 879 deletions(-) > delete mode 100644 sysdeps/x86_64/multiarch/strcat-ssse3.S > delete mode 100644 sysdeps/x86_64/multiarch/strncat-ssse3.S > > diff --git a/sysdeps/x86_64/multiarch/Makefile b/sysdeps/x86_64/multiarch/Makefile > index ed2def288d..2b3c625ea2 100644 > --- a/sysdeps/x86_64/multiarch/Makefile > +++ b/sysdeps/x86_64/multiarch/Makefile > @@ -63,7 +63,6 @@ sysdep_routines += \ > strcat-evex \ > strcat-sse2 \ > strcat-sse2-unaligned \ > - strcat-ssse3 \ > strchr-avx2 \ > strchr-avx2-rtm \ > strchr-evex \ > @@ -101,7 +100,6 @@ sysdep_routines += \ > strncat-c \ > strncat-evex \ > strncat-sse2-unaligned \ > - strncat-ssse3 \ > strncmp-avx2 \ > strncmp-avx2-rtm \ > strncmp-evex \ > diff --git a/sysdeps/x86_64/multiarch/ifunc-impl-list.c b/sysdeps/x86_64/multiarch/ifunc-impl-list.c > index 7e2be3554b..41a04621ad 100644 > --- a/sysdeps/x86_64/multiarch/ifunc-impl-list.c > +++ b/sysdeps/x86_64/multiarch/ifunc-impl-list.c > @@ -481,8 +481,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, > (CPU_FEATURE_USABLE (AVX512VL) > && CPU_FEATURE_USABLE (AVX512BW)), > __strcat_evex) > - IFUNC_IMPL_ADD (array, i, strcat, CPU_FEATURE_USABLE (SSSE3), > - __strcat_ssse3) > IFUNC_IMPL_ADD (array, i, strcat, 1, __strcat_sse2_unaligned) > IFUNC_IMPL_ADD (array, i, strcat, 1, __strcat_sse2)) > > @@ -630,8 +628,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, > (CPU_FEATURE_USABLE (AVX512VL) > && CPU_FEATURE_USABLE (AVX512BW)), > __strncat_evex) > - IFUNC_IMPL_ADD (array, i, strncat, CPU_FEATURE_USABLE (SSSE3), > - __strncat_ssse3) > IFUNC_IMPL_ADD (array, i, strncat, 1, > __strncat_sse2_unaligned) > IFUNC_IMPL_ADD (array, i, strncat, 1, __strncat_sse2)) > diff --git a/sysdeps/x86_64/multiarch/ifunc-strcpy.h b/sysdeps/x86_64/multiarch/ifunc-strcpy.h > index 5bece38f78..a15afa44e9 100644 > --- a/sysdeps/x86_64/multiarch/ifunc-strcpy.h > +++ b/sysdeps/x86_64/multiarch/ifunc-strcpy.h > @@ -23,7 +23,6 @@ > extern __typeof (REDIRECT_NAME) OPTIMIZE (sse2) attribute_hidden; > extern __typeof (REDIRECT_NAME) OPTIMIZE (sse2_unaligned) > attribute_hidden; > -extern __typeof (REDIRECT_NAME) OPTIMIZE (ssse3) attribute_hidden; > extern __typeof (REDIRECT_NAME) OPTIMIZE (avx2) attribute_hidden; > extern __typeof (REDIRECT_NAME) OPTIMIZE (avx2_rtm) attribute_hidden; > extern __typeof (REDIRECT_NAME) OPTIMIZE (evex) attribute_hidden; > @@ -50,8 +49,5 @@ IFUNC_SELECTOR (void) > if (CPU_FEATURES_ARCH_P (cpu_features, Fast_Unaligned_Load)) > return OPTIMIZE (sse2_unaligned); > > - if (CPU_FEATURE_USABLE_P (cpu_features, SSSE3)) > - return OPTIMIZE (ssse3); > - > return OPTIMIZE (sse2); > } > diff --git a/sysdeps/x86_64/multiarch/strcat-ssse3.S b/sysdeps/x86_64/multiarch/strcat-ssse3.S > deleted file mode 100644 > index 9f39e4fcd1..0000000000 > --- a/sysdeps/x86_64/multiarch/strcat-ssse3.S > +++ /dev/null > @@ -1,866 +0,0 @@ > -/* strcat with SSSE3 > - Copyright (C) 2011-2022 Free Software Foundation, Inc. > - This file is part of the GNU C Library. > - > - The GNU C Library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - The GNU C Library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with the GNU C Library; if not, see > - . */ > - > -#if IS_IN (libc) > - > -# include > - > -# ifndef STRCAT > -# define STRCAT __strcat_ssse3 > -# endif > - > -# define USE_AS_STRCAT > - > -.text > -ENTRY (STRCAT) > -# ifdef USE_AS_STRNCAT > - mov %rdx, %r8 > -# endif > - > - > -/* Inline corresponding strlen file, temporary until new strcpy > - implementation gets merged. */ > - > - xor %eax, %eax > - cmpb $0, (%rdi) > - jz L(exit_tail0) > - cmpb $0, 1(%rdi) > - jz L(exit_tail1) > - cmpb $0, 2(%rdi) > - jz L(exit_tail2) > - cmpb $0, 3(%rdi) > - jz L(exit_tail3) > - > - cmpb $0, 4(%rdi) > - jz L(exit_tail4) > - cmpb $0, 5(%rdi) > - jz L(exit_tail5) > - cmpb $0, 6(%rdi) > - jz L(exit_tail6) > - cmpb $0, 7(%rdi) > - jz L(exit_tail7) > - > - cmpb $0, 8(%rdi) > - jz L(exit_tail8) > - cmpb $0, 9(%rdi) > - jz L(exit_tail9) > - cmpb $0, 10(%rdi) > - jz L(exit_tail10) > - cmpb $0, 11(%rdi) > - jz L(exit_tail11) > - > - cmpb $0, 12(%rdi) > - jz L(exit_tail12) > - cmpb $0, 13(%rdi) > - jz L(exit_tail13) > - cmpb $0, 14(%rdi) > - jz L(exit_tail14) > - cmpb $0, 15(%rdi) > - jz L(exit_tail15) > - pxor %xmm0, %xmm0 > - lea 16(%rdi), %rcx > - lea 16(%rdi), %rax > - and $-16, %rax > - > - pcmpeqb (%rax), %xmm0 > - pmovmskb %xmm0, %edx > - pxor %xmm1, %xmm1 > - test %edx, %edx > - lea 16(%rax), %rax > - jnz L(exit) > - > - pcmpeqb (%rax), %xmm1 > - pmovmskb %xmm1, %edx > - pxor %xmm2, %xmm2 > - test %edx, %edx > - lea 16(%rax), %rax > - jnz L(exit) > - > - pcmpeqb (%rax), %xmm2 > - pmovmskb %xmm2, %edx > - pxor %xmm3, %xmm3 > - test %edx, %edx > - lea 16(%rax), %rax > - jnz L(exit) > - > - pcmpeqb (%rax), %xmm3 > - pmovmskb %xmm3, %edx > - test %edx, %edx > - lea 16(%rax), %rax > - jnz L(exit) > - > - pcmpeqb (%rax), %xmm0 > - pmovmskb %xmm0, %edx > - test %edx, %edx > - lea 16(%rax), %rax > - jnz L(exit) > - > - pcmpeqb (%rax), %xmm1 > - pmovmskb %xmm1, %edx > - test %edx, %edx > - lea 16(%rax), %rax > - jnz L(exit) > - > - pcmpeqb (%rax), %xmm2 > - pmovmskb %xmm2, %edx > - test %edx, %edx > - lea 16(%rax), %rax > - jnz L(exit) > - > - pcmpeqb (%rax), %xmm3 > - pmovmskb %xmm3, %edx > - test %edx, %edx > - lea 16(%rax), %rax > - jnz L(exit) > - > - pcmpeqb (%rax), %xmm0 > - pmovmskb %xmm0, %edx > - test %edx, %edx > - lea 16(%rax), %rax > - jnz L(exit) > - > - pcmpeqb (%rax), %xmm1 > - pmovmskb %xmm1, %edx > - test %edx, %edx > - lea 16(%rax), %rax > - jnz L(exit) > - > - pcmpeqb (%rax), %xmm2 > - pmovmskb %xmm2, %edx > - test %edx, %edx > - lea 16(%rax), %rax > - jnz L(exit) > - > - pcmpeqb (%rax), %xmm3 > - pmovmskb %xmm3, %edx > - test %edx, %edx > - lea 16(%rax), %rax > - jnz L(exit) > - > - pcmpeqb (%rax), %xmm0 > - pmovmskb %xmm0, %edx > - test %edx, %edx > - lea 16(%rax), %rax > - jnz L(exit) > - > - pcmpeqb (%rax), %xmm1 > - pmovmskb %xmm1, %edx > - test %edx, %edx > - lea 16(%rax), %rax > - jnz L(exit) > - > - pcmpeqb (%rax), %xmm2 > - pmovmskb %xmm2, %edx > - test %edx, %edx > - lea 16(%rax), %rax > - jnz L(exit) > - > - pcmpeqb (%rax), %xmm3 > - pmovmskb %xmm3, %edx > - test %edx, %edx > - lea 16(%rax), %rax > - jnz L(exit) > - > - and $-0x40, %rax > - > - .p2align 4 > -L(aligned_64): > - pcmpeqb (%rax), %xmm0 > - pcmpeqb 16(%rax), %xmm1 > - pcmpeqb 32(%rax), %xmm2 > - pcmpeqb 48(%rax), %xmm3 > - pmovmskb %xmm0, %edx > - pmovmskb %xmm1, %r11d > - pmovmskb %xmm2, %r10d > - pmovmskb %xmm3, %r9d > - or %edx, %r9d > - or %r11d, %r9d > - or %r10d, %r9d > - lea 64(%rax), %rax > - jz L(aligned_64) > - > - test %edx, %edx > - jnz L(aligned_64_exit_16) > - test %r11d, %r11d > - jnz L(aligned_64_exit_32) > - test %r10d, %r10d > - jnz L(aligned_64_exit_48) > - > -L(aligned_64_exit_64): > - pmovmskb %xmm3, %edx > - jmp L(exit) > - > -L(aligned_64_exit_48): > - lea -16(%rax), %rax > - mov %r10d, %edx > - jmp L(exit) > - > -L(aligned_64_exit_32): > - lea -32(%rax), %rax > - mov %r11d, %edx > - jmp L(exit) > - > -L(aligned_64_exit_16): > - lea -48(%rax), %rax > - > -L(exit): > - sub %rcx, %rax > - test %dl, %dl > - jz L(exit_high) > - test $0x01, %dl > - jnz L(exit_tail0) > - > - test $0x02, %dl > - jnz L(exit_tail1) > - > - test $0x04, %dl > - jnz L(exit_tail2) > - > - test $0x08, %dl > - jnz L(exit_tail3) > - > - test $0x10, %dl > - jnz L(exit_tail4) > - > - test $0x20, %dl > - jnz L(exit_tail5) > - > - test $0x40, %dl > - jnz L(exit_tail6) > - add $7, %eax > -L(exit_tail0): > - jmp L(StartStrcpyPart) > - > - .p2align 4 > -L(exit_high): > - add $8, %eax > - test $0x01, %dh > - jnz L(exit_tail0) > - > - test $0x02, %dh > - jnz L(exit_tail1) > - > - test $0x04, %dh > - jnz L(exit_tail2) > - > - test $0x08, %dh > - jnz L(exit_tail3) > - > - test $0x10, %dh > - jnz L(exit_tail4) > - > - test $0x20, %dh > - jnz L(exit_tail5) > - > - test $0x40, %dh > - jnz L(exit_tail6) > - add $7, %eax > - jmp L(StartStrcpyPart) > - > - .p2align 4 > -L(exit_tail1): > - add $1, %eax > - jmp L(StartStrcpyPart) > - > - .p2align 4 > -L(exit_tail2): > - add $2, %eax > - jmp L(StartStrcpyPart) > - > - .p2align 4 > -L(exit_tail3): > - add $3, %eax > - jmp L(StartStrcpyPart) > - > - .p2align 4 > -L(exit_tail4): > - add $4, %eax > - jmp L(StartStrcpyPart) > - > - .p2align 4 > -L(exit_tail5): > - add $5, %eax > - jmp L(StartStrcpyPart) > - > - .p2align 4 > -L(exit_tail6): > - add $6, %eax > - jmp L(StartStrcpyPart) > - > - .p2align 4 > -L(exit_tail7): > - add $7, %eax > - jmp L(StartStrcpyPart) > - > - .p2align 4 > -L(exit_tail8): > - add $8, %eax > - jmp L(StartStrcpyPart) > - > - .p2align 4 > -L(exit_tail9): > - add $9, %eax > - jmp L(StartStrcpyPart) > - > - .p2align 4 > -L(exit_tail10): > - add $10, %eax > - jmp L(StartStrcpyPart) > - > - .p2align 4 > -L(exit_tail11): > - add $11, %eax > - jmp L(StartStrcpyPart) > - > - .p2align 4 > -L(exit_tail12): > - add $12, %eax > - jmp L(StartStrcpyPart) > - > - .p2align 4 > -L(exit_tail13): > - add $13, %eax > - jmp L(StartStrcpyPart) > - > - .p2align 4 > -L(exit_tail14): > - add $14, %eax > - jmp L(StartStrcpyPart) > - > - .p2align 4 > -L(exit_tail15): > - add $15, %eax > - > - .p2align 4 > -L(StartStrcpyPart): > - mov %rsi, %rcx > - lea (%rdi, %rax), %rdx > -# ifdef USE_AS_STRNCAT > - test %r8, %r8 > - jz L(StrncatExit0) > - cmp $8, %r8 > - jbe L(StrncatExit8Bytes) > -# endif > - cmpb $0, (%rcx) > - jz L(Exit1) > - cmpb $0, 1(%rcx) > - jz L(Exit2) > - cmpb $0, 2(%rcx) > - jz L(Exit3) > - cmpb $0, 3(%rcx) > - jz L(Exit4) > - cmpb $0, 4(%rcx) > - jz L(Exit5) > - cmpb $0, 5(%rcx) > - jz L(Exit6) > - cmpb $0, 6(%rcx) > - jz L(Exit7) > - cmpb $0, 7(%rcx) > - jz L(Exit8) > - cmpb $0, 8(%rcx) > - jz L(Exit9) > -# ifdef USE_AS_STRNCAT > - cmp $16, %r8 > - jb L(StrncatExit15Bytes) > -# endif > - cmpb $0, 9(%rcx) > - jz L(Exit10) > - cmpb $0, 10(%rcx) > - jz L(Exit11) > - cmpb $0, 11(%rcx) > - jz L(Exit12) > - cmpb $0, 12(%rcx) > - jz L(Exit13) > - cmpb $0, 13(%rcx) > - jz L(Exit14) > - cmpb $0, 14(%rcx) > - jz L(Exit15) > - cmpb $0, 15(%rcx) > - jz L(Exit16) > -# ifdef USE_AS_STRNCAT > - cmp $16, %r8 > - je L(StrncatExit16) > -# define USE_AS_STRNCPY > -# endif > - > -# include "strcpy-ssse3.S" > - > - .p2align 4 > -L(CopyFrom1To16Bytes): > - add %rsi, %rdx > - add %rsi, %rcx > - > - test %al, %al > - jz L(ExitHigh) > - test $0x01, %al > - jnz L(Exit1) > - test $0x02, %al > - jnz L(Exit2) > - test $0x04, %al > - jnz L(Exit3) > - test $0x08, %al > - jnz L(Exit4) > - test $0x10, %al > - jnz L(Exit5) > - test $0x20, %al > - jnz L(Exit6) > - test $0x40, %al > - jnz L(Exit7) > - movlpd (%rcx), %xmm0 > - movlpd %xmm0, (%rdx) > - mov %rdi, %rax > - ret > - > - .p2align 4 > -L(ExitHigh): > - test $0x01, %ah > - jnz L(Exit9) > - test $0x02, %ah > - jnz L(Exit10) > - test $0x04, %ah > - jnz L(Exit11) > - test $0x08, %ah > - jnz L(Exit12) > - test $0x10, %ah > - jnz L(Exit13) > - test $0x20, %ah > - jnz L(Exit14) > - test $0x40, %ah > - jnz L(Exit15) > - movlpd (%rcx), %xmm0 > - movlpd 8(%rcx), %xmm1 > - movlpd %xmm0, (%rdx) > - movlpd %xmm1, 8(%rdx) > - mov %rdi, %rax > - ret > - > - .p2align 4 > -L(StrncatExit1): > - xor %ah, %ah > - movb %ah, 1(%rdx) > -L(Exit1): > - movb (%rcx), %al > - movb %al, (%rdx) > - mov %rdi, %rax > - ret > - > - .p2align 4 > -L(StrncatExit2): > - xor %ah, %ah > - movb %ah, 2(%rdx) > -L(Exit2): > - movw (%rcx), %ax > - movw %ax, (%rdx) > - mov %rdi, %rax > - ret > - > - .p2align 4 > -L(StrncatExit3): > - xor %ah, %ah > - movb %ah, 3(%rdx) > -L(Exit3): > - movw (%rcx), %ax > - movw %ax, (%rdx) > - movb 2(%rcx), %al > - movb %al, 2(%rdx) > - mov %rdi, %rax > - ret > - > - .p2align 4 > -L(StrncatExit4): > - xor %ah, %ah > - movb %ah, 4(%rdx) > -L(Exit4): > - mov (%rcx), %eax > - mov %eax, (%rdx) > - mov %rdi, %rax > - ret > - > - .p2align 4 > -L(StrncatExit5): > - xor %ah, %ah > - movb %ah, 5(%rdx) > -L(Exit5): > - mov (%rcx), %eax > - mov %eax, (%rdx) > - movb 4(%rcx), %al > - movb %al, 4(%rdx) > - mov %rdi, %rax > - ret > - > - .p2align 4 > -L(StrncatExit6): > - xor %ah, %ah > - movb %ah, 6(%rdx) > -L(Exit6): > - mov (%rcx), %eax > - mov %eax, (%rdx) > - movw 4(%rcx), %ax > - movw %ax, 4(%rdx) > - mov %rdi, %rax > - ret > - > - .p2align 4 > -L(StrncatExit7): > - xor %ah, %ah > - movb %ah, 7(%rdx) > -L(Exit7): > - mov (%rcx), %eax > - mov %eax, (%rdx) > - mov 3(%rcx), %eax > - mov %eax, 3(%rdx) > - mov %rdi, %rax > - ret > - > - .p2align 4 > -L(StrncatExit8): > - xor %ah, %ah > - movb %ah, 8(%rdx) > -L(Exit8): > - movlpd (%rcx), %xmm0 > - movlpd %xmm0, (%rdx) > - mov %rdi, %rax > - ret > - > - .p2align 4 > -L(StrncatExit9): > - xor %ah, %ah > - movb %ah, 9(%rdx) > -L(Exit9): > - movlpd (%rcx), %xmm0 > - movlpd %xmm0, (%rdx) > - movb 8(%rcx), %al > - movb %al, 8(%rdx) > - mov %rdi, %rax > - ret > - > - .p2align 4 > -L(StrncatExit10): > - xor %ah, %ah > - movb %ah, 10(%rdx) > -L(Exit10): > - movlpd (%rcx), %xmm0 > - movlpd %xmm0, (%rdx) > - movw 8(%rcx), %ax > - movw %ax, 8(%rdx) > - mov %rdi, %rax > - ret > - > - .p2align 4 > -L(StrncatExit11): > - xor %ah, %ah > - movb %ah, 11(%rdx) > -L(Exit11): > - movlpd (%rcx), %xmm0 > - movlpd %xmm0, (%rdx) > - mov 7(%rcx), %eax > - mov %eax, 7(%rdx) > - mov %rdi, %rax > - ret > - > - .p2align 4 > -L(StrncatExit12): > - xor %ah, %ah > - movb %ah, 12(%rdx) > -L(Exit12): > - movlpd (%rcx), %xmm0 > - movlpd %xmm0, (%rdx) > - mov 8(%rcx), %eax > - mov %eax, 8(%rdx) > - mov %rdi, %rax > - ret > - > - .p2align 4 > -L(StrncatExit13): > - xor %ah, %ah > - movb %ah, 13(%rdx) > -L(Exit13): > - movlpd (%rcx), %xmm0 > - movlpd %xmm0, (%rdx) > - movlpd 5(%rcx), %xmm1 > - movlpd %xmm1, 5(%rdx) > - mov %rdi, %rax > - ret > - > - .p2align 4 > -L(StrncatExit14): > - xor %ah, %ah > - movb %ah, 14(%rdx) > -L(Exit14): > - movlpd (%rcx), %xmm0 > - movlpd %xmm0, (%rdx) > - movlpd 6(%rcx), %xmm1 > - movlpd %xmm1, 6(%rdx) > - mov %rdi, %rax > - ret > - > - .p2align 4 > -L(StrncatExit15): > - xor %ah, %ah > - movb %ah, 15(%rdx) > -L(Exit15): > - movlpd (%rcx), %xmm0 > - movlpd %xmm0, (%rdx) > - movlpd 7(%rcx), %xmm1 > - movlpd %xmm1, 7(%rdx) > - mov %rdi, %rax > - ret > - > - .p2align 4 > -L(StrncatExit16): > - xor %ah, %ah > - movb %ah, 16(%rdx) > -L(Exit16): > - movlpd (%rcx), %xmm0 > - movlpd 8(%rcx), %xmm1 > - movlpd %xmm0, (%rdx) > - movlpd %xmm1, 8(%rdx) > - mov %rdi, %rax > - ret > - > -# ifdef USE_AS_STRNCPY > - > - .p2align 4 > -L(CopyFrom1To16BytesCase2): > - add $16, %r8 > - add %rsi, %rcx > - lea (%rsi, %rdx), %rsi > - lea -9(%r8), %rdx > - and $1<<7, %dh > - or %al, %dh > - test %dh, %dh > - lea (%rsi), %rdx > - jz L(ExitHighCase2) > - > - test $0x01, %al > - jnz L(Exit1) > - cmp $1, %r8 > - je L(StrncatExit1) > - test $0x02, %al > - jnz L(Exit2) > - cmp $2, %r8 > - je L(StrncatExit2) > - test $0x04, %al > - jnz L(Exit3) > - cmp $3, %r8 > - je L(StrncatExit3) > - test $0x08, %al > - jnz L(Exit4) > - cmp $4, %r8 > - je L(StrncatExit4) > - test $0x10, %al > - jnz L(Exit5) > - cmp $5, %r8 > - je L(StrncatExit5) > - test $0x20, %al > - jnz L(Exit6) > - cmp $6, %r8 > - je L(StrncatExit6) > - test $0x40, %al > - jnz L(Exit7) > - cmp $7, %r8 > - je L(StrncatExit7) > - movlpd (%rcx), %xmm0 > - movlpd %xmm0, (%rdx) > - lea 7(%rdx), %rax > - cmpb $1, (%rax) > - sbb $-1, %rax > - xor %cl, %cl > - movb %cl, (%rax) > - mov %rdi, %rax > - ret > - > - .p2align 4 > -L(ExitHighCase2): > - test $0x01, %ah > - jnz L(Exit9) > - cmp $9, %r8 > - je L(StrncatExit9) > - test $0x02, %ah > - jnz L(Exit10) > - cmp $10, %r8 > - je L(StrncatExit10) > - test $0x04, %ah > - jnz L(Exit11) > - cmp $11, %r8 > - je L(StrncatExit11) > - test $0x8, %ah > - jnz L(Exit12) > - cmp $12, %r8 > - je L(StrncatExit12) > - test $0x10, %ah > - jnz L(Exit13) > - cmp $13, %r8 > - je L(StrncatExit13) > - test $0x20, %ah > - jnz L(Exit14) > - cmp $14, %r8 > - je L(StrncatExit14) > - test $0x40, %ah > - jnz L(Exit15) > - cmp $15, %r8 > - je L(StrncatExit15) > - movlpd (%rcx), %xmm0 > - movlpd %xmm0, (%rdx) > - movlpd 8(%rcx), %xmm1 > - movlpd %xmm1, 8(%rdx) > - mov %rdi, %rax > - ret > - > -L(CopyFrom1To16BytesCase2OrCase3): > - test %rax, %rax > - jnz L(CopyFrom1To16BytesCase2) > - > - .p2align 4 > -L(CopyFrom1To16BytesCase3): > - add $16, %r8 > - add %rsi, %rdx > - add %rsi, %rcx > - > - cmp $8, %r8 > - ja L(ExitHighCase3) > - cmp $1, %r8 > - je L(StrncatExit1) > - cmp $2, %r8 > - je L(StrncatExit2) > - cmp $3, %r8 > - je L(StrncatExit3) > - cmp $4, %r8 > - je L(StrncatExit4) > - cmp $5, %r8 > - je L(StrncatExit5) > - cmp $6, %r8 > - je L(StrncatExit6) > - cmp $7, %r8 > - je L(StrncatExit7) > - movlpd (%rcx), %xmm0 > - movlpd %xmm0, (%rdx) > - xor %ah, %ah > - movb %ah, 8(%rdx) > - mov %rdi, %rax > - ret > - > - .p2align 4 > -L(ExitHighCase3): > - cmp $9, %r8 > - je L(StrncatExit9) > - cmp $10, %r8 > - je L(StrncatExit10) > - cmp $11, %r8 > - je L(StrncatExit11) > - cmp $12, %r8 > - je L(StrncatExit12) > - cmp $13, %r8 > - je L(StrncatExit13) > - cmp $14, %r8 > - je L(StrncatExit14) > - cmp $15, %r8 > - je L(StrncatExit15) > - movlpd (%rcx), %xmm0 > - movlpd %xmm0, (%rdx) > - movlpd 8(%rcx), %xmm1 > - movlpd %xmm1, 8(%rdx) > - xor %ah, %ah > - movb %ah, 16(%rdx) > - mov %rdi, %rax > - ret > - > - .p2align 4 > -L(StrncatExit0): > - mov %rdi, %rax > - ret > - > - .p2align 4 > -L(StrncatExit15Bytes): > - cmp $9, %r8 > - je L(StrncatExit9) > - cmpb $0, 9(%rcx) > - jz L(Exit10) > - cmp $10, %r8 > - je L(StrncatExit10) > - cmpb $0, 10(%rcx) > - jz L(Exit11) > - cmp $11, %r8 > - je L(StrncatExit11) > - cmpb $0, 11(%rcx) > - jz L(Exit12) > - cmp $12, %r8 > - je L(StrncatExit12) > - cmpb $0, 12(%rcx) > - jz L(Exit13) > - cmp $13, %r8 > - je L(StrncatExit13) > - cmpb $0, 13(%rcx) > - jz L(Exit14) > - cmp $14, %r8 > - je L(StrncatExit14) > - movlpd (%rcx), %xmm0 > - movlpd %xmm0, (%rdx) > - movlpd 7(%rcx), %xmm1 > - movlpd %xmm1, 7(%rdx) > - lea 14(%rdx), %rax > - cmpb $1, (%rax) > - sbb $-1, %rax > - xor %cl, %cl > - movb %cl, (%rax) > - mov %rdi, %rax > - ret > - > - .p2align 4 > -L(StrncatExit8Bytes): > - cmpb $0, (%rcx) > - jz L(Exit1) > - cmp $1, %r8 > - je L(StrncatExit1) > - cmpb $0, 1(%rcx) > - jz L(Exit2) > - cmp $2, %r8 > - je L(StrncatExit2) > - cmpb $0, 2(%rcx) > - jz L(Exit3) > - cmp $3, %r8 > - je L(StrncatExit3) > - cmpb $0, 3(%rcx) > - jz L(Exit4) > - cmp $4, %r8 > - je L(StrncatExit4) > - cmpb $0, 4(%rcx) > - jz L(Exit5) > - cmp $5, %r8 > - je L(StrncatExit5) > - cmpb $0, 5(%rcx) > - jz L(Exit6) > - cmp $6, %r8 > - je L(StrncatExit6) > - cmpb $0, 6(%rcx) > - jz L(Exit7) > - cmp $7, %r8 > - je L(StrncatExit7) > - movlpd (%rcx), %xmm0 > - movlpd %xmm0, (%rdx) > - lea 7(%rdx), %rax > - cmpb $1, (%rax) > - sbb $-1, %rax > - xor %cl, %cl > - movb %cl, (%rax) > - mov %rdi, %rax > - ret > - > -# endif > -END (STRCAT) > -#endif > diff --git a/sysdeps/x86_64/multiarch/strncat-ssse3.S b/sysdeps/x86_64/multiarch/strncat-ssse3.S > deleted file mode 100644 > index 6c45ff3ec7..0000000000 > --- a/sysdeps/x86_64/multiarch/strncat-ssse3.S > +++ /dev/null > @@ -1,3 +0,0 @@ > -#define USE_AS_STRNCAT > -#define STRCAT __strncat_ssse3 > -#include "strcat-ssse3.S" > -- > 2.25.1 > LGTM. Reviewed-by: H.J. Lu Thanks. -- H.J.