Skip to content

Commit ef9421d

Browse files
committed
[LoongArch] Remove useless 'invalid' and 'none' feature and arch names. NFC
1 parent fb54fec commit ef9421d

File tree

4 files changed

+7
-16
lines changed

4 files changed

+7
-16
lines changed

clang/lib/Driver/ToolChains/Arch/LoongArch.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,8 @@ void loongarch::getLoongArchTargetFeatures(const Driver &D,
127127
const ArgList &Args,
128128
std::vector<StringRef> &Features) {
129129
StringRef ArchName;
130-
llvm::LoongArch::ArchKind ArchKind = llvm::LoongArch::ArchKind::AK_INVALID;
131130
if (const Arg *A = Args.getLastArg(options::OPT_march_EQ)) {
132-
ArchKind = llvm::LoongArch::parseArch(A->getValue());
133-
if (ArchKind == llvm::LoongArch::ArchKind::AK_INVALID) {
131+
if (!llvm::LoongArch::isValidArchName(A->getValue())) {
134132
D.Diag(clang::diag::err_drv_invalid_arch_name) << A->getAsString(Args);
135133
return;
136134
}

llvm/include/llvm/TargetParser/LoongArchTargetParser.def

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
#define LOONGARCH_FEATURE(NAME, KIND)
33
#endif
44

5-
LOONGARCH_FEATURE("invalid", FK_INVALID)
6-
LOONGARCH_FEATURE("none", FK_NONE)
75
LOONGARCH_FEATURE("+64bit", FK_64BIT)
86
LOONGARCH_FEATURE("+f", FK_FP32)
97
LOONGARCH_FEATURE("+d", FK_FP64)
@@ -19,7 +17,6 @@ LOONGARCH_FEATURE("+ual", FK_UAL)
1917
#define LOONGARCH_ARCH(NAME, KIND, FEATURES)
2018
#endif
2119

22-
LOONGARCH_ARCH("invalid", AK_INVALID, FK_INVALID)
2320
LOONGARCH_ARCH("loongarch64", AK_LOONGARCH64, FK_64BIT | FK_FP32 | FK_FP64 | FK_UAL)
2421
LOONGARCH_ARCH("la464", AK_LA464, FK_64BIT | FK_FP32 | FK_FP64 | FK_LSX | FK_LASX | FK_UAL)
2522

llvm/include/llvm/TargetParser/LoongArchTargetParser.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ class StringRef;
2323
namespace LoongArch {
2424

2525
enum FeatureKind : uint32_t {
26-
FK_INVALID = 0,
27-
FK_NONE = 1,
28-
2926
// 64-bit ISA is available.
3027
FK_64BIT = 1 << 1,
3128

@@ -67,7 +64,7 @@ struct ArchInfo {
6764
uint32_t Features;
6865
};
6966

70-
ArchKind parseArch(StringRef Arch);
67+
bool isValidArchName(StringRef Arch);
7168
bool getArchFeatures(StringRef Arch, std::vector<StringRef> &Features);
7269

7370
} // namespace LoongArch

llvm/lib/TargetParser/LoongArchTargetParser.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//==-- LoongArch64TargetParser - Parser for LoongArch64 features --*- C++ -*-=//
1+
//===-- LoongArchTargetParser - Parser for LoongArch features --*- C++ -*-====//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.
@@ -27,20 +27,19 @@ const ArchInfo AllArchs[] = {
2727
#include "llvm/TargetParser/LoongArchTargetParser.def"
2828
};
2929

30-
LoongArch::ArchKind LoongArch::parseArch(StringRef Arch) {
30+
bool LoongArch::isValidArchName(StringRef Arch) {
3131
for (const auto A : AllArchs)
3232
if (A.Name == Arch)
33-
return A.Kind;
34-
35-
return LoongArch::ArchKind::AK_INVALID;
33+
return true;
34+
return false;
3635
}
3736

3837
bool LoongArch::getArchFeatures(StringRef Arch,
3938
std::vector<StringRef> &Features) {
4039
for (const auto A : AllArchs) {
4140
if (A.Name == Arch) {
4241
for (const auto F : AllFeatures)
43-
if ((A.Features & F.Kind) == F.Kind && F.Kind != FK_INVALID)
42+
if ((A.Features & F.Kind) == F.Kind)
4443
Features.push_back(F.Name);
4544
return true;
4645
}

0 commit comments

Comments
 (0)