Skip to content

Revert "[clang] [ARM] Explicitly enable NEON for Windows/Darwin targets (#122095)" #134407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 11, 2025
Merged

Revert "[clang] [ARM] Explicitly enable NEON for Windows/Darwin targets (#122095)" #134407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions clang/lib/Driver/ToolChains/Arch/ARM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,21 +658,13 @@ llvm::ARM::FPUKind arm::getARMTargetFeatures(const Driver &D,
CPUArgFPUKind != llvm::ARM::FK_INVALID ? CPUArgFPUKind : ArchArgFPUKind;
(void)llvm::ARM::getFPUFeatures(FPUKind, Features);
} else {
bool Generic = true;
if (!ForAS) {
std::string CPU = arm::getARMTargetCPU(CPUName, ArchName, Triple);
if (CPU != "generic")
Generic = false;
llvm::ARM::ArchKind ArchKind =
arm::getLLVMArchKindForARM(CPU, ArchName, Triple);
FPUKind = llvm::ARM::getDefaultFPU(CPU, ArchKind);
(void)llvm::ARM::getFPUFeatures(FPUKind, Features);
}
if (Generic && (Triple.isOSWindows() || Triple.isOSDarwin()) &&
getARMSubArchVersionNumber(Triple) >= 7) {
FPUKind = llvm::ARM::parseFPU("neon");
(void)llvm::ARM::getFPUFeatures(FPUKind, Features);
}
}

// Now we've finished accumulating features from arch, cpu and fpu,
Expand Down
6 changes: 2 additions & 4 deletions clang/test/Driver/arm-mfpu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,10 +356,8 @@
// CHECK-HF-DAG: "-target-cpu" "arm1176jzf-s"

// RUN: %clang -target armv7-apple-darwin -x assembler %s -### -c 2>&1 \
// RUN: | FileCheck --check-prefix=ASM-NEON %s
// RUN: %clang -target armv7-windows -x assembler %s -### -c 2>&1 \
// RUN: | FileCheck --check-prefix=ASM-NEON %s
// ASM-NEON: "-target-feature" "+neon"
// RUN: | FileCheck --check-prefix=ASM %s
// ASM-NOT: -target-feature

// RUN: %clang -target armv8-linux-gnueabi -mfloat-abi=soft -mfpu=none %s -### -c 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-SOFT-ABI-FP %s
Expand Down
27 changes: 0 additions & 27 deletions clang/test/Preprocessor/arm-target-features.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,30 +132,6 @@
// CHECK-V7VE-DEFAULT-ABI-SOFT: #define __ARM_ARCH_EXT_IDIV__ 1
// CHECK-V7VE-DEFAULT-ABI-SOFT: #define __ARM_FP 0xc

// RUN: %clang -target x86_64-apple-macosx10.10 -arch armv7 -x c -E -dM %s -o - | FileCheck -match-full-lines --check-prefix=CHECK-DARWIN-V7 %s
// CHECK-DARWIN-V7: #define __ARMEL__ 1
// CHECK-DARWIN-V7: #define __ARM_ARCH 7
// CHECK-DARWIN-V7: #define __ARM_ARCH_7A__ 1
// CHECK-DARWIN-V7-NOT: __ARM_FEATURE_CRC32
// CHECK-DARWIN-V7-NOT: __ARM_FEATURE_NUMERIC_MAXMIN
// CHECK-DARWIN-V7-NOT: __ARM_FEATURE_DIRECTED_ROUNDING
// CHECK-DARWIN-V7: #define __ARM_FP 0xc
// CHECK-DARWIN-V7: #define __ARM_NEON 1
// CHECK-DARWIN-V7: #define __ARM_NEON_FP 0x4
// CHECK-DARWIN-V7: #define __ARM_NEON__ 1

// RUN: %clang -target armv7-windows -x c -E -dM %s -o - | FileCheck -match-full-lines --check-prefix=CHECK-WINDOWS-V7 %s
// CHECK-WINDOWS-V7: #define __ARMEL__ 1
// CHECK-WINDOWS-V7: #define __ARM_ARCH 7
// CHECK-WINDOWS-V7: #define __ARM_ARCH_7A__ 1
// CHECK-WINDOWS-V7-NOT: __ARM_FEATURE_CRC32
// CHECK-WINDOWS-V7-NOT: __ARM_FEATURE_NUMERIC_MAXMIN
// CHECK-WINDOWS-V7-NOT: __ARM_FEATURE_DIRECTED_ROUNDING
// CHECK-WINDOWS-V7: #define __ARM_FP 0xe
// CHECK-WINDOWS-V7: #define __ARM_NEON 1
// CHECK-WINDOWS-V7: #define __ARM_NEON_FP 0x6
// CHECK-WINDOWS-V7: #define __ARM_NEON__ 1

// RUN: %clang -target x86_64-apple-macosx10.10 -arch armv7s -x c -E -dM %s -o - | FileCheck -match-full-lines --check-prefix=CHECK-V7S %s
// CHECK-V7S: #define __ARMEL__ 1
// CHECK-V7S: #define __ARM_ARCH 7
Expand All @@ -164,9 +140,6 @@
// CHECK-V7S-NOT: __ARM_FEATURE_NUMERIC_MAXMIN
// CHECK-V7S-NOT: __ARM_FEATURE_DIRECTED_ROUNDING
// CHECK-V7S: #define __ARM_FP 0xe
// CHECK-V7S: #define __ARM_NEON 1
// CHECK-V7S: #define __ARM_NEON_FP 0x6
// CHECK-V7S: #define __ARM_NEON__ 1

// RUN: %clang -target arm-arm-none-eabi -march=armv7-m -mfloat-abi=soft -x c -E -dM %s | FileCheck -match-full-lines --check-prefix=CHECK-VFP-FP %s
// RUN: %clang -target arm-arm-none-eabi -march=armv7-m -mfloat-abi=softfp -x c -E -dM %s | FileCheck -match-full-lines --check-prefix=CHECK-VFP-FP %s
Expand Down
Loading