| Message ID | PAWPR08MB8982DE895F83B4E3D4CEA5B0839A2@PAWPR08MB8982.eurprd08.prod.outlook.com |
|---|---|
| State | New |
| Headers | show |
| Series | AArch64: Remove memset-reg.h | expand |
On 10/09/24 09:40, Wilco Dijkstra wrote: > > Remove memset-reg.h by moving register definitions into the memset implementations. > > OK for commit? LGTM, thanks. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> > > --- > > diff --git a/sysdeps/aarch64/memset-reg.h b/sysdeps/aarch64/memset-reg.h > deleted file mode 100644 > index 6c7f60b37edf3b117595ffa3b795573a469a980e..0000000000000000000000000000000000000000 > --- a/sysdeps/aarch64/memset-reg.h > +++ /dev/null > @@ -1,30 +0,0 @@ > -/* Register aliases for memset to be used across implementations. > - Copyright (C) 2017-2024 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 > - <https://www.gnu.org/licenses/>. */ > - > -#define dstin x0 > -#define val x1 > -#define valw w1 > -#define count x2 > -#define dst x3 > -#define dstend x4 > -#define tmp1 x5 > -#define tmp1w w5 > -#define tmp2 x6 > -#define tmp2w w6 > -#define zva_len x7 > -#define zva_lenw w7 > diff --git a/sysdeps/aarch64/memset.S b/sysdeps/aarch64/memset.S > index caafb019e2b6217b8a7ebc48a453a48a66ce76d3..b76dde1557ed8fb195c24a13a06f8d0d9ab126fa 100644 > --- a/sysdeps/aarch64/memset.S > +++ b/sysdeps/aarch64/memset.S > @@ -30,7 +30,6 @@ > */ > > #define dstin x0 > -#define val x1 > #define valw w1 > #define count x2 > #define dst x3 > diff --git a/sysdeps/aarch64/multiarch/memset_a64fx.S b/sysdeps/aarch64/multiarch/memset_a64fx.S > index 2e6d882fc931a882b18ceb32086e10a361b79fae..f665b5a891433c1c9363a5d7e2194f863de9cdfc 100644 > --- a/sysdeps/aarch64/multiarch/memset_a64fx.S > +++ b/sysdeps/aarch64/multiarch/memset_a64fx.S > @@ -18,7 +18,6 @@ > <https://www.gnu.org/licenses/>. */ > > #include <sysdep.h> > -#include <sysdeps/aarch64/memset-reg.h> > > /* Assumptions: > * > @@ -36,6 +35,14 @@ > > .arch armv8.2-a+sve > > +#define dstin x0 > +#define valw w1 > +#define count x2 > +#define dst x3 > +#define dstend x4 > +#define tmp1 x5 > +#define tmp2 x6 > + > .macro st1b_unroll first=0, last=7 > st1b z0.b, p0, [dst, \first, mul vl] > .if \last-\first > diff --git a/sysdeps/aarch64/multiarch/memset_emag.S b/sysdeps/aarch64/multiarch/memset_emag.S > index 6d714ed0e1b396ef53bb8f38a05ff5b94fb952c1..cf1b25f2edf64900af313205ac6f5d0f210e97f3 100644 > --- a/sysdeps/aarch64/multiarch/memset_emag.S > +++ b/sysdeps/aarch64/multiarch/memset_emag.S > @@ -18,7 +18,6 @@ > <https://www.gnu.org/licenses/>. */ > > #include <sysdep.h> > -#include "memset-reg.h" > > /* Assumptions: > * > @@ -26,6 +25,13 @@ > * > */ > > +#define dstin x0 > +#define val x1 > +#define valw w1 > +#define count x2 > +#define dst x3 > +#define dstend x4 > + > ENTRY (__memset_emag) > > PTR_ARG (0) > diff --git a/sysdeps/aarch64/multiarch/memset_kunpeng.S b/sysdeps/aarch64/multiarch/memset_kunpeng.S > index 7b215501376cbe03a833a9468102270ce73ed486..f815c20b0383f0570de320235c7e30b8d8caa429 100644 > --- a/sysdeps/aarch64/multiarch/memset_kunpeng.S > +++ b/sysdeps/aarch64/multiarch/memset_kunpeng.S > @@ -18,7 +18,6 @@ > <https://www.gnu.org/licenses/>. */ > > #include <sysdep.h> > -#include <sysdeps/aarch64/memset-reg.h> > > /* Assumptions: > * > @@ -26,6 +25,12 @@ > * > */ > > +#define dstin x0 > +#define valw w1 > +#define count x2 > +#define dst x3 > +#define dstend x4 > + > ENTRY (__memset_kunpeng) > > PTR_ARG (0) > diff --git a/sysdeps/aarch64/multiarch/memset_oryon1.S b/sysdeps/aarch64/multiarch/memset_oryon1.S > index b43a43b54e1b3439d2a21f649a0fb1b37fd877ea..6fa28a9bd030a70594274cc8d69a0c0ef3b47093 100644 > --- a/sysdeps/aarch64/multiarch/memset_oryon1.S > +++ b/sysdeps/aarch64/multiarch/memset_oryon1.S > @@ -19,12 +19,18 @@ > <https://www.gnu.org/licenses/>. */ > > #include <sysdep.h> > -#include "memset-reg.h" > > /* Assumptions: > ARMv8-a, AArch64, unaligned accesses > */ > > +#define dstin x0 > +#define val x1 > +#define valw w1 > +#define count x2 > +#define dst x3 > +#define dstend x4 > + > ENTRY (__memset_oryon1) > > PTR_ARG (0) > >
diff --git a/sysdeps/aarch64/memset-reg.h b/sysdeps/aarch64/memset-reg.h deleted file mode 100644 index 6c7f60b37edf3b117595ffa3b795573a469a980e..0000000000000000000000000000000000000000 --- a/sysdeps/aarch64/memset-reg.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Register aliases for memset to be used across implementations. - Copyright (C) 2017-2024 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 - <https://www.gnu.org/licenses/>. */ - -#define dstin x0 -#define val x1 -#define valw w1 -#define count x2 -#define dst x3 -#define dstend x4 -#define tmp1 x5 -#define tmp1w w5 -#define tmp2 x6 -#define tmp2w w6 -#define zva_len x7 -#define zva_lenw w7 diff --git a/sysdeps/aarch64/memset.S b/sysdeps/aarch64/memset.S index caafb019e2b6217b8a7ebc48a453a48a66ce76d3..b76dde1557ed8fb195c24a13a06f8d0d9ab126fa 100644 --- a/sysdeps/aarch64/memset.S +++ b/sysdeps/aarch64/memset.S @@ -30,7 +30,6 @@ */ #define dstin x0 -#define val x1 #define valw w1 #define count x2 #define dst x3 diff --git a/sysdeps/aarch64/multiarch/memset_a64fx.S b/sysdeps/aarch64/multiarch/memset_a64fx.S index 2e6d882fc931a882b18ceb32086e10a361b79fae..f665b5a891433c1c9363a5d7e2194f863de9cdfc 100644 --- a/sysdeps/aarch64/multiarch/memset_a64fx.S +++ b/sysdeps/aarch64/multiarch/memset_a64fx.S @@ -18,7 +18,6 @@ <https://www.gnu.org/licenses/>. */ #include <sysdep.h> -#include <sysdeps/aarch64/memset-reg.h> /* Assumptions: * @@ -36,6 +35,14 @@ .arch armv8.2-a+sve +#define dstin x0 +#define valw w1 +#define count x2 +#define dst x3 +#define dstend x4 +#define tmp1 x5 +#define tmp2 x6 + .macro st1b_unroll first=0, last=7 st1b z0.b, p0, [dst, \first, mul vl] .if \last-\first diff --git a/sysdeps/aarch64/multiarch/memset_emag.S b/sysdeps/aarch64/multiarch/memset_emag.S index 6d714ed0e1b396ef53bb8f38a05ff5b94fb952c1..cf1b25f2edf64900af313205ac6f5d0f210e97f3 100644 --- a/sysdeps/aarch64/multiarch/memset_emag.S +++ b/sysdeps/aarch64/multiarch/memset_emag.S @@ -18,7 +18,6 @@ <https://www.gnu.org/licenses/>. */ #include <sysdep.h> -#include "memset-reg.h" /* Assumptions: * @@ -26,6 +25,13 @@ * */ +#define dstin x0 +#define val x1 +#define valw w1 +#define count x2 +#define dst x3 +#define dstend x4 + ENTRY (__memset_emag) PTR_ARG (0) diff --git a/sysdeps/aarch64/multiarch/memset_kunpeng.S b/sysdeps/aarch64/multiarch/memset_kunpeng.S index 7b215501376cbe03a833a9468102270ce73ed486..f815c20b0383f0570de320235c7e30b8d8caa429 100644 --- a/sysdeps/aarch64/multiarch/memset_kunpeng.S +++ b/sysdeps/aarch64/multiarch/memset_kunpeng.S @@ -18,7 +18,6 @@ <https://www.gnu.org/licenses/>. */ #include <sysdep.h> -#include <sysdeps/aarch64/memset-reg.h> /* Assumptions: * @@ -26,6 +25,12 @@ * */ +#define dstin x0 +#define valw w1 +#define count x2 +#define dst x3 +#define dstend x4 + ENTRY (__memset_kunpeng) PTR_ARG (0) diff --git a/sysdeps/aarch64/multiarch/memset_oryon1.S b/sysdeps/aarch64/multiarch/memset_oryon1.S index b43a43b54e1b3439d2a21f649a0fb1b37fd877ea..6fa28a9bd030a70594274cc8d69a0c0ef3b47093 100644 --- a/sysdeps/aarch64/multiarch/memset_oryon1.S +++ b/sysdeps/aarch64/multiarch/memset_oryon1.S @@ -19,12 +19,18 @@ <https://www.gnu.org/licenses/>. */ #include <sysdep.h> -#include "memset-reg.h" /* Assumptions: ARMv8-a, AArch64, unaligned accesses */ +#define dstin x0 +#define val x1 +#define valw w1 +#define count x2 +#define dst x3 +#define dstend x4 + ENTRY (__memset_oryon1) PTR_ARG (0)