From patchwork Tue Feb 28 17:23:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 65798 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 014333854839 for ; Tue, 28 Feb 2023 17:25:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 014333854839 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1677605122; bh=3Ryvzy9uzuhYF6oIJZqGs69R/6k9lgjFKWv2RsFyX3w=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=HXnCdRVOvZuhlGvvYWiWl1uTV5uBNSaai5pdzlJ/A/OfFPT47lnuNSod3bzuwl+BR ciZxo1ABd4qVIDgP6KeJBh7It47HzCGKuuJ12SXXoqk+Xwk+6BvOKn/t1OdwfSRDd5 YRIpWNE+buWEq1Gcblqg+Zp846c8XizFT9+6Vapw= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-ot1-x335.google.com (mail-ot1-x335.google.com [IPv6:2607:f8b0:4864:20::335]) by sourceware.org (Postfix) with ESMTPS id 2BACB3858D3C for ; Tue, 28 Feb 2023 17:24:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2BACB3858D3C Received: by mail-ot1-x335.google.com with SMTP id q11-20020a056830440b00b00693c1a62101so6038387otv.0 for ; Tue, 28 Feb 2023 09:24:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677605047; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3Ryvzy9uzuhYF6oIJZqGs69R/6k9lgjFKWv2RsFyX3w=; b=Y8sgTiUqd/o8bnQf23L3E+tjEaV1vCj/Cw0tuqDqboLiET9YXJl6czxRYoLxcJ7Bff /UvoqTnHlgcw5YdSevXHR3IYwsa4oGmH4xExS7jp4suggmHGTyRa5dOkAQASI3q5bYcg 0e4pWt0Dacjcb/4x2GE/Yfj8kqeQ7bTgykfDLm5fOTUgLb8q+UGSISzZRdk9zt0r4X8m tFBa9A71TaKB6foQ1PWHy9B3BuGLk22kscBl0GXZ17/92ASZG6l0puHZcbzmk8GTgc08 yY5UDqrq8C8szZrjxv2PDVOGMlfenbtPZ4n4ltqbDic9uVdtIQIbx8LFEzjpydEBIHg6 eUOg== X-Gm-Message-State: AO0yUKV8RwtJFdiuCrWzWhPZ6Dj3yvCAGHuRd7GBxQTs2nP67nYXLfGc l37ZXRp+QKEVDr/FPVhBKvVU3Xvhs+x9YXayLE4= X-Google-Smtp-Source: AK7set9EVMyQJrSFsVLlvHr+3qHgFS1XfqvhL9iKPQvQi/NbbpdKo8O3r63+a2d2e/p/XcOTd9bSZA== X-Received: by 2002:a05:6830:440b:b0:68d:6a1e:46b9 with SMTP id q11-20020a056830440b00b0068d6a1e46b9mr2183155otv.26.1677605046259; Tue, 28 Feb 2023 09:24:06 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c3:d849:7299:419:6fb3:7a8]) by smtp.gmail.com with ESMTPSA id e7-20020a05683013c700b00684152e9ff2sm3925220otq.0.2023.02.28.09.24.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 09:24:05 -0800 (PST) To: libc-alpha@sourceware.org, Richard Henderson Subject: [PATCH 1/3] powerpc: Remove strncmp variants Date: Tue, 28 Feb 2023 14:23:58 -0300 Message-Id: <20230228172400.2763397-2-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230228172400.2763397-1-adhemerval.zanella@linaro.org> References: <20230228172400.2763397-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, KAM_STOCKGEN, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The default, power4, and power7 implementation just adds word aligned access when inputs have the same aligment. The unaligned case is still done by byte operations. This is already covered by the generic implementation, which also add the unaligned input optimization. Checked on powerpc-linux-gnu built without multi-arch for powerpc, power4, and power7. Reviewed-by: Rajalakshmi Srinivasaraghavan --- .../powerpc32/power4/multiarch/Makefile | 2 +- .../power4/multiarch/ifunc-impl-list.c | 7 - .../power4/multiarch/strncmp-power7.S | 38 ---- .../power4/multiarch/strncmp-ppc32.S | 40 ---- .../powerpc32/power4/multiarch/strncmp.c | 39 ---- sysdeps/powerpc/powerpc32/power4/strncmp.S | 196 ----------------- sysdeps/powerpc/powerpc32/power7/strncmp.S | 199 ------------------ sysdeps/powerpc/powerpc32/strncmp.S | 181 ---------------- 8 files changed, 1 insertion(+), 701 deletions(-) delete mode 100644 sysdeps/powerpc/powerpc32/power4/multiarch/strncmp-power7.S delete mode 100644 sysdeps/powerpc/powerpc32/power4/multiarch/strncmp-ppc32.S delete mode 100644 sysdeps/powerpc/powerpc32/power4/multiarch/strncmp.c delete mode 100644 sysdeps/powerpc/powerpc32/power4/strncmp.S delete mode 100644 sysdeps/powerpc/powerpc32/power7/strncmp.S delete mode 100644 sysdeps/powerpc/powerpc32/strncmp.S diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile b/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile index b2f9deefb8..0a4e828435 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile @@ -5,7 +5,7 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \ mempcpy-power7 mempcpy-ppc32 memchr-power7 \ memchr-ppc32 memrchr-power7 memrchr-ppc32 rawmemchr-power7 \ rawmemchr-ppc32 strlen-power7 strlen-ppc32 strnlen-power7 \ - strnlen-ppc32 strncmp-power7 strncmp-ppc32 \ + strnlen-ppc32 \ strcasecmp-power7 strcasecmp_l-power7 strncase-power7 \ strncase_l-power7 strchrnul-power7 strchrnul-ppc32 \ strchr-power7 strchr-ppc32 \ diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/ifunc-impl-list.c b/sysdeps/powerpc/powerpc32/power4/multiarch/ifunc-impl-list.c index 3b95ad2c12..b4f80539e7 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/ifunc-impl-list.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/ifunc-impl-list.c @@ -81,13 +81,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, __strnlen_power7) IFUNC_IMPL_ADD (array, i, strnlen, 1, __strnlen_ppc)) - - /* Support sysdeps/powerpc/powerpc32/multiarch/strncmp.c. */ - IFUNC_IMPL (i, name, strncmp, - IFUNC_IMPL_ADD (array, i, strncmp, hwcap & PPC_FEATURE_HAS_VSX, - __strncmp_power7) - IFUNC_IMPL_ADD (array, i, strncmp, 1, - __strncmp_ppc)) #endif /* Support sysdeps/powerpc/powerpc32/power4/multiarch/memcmp.c. */ diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/strncmp-power7.S b/sysdeps/powerpc/powerpc32/power4/multiarch/strncmp-power7.S deleted file mode 100644 index 068b1bb8ad..0000000000 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/strncmp-power7.S +++ /dev/null @@ -1,38 +0,0 @@ -/* Optimized strcmp implementation for POWER7/PowerPC32. - Copyright (C) 2013-2023 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 - . */ - -#include - -#undef EALIGN -#define EALIGN(name, alignt, words) \ - .globl C_SYMBOL_NAME(__strncmp_power7); \ - .type C_SYMBOL_NAME(__strncmp_power7),@function; \ - .align ALIGNARG(alignt); \ - EALIGN_W_##words; \ - C_LABEL(__strncmp_power7) \ - cfi_startproc; - -#undef END -#define END(name) \ - cfi_endproc; \ - ASM_SIZE_DIRECTIVE(__strncmp_power7) - -#undef libc_hidden_builtin_def -#define libc_hidden_builtin_def(name) - -#include diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/strncmp-ppc32.S b/sysdeps/powerpc/powerpc32/power4/multiarch/strncmp-ppc32.S deleted file mode 100644 index b04afd4478..0000000000 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/strncmp-ppc32.S +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright (C) 2013-2023 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 - . */ - -#include - -#if defined SHARED && IS_IN (libc) -# undef EALIGN -# define EALIGN(name, alignt, words) \ - .globl C_SYMBOL_NAME(__strncmp_ppc); \ - .type C_SYMBOL_NAME(__strncmp_ppc),@function; \ - .align ALIGNARG(alignt); \ - EALIGN_W_##words; \ - C_LABEL(__strncmp_ppc) \ - cfi_startproc; - -# undef END -# define END(name) \ - cfi_endproc; \ - ASM_SIZE_DIRECTIVE(__strncmp_ppc) - -# undef libc_hidden_builtin_def -# define libc_hidden_builtin_def(name) \ - .globl __GI_strncmp; __GI_strncmp = __strncmp_ppc -#endif - -#include diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/strncmp.c b/sysdeps/powerpc/powerpc32/power4/multiarch/strncmp.c deleted file mode 100644 index 79046015e5..0000000000 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/strncmp.c +++ /dev/null @@ -1,39 +0,0 @@ -/* Multiple versions of strncmp. - Copyright (C) 2013-2023 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 - . */ - -/* Define multiple versions only for definition in libc. */ -#if defined SHARED && IS_IN (libc) -# define strncmp __redirect_strncmp -/* Omit the strncmp inline definitions because it would redefine strncmp. */ -# define __NO_STRING_INLINES -# include -# include -# include "init-arch.h" - -extern __typeof (strncmp) __strncmp_ppc attribute_hidden; -extern __typeof (strncmp) __strncmp_power4 attribute_hidden; -extern __typeof (strncmp) __strncmp_power7 attribute_hidden; -# undef strncmp - -/* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle - ifunc symbol properly. */ -libc_ifunc_redirected (__redirect_strncmp, strncmp, - (hwcap & PPC_FEATURE_HAS_VSX) - ? __strncmp_power7 - : __strncmp_ppc); -#endif diff --git a/sysdeps/powerpc/powerpc32/power4/strncmp.S b/sysdeps/powerpc/powerpc32/power4/strncmp.S deleted file mode 100644 index 1f65c947cd..0000000000 --- a/sysdeps/powerpc/powerpc32/power4/strncmp.S +++ /dev/null @@ -1,196 +0,0 @@ -/* Optimized strcmp implementation for PowerPC32. - Copyright (C) 2003-2023 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 - . */ - -#include - -/* See strlen.s for comments on how the end-of-string testing works. */ - -/* int [r3] strncmp (const char *s1 [r3], const char *s2 [r4], size_t size [r5]) */ - -EALIGN (strncmp, 4, 0) - -#define rTMP2 r0 -#define rRTN r3 -#define rSTR1 r3 /* first string arg */ -#define rSTR2 r4 /* second string arg */ -#define rN r5 /* max string length */ -#define rWORD1 r6 /* current word in s1 */ -#define rWORD2 r7 /* current word in s2 */ -#define rWORD3 r10 -#define rWORD4 r11 -#define rFEFE r8 /* constant 0xfefefeff (-0x01010101) */ -#define r7F7F r9 /* constant 0x7f7f7f7f */ -#define rNEG r10 /* ~(word in s1 | 0x7f7f7f7f) */ -#define rBITDIF r11 /* bits that differ in s1 & s2 words */ -#define rTMP r12 - - dcbt 0,rSTR1 - or rTMP, rSTR2, rSTR1 - lis r7F7F, 0x7f7f - dcbt 0,rSTR2 - clrlwi. rTMP, rTMP, 30 - cmplwi cr1, rN, 0 - lis rFEFE, -0x101 - bne L(unaligned) -/* We are word aligned so set up for two loops. first a word - loop, then fall into the byte loop if any residual. */ - srwi. rTMP, rN, 2 - clrlwi rN, rN, 30 - addi rFEFE, rFEFE, -0x101 - addi r7F7F, r7F7F, 0x7f7f - cmplwi cr1, rN, 0 - beq L(unaligned) - - mtctr rTMP /* Power4 wants mtctr 1st in dispatch group. */ - lwz rWORD1, 0(rSTR1) - lwz rWORD2, 0(rSTR2) - b L(g1) - -L(g0): - lwzu rWORD1, 4(rSTR1) - bne- cr1, L(different) - lwzu rWORD2, 4(rSTR2) -L(g1): add rTMP, rFEFE, rWORD1 - nor rNEG, r7F7F, rWORD1 - bdz L(tail) - and. rTMP, rTMP, rNEG - cmpw cr1, rWORD1, rWORD2 - beq+ L(g0) - -/* OK. We've hit the end of the string. We need to be careful that - we don't compare two strings as different because of gunk beyond - the end of the strings... */ - -#ifdef __LITTLE_ENDIAN__ -L(endstring): - slwi rTMP, rTMP, 1 - addi rTMP2, rTMP, -1 - andc rTMP2, rTMP2, rTMP - and rWORD2, rWORD2, rTMP2 /* Mask off gunk. */ - and rWORD1, rWORD1, rTMP2 - rlwinm rTMP2, rWORD2, 8, 0xffffffff /* Byte reverse word. */ - rlwinm rTMP, rWORD1, 8, 0xffffffff - rldimi rTMP2, rWORD2, 24, 32 - rldimi rTMP, rWORD1, 24, 32 - rlwimi rTMP2, rWORD2, 24, 16, 23 - rlwimi rTMP, rWORD1, 24, 16, 23 - xor. rBITDIF, rTMP, rTMP2 - sub rRTN, rTMP, rTMP2 - bgelr+ - ori rRTN, rTMP2, 1 - blr - -L(different): - lwz rWORD1, -4(rSTR1) - rlwinm rTMP2, rWORD2, 8, 0xffffffff /* Byte reverse word. */ - rlwinm rTMP, rWORD1, 8, 0xffffffff - rldimi rTMP2, rWORD2, 24, 32 - rldimi rTMP, rWORD1, 24, 32 - rlwimi rTMP2, rWORD2, 24, 16, 23 - rlwimi rTMP, rWORD1, 24, 16, 23 - xor. rBITDIF, rTMP, rTMP2 - sub rRTN, rTMP, rTMP2 - bgelr+ - ori rRTN, rTMP2, 1 - blr - -#else -L(endstring): - and rTMP, r7F7F, rWORD1 - beq cr1, L(equal) - add rTMP, rTMP, r7F7F - xor. rBITDIF, rWORD1, rWORD2 - andc rNEG, rNEG, rTMP - blt- L(highbit) - cntlzw rBITDIF, rBITDIF - cntlzw rNEG, rNEG - addi rNEG, rNEG, 7 - cmpw cr1, rNEG, rBITDIF - sub rRTN, rWORD1, rWORD2 - bgelr+ cr1 -L(equal): - li rRTN, 0 - blr - -L(different): - lwz rWORD1, -4(rSTR1) - xor. rBITDIF, rWORD1, rWORD2 - sub rRTN, rWORD1, rWORD2 - bgelr+ -L(highbit): - ori rRTN, rWORD2, 1 - blr -#endif - -/* Oh well. In this case, we just do a byte-by-byte comparison. */ - .align 4 -L(tail): - and. rTMP, rTMP, rNEG - cmpw cr1, rWORD1, rWORD2 - bne- L(endstring) - addi rSTR1, rSTR1, 4 - bne- cr1, L(different) - addi rSTR2, rSTR2, 4 - cmplwi cr1, rN, 0 -L(unaligned): - mtctr rN /* Power4 wants mtctr 1st in dispatch group */ - ble cr1, L(ux) -L(uz): - lbz rWORD1, 0(rSTR1) - lbz rWORD2, 0(rSTR2) - .align 4 -L(u1): - cmpwi cr1, rWORD1, 0 - bdz L(u4) - cmpw rWORD1, rWORD2 - beq- cr1, L(u4) - bne- L(u4) - lbzu rWORD3, 1(rSTR1) - lbzu rWORD4, 1(rSTR2) - cmpwi cr1, rWORD3, 0 - bdz L(u3) - cmpw rWORD3, rWORD4 - beq- cr1, L(u3) - bne- L(u3) - lbzu rWORD1, 1(rSTR1) - lbzu rWORD2, 1(rSTR2) - cmpwi cr1, rWORD1, 0 - bdz L(u4) - cmpw rWORD1, rWORD2 - beq- cr1, L(u4) - bne- L(u4) - lbzu rWORD3, 1(rSTR1) - lbzu rWORD4, 1(rSTR2) - cmpwi cr1, rWORD3, 0 - bdz L(u3) - cmpw rWORD3, rWORD4 - beq- cr1, L(u3) - bne- L(u3) - lbzu rWORD1, 1(rSTR1) - lbzu rWORD2, 1(rSTR2) - b L(u1) - -L(u3): sub rRTN, rWORD3, rWORD4 - blr -L(u4): sub rRTN, rWORD1, rWORD2 - blr -L(ux): - li rRTN, 0 - blr -END (strncmp) -libc_hidden_builtin_def (strncmp) diff --git a/sysdeps/powerpc/powerpc32/power7/strncmp.S b/sysdeps/powerpc/powerpc32/power7/strncmp.S deleted file mode 100644 index bbaab6ca0e..0000000000 --- a/sysdeps/powerpc/powerpc32/power7/strncmp.S +++ /dev/null @@ -1,199 +0,0 @@ -/* Optimized strcmp implementation for POWER7/PowerPC32. - Copyright (C) 2010-2023 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 - . */ - -#include - -/* See strlen.s for comments on how the end-of-string testing works. */ - -/* int [r3] strncmp (const char *s1 [r3], - const char *s2 [r4], - size_t size [r5]) */ - -EALIGN (strncmp,5,0) - -#define rTMP2 r0 -#define rRTN r3 -#define rSTR1 r3 /* first string arg */ -#define rSTR2 r4 /* second string arg */ -#define rN r5 /* max string length */ -#define rWORD1 r6 /* current word in s1 */ -#define rWORD2 r7 /* current word in s2 */ -#define rWORD3 r10 -#define rWORD4 r11 -#define rFEFE r8 /* constant 0xfefefeff (-0x01010101) */ -#define r7F7F r9 /* constant 0x7f7f7f7f */ -#define rNEG r10 /* ~(word in s1 | 0x7f7f7f7f) */ -#define rBITDIF r11 /* bits that differ in s1 & s2 words */ -#define rTMP r12 - - dcbt 0,rSTR1 - nop - or rTMP,rSTR2,rSTR1 - lis r7F7F,0x7f7f - dcbt 0,rSTR2 - nop - clrlwi. rTMP,rTMP,30 - cmplwi cr1,rN,0 - lis rFEFE,-0x101 - bne L(unaligned) -/* We are word aligned so set up for two loops. first a word - loop, then fall into the byte loop if any residual. */ - srwi. rTMP,rN,2 - clrlwi rN,rN,30 - addi rFEFE,rFEFE,-0x101 - addi r7F7F,r7F7F,0x7f7f - cmplwi cr1,rN,0 - beq L(unaligned) - - mtctr rTMP - lwz rWORD1,0(rSTR1) - lwz rWORD2,0(rSTR2) - b L(g1) - -L(g0): - lwzu rWORD1,4(rSTR1) - bne cr1,L(different) - lwzu rWORD2,4(rSTR2) -L(g1): add rTMP,rFEFE,rWORD1 - nor rNEG,r7F7F,rWORD1 - bdz L(tail) - and. rTMP,rTMP,rNEG - cmpw cr1,rWORD1,rWORD2 - beq L(g0) - -/* OK. We've hit the end of the string. We need to be careful that - we don't compare two strings as different because of gunk beyond - the end of the strings... */ -#ifdef __LITTLE_ENDIAN__ -L(endstring): - slwi rTMP, rTMP, 1 - addi rTMP2, rTMP, -1 - andc rTMP2, rTMP2, rTMP - and rWORD2, rWORD2, rTMP2 /* Mask off gunk. */ - and rWORD1, rWORD1, rTMP2 - rlwinm rTMP2, rWORD2, 8, 0xffffffff /* Byte reverse word. */ - rlwinm rTMP, rWORD1, 8, 0xffffffff - rldimi rTMP2, rWORD2, 24, 32 - rldimi rTMP, rWORD1, 24, 32 - rlwimi rTMP2, rWORD2, 24, 16, 23 - rlwimi rTMP, rWORD1, 24, 16, 23 - xor. rBITDIF, rTMP, rTMP2 - sub rRTN, rTMP, rTMP2 - bgelr - ori rRTN, rTMP2, 1 - blr - -L(different): - lwz rWORD1, -4(rSTR1) - rlwinm rTMP2, rWORD2, 8, 0xffffffff /* Byte reverse word. */ - rlwinm rTMP, rWORD1, 8, 0xffffffff - rldimi rTMP2, rWORD2, 24, 32 - rldimi rTMP, rWORD1, 24, 32 - rlwimi rTMP2, rWORD2, 24, 16, 23 - rlwimi rTMP, rWORD1, 24, 16, 23 - xor. rBITDIF, rTMP, rTMP2 - sub rRTN, rTMP, rTMP2 - bgelr - ori rRTN, rTMP2, 1 - blr - -#else -L(endstring): - and rTMP,r7F7F,rWORD1 - beq cr1,L(equal) - add rTMP,rTMP,r7F7F - xor. rBITDIF,rWORD1,rWORD2 - andc rNEG,rNEG,rTMP - blt L(highbit) - cntlzw rBITDIF,rBITDIF - cntlzw rNEG,rNEG - addi rNEG,rNEG,7 - cmpw cr1,rNEG,rBITDIF - sub rRTN,rWORD1,rWORD2 - bgelr cr1 -L(equal): - li rRTN,0 - blr - -L(different): - lwz rWORD1,-4(rSTR1) - xor. rBITDIF,rWORD1,rWORD2 - sub rRTN,rWORD1,rWORD2 - bgelr -L(highbit): - ori rRTN, rWORD2, 1 - blr -#endif - -/* Oh well. In this case, we just do a byte-by-byte comparison. */ - .align 4 -L(tail): - and. rTMP,rTMP,rNEG - cmpw cr1,rWORD1,rWORD2 - bne L(endstring) - addi rSTR1,rSTR1,4 - bne cr1,L(different) - addi rSTR2,rSTR2,4 - cmplwi cr1,rN,0 -L(unaligned): - mtctr rN - ble cr1,L(ux) -L(uz): - lbz rWORD1,0(rSTR1) - lbz rWORD2,0(rSTR2) - .align 4 -L(u1): - cmpwi cr1,rWORD1,0 - bdz L(u4) - cmpw rWORD1,rWORD2 - beq cr1,L(u4) - bne L(u4) - lbzu rWORD3,1(rSTR1) - lbzu rWORD4,1(rSTR2) - cmpwi cr1,rWORD3,0 - bdz L(u3) - cmpw rWORD3,rWORD4 - beq cr1,L(u3) - bne L(u3) - lbzu rWORD1,1(rSTR1) - lbzu rWORD2,1(rSTR2) - cmpwi cr1,rWORD1,0 - bdz L(u4) - cmpw rWORD1,rWORD2 - beq cr1,L(u4) - bne L(u4) - lbzu rWORD3,1(rSTR1) - lbzu rWORD4,1(rSTR2) - cmpwi cr1,rWORD3,0 - bdz L(u3) - cmpw rWORD3,rWORD4 - beq cr1,L(u3) - bne L(u3) - lbzu rWORD1,1(rSTR1) - lbzu rWORD2,1(rSTR2) - b L(u1) - -L(u3): sub rRTN,rWORD3,rWORD4 - blr -L(u4): sub rRTN,rWORD1,rWORD2 - blr -L(ux): - li rRTN,0 - blr -END (strncmp) -libc_hidden_builtin_def (strncmp) diff --git a/sysdeps/powerpc/powerpc32/strncmp.S b/sysdeps/powerpc/powerpc32/strncmp.S deleted file mode 100644 index 28cae4ddce..0000000000 --- a/sysdeps/powerpc/powerpc32/strncmp.S +++ /dev/null @@ -1,181 +0,0 @@ -/* Optimized strcmp implementation for PowerPC32. - Copyright (C) 2003-2023 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 - . */ - -#include - -/* See strlen.s for comments on how the end-of-string testing works. */ - -/* int [r3] strncmp (const char *s1 [r3], const char *s2 [r4], size_t size [r5]) */ - -EALIGN (strncmp, 4, 0) - -#define rTMP2 r0 -#define rRTN r3 -#define rSTR1 r3 /* first string arg */ -#define rSTR2 r4 /* second string arg */ -#define rN r5 /* max string length */ -#define rWORD1 r6 /* current word in s1 */ -#define rWORD2 r7 /* current word in s2 */ -#define rFEFE r8 /* constant 0xfefefeff (-0x01010101) */ -#define r7F7F r9 /* constant 0x7f7f7f7f */ -#define rNEG r10 /* ~(word in s1 | 0x7f7f7f7f) */ -#define rBITDIF r11 /* bits that differ in s1 & s2 words */ -#define rTMP r12 - - dcbt 0,rSTR1 - or rTMP, rSTR2, rSTR1 - lis r7F7F, 0x7f7f - dcbt 0,rSTR2 - clrlwi. rTMP, rTMP, 30 - cmplwi cr1, rN, 0 - lis rFEFE, -0x101 - bne L(unaligned) -/* We are word aligned so set up for two loops. first a word - loop, then fall into the byte loop if any residual. */ - srwi. rTMP, rN, 2 - clrlwi rN, rN, 30 - addi rFEFE, rFEFE, -0x101 - addi r7F7F, r7F7F, 0x7f7f - cmplwi cr1, rN, 0 - beq L(unaligned) - - mtctr rTMP /* Power4 wants mtctr 1st in dispatch group. */ - lwz rWORD1, 0(rSTR1) - lwz rWORD2, 0(rSTR2) - b L(g1) - -L(g0): - lwzu rWORD1, 4(rSTR1) - bne- cr1, L(different) - lwzu rWORD2, 4(rSTR2) -L(g1): add rTMP, rFEFE, rWORD1 - nor rNEG, r7F7F, rWORD1 - bdz L(tail) - and. rTMP, rTMP, rNEG - cmpw cr1, rWORD1, rWORD2 - beq+ L(g0) - -/* OK. We've hit the end of the string. We need to be careful that - we don't compare two strings as different because of gunk beyond - the end of the strings... */ - -#ifdef __LITTLE_ENDIAN__ -L(endstring): - slwi rTMP, rTMP, 1 - addi rTMP2, rTMP, -1 - andc rTMP2, rTMP2, rTMP - and rWORD2, rWORD2, rTMP2 /* Mask off gunk. */ - and rWORD1, rWORD1, rTMP2 - rlwinm rTMP2, rWORD2, 8, 0xffffffff /* Byte reverse word. */ - rlwinm rTMP, rWORD1, 8, 0xffffffff - rlwimi rTMP2, rWORD2, 24, 0, 7 - rlwimi rTMP, rWORD1, 24, 0, 7 - rlwimi rTMP2, rWORD2, 24, 16, 23 - rlwimi rTMP, rWORD1, 24, 16, 23 - xor. rBITDIF, rTMP, rTMP2 - sub rRTN, rTMP, rTMP2 - bgelr+ - ori rRTN, rTMP2, 1 - blr - -L(different): - lwz rWORD1, -4(rSTR1) - rlwinm rTMP2, rWORD2, 8, 0xffffffff /* Byte reverse word. */ - rlwinm rTMP, rWORD1, 8, 0xffffffff - rlwimi rTMP2, rWORD2, 24, 0, 7 - rlwimi rTMP, rWORD1, 24, 0, 7 - rlwimi rTMP2, rWORD2, 24, 16, 23 - rlwimi rTMP, rWORD1, 24, 16, 23 - xor. rBITDIF, rTMP, rTMP2 - sub rRTN, rTMP, rTMP2 - bgelr+ - ori rRTN, rTMP2, 1 - blr - -#else -L(endstring): - and rTMP, r7F7F, rWORD1 - beq cr1, L(equal) - add rTMP, rTMP, r7F7F - xor. rBITDIF, rWORD1, rWORD2 - andc rNEG, rNEG, rTMP - blt- L(highbit) - cntlzw rBITDIF, rBITDIF - cntlzw rNEG, rNEG - addi rNEG, rNEG, 7 - cmpw cr1, rNEG, rBITDIF - sub rRTN, rWORD1, rWORD2 - bgelr+ cr1 -L(equal): - li rRTN, 0 - blr - -L(different): - lwz rWORD1, -4(rSTR1) - xor. rBITDIF, rWORD1, rWORD2 - sub rRTN, rWORD1, rWORD2 - bgelr+ -L(highbit): - ori rRTN, rWORD2, 1 - blr -#endif - -/* Oh well. In this case, we just do a byte-by-byte comparison. */ - .align 4 -L(tail): - and. rTMP, rTMP, rNEG - cmpw cr1, rWORD1, rWORD2 - bne- L(endstring) - addi rSTR1, rSTR1, 4 - bne- cr1, L(different) - addi rSTR2, rSTR2, 4 - cmplwi cr1, rN, 0 -L(unaligned): - mtctr rN /* Power4 wants mtctr 1st in dispatch group */ - bgt cr1, L(uz) -L(ux): - li rRTN, 0 - blr - .align 4 -L(uz): - lbz rWORD1, 0(rSTR1) - lbz rWORD2, 0(rSTR2) - nop - b L(u1) -L(u0): - lbzu rWORD2, 1(rSTR2) -L(u1): - bdz L(u3) - cmpwi cr1, rWORD1, 0 - cmpw rWORD1, rWORD2 - beq- cr1, L(u3) - lbzu rWORD1, 1(rSTR1) - bne- L(u2) - lbzu rWORD2, 1(rSTR2) - bdz L(u3) - cmpwi cr1, rWORD1, 0 - cmpw rWORD1, rWORD2 - bne- L(u3) - lbzu rWORD1, 1(rSTR1) - bne+ cr1, L(u0) - -L(u2): lbzu rWORD1, -1(rSTR1) -L(u3): sub rRTN, rWORD1, rWORD2 - blr -END (strncmp) -libc_hidden_builtin_def (strncmp)