pratlucas created this revision.
Herald added subscribers: hiraditya, kristof.beyls.
Herald added a project: All.
pratlucas requested review of this revision.
Herald added subscribers: llvm-commits, cfe-commits, MaskRay.
Herald added projects: clang, LLVM.
This updates the AArch64's Target Parser and its uses to capture
information about default features directly from ArchInfo and CpuInfo
objects, instead of relying on an API function to access them
indirectly.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D142540
Files:
clang/lib/Basic/Targets/AArch64.cpp
clang/lib/Driver/ToolChains/Arch/AArch64.cpp
llvm/include/llvm/TargetParser/AArch64TargetParser.h
llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
llvm/lib/TargetParser/AArch64TargetParser.cpp
llvm/unittests/TargetParser/TargetParserTest.cpp
Index: llvm/unittests/TargetParser/TargetParserTest.cpp
===================================================================
--- llvm/unittests/TargetParser/TargetParserTest.cpp
+++ llvm/unittests/TargetParser/TargetParserTest.cpp
@@ -966,11 +966,9 @@
EXPECT_TRUE(Cpu);
EXPECT_EQ(params.ExpectedArch, Cpu->Arch.Name);
- uint64_t default_extensions =
- AArch64::getDefaultExtensions(params.CPUName, Cpu->Arch);
EXPECT_PRED_FORMAT2(
AssertSameExtensionFlags<ARM::ISAKind::AARCH64>(params.CPUName),
- params.ExpectedFlags, default_extensions);
+ params.ExpectedFlags, Cpu->getDefaultExtensions());
}
INSTANTIATE_TEST_SUITE_P(
@@ -1457,7 +1455,7 @@
if (!Extension)
return false;
std::optional<AArch64::CpuInfo> CpuInfo = AArch64::parseCpu(CPUName);
- return (CpuInfo->Arch.DefaultExts | CpuInfo->DefaultExtensions) & Extension->ID;
+ return CpuInfo->getDefaultExtensions() & Extension->ID;
}
bool testAArch64Extension(const AArch64::ArchInfo &AI, StringRef ArchExt) {
Index: llvm/lib/TargetParser/AArch64TargetParser.cpp
===================================================================
--- llvm/lib/TargetParser/AArch64TargetParser.cpp
+++ llvm/lib/TargetParser/AArch64TargetParser.cpp
@@ -25,19 +25,6 @@
return 0;
}
-uint64_t AArch64::getDefaultExtensions(StringRef CPU,
- const AArch64::ArchInfo &AI) {
- if (CPU == "generic")
- return AI.DefaultExts;
-
- // Note: this now takes cpu aliases into account
- std::optional<CpuInfo> Cpu = parseCpu(CPU);
- if (!Cpu)
- return AI.DefaultExts;
-
- return Cpu->Arch.DefaultExts | Cpu->DefaultExtensions;
-}
-
void AArch64::getFeatureOption(StringRef Name, std::string &Feature) {
for (const auto &E : llvm::AArch64::Extensions) {
if (Name == E.Name) {
Index: llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
===================================================================
--- llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
+++ llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
@@ -6891,8 +6891,7 @@
// Get the architecture and extension features.
std::vector<StringRef> AArch64Features;
AArch64Features.push_back(ArchInfo->ArchFeature);
- AArch64::getExtensionFeatures(
- AArch64::getDefaultExtensions("generic", *ArchInfo), AArch64Features);
+ AArch64::getExtensionFeatures(ArchInfo->DefaultExts, AArch64Features);
MCSubtargetInfo &STI = copySTI();
std::vector<std::string> ArchFeatures(AArch64Features.begin(), AArch64Features.end());
Index: llvm/include/llvm/TargetParser/AArch64TargetParser.h
===================================================================
--- llvm/include/llvm/TargetParser/AArch64TargetParser.h
+++ llvm/include/llvm/TargetParser/AArch64TargetParser.h
@@ -334,6 +334,10 @@
const ArchInfo &Arch;
uint64_t DefaultExtensions; // Default extensions for this CPU. These will be
// ORd with the architecture defaults.
+
+ uint64_t getDefaultExtensions() const {
+ return DefaultExtensions | Arch.DefaultExts;
+ }
};
inline constexpr CpuInfo CpuInfos[] = {
@@ -501,7 +505,6 @@
StringRef resolveCPUAlias(StringRef CPU);
// Information by Name
-uint64_t getDefaultExtensions(StringRef CPU, const ArchInfo &AI);
void getFeatureOption(StringRef Name, std::string &Feature);
std::optional<ArchInfo> getArchForCpu(StringRef CPU);
Index: clang/lib/Driver/ToolChains/Arch/AArch64.cpp
===================================================================
--- clang/lib/Driver/ToolChains/Arch/AArch64.cpp
+++ clang/lib/Driver/ToolChains/Arch/AArch64.cpp
@@ -140,7 +140,7 @@
Features.push_back(ArchInfo->ArchFeature);
- uint64_t Extension = llvm::AArch64::getDefaultExtensions(CPU, *ArchInfo);
+ uint64_t Extension = CpuInfo->getDefaultExtensions();
if (!llvm::AArch64::getExtensionFeatures(Extension, Features))
return false;
}
Index: clang/lib/Basic/Targets/AArch64.cpp
===================================================================
--- clang/lib/Basic/Targets/AArch64.cpp
+++ clang/lib/Basic/Targets/AArch64.cpp
@@ -692,10 +692,8 @@
Features[OtherArch->getSubArch()] = Enabled;
// Set any features implied by the architecture
- uint64_t Extensions =
- llvm::AArch64::getDefaultExtensions("generic", *ArchInfo);
std::vector<StringRef> CPUFeats;
- if (llvm::AArch64::getExtensionFeatures(Extensions, CPUFeats)) {
+ if (llvm::AArch64::getExtensionFeatures(ArchInfo->DefaultExts, CPUFeats)) {
for (auto F : CPUFeats) {
assert(F[0] == '+' && "Expected + in target feature!");
Features[F.drop_front(1)] = true;
@@ -951,7 +949,7 @@
// Parse the CPU and add any implied features.
std::optional<llvm::AArch64::CpuInfo> CpuInfo = llvm::AArch64::parseCpu(CPU);
if (CpuInfo) {
- uint64_t Exts = llvm::AArch64::getDefaultExtensions(CPU, CpuInfo->Arch);
+ uint64_t Exts = CpuInfo->getDefaultExtensions();
std::vector<StringRef> CPUFeats;
llvm::AArch64::getExtensionFeatures(Exts, CPUFeats);
for (auto F : CPUFeats) {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
