Index: include/llvm/Support/TargetParser.h =================================================================== --- include/llvm/Support/TargetParser.h +++ include/llvm/Support/TargetParser.h @@ -140,6 +140,16 @@ AEK_LAST }; + // Hardware Divide + enum HWDivKind { + HDK_INVALID = 0, + HDK_NONE, + HDK_ARM, + HDK_THUMB, + HDK_ARM_THUMB, + HDK_LAST + }; + // ISA kinds. enum ISAKind { IK_INVALID = 0, @@ -167,6 +177,7 @@ // Target Parsers, one per architecture. class ARMTargetParser { + static StringRef getHWDivSynonym(StringRef HWDiv); static StringRef getFPUSynonym(StringRef FPU); static StringRef getArchSynonym(StringRef Arch); @@ -179,9 +190,12 @@ static unsigned getFPUNeonSupportLevel(unsigned FPUKind); static unsigned getFPURestriction(unsigned FPUKind); static unsigned getDefaultFPU(StringRef CPU); + static unsigned getDefaultHWDiv(StringRef CPU); // FIXME: This should be moved to TargetTuple once it exists static bool getFPUFeatures(unsigned FPUKind, std::vector &Features); + static bool getHWDivFeatures(unsigned HWDivKind, + std::vector &Features); static const char * getArchName(unsigned ArchKind); static unsigned getArchAttr(unsigned ArchKind); static const char * getCPUAttr(unsigned ArchKind); @@ -190,6 +204,7 @@ static const char * getDefaultCPU(StringRef Arch); // Parser + static unsigned parseHWDiv(StringRef HWDiv); static unsigned parseFPU(StringRef FPU); static unsigned parseArch(StringRef Arch); static unsigned parseArchExt(StringRef ArchExt); Index: lib/Support/TargetParser.cpp =================================================================== --- lib/Support/TargetParser.cpp +++ lib/Support/TargetParser.cpp @@ -130,6 +130,19 @@ { "maverick", ARM::AEK_MAVERICK }, { "xscale", ARM::AEK_XSCALE } }; +// List of HWDiv names (use getHWDivSynonym) and which architectural +// features they correspond to (use getHWDivFeatures). +// FIXME: TableGen this. +struct { + const char *Name; + ARM::HWDivKind ID; +} HWDivNames[] = { + { "invalid", ARM::HDK_INVALID }, + { "none", ARM::HDK_NONE }, + { "arm", ARM::HDK_ARM }, + { "thumb", ARM::HDK_THUMB }, + { "arm,thumb", ARM::HDK_ARM_THUMB } +}; // List of CPU names and their arches. // The same CPU can have multiple arches and can be default on multiple arches. // When finding the Arch for a CPU, first-found prevails. Sort them accordingly. @@ -139,93 +152,94 @@ const char *Name; ARM::ArchKind ArchID; ARM::FPUKind DefaultFPU; + ARM::HWDivKind DefaultHWDiv; bool Default; // is $Name the default CPU for $ArchID ? } CPUNames[] = { - { "arm2", ARM::AK_ARMV2, ARM::FK_NONE, true }, - { "arm3", ARM::AK_ARMV2A, ARM::FK_NONE, true }, - { "arm6", ARM::AK_ARMV3, ARM::FK_NONE, true }, - { "arm7m", ARM::AK_ARMV3M, ARM::FK_NONE, true }, - { "arm8", ARM::AK_ARMV4, ARM::FK_NONE, false }, - { "arm810", ARM::AK_ARMV4, ARM::FK_NONE, false }, - { "strongarm", ARM::AK_ARMV4, ARM::FK_NONE, true }, - { "strongarm110", ARM::AK_ARMV4, ARM::FK_NONE, false }, - { "strongarm1100", ARM::AK_ARMV4, ARM::FK_NONE, false }, - { "strongarm1110", ARM::AK_ARMV4, ARM::FK_NONE, false }, - { "arm7tdmi", ARM::AK_ARMV4T, ARM::FK_NONE, true }, - { "arm7tdmi-s", ARM::AK_ARMV4T, ARM::FK_NONE, false }, - { "arm710t", ARM::AK_ARMV4T, ARM::FK_NONE, false }, - { "arm720t", ARM::AK_ARMV4T, ARM::FK_NONE, false }, - { "arm9", ARM::AK_ARMV4T, ARM::FK_NONE, false }, - { "arm9tdmi", ARM::AK_ARMV4T, ARM::FK_NONE, false }, - { "arm920", ARM::AK_ARMV4T, ARM::FK_NONE, false }, - { "arm920t", ARM::AK_ARMV4T, ARM::FK_NONE, false }, - { "arm922t", ARM::AK_ARMV4T, ARM::FK_NONE, false }, - { "arm9312", ARM::AK_ARMV4T, ARM::FK_NONE, false }, - { "arm940t", ARM::AK_ARMV4T, ARM::FK_NONE, false }, - { "ep9312", ARM::AK_ARMV4T, ARM::FK_NONE, false }, - { "arm10tdmi", ARM::AK_ARMV5T, ARM::FK_NONE, true }, - { "arm1020t", ARM::AK_ARMV5T, ARM::FK_NONE, false }, - { "arm9e", ARM::AK_ARMV5TE, ARM::FK_NONE, false }, - { "arm946e-s", ARM::AK_ARMV5TE, ARM::FK_NONE, false }, - { "arm966e-s", ARM::AK_ARMV5TE, ARM::FK_NONE, false }, - { "arm968e-s", ARM::AK_ARMV5TE, ARM::FK_NONE, false }, - { "arm10e", ARM::AK_ARMV5TE, ARM::FK_NONE, false }, - { "arm1020e", ARM::AK_ARMV5TE, ARM::FK_NONE, false }, - { "arm1022e", ARM::AK_ARMV5TE, ARM::FK_NONE, true }, - { "iwmmxt", ARM::AK_ARMV5TE, ARM::FK_NONE, false }, - { "xscale", ARM::AK_ARMV5TE, ARM::FK_NONE, false }, - { "arm926ej-s", ARM::AK_ARMV5TEJ, ARM::FK_NONE, true }, - { "arm1136jf-s", ARM::AK_ARMV6, ARM::FK_VFPV2, true }, - { "arm1176j-s", ARM::AK_ARMV6K, ARM::FK_NONE, false }, - { "arm1176jz-s", ARM::AK_ARMV6K, ARM::FK_NONE, false }, - { "mpcore", ARM::AK_ARMV6K, ARM::FK_VFPV2, false }, - { "mpcorenovfp", ARM::AK_ARMV6K, ARM::FK_NONE, false }, - { "arm1176jzf-s", ARM::AK_ARMV6K, ARM::FK_VFPV2, true }, - { "arm1176jzf-s", ARM::AK_ARMV6Z, ARM::FK_VFPV2, true }, - { "arm1176jzf-s", ARM::AK_ARMV6ZK, ARM::FK_VFPV2, true }, - { "arm1156t2-s", ARM::AK_ARMV6T2, ARM::FK_NONE, true }, - { "arm1156t2f-s", ARM::AK_ARMV6T2, ARM::FK_VFPV2, false }, - { "cortex-m0", ARM::AK_ARMV6M, ARM::FK_NONE, true }, - { "cortex-m0plus", ARM::AK_ARMV6M, ARM::FK_NONE, false }, - { "cortex-m1", ARM::AK_ARMV6M, ARM::FK_NONE, false }, - { "sc000", ARM::AK_ARMV6M, ARM::FK_NONE, false }, - { "cortex-a5", ARM::AK_ARMV7A, ARM::FK_NEON_VFPV4, false }, - { "cortex-a7", ARM::AK_ARMV7A, ARM::FK_NEON_VFPV4, false }, - { "cortex-a8", ARM::AK_ARMV7A, ARM::FK_NEON, true }, - { "cortex-a9", ARM::AK_ARMV7A, ARM::FK_NEON_FP16, false }, - { "cortex-a12", ARM::AK_ARMV7A, ARM::FK_NEON_VFPV4, false }, - { "cortex-a15", ARM::AK_ARMV7A, ARM::FK_NEON_VFPV4, false }, - { "cortex-a17", ARM::AK_ARMV7A, ARM::FK_NEON_VFPV4, false }, - { "krait", ARM::AK_ARMV7A, ARM::FK_NEON_VFPV4, false }, - { "cortex-r4", ARM::AK_ARMV7R, ARM::FK_NONE, true }, - { "cortex-r4f", ARM::AK_ARMV7R, ARM::FK_VFPV3_D16, false }, - { "cortex-r5", ARM::AK_ARMV7R, ARM::FK_VFPV3_D16, false }, - { "cortex-r7", ARM::AK_ARMV7R, ARM::FK_VFPV3_D16_FP16, false }, - { "sc300", ARM::AK_ARMV7M, ARM::FK_NONE, false }, - { "cortex-m3", ARM::AK_ARMV7M, ARM::FK_NONE, true }, - { "cortex-m4", ARM::AK_ARMV7EM, ARM::FK_FPV4_SP_D16, true }, - { "cortex-m7", ARM::AK_ARMV7EM, ARM::FK_FPV5_D16, false }, - { "cortex-a53", ARM::AK_ARMV8A, ARM::FK_CRYPTO_NEON_FP_ARMV8, true }, - { "cortex-a57", ARM::AK_ARMV8A, ARM::FK_CRYPTO_NEON_FP_ARMV8, false }, - { "cortex-a72", ARM::AK_ARMV8A, ARM::FK_CRYPTO_NEON_FP_ARMV8, false }, - { "cyclone", ARM::AK_ARMV8A, ARM::FK_CRYPTO_NEON_FP_ARMV8, false }, - { "generic", ARM::AK_ARMV8_1A, ARM::FK_NEON_FP_ARMV8, true }, + { "arm2", ARM::AK_ARMV2, ARM::FK_NONE, ARM::HDK_NONE, true }, + { "arm3", ARM::AK_ARMV2A, ARM::FK_NONE, ARM::HDK_NONE, true }, + { "arm6", ARM::AK_ARMV3, ARM::FK_NONE, ARM::HDK_NONE, true }, + { "arm7m", ARM::AK_ARMV3M, ARM::FK_NONE, ARM::HDK_NONE, true }, + { "arm8", ARM::AK_ARMV4, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "arm810", ARM::AK_ARMV4, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "strongarm", ARM::AK_ARMV4, ARM::FK_NONE, ARM::HDK_NONE, true }, + { "strongarm110", ARM::AK_ARMV4, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "strongarm1100", ARM::AK_ARMV4, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "strongarm1110", ARM::AK_ARMV4, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "arm7tdmi", ARM::AK_ARMV4T, ARM::FK_NONE, ARM::HDK_NONE, true }, + { "arm7tdmi-s", ARM::AK_ARMV4T, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "arm710t", ARM::AK_ARMV4T, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "arm720t", ARM::AK_ARMV4T, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "arm9", ARM::AK_ARMV4T, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "arm9tdmi", ARM::AK_ARMV4T, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "arm920", ARM::AK_ARMV4T, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "arm920t", ARM::AK_ARMV4T, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "arm922t", ARM::AK_ARMV4T, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "arm9312", ARM::AK_ARMV4T, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "arm940t", ARM::AK_ARMV4T, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "ep9312", ARM::AK_ARMV4T, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "arm10tdmi", ARM::AK_ARMV5T, ARM::FK_NONE, ARM::HDK_NONE, true }, + { "arm1020t", ARM::AK_ARMV5T, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "arm9e", ARM::AK_ARMV5TE, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "arm946e-s", ARM::AK_ARMV5TE, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "arm966e-s", ARM::AK_ARMV5TE, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "arm968e-s", ARM::AK_ARMV5TE, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "arm10e", ARM::AK_ARMV5TE, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "arm1020e", ARM::AK_ARMV5TE, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "arm1022e", ARM::AK_ARMV5TE, ARM::FK_NONE, ARM::HDK_NONE, true }, + { "iwmmxt", ARM::AK_ARMV5TE, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "xscale", ARM::AK_ARMV5TE, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "arm926ej-s", ARM::AK_ARMV5TEJ, ARM::FK_NONE, ARM::HDK_NONE, true }, + { "arm1136jf-s", ARM::AK_ARMV6, ARM::FK_VFPV2, ARM::HDK_NONE, true }, + { "arm1176j-s", ARM::AK_ARMV6K, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "arm1176jz-s", ARM::AK_ARMV6K, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "mpcore", ARM::AK_ARMV6K, ARM::FK_VFPV2, ARM::HDK_NONE, false }, + { "mpcorenovfp", ARM::AK_ARMV6K, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "arm1176jzf-s", ARM::AK_ARMV6K, ARM::FK_VFPV2, ARM::HDK_NONE, true }, + { "arm1176jzf-s", ARM::AK_ARMV6Z, ARM::FK_VFPV2, ARM::HDK_NONE, true }, + { "arm1176jzf-s", ARM::AK_ARMV6ZK, ARM::FK_VFPV2, ARM::HDK_NONE, true }, + { "arm1156t2-s", ARM::AK_ARMV6T2, ARM::FK_NONE, ARM::HDK_NONE, true }, + { "arm1156t2f-s", ARM::AK_ARMV6T2, ARM::FK_VFPV2, ARM::HDK_NONE, false }, + { "cortex-m0", ARM::AK_ARMV6M, ARM::FK_NONE, ARM::HDK_NONE, true }, + { "cortex-m0plus", ARM::AK_ARMV6M, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "cortex-m1", ARM::AK_ARMV6M, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "sc000", ARM::AK_ARMV6M, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "cortex-a5", ARM::AK_ARMV7A, ARM::FK_NEON_VFPV4, ARM::HDK_NONE, false }, + { "cortex-a7", ARM::AK_ARMV7A, ARM::FK_NEON_VFPV4, ARM::HDK_ARM_THUMB, false }, + { "cortex-a8", ARM::AK_ARMV7A, ARM::FK_NEON, ARM::HDK_NONE, true }, + { "cortex-a9", ARM::AK_ARMV7A, ARM::FK_NEON_FP16, ARM::HDK_NONE, false }, + { "cortex-a12", ARM::AK_ARMV7A, ARM::FK_NEON_VFPV4, ARM::HDK_ARM_THUMB, false }, + { "cortex-a15", ARM::AK_ARMV7A, ARM::FK_NEON_VFPV4, ARM::HDK_ARM_THUMB, false }, + { "cortex-a17", ARM::AK_ARMV7A, ARM::FK_NEON_VFPV4, ARM::HDK_ARM_THUMB, false }, + { "krait", ARM::AK_ARMV7A, ARM::FK_NEON_VFPV4, ARM::HDK_ARM_THUMB, false }, + { "cortex-r4", ARM::AK_ARMV7R, ARM::FK_NONE, ARM::HDK_THUMB, true }, + { "cortex-r4f", ARM::AK_ARMV7R, ARM::FK_VFPV3_D16, ARM::HDK_THUMB, false }, + { "cortex-r5", ARM::AK_ARMV7R, ARM::FK_VFPV3_D16, ARM::HDK_ARM_THUMB, false }, + { "cortex-r7", ARM::AK_ARMV7R, ARM::FK_VFPV3_D16_FP16, ARM::HDK_ARM_THUMB, false }, + { "sc300", ARM::AK_ARMV7M, ARM::FK_NONE, ARM::HDK_THUMB, false }, + { "cortex-m3", ARM::AK_ARMV7M, ARM::FK_NONE, ARM::HDK_THUMB, true }, + { "cortex-m4", ARM::AK_ARMV7EM, ARM::FK_FPV4_SP_D16, ARM::HDK_THUMB, true }, + { "cortex-m7", ARM::AK_ARMV7EM, ARM::FK_FPV5_D16, ARM::HDK_THUMB, false }, + { "cortex-a53", ARM::AK_ARMV8A, ARM::FK_CRYPTO_NEON_FP_ARMV8, ARM::HDK_ARM_THUMB, true }, + { "cortex-a57", ARM::AK_ARMV8A, ARM::FK_CRYPTO_NEON_FP_ARMV8, ARM::HDK_ARM_THUMB, false }, + { "cortex-a72", ARM::AK_ARMV8A, ARM::FK_CRYPTO_NEON_FP_ARMV8, ARM::HDK_ARM_THUMB, false }, + { "cyclone", ARM::AK_ARMV8A, ARM::FK_CRYPTO_NEON_FP_ARMV8, ARM::HDK_ARM_THUMB, false }, + { "generic", ARM::AK_ARMV8_1A, ARM::FK_NEON_FP_ARMV8, ARM::HDK_ARM_THUMB, true }, // Non-standard Arch names. - { "iwmmxt", ARM::AK_IWMMXT, ARM::FK_NONE, true }, - { "xscale", ARM::AK_XSCALE, ARM::FK_NONE, true }, - { "arm10tdmi", ARM::AK_ARMV5, ARM::FK_NONE, true }, - { "arm1022e", ARM::AK_ARMV5E, ARM::FK_NONE, true }, - { "arm1136j-s", ARM::AK_ARMV6J, ARM::FK_NONE, true }, - { "arm1136jz-s", ARM::AK_ARMV6J, ARM::FK_NONE, false }, - { "cortex-m0", ARM::AK_ARMV6SM, ARM::FK_NONE, true }, - { "arm1176jzf-s", ARM::AK_ARMV6HL, ARM::FK_VFPV2, true }, - { "cortex-a8", ARM::AK_ARMV7, ARM::FK_NEON, true }, - { "cortex-a8", ARM::AK_ARMV7L, ARM::FK_NEON, true }, - { "cortex-a8", ARM::AK_ARMV7HL, ARM::FK_NEON, true }, - { "cortex-m4", ARM::AK_ARMV7EM, ARM::FK_NONE, true }, - { "swift", ARM::AK_ARMV7S, ARM::FK_NEON_VFPV4, true }, + { "iwmmxt", ARM::AK_IWMMXT, ARM::FK_NONE, ARM::HDK_NONE, true }, + { "xscale", ARM::AK_XSCALE, ARM::FK_NONE, ARM::HDK_NONE, true }, + { "arm10tdmi", ARM::AK_ARMV5, ARM::FK_NONE, ARM::HDK_NONE, true }, + { "arm1022e", ARM::AK_ARMV5E, ARM::FK_NONE, ARM::HDK_NONE, true }, + { "arm1136j-s", ARM::AK_ARMV6J, ARM::FK_NONE, ARM::HDK_NONE, true }, + { "arm1136jz-s", ARM::AK_ARMV6J, ARM::FK_NONE, ARM::HDK_NONE, false }, + { "cortex-m0", ARM::AK_ARMV6SM, ARM::FK_NONE, ARM::HDK_NONE, true }, + { "arm1176jzf-s", ARM::AK_ARMV6HL, ARM::FK_VFPV2, ARM::HDK_NONE, true }, + { "cortex-a8", ARM::AK_ARMV7, ARM::FK_NEON, ARM::HDK_NONE, true }, + { "cortex-a8", ARM::AK_ARMV7L, ARM::FK_NEON, ARM::HDK_NONE, true }, + { "cortex-a8", ARM::AK_ARMV7HL, ARM::FK_NEON, ARM::HDK_NONE, true }, + { "cortex-m4", ARM::AK_ARMV7EM, ARM::FK_NONE, ARM::HDK_THUMB, true }, + { "swift", ARM::AK_ARMV7S, ARM::FK_NEON_VFPV4, ARM::HDK_ARM_THUMB, true }, // Invalid CPU - { "invalid", ARM::AK_INVALID, ARM::FK_INVALID, true } + { "invalid", ARM::AK_INVALID, ARM::FK_INVALID, ARM::HDK_INVALID, true } }; } // namespace @@ -266,6 +280,42 @@ return ARM::FK_INVALID; } +unsigned ARMTargetParser::getDefaultHWDiv(StringRef CPU) { + for (const auto C : CPUNames) { + if (CPU == C.Name) + return C.DefaultHWDiv; + } + return ARM::HDK_INVALID; +} + +bool ARMTargetParser::getHWDivFeatures(unsigned HWDivKind, + std::vector &Features) { + + if (HWDivKind >= ARM::HDK_LAST || HWDivKind == ARM::HDK_INVALID) + return false; + + switch (HWDivKind) { + case ARM::HDK_NONE: + Features.push_back("-hwdiv-arm"); + Features.push_back("-hwdiv"); + break; + case ARM::HDK_ARM: + Features.push_back("+hwdiv-arm"); + Features.push_back("-hwdiv"); + break; + case ARM::HDK_THUMB: + Features.push_back("-hwdiv-arm"); + Features.push_back("+hwdiv"); + break; + case ARM::HDK_ARM_THUMB: + Features.push_back("+hwdiv-arm"); + Features.push_back("+hwdiv"); + break; + } + + return true; +} + bool ARMTargetParser::getFPUFeatures(unsigned FPUKind, std::vector &Features) { @@ -333,6 +383,7 @@ switch (FPUNames[FPUKind].NeonSupport) { case ARM::NS_Crypto: Features.push_back("+crypto"); + //Features.push_back("+neon"); break; case ARM::NS_Neon: Features.push_back("+neon"); @@ -394,6 +445,12 @@ // Parsers // ======================================================= // +StringRef ARMTargetParser::getHWDivSynonym(StringRef HWDiv) { + return StringSwitch(HWDiv) + .Case("thumb,arm", "arm,thumb") + .Default(HWDiv); +} + StringRef ARMTargetParser::getFPUSynonym(StringRef FPU) { return StringSwitch(FPU) .Cases("fpa", "fpe2", "fpe3", "maverick", "invalid") // Unsupported @@ -477,6 +534,15 @@ return A; } +unsigned ARMTargetParser::parseHWDiv(StringRef HWDiv) { + StringRef Syn = getHWDivSynonym(HWDiv); + for (const auto D : HWDivNames) { + if (Syn == D.Name) + return D.ID; + } + return ARM::HDK_INVALID; +} + unsigned ARMTargetParser::parseFPU(StringRef FPU) { StringRef Syn = getFPUSynonym(FPU); for (const auto F : FPUNames) {