[compiler-rt] [compiler-rt][AArch64] NFCI: Remove sme-abi-vg.c (PR #119193)

Sander de Smalen via llvm-commits llvm-commits at lists.llvm.org
Mon Dec 9 02:18:19 PST 2024


https://github.com/sdesmalen-arm created https://github.com/llvm/llvm-project/pull/119193

Given that FMV support is required for the SME builtins to be built, the FMV constructor as defined in:

  compiler-rt/lib/builtins/cpu_model/aarch64.c

already initialises the feature bits, so there's no need to create another one.

>From d453dd963afd05c4c76828d3a236d56d71559522 Mon Sep 17 00:00:00 2001
From: Sander de Smalen <sander.desmalen at arm.com>
Date: Fri, 6 Dec 2024 14:56:52 +0000
Subject: [PATCH] [compiler-rt][AArch64] NFCI: Remove sme-abi-vg.c

Given that FMV support is required for the SME builtins to be built,
the FMV constructor as defined in:

  compiler-rt/lib/builtins/cpu_model/aarch64.c

already initialises the feature bits, so there's no need to create
another one.
---
 compiler-rt/lib/builtins/CMakeLists.txt       |  2 +-
 compiler-rt/lib/builtins/aarch64/sme-abi-vg.c | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 compiler-rt/lib/builtins/aarch64/sme-abi-vg.c

diff --git a/compiler-rt/lib/builtins/CMakeLists.txt b/compiler-rt/lib/builtins/CMakeLists.txt
index 73c1b5062ec9a9..70dc7d860d8f6a 100644
--- a/compiler-rt/lib/builtins/CMakeLists.txt
+++ b/compiler-rt/lib/builtins/CMakeLists.txt
@@ -574,7 +574,7 @@ set(aarch64_SOURCES
 
 if (COMPILER_RT_HAS_AARCH64_SME)
   if (NOT COMPILER_RT_DISABLE_AARCH64_FMV AND COMPILER_RT_HAS_FNO_BUILTIN_FLAG AND (COMPILER_RT_HAS_AUXV OR COMPILER_RT_BAREMETAL_BUILD))
-    list(APPEND aarch64_SOURCES aarch64/sme-abi.S aarch64/sme-libc-mem-routines.S aarch64/sme-abi-init.c aarch64/sme-abi-vg.c aarch64/sme-libc-routines.c)
+    list(APPEND aarch64_SOURCES aarch64/sme-abi.S aarch64/sme-libc-mem-routines.S aarch64/sme-abi-init.c aarch64/sme-libc-routines.c)
     message(STATUS "AArch64 SME ABI routines enabled")
     set_source_files_properties(aarch64/sme-libc-routines.c PROPERTIES COMPILE_FLAGS "-fno-builtin")
   else()
diff --git a/compiler-rt/lib/builtins/aarch64/sme-abi-vg.c b/compiler-rt/lib/builtins/aarch64/sme-abi-vg.c
deleted file mode 100644
index 4b9ee8c1d382d9..00000000000000
--- a/compiler-rt/lib/builtins/aarch64/sme-abi-vg.c
+++ /dev/null
@@ -1,18 +0,0 @@
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-
-#include "../cpu_model/aarch64.h"
-
-struct FEATURES {
-  unsigned long long features;
-};
-
-extern struct FEATURES __aarch64_cpu_features;
-
-CONSTRUCTOR_ATTRIBUTE static void get_aarch64_cpu_features(void) {
-  if (__atomic_load_n(&__aarch64_cpu_features.features, __ATOMIC_RELAXED))
-    return;
-
-  __init_cpu_features();
-}



More information about the llvm-commits mailing list