maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[AArch64][AsmParser] Show name of missing feature for system instructions 

Parsing of the system instructions (IC, DC, AT and TLBI) uses this
function to show the required architecture when the operand is valid,
but the architecture is not enabled. Armv8.5A adds a few different
system instructions as part of optional features, so we need to extend
it to show individual features, not just base architectures.

This is NFC for now, but will be used by three different features added
in v8.5A, and will be tested by them.

Patch by David Spickett!

Differential revision: https://reviews.llvm.org/D52478

llvm-svn: 343109
This commit is contained in:
Oliver Stannard 2018-09-26 13:52:27 +00:00
parent 28d4f85824
commit 89b1604935
1 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
View File

@ -2741,6 +2741,29 @@ AArch64AsmParser::tryParseOptionalShiftExtend(OperandVector &Operands) {
return MatchOperand_Success;
}
static const struct Extension {
const char *Name;
const FeatureBitset Features;
} ExtensionMap[] = {
{ "crc", {AArch64::FeatureCRC} },
{ "sm4", {AArch64::FeatureSM4} },
{ "sha3", {AArch64::FeatureSHA3} },
{ "sha2", {AArch64::FeatureSHA2} },
{ "aes", {AArch64::FeatureAES} },
{ "crypto", {AArch64::FeatureCrypto} },
{ "fp", {AArch64::FeatureFPARMv8} },
{ "simd", {AArch64::FeatureNEON} },
{ "ras", {AArch64::FeatureRAS} },
{ "lse", {AArch64::FeatureLSE} },
// FIXME: Unsupported extensions
{ "pan", {} },
{ "lor", {} },
{ "rdma", {} },
{ "profile", {} },
};
static void setRequiredFeatureString(FeatureBitset FBS, std::string &Str) {
if (FBS[AArch64::HasV8_1aOps])
Str += "ARMv8.1a";
@ -2750,8 +2773,18 @@ static void setRequiredFeatureString(FeatureBitset FBS, std::string &Str) {
Str += "ARMv8.3a";
else if (FBS[AArch64::HasV8_4aOps])
Str += "ARMv8.4a";
else
Str += "(unknown)";
else if (FBS[AArch64::HasV8_5aOps])
Str += "ARMv8.5a";
else {
auto ext = std::find_if(std::begin(ExtensionMap),
std::end(ExtensionMap),
[&](const Extension& e)
// Use & in case multiple features are enabled
{ return (FBS & e.Features) != FeatureBitset(); }
);
Str += ext != std::end(ExtensionMap) ? ext->Name : "(unknown)";
}
}
void AArch64AsmParser::createSysAlias(uint16_t Encoding, OperandVector &Operands,
@ -4902,28 +4935,6 @@ bool AArch64AsmParser::ParseDirective(AsmToken DirectiveID) {
return false;
}
static const struct {
const char *Name;
const FeatureBitset Features;
} ExtensionMap[] = {
{ "crc", {AArch64::FeatureCRC} },
{ "sm4", {AArch64::FeatureSM4} },
{ "sha3", {AArch64::FeatureSHA3} },
{ "sha2", {AArch64::FeatureSHA2} },
{ "aes", {AArch64::FeatureAES} },
{ "crypto", {AArch64::FeatureCrypto} },
{ "fp", {AArch64::FeatureFPARMv8} },
{ "simd", {AArch64::FeatureNEON} },
{ "ras", {AArch64::FeatureRAS} },
{ "lse", {AArch64::FeatureLSE} },
// FIXME: Unsupported extensions
{ "pan", {} },
{ "lor", {} },
{ "rdma", {} },
{ "profile", {} },
};
static void ExpandCryptoAEK(AArch64::ArchKind ArchKind,
SmallVector<StringRef, 4> &RequestedExtensions) {
const bool NoCrypto =