| Message ID | DB8PR08MB5036B58CE770CD9D59E842C783610@DB8PR08MB5036.eurprd08.prod.outlook.com |
|---|---|
| State | New |
| Headers | show |
| Series | AArch64: Rename IS_ARES to IS_NEOVERSE_N1 | expand |
On 7/14/20 12:37 PM, Wilco Dijkstra wrote: > Rename IS_ARES to IS_NEOVERSE_N1 since that is a bit clearer. > > OK for commit? Absolutely, we should used released names where possible at all times. OK for 2.32. Reviewed-by: Carlos O'Donell <carlos@redhat.com> > --- > diff --git a/sysdeps/aarch64/multiarch/memcpy.c b/sysdeps/aarch64/multiarch/memcpy.c > index e6f3ae116701097d71a02e2a1f6bfdadc1eec34a..7cf5f033e8fcdcbfdfbfe73e6ad24d8b3fc79b66 100644 > --- a/sysdeps/aarch64/multiarch/memcpy.c > +++ b/sysdeps/aarch64/multiarch/memcpy.c > @@ -41,7 +41,9 @@ libc_ifunc (__libc_memcpy, > ? __memcpy_falkor > : (IS_THUNDERX2 (midr) || IS_THUNDERX2PA (midr) > ? __memcpy_thunderx2 > - : (IS_ARES (midr) ? __memcpy_simd : __memcpy_generic))))); > + : (IS_NEOVERSE_N1 (midr) > + ? __memcpy_simd > + : __memcpy_generic))))); > > # undef memcpy > strong_alias (__libc_memcpy, memcpy); > diff --git a/sysdeps/aarch64/multiarch/memmove.c b/sysdeps/aarch64/multiarch/memmove.c > index 1229f8b89296eddd2e711490bb7fc0b35726b6f5..ad10aa8ac6fba884ffb3736ed6e73d16b6eaa60c 100644 > --- a/sysdeps/aarch64/multiarch/memmove.c > +++ b/sysdeps/aarch64/multiarch/memmove.c > @@ -41,7 +41,9 @@ libc_ifunc (__libc_memmove, > ? __memmove_falkor > : (IS_THUNDERX2 (midr) || IS_THUNDERX2PA (midr) > ? __memmove_thunderx2 > - : (IS_ARES (midr) ? __memmove_simd : __memmove_generic))))); > + : (IS_NEOVERSE_N1 (midr) > + ? __memmove_simd > + : __memmove_generic))))); > > # undef memmove > strong_alias (__libc_memmove, memmove); > diff --git a/sysdeps/unix/sysv/linux/aarch64/cpu-features.h b/sysdeps/unix/sysv/linux/aarch64/cpu-features.h > index a81f186ec2df43387c50956b74844a4b1ca8d334..fc688450ee0e0f7cf58e73920263631a0ea7c8d6 100644 > --- a/sysdeps/unix/sysv/linux/aarch64/cpu-features.h > +++ b/sysdeps/unix/sysv/linux/aarch64/cpu-features.h > @@ -52,8 +52,8 @@ > > #define IS_PHECDA(midr) (MIDR_IMPLEMENTOR(midr) == 'h' \ > && MIDR_PARTNUM(midr) == 0x000) > -#define IS_ARES(midr) (MIDR_IMPLEMENTOR(midr) == 'A' \ > - && MIDR_PARTNUM(midr) == 0xd0c) > +#define IS_NEOVERSE_N1(midr) (MIDR_IMPLEMENTOR(midr) == 'A' \ > + && MIDR_PARTNUM(midr) == 0xd0c) > > #define IS_EMAG(midr) (MIDR_IMPLEMENTOR(midr) == 'P' \ > && MIDR_PARTNUM(midr) == 0x000) > >
diff --git a/sysdeps/aarch64/multiarch/memcpy.c b/sysdeps/aarch64/multiarch/memcpy.c index e6f3ae116701097d71a02e2a1f6bfdadc1eec34a..7cf5f033e8fcdcbfdfbfe73e6ad24d8b3fc79b66 100644 --- a/sysdeps/aarch64/multiarch/memcpy.c +++ b/sysdeps/aarch64/multiarch/memcpy.c @@ -41,7 +41,9 @@ libc_ifunc (__libc_memcpy, ? __memcpy_falkor : (IS_THUNDERX2 (midr) || IS_THUNDERX2PA (midr) ? __memcpy_thunderx2 - : (IS_ARES (midr) ? __memcpy_simd : __memcpy_generic))))); + : (IS_NEOVERSE_N1 (midr) + ? __memcpy_simd + : __memcpy_generic))))); # undef memcpy strong_alias (__libc_memcpy, memcpy); diff --git a/sysdeps/aarch64/multiarch/memmove.c b/sysdeps/aarch64/multiarch/memmove.c index 1229f8b89296eddd2e711490bb7fc0b35726b6f5..ad10aa8ac6fba884ffb3736ed6e73d16b6eaa60c 100644 --- a/sysdeps/aarch64/multiarch/memmove.c +++ b/sysdeps/aarch64/multiarch/memmove.c @@ -41,7 +41,9 @@ libc_ifunc (__libc_memmove, ? __memmove_falkor : (IS_THUNDERX2 (midr) || IS_THUNDERX2PA (midr) ? __memmove_thunderx2 - : (IS_ARES (midr) ? __memmove_simd : __memmove_generic))))); + : (IS_NEOVERSE_N1 (midr) + ? __memmove_simd + : __memmove_generic))))); # undef memmove strong_alias (__libc_memmove, memmove); diff --git a/sysdeps/unix/sysv/linux/aarch64/cpu-features.h b/sysdeps/unix/sysv/linux/aarch64/cpu-features.h index a81f186ec2df43387c50956b74844a4b1ca8d334..fc688450ee0e0f7cf58e73920263631a0ea7c8d6 100644 --- a/sysdeps/unix/sysv/linux/aarch64/cpu-features.h +++ b/sysdeps/unix/sysv/linux/aarch64/cpu-features.h @@ -52,8 +52,8 @@ #define IS_PHECDA(midr) (MIDR_IMPLEMENTOR(midr) == 'h' \ && MIDR_PARTNUM(midr) == 0x000) -#define IS_ARES(midr) (MIDR_IMPLEMENTOR(midr) == 'A' \ - && MIDR_PARTNUM(midr) == 0xd0c) +#define IS_NEOVERSE_N1(midr) (MIDR_IMPLEMENTOR(midr) == 'A' \ + && MIDR_PARTNUM(midr) == 0xd0c) #define IS_EMAG(midr) (MIDR_IMPLEMENTOR(midr) == 'P' \ && MIDR_PARTNUM(midr) == 0x000)