Skip to content

Commit 59b419a

Browse files
committed
Revert "[Clang,Driver] Add -fveclib=Darwin_libsystem_m support."
This reverts commit 187a14e. The test added in this commit is failing on several build bots: https://lab.llvm.org/buildbot/#/builders/139/builds/4059 https://lab.llvm.org/buildbot/#/builders/132/builds/5605
1 parent 0a621d3 commit 59b419a

File tree

6 files changed

+7
-30
lines changed

6 files changed

+7
-30
lines changed

clang/include/clang/Basic/CodeGenOptions.h

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,11 @@ class CodeGenOptions : public CodeGenOptionsBase {
5555
};
5656

5757
enum VectorLibrary {
58-
NoLibrary, // Don't use any vector library.
59-
Accelerate, // Use the Accelerate framework.
60-
LIBMVEC, // GLIBC vector math library.
61-
MASSV, // IBM MASS vector library.
62-
SVML, // Intel short vector math library.
63-
Darwin_libsystem_m // Use Darwin's libsytem_m vector functions.
58+
NoLibrary, // Don't use any vector library.
59+
Accelerate, // Use the Accelerate framework.
60+
LIBMVEC, // GLIBC vector math library.
61+
MASSV, // IBM MASS vector library.
62+
SVML // Intel short vector math library.
6463
};
6564

6665
enum ObjCDispatchMethodKind {

clang/include/clang/Driver/Options.td

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2171,10 +2171,9 @@ def fno_experimental_isel : Flag<["-"], "fno-experimental-isel">, Group<f_clang_
21712171
Alias<fno_global_isel>;
21722172
def fveclib : Joined<["-"], "fveclib=">, Group<f_Group>, Flags<[CC1Option]>,
21732173
HelpText<"Use the given vector functions library">,
2174-
Values<"Accelerate,libmvec,MASSV,SVML,Darwin_libsystem_m,none">,
2174+
Values<"Accelerate,libmvec,MASSV,SVML,none">,
21752175
NormalizedValuesScope<"CodeGenOptions">,
2176-
NormalizedValues<["Accelerate", "LIBMVEC", "MASSV", "SVML",
2177-
"Darwin_libsystem_m", "NoLibrary"]>,
2176+
NormalizedValues<["Accelerate", "LIBMVEC", "MASSV", "SVML", "NoLibrary"]>,
21782177
MarshallingInfoEnum<CodeGenOpts<"VecLib">, "NoLibrary">;
21792178
def fno_lax_vector_conversions : Flag<["-"], "fno-lax-vector-conversions">, Group<f_Group>,
21802179
Alias<flax_vector_conversions_EQ>, AliasArgs<["none"]>;

clang/lib/CodeGen/BackendUtil.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -402,10 +402,6 @@ static TargetLibraryInfoImpl *createTLII(llvm::Triple &TargetTriple,
402402
case CodeGenOptions::SVML:
403403
TLII->addVectorizableFunctionsFromVecLib(TargetLibraryInfoImpl::SVML);
404404
break;
405-
case CodeGenOptions::Darwin_libsystem_m:
406-
TLII->addVectorizableFunctionsFromVecLib(
407-
TargetLibraryInfoImpl::DarwinLibSystemM);
408-
break;
409405
default:
410406
break;
411407
}

clang/test/CodeGen/veclib-darwin-libsystem-m.c

Lines changed: 0 additions & 14 deletions
This file was deleted.

clang/test/Driver/autocomplete.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
// FLTOALL-NEXT: thin
7777
// RUN: %clang --autocomplete=-fveclib= | FileCheck %s -check-prefix=FVECLIBALL
7878
// FVECLIBALL: Accelerate
79-
// FVECLIBALL-NEXT: Darwin_libsystem_m
8079
// FVECLIBALL-NEXT: libmvec
8180
// FVECLIBALL-NEXT: MASSV
8281
// FVECLIBALL-NEXT: none

clang/test/Driver/fveclib.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@
22
// RUN: %clang -### -c -fveclib=Accelerate %s 2>&1 | FileCheck -check-prefix CHECK-ACCELERATE %s
33
// RUN: %clang -### -c -fveclib=libmvec %s 2>&1 | FileCheck -check-prefix CHECK-libmvec %s
44
// RUN: %clang -### -c -fveclib=MASSV %s 2>&1 | FileCheck -check-prefix CHECK-MASSV %s
5-
// RUN: %clang -### -c -fveclib=Darwin_libsystem_m %s 2>&1 | FileCheck -check-prefix CHECK-DARWIN_LIBSYSTEM_M %s
65
// RUN: not %clang -c -fveclib=something %s 2>&1 | FileCheck -check-prefix CHECK-INVALID %s
76

87
// CHECK-NOLIB: "-fveclib=none"
98
// CHECK-ACCELERATE: "-fveclib=Accelerate"
109
// CHECK-libmvec: "-fveclib=libmvec"
1110
// CHECK-MASSV: "-fveclib=MASSV"
12-
// CHECK-DARWIN_LIBSYSTEM_M: "-fveclib=Darwin_libsystem_m"
1311

1412
// CHECK-INVALID: error: invalid value 'something' in '-fveclib=something'
1513

0 commit comments

Comments
 (0)