public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Szabolcs Nagy <nsz@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc/arm/morello/main] Revert "TODO(drop): aarch64: morello: CPU feature detection for Morello"
Date: Wed, 26 Oct 2022 14:50:14 +0000 (GMT)	[thread overview]
Message-ID: <20221026145014.A96B93853540@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=3295936b272a1018e31fd634b7e327101eacd711

commit 3295936b272a1018e31fd634b7e327101eacd711
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date:   Fri Oct 21 15:41:13 2022 +0100

    Revert "TODO(drop): aarch64: morello: CPU feature detection for Morello"
    
    This reverts commit 078ebf3e35bd0c50b58dc2ec796530054f69b9a9.

Diff:
---
 sysdeps/aarch64/multiarch/init-arch.h          | 4 +---
 sysdeps/unix/sysv/linux/aarch64/cpu-features.c | 3 ---
 sysdeps/unix/sysv/linux/aarch64/cpu-features.h | 6 ------
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/sysdeps/aarch64/multiarch/init-arch.h b/sysdeps/aarch64/multiarch/init-arch.h
index d5219186be..a4dcac0019 100644
--- a/sysdeps/aarch64/multiarch/init-arch.h
+++ b/sysdeps/aarch64/multiarch/init-arch.h
@@ -35,6 +35,4 @@
   bool __attribute__((unused)) mte =					      \
     MTE_ENABLED ();							      \
   bool __attribute__((unused)) sve =					      \
-    GLRO(dl_aarch64_cpu_features).sve;					      \
-  bool __attribute__((unused)) morello =				      \
-    GLRO(dl_hwcap2) & HWCAP2_MORELLO;
+    GLRO(dl_aarch64_cpu_features).sve;
diff --git a/sysdeps/unix/sysv/linux/aarch64/cpu-features.c b/sysdeps/unix/sysv/linux/aarch64/cpu-features.c
index 3d95815d5f..d14c0f4e1f 100644
--- a/sysdeps/unix/sysv/linux/aarch64/cpu-features.c
+++ b/sysdeps/unix/sysv/linux/aarch64/cpu-features.c
@@ -126,7 +126,4 @@ init_cpu_features (struct cpu_features *cpu_features)
 
   /* Check if SVE is supported.  */
   cpu_features->sve = GLRO (dl_hwcap) & HWCAP_SVE;
-
-  /* Check if Morello is supported.  */
-  cpu_features->morello = GLRO (dl_hwcap2) & HWCAP2_MORELLO;
 }
diff --git a/sysdeps/unix/sysv/linux/aarch64/cpu-features.h b/sysdeps/unix/sysv/linux/aarch64/cpu-features.h
index 0742ac1409..391165a99c 100644
--- a/sysdeps/unix/sysv/linux/aarch64/cpu-features.h
+++ b/sysdeps/unix/sysv/linux/aarch64/cpu-features.h
@@ -68,11 +68,6 @@
 #define IS_A64FX(midr) (MIDR_IMPLEMENTOR(midr) == 'F'			      \
 			&& MIDR_PARTNUM(midr) == 0x001)
 
-/* TODO: This is based on the Morello Fast Model.
-	 Will MIDR_IMPLEMENTOR change to 'A'?  */
-#define IS_MORELLO(midr) (MIDR_IMPLEMENTOR(midr) == 0x3f       \
-                         && MIDR_PARTNUM(midr) == 0x412)
-
 struct cpu_features
 {
   uint64_t midr_el1;
@@ -81,7 +76,6 @@ struct cpu_features
   /* Currently, the GLIBC memory tagging tunable only defines 8 bits.  */
   uint8_t mte_state;
   bool sve;
-  bool morello;
 };
 
 #endif /* _CPU_FEATURES_AARCH64_H  */

                 reply	other threads:[~2022-10-26 14:50 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221026145014.A96B93853540@sourceware.org \
    --to=nsz@sourceware.org \
    --cc=glibc-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).