[llvm] r253201 - NFC refactorings in lib/Support/TargetParser.cpp
Artyom Skrobov via llvm-commits
llvm-commits at lists.llvm.org
Mon Nov 16 04:08:05 PST 2015
Author: askrobov
Date: Mon Nov 16 06:08:05 2015
New Revision: 253201
URL: http://llvm.org/viewvc/llvm-project?rev=253201&view=rev
Log:
NFC refactorings in lib/Support/TargetParser.cpp
Summary:
* declare FPUNames, ARCHNames, ARCHExtNames, HWDivNames, CPUNames
as static const
* implement getDefaultExtensions with a StringSwitch, in the same
way getDefaultFPU is implemented
Reviewers: rengolin
Subscribers: llvm-commits
Differential Revision: http://reviews.llvm.org/D14648
Modified:
llvm/trunk/lib/Support/TargetParser.cpp
Modified: llvm/trunk/lib/Support/TargetParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/TargetParser.cpp?rev=253201&r1=253200&r2=253201&view=diff
==============================================================================
--- llvm/trunk/lib/Support/TargetParser.cpp (original)
+++ llvm/trunk/lib/Support/TargetParser.cpp Mon Nov 16 06:08:05 2015
@@ -27,7 +27,7 @@ namespace {
// features they correspond to (use getFPUFeatures).
// FIXME: TableGen this.
// The entries must appear in the order listed in ARM::FPUKind for correct indexing
-struct {
+static const struct {
const char *NameCStr;
size_t NameLength;
ARM::FPUKind ID;
@@ -50,7 +50,7 @@ struct {
// of the triples and are not conforming with their official names.
// Check to see if the expectation should be changed.
// FIXME: TableGen this.
-struct {
+static const struct {
const char *NameCStr;
size_t NameLength;
ARM::ArchKind ID;
@@ -78,7 +78,7 @@ struct {
// List of Arch Extension names.
// FIXME: TableGen this.
-struct {
+static const struct {
const char *NameCStr;
size_t NameLength;
unsigned ID;
@@ -92,7 +92,7 @@ struct {
// List of HWDiv names (use getHWDivSynonym) and which architectural
// features they correspond to (use getHWDivFeatures).
// FIXME: TableGen this.
-struct {
+static const struct {
const char *NameCStr;
size_t NameLength;
unsigned ID;
@@ -108,7 +108,7 @@ struct {
// When finding the Arch for a CPU, first-found prevails. Sort them accordingly.
// When this becomes table-generated, we'd probably need two tables.
// FIXME: TableGen this.
-struct {
+static const struct {
const char *NameCStr;
size_t NameLength;
ARM::ArchKind ArchID;
@@ -163,6 +163,17 @@ unsigned llvm::ARM::getDefaultFPU(String
.Default(ARM::FK_INVALID);
}
+unsigned llvm::ARM::getDefaultExtensions(StringRef CPU, unsigned ArchKind) {
+ if (CPU == "generic")
+ return ARCHNames[ArchKind].ArchBaseExtensions;
+
+ return StringSwitch<unsigned>(CPU)
+#define ARM_CPU_NAME(NAME, ID, DEFAULT_FPU, IS_DEFAULT, DEFAULT_EXT) \
+ .Case(NAME, ARCHNames[ID].ArchBaseExtensions | DEFAULT_EXT)
+#include "llvm/Support/ARMTargetParser.def"
+ .Default(ARM::AEK_INVALID);
+}
+
bool llvm::ARM::getHWDivFeatures(unsigned HWDivKind,
std::vector<const char *> &Features) {
@@ -323,17 +334,6 @@ StringRef llvm::ARM::getHWDivName(unsign
return StringRef();
}
-unsigned llvm::ARM::getDefaultExtensions(StringRef CPU, unsigned ArchKind) {
- if (CPU == "generic")
- return ARCHNames[ArchKind].ArchBaseExtensions;
-
- for (const auto C : CPUNames) {
- if (CPU == C.getName())
- return (ARCHNames[C.ArchID].ArchBaseExtensions | C.DefaultExtensions);
- }
- return ARM::AEK_INVALID;
-}
-
StringRef llvm::ARM::getDefaultCPU(StringRef Arch) {
unsigned AK = parseArch(Arch);
if (AK == ARM::AK_INVALID)
More information about the llvm-commits
mailing list