From patchwork Sat Apr 15 11:23:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xi Ruoyao X-Patchwork-Id: 67776 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 21E97385702B for ; Sat, 15 Apr 2023 11:24:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 21E97385702B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1681557861; bh=OTE6W6OvOhPeNAXS7Qh2wSAB+huk7IMDdqqLPSA4+hU=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=mDPH0kHWfBgF4cwwfdjrKLvEorJzk9yp1jed5SQGDA32xIbx8FqV98WaVYBWzx6lM a8PY2/pogi76xftdtrQnHKECZQNdH6CFuOIwFhcncjh4sEZwYj3BRcDNhYpYWIqX0m H4f4bXZALXulzFDhH7Z4SAV97TbYXDHYdxH3jPhI= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from xry111.site (xry111.site [IPv6:2001:470:683e::1]) by sourceware.org (Postfix) with ESMTPS id 35E423858C2B for ; Sat, 15 Apr 2023 11:23:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 35E423858C2B Received: from stargazer.. (unknown [113.140.11.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) (Authenticated sender: xry111@xry111.site) by xry111.site (Postfix) with ESMTPSA id 0E9A4660BA; Sat, 15 Apr 2023 07:23:54 -0400 (EDT) To: libc-alpha@sourceware.org Cc: caiyinyu , Wang Xuerui , Adhemerval Zanella Netto , Xi Ruoyao Subject: [PATCH 1/5] LoongArch: Add bits/hwcap.h for Linux Date: Sat, 15 Apr 2023 19:23:36 +0800 Message-Id: <20230415112340.38431-2-xry111@xry111.site> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230415112340.38431-1-xry111@xry111.site> References: <20230415112340.38431-1-xry111@xry111.site> MIME-Version: 1.0 X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, LIKELY_SPAM_FROM, RCVD_IN_BARRACUDACENTRAL, SPF_HELO_PASS, 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: Xi Ruoyao via Libc-alpha From: Xi Ruoyao Reply-To: Xi Ruoyao Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Add this file and include it from sysdep.h so we can use HWCAP bits in Glibc and/or downstream apps. --- .../unix/sysv/linux/loongarch/bits/hwcap.h | 37 +++++++++++++++++++ sysdeps/unix/sysv/linux/loongarch/sysdep.h | 1 + 2 files changed, 38 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/loongarch/bits/hwcap.h diff --git a/sysdeps/unix/sysv/linux/loongarch/bits/hwcap.h b/sysdeps/unix/sysv/linux/loongarch/bits/hwcap.h new file mode 100644 index 0000000000..50100fba61 --- /dev/null +++ b/sysdeps/unix/sysv/linux/loongarch/bits/hwcap.h @@ -0,0 +1,37 @@ +/* Defines for bits in AT_HWCAP. LoongArch Linux version. + Copyright (C) 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 + . */ + +#if !defined(_SYS_AUXV_H) && !defined(_LINUX_LOONGARCH_SYSDEP_H) +# error "Never include directly; use instead." +#endif + +/* The bit numbers must match those in the kernel's . */ + +#define HWCAP_LOONGARCH_CPUCFG (1 << 0) +#define HWCAP_LOONGARCH_LAM (1 << 1) +#define HWCAP_LOONGARCH_UAL (1 << 2) +#define HWCAP_LOONGARCH_FPU (1 << 3) +#define HWCAP_LOONGARCH_LSX (1 << 4) +#define HWCAP_LOONGARCH_LASX (1 << 5) +#define HWCAP_LOONGARCH_CRC32 (1 << 6) +#define HWCAP_LOONGARCH_COMPLEX (1 << 7) +#define HWCAP_LOONGARCH_CRYPTO (1 << 8) +#define HWCAP_LOONGARCH_LVZ (1 << 9) +#define HWCAP_LOONGARCH_LBT_X86 (1 << 10) +#define HWCAP_LOONGARCH_LBT_ARM (1 << 11) +#define HWCAP_LOONGARCH_LBT_MIPS (1 << 12) diff --git a/sysdeps/unix/sysv/linux/loongarch/sysdep.h b/sysdeps/unix/sysv/linux/loongarch/sysdep.h index 8a2d73ec8c..782ea1ccf9 100644 --- a/sysdeps/unix/sysv/linux/loongarch/sysdep.h +++ b/sysdeps/unix/sysv/linux/loongarch/sysdep.h @@ -22,6 +22,7 @@ #include #include #include +#include #ifdef __ASSEMBLER__ From patchwork Sat Apr 15 11:23:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xi Ruoyao X-Patchwork-Id: 67778 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 211D33856DD6 for ; Sat, 15 Apr 2023 11:25:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 211D33856DD6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1681557904; bh=nXr//S1/CA0Uqs8tU++vnc+bTmIGXDoXQ0cEAL26BVk=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=YhtzDIn3W1o28ciixXKZN4YlVXqzpE0hXLLegJgnA8hEyiGqQST8e88GNVM2x+7Sh L5UZc1KNscuD8nvczWi1NPvlEwIkMo+d9wLQ9dZIIQgqwQ5BENjj1WzImmNm3EECGR t61zROAvQTsY5b3EmhrSKu2xPF9B2QEHD/tpvSgM= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from xry111.site (xry111.site [IPv6:2001:470:683e::1]) by sourceware.org (Postfix) with ESMTPS id B2D953857733 for ; Sat, 15 Apr 2023 11:23:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B2D953857733 Received: from stargazer.. (unknown [113.140.11.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) (Authenticated sender: xry111@xry111.site) by xry111.site (Postfix) with ESMTPSA id C5E8C660BB; Sat, 15 Apr 2023 07:23:56 -0400 (EDT) To: libc-alpha@sourceware.org Cc: caiyinyu , Wang Xuerui , Adhemerval Zanella Netto , Xi Ruoyao Subject: [PATCH 2/5] LoongArch: Add LOONGARCH_HAVE_UAL macro Date: Sat, 15 Apr 2023 19:23:37 +0800 Message-Id: <20230415112340.38431-3-xry111@xry111.site> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230415112340.38431-1-xry111@xry111.site> References: <20230415112340.38431-1-xry111@xry111.site> MIME-Version: 1.0 X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, LIKELY_SPAM_FROM, RCVD_IN_BARRACUDACENTRAL, SPF_HELO_PASS, 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: Xi Ruoyao via Libc-alpha From: Xi Ruoyao Reply-To: Xi Ruoyao Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" On Linux, we can determine if the CPU supports unaligned access via HWCAP. Otherwise, we conservatively assume the CPU does not support unaligned access. Maybe we should add a built-in macro for GCC to tell if -m[no-]strict-align is used, but it won't happen for GCC 12 and 13. --- sysdeps/loongarch/loongarch-features.h | 26 ++++++++++++++++ .../sysv/linux/loongarch/loongarch-features.h | 30 +++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 sysdeps/loongarch/loongarch-features.h create mode 100644 sysdeps/unix/sysv/linux/loongarch/loongarch-features.h diff --git a/sysdeps/loongarch/loongarch-features.h b/sysdeps/loongarch/loongarch-features.h new file mode 100644 index 0000000000..722b4b61dc --- /dev/null +++ b/sysdeps/loongarch/loongarch-features.h @@ -0,0 +1,26 @@ +/* Macros to test for CPU features on LoongArch. + Copyright (C) 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 + . */ + +#ifndef _LOONGARCH_LOONGARCH_FEATURES_H +#define _LOONGARCH_LOONGARCH_FEATURES_H 1 + +#ifndef LOONGARCH_HAVE_UAL +# define LOONGARCH_HAVE_UAL 0 +#endif + +#endif /* loongarch-features.h */ diff --git a/sysdeps/unix/sysv/linux/loongarch/loongarch-features.h b/sysdeps/unix/sysv/linux/loongarch/loongarch-features.h new file mode 100644 index 0000000000..d4c18d3cfe --- /dev/null +++ b/sysdeps/unix/sysv/linux/loongarch/loongarch-features.h @@ -0,0 +1,30 @@ +/* Macros to test for CPU features on LoongArch. Linux version. + Copyright (C) 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 + . */ + +#ifndef _LINUX_LOONGARCH_FEATURES_H +#define _LINUX_LOONGARCH_FEATURES_H 1 + +#ifndef __ASSEMBLER__ +# include + +# define LOONGARCH_HAVE_UAL (GLRO (dl_hwcap) & HWCAP_LOONGARCH_UAL) +#endif + +#include_next + +#endif /* loongarch-features.h */ From patchwork Sat Apr 15 11:23:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xi Ruoyao X-Patchwork-Id: 67777 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 2C1CB3856254 for ; Sat, 15 Apr 2023 11:24:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2C1CB3856254 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1681557873; bh=Uig2CG40Pcf1FgIimHmUMstEMdipDJpVTT+XgGG6BY0=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=xnUqf6BrY4zQe4rEsuuJYXXvGUBK19bpnBanxZ0gIuCYppfOxxxwfP9YJpKf8EPnJ 2euvDXXjRXZnZ6iNvvv7MmQRfagFv24EByK6WMN0l4V7YgAd/3OEFfRfiockfHRMUU c6dti+QkSnidsFG0kyTroKFsOFJ+Y6jXp3BSjOwI= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from xry111.site (xry111.site [89.208.246.23]) by sourceware.org (Postfix) with ESMTPS id E58733857735 for ; Sat, 15 Apr 2023 11:23:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E58733857735 Received: from stargazer.. (unknown [113.140.11.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) (Authenticated sender: xry111@xry111.site) by xry111.site (Postfix) with ESMTPSA id 33876660BC; Sat, 15 Apr 2023 07:23:58 -0400 (EDT) To: libc-alpha@sourceware.org Cc: caiyinyu , Wang Xuerui , Adhemerval Zanella Netto , Xi Ruoyao Subject: [PATCH 3/5] string: stpcpy.c: Only alias __stpcpy to stpcpy if STPCPY undefined Date: Sat, 15 Apr 2023 19:23:38 +0800 Message-Id: <20230415112340.38431-4-xry111@xry111.site> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230415112340.38431-1-xry111@xry111.site> References: <20230415112340.38431-1-xry111@xry111.site> MIME-Version: 1.0 X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, LIKELY_SPAM_FROM, RCVD_IN_BARRACUDACENTRAL, SPF_HELO_PASS, 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: Xi Ruoyao via Libc-alpha From: Xi Ruoyao Reply-To: Xi Ruoyao Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" If STPCPY is defined, it's likely __stpcpy is not provided by this file anyway. So it does not make too much sense to make the alias. --- string/stpcpy.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/string/stpcpy.c b/string/stpcpy.c index dd0fef12ef..80ddf81595 100644 --- a/string/stpcpy.c +++ b/string/stpcpy.c @@ -116,6 +116,9 @@ STPCPY (char *dest, const char *src) : stpcpy_unaligned_loop ((op_t*) dest, (const op_t *) (src - ofs) , ofs); } + +#ifndef STPCPY weak_alias (__stpcpy, stpcpy) libc_hidden_def (__stpcpy) libc_hidden_builtin_def (stpcpy) +#endif From patchwork Sat Apr 15 11:23:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xi Ruoyao X-Patchwork-Id: 67779 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 1BD223856DE7 for ; Sat, 15 Apr 2023 11:25:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1BD223856DE7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1681557915; bh=yw7BZMhKhW7NZ+3bKPE0YKL64b9ymn6DQttBCzVojKs=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=AT+7KDxkLAJ6p2B5VDTHt6KUEfjHV75WjcK7FQ9qTOstDNUSKPr1oTl+h6L4OVBjB xWvdUmChLUve5ZlXnBRZ5sPPic0oL+UH2u55PlbzA2HRzJdGr9Q4QuxVed3rzncTWR br8dFOt5mr7+9JfyBV0JxmN1zaNxQ0Bx8t/cB03Q= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from xry111.site (xry111.site [IPv6:2001:470:683e::1]) by sourceware.org (Postfix) with ESMTPS id EE8C23857024 for ; Sat, 15 Apr 2023 11:24:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EE8C23857024 Received: from stargazer.. (unknown [113.140.11.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) (Authenticated sender: xry111@xry111.site) by xry111.site (Postfix) with ESMTPSA id D4E9666120; Sat, 15 Apr 2023 07:23:59 -0400 (EDT) To: libc-alpha@sourceware.org Cc: caiyinyu , Wang Xuerui , Adhemerval Zanella Netto , Xi Ruoyao Subject: [PATCH 4/5] LoongArch: Multiarch stpcpy for unaligned access Date: Sat, 15 Apr 2023 19:23:39 +0800 Message-Id: <20230415112340.38431-5-xry111@xry111.site> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230415112340.38431-1-xry111@xry111.site> References: <20230415112340.38431-1-xry111@xry111.site> MIME-Version: 1.0 X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, LIKELY_SPAM_FROM, RCVD_IN_BARRACUDACENTRAL, SPF_HELO_PASS, 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: Xi Ruoyao via Libc-alpha From: Xi Ruoyao Reply-To: Xi Ruoyao Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" When the CPU supports unaligned access, we can align the src pointer first (to avoid a segmentation fault if a small source string is located at the end of a page), then just copy the string pretending both src and dest are aligned. --- sysdeps/loongarch/multiarch/Makefile | 5 +++ sysdeps/loongarch/multiarch/stpcpy-generic.c | 25 ++++++++++++ sysdeps/loongarch/multiarch/stpcpy-ual.c | 43 ++++++++++++++++++++ sysdeps/loongarch/multiarch/stpcpy.c | 37 +++++++++++++++++ 4 files changed, 110 insertions(+) create mode 100644 sysdeps/loongarch/multiarch/Makefile create mode 100644 sysdeps/loongarch/multiarch/stpcpy-generic.c create mode 100644 sysdeps/loongarch/multiarch/stpcpy-ual.c create mode 100644 sysdeps/loongarch/multiarch/stpcpy.c diff --git a/sysdeps/loongarch/multiarch/Makefile b/sysdeps/loongarch/multiarch/Makefile new file mode 100644 index 0000000000..958752bcbd --- /dev/null +++ b/sysdeps/loongarch/multiarch/Makefile @@ -0,0 +1,5 @@ +ifeq ($(subdir),string) +sysdep_routines += stpcpy-generic stpcpy-ual + +CFLAGS-stpcpy-ual.c += -mno-strict-align +endif diff --git a/sysdeps/loongarch/multiarch/stpcpy-generic.c b/sysdeps/loongarch/multiarch/stpcpy-generic.c new file mode 100644 index 0000000000..487388372f --- /dev/null +++ b/sysdeps/loongarch/multiarch/stpcpy-generic.c @@ -0,0 +1,25 @@ +/* Multiarch stpcpy for LoongArch. Generic version. + Copyright (C) 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 + +extern __typeof (stpcpy) __stpcpy_generic attribute_hidden; + +#define STPCPY __stpcpy_generic + +#include diff --git a/sysdeps/loongarch/multiarch/stpcpy-ual.c b/sysdeps/loongarch/multiarch/stpcpy-ual.c new file mode 100644 index 0000000000..9cd13e7fef --- /dev/null +++ b/sysdeps/loongarch/multiarch/stpcpy-ual.c @@ -0,0 +1,43 @@ +/* Multiarch stpcpy for LoongArch. Unaligned access version. + Copyright (C) 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 + +static __typeof (stpcpy) __stpcpy_unused __attribute__ ((unused)); +extern __typeof (stpcpy) __stpcpy_ual attribute_hidden; + +#define STPCPY __stpcpy_unused + +#include + +char * +__stpcpy_ual (char *dest, const char *src) +{ + /* Copy just a few bytes to make SRC aligned. It's needed not to trigger + a segmentation fault when a short string is at the end of a segment. */ + size_t len = (-(uintptr_t) src) % OPSIZ; + for (; len != 0; len--, ++dest) + { + char c = *src++; + *dest = c; + if (c == '\0') + return dest; + } + + return stpcpy_aligned_loop ((op_t *) dest, (const op_t *) src); +} diff --git a/sysdeps/loongarch/multiarch/stpcpy.c b/sysdeps/loongarch/multiarch/stpcpy.c new file mode 100644 index 0000000000..58bfb1c89d --- /dev/null +++ b/sysdeps/loongarch/multiarch/stpcpy.c @@ -0,0 +1,37 @@ +/* Multiple versions of stpcpy. LoongArch version. + Copyright (C) 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 + . */ + +#if defined SHARED && IS_IN (libc) +# define __NO_STRING_INLINES +# define NO_MEMPCPY_STPCPY_REDIRECT +# include + +extern __typeof (__stpcpy) __stpcpy_generic attribute_hidden; +extern __typeof (__stpcpy) __stpcpy_ual attribute_hidden; + +# include +# define INIT_ARCH() + +libc_ifunc_hidden (__stpcpy, __stpcpy, + LOONGARCH_HAVE_UAL ? __stpcpy_ual : __stpcpy_generic); +weak_alias (__stpcpy, stpcpy) +libc_hidden_def (__stpcpy) +libc_hidden_def (stpcpy) +#else +# include +#endif From patchwork Sat Apr 15 11:23:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xi Ruoyao X-Patchwork-Id: 67780 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 7B1843856DE7 for ; Sat, 15 Apr 2023 11:25:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7B1843856DE7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1681557956; bh=m/MiL9i2v0psQrleICfmgLRAgR3Am2oSpeyHnLVPBw4=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=sq/dKzSVkCreowDdw2H+yMPKLCmrgxnkN3Pyc8fcVFQJ7AyeczpLGT58RZDldb9zK jKmQgNMXXKgyfMRfF5jrRbFNhbYeD7y/UWu/UeMRKaZN1Myjm3jyOSomGPGyn/qO5h jdW+51I8FPZl0Z4dikMeB9t9SGeLZmjpSaaRrLbs= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from xry111.site (xry111.site [IPv6:2001:470:683e::1]) by sourceware.org (Postfix) with ESMTPS id 274C6385734E for ; Sat, 15 Apr 2023 11:24:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 274C6385734E Received: from stargazer.. (unknown [113.140.11.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) (Authenticated sender: xry111@xry111.site) by xry111.site (Postfix) with ESMTPSA id AEAA266128; Sat, 15 Apr 2023 07:24:01 -0400 (EDT) To: libc-alpha@sourceware.org Cc: caiyinyu , Wang Xuerui , Adhemerval Zanella Netto , Xi Ruoyao Subject: [PATCH 5/5] LoongArch: Multiarch memcpy for unaligned access Date: Sat, 15 Apr 2023 19:23:40 +0800 Message-Id: <20230415112340.38431-6-xry111@xry111.site> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230415112340.38431-1-xry111@xry111.site> References: <20230415112340.38431-1-xry111@xry111.site> MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, LIKELY_SPAM_FROM, RCVD_IN_BARRACUDACENTRAL, SPF_HELO_PASS, 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: Xi Ruoyao via Libc-alpha From: Xi Ruoyao Reply-To: Xi Ruoyao Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" When the CPU supports unaligned access, we can align the dest pointer first (this will make a better performance than solely relying on the hardware unaligned access support), then just copy the memory area word by word pretending both src and dest are aligned. --- sysdeps/loongarch/multiarch/Makefile | 3 +- sysdeps/loongarch/multiarch/memcpy-generic.c | 27 ++++++++++ sysdeps/loongarch/multiarch/memcpy-ual.c | 50 +++++++++++++++++++ sysdeps/loongarch/multiarch/memcpy.c | 39 +++++++++++++++ .../loongarch/multiarch/wordcopy-ual-inline.c | 31 ++++++++++++ 5 files changed, 149 insertions(+), 1 deletion(-) create mode 100644 sysdeps/loongarch/multiarch/memcpy-generic.c create mode 100644 sysdeps/loongarch/multiarch/memcpy-ual.c create mode 100644 sysdeps/loongarch/multiarch/memcpy.c create mode 100644 sysdeps/loongarch/multiarch/wordcopy-ual-inline.c diff --git a/sysdeps/loongarch/multiarch/Makefile b/sysdeps/loongarch/multiarch/Makefile index 958752bcbd..34e2f2a334 100644 --- a/sysdeps/loongarch/multiarch/Makefile +++ b/sysdeps/loongarch/multiarch/Makefile @@ -1,5 +1,6 @@ ifeq ($(subdir),string) -sysdep_routines += stpcpy-generic stpcpy-ual +sysdep_routines += stpcpy-generic stpcpy-ual memcpy-generic memcpy-ual CFLAGS-stpcpy-ual.c += -mno-strict-align +CFLAGS-memcpy-ual.c += -mno-strict-align endif diff --git a/sysdeps/loongarch/multiarch/memcpy-generic.c b/sysdeps/loongarch/multiarch/memcpy-generic.c new file mode 100644 index 0000000000..9374ced033 --- /dev/null +++ b/sysdeps/loongarch/multiarch/memcpy-generic.c @@ -0,0 +1,27 @@ +/* Multiarch memcpy for LoongArch. Generic version. + Copyright (C) 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 + +extern __typeof (memcpy) __memcpy_generic attribute_hidden; + +#define MEMCPY __memcpy_generic +#undef libc_hidden_def +#define libc_hidden_def(name) + +#include diff --git a/sysdeps/loongarch/multiarch/memcpy-ual.c b/sysdeps/loongarch/multiarch/memcpy-ual.c new file mode 100644 index 0000000000..e7cd8f253b --- /dev/null +++ b/sysdeps/loongarch/multiarch/memcpy-ual.c @@ -0,0 +1,50 @@ +/* Multiarch memcpy for LoongArch. Unaligned access version. + Copyright (C) 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 + +extern __typeof (memcpy) __memcpy_ual attribute_hidden; + +#include "wordcopy-ual-inline.c" + +#define OPSIZ (sizeof (op_t)) + +void * +__memcpy_ual (void *dest, const void *src, size_t len) +{ + unsigned long int dstp = (long int) dest; + unsigned long int srcp = (long int) src; + + /* If there not too few bytes to copy, use word copy. */ + if (len >= OP_T_THRES) + { + /* Copy just a few bytes to make DSTP aligned. Not needed with + unaligned access support, but it improves the performance. */ + len -= (-dstp) % OPSIZ; + BYTE_COPY_FWD (dstp, srcp, (-dstp) % OPSIZ); + + _wordcopy_fwd_ual (dstp, srcp, len / OPSIZ); + dstp += len & -OPSIZ; + srcp += len & -OPSIZ; + len %= OPSIZ; + } + + BYTE_COPY_FWD (dstp, srcp, len); + + return dest; +} diff --git a/sysdeps/loongarch/multiarch/memcpy.c b/sysdeps/loongarch/multiarch/memcpy.c new file mode 100644 index 0000000000..6a3089f88c --- /dev/null +++ b/sysdeps/loongarch/multiarch/memcpy.c @@ -0,0 +1,39 @@ +/* Multiple versions of memcpy. LoongArch version. + Copyright (C) 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 + . */ + +#if defined SHARED && IS_IN (libc) +# undef memcpy +# define memcpy __redirect_memcpy +# include +# undef memcpy + +extern __typeof (__redirect_memcpy) __libc_memcpy; + +extern __typeof (__redirect_memcpy) __memcpy_generic attribute_hidden; +extern __typeof (__redirect_memcpy) __memcpy_ual attribute_hidden; + +# include +# define INIT_ARCH() + +libc_ifunc (__libc_memcpy, + LOONGARCH_HAVE_UAL ? __memcpy_ual : __memcpy_generic); +strong_alias (__libc_memcpy, memcpy); +libc_hidden_ver (__libc_memcpy, memcpy) +#else +# include +#endif diff --git a/sysdeps/loongarch/multiarch/wordcopy-ual-inline.c b/sysdeps/loongarch/multiarch/wordcopy-ual-inline.c new file mode 100644 index 0000000000..a552aa6946 --- /dev/null +++ b/sysdeps/loongarch/multiarch/wordcopy-ual-inline.c @@ -0,0 +1,31 @@ +/* Reuse subroutine from string/wordcopy.c for LoongArch unaligned access. + Copyright (C) 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 + +static __always_inline void _wordcopy_fwd_ual (long int, long int, size_t); +static void _nouse_1 (long int, long int, size_t) __attribute__ ((unused)); +static void _nouse_2 (long int, long int, size_t) __attribute__ ((unused)); +static void _nouse_3 (long int, long int, size_t) __attribute__ ((unused)); + +#define WORDCOPY_FWD_ALIGNED _wordcopy_fwd_ual +#define WORDCOPY_BWD_ALIGNED _nouse_1 +#define WORDCOPY_FWD_DEST_ALIGNED _nouse_2 +#define WORDCOPY_BWD_DEST_ALIGNED _nouse_3 + +#include