diff options
author | Craig Topper <craig.topper@gmail.com> | 2011-12-29 16:10:46 +0000 |
---|---|---|
committer | Craig Topper <craig.topper@gmail.com> | 2011-12-29 16:10:46 +0000 |
commit | e14e08b2552b43d81a295401ddf9b8da2c499233 (patch) | |
tree | a6098ab9acaa1e14ae5a8d5b6d088bfa7c922c05 /lib/Basic/Targets.cpp | |
parent | 63d32bdf895e1ad8cfeef8e634a84fe136215202 (diff) |
Add popcnt feature flag to match gcc. This flag is implied when sse42 is enabled, but can be disabled separately. Move popcnt intrinsics to popcntintrin.h to match gcc.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@147340 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Basic/Targets.cpp')
-rw-r--r-- | lib/Basic/Targets.cpp | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp index bb1051d740..a768226b40 100644 --- a/lib/Basic/Targets.cpp +++ b/lib/Basic/Targets.cpp @@ -1198,6 +1198,7 @@ class X86TargetInfo : public TargetInfo { bool HasLZCNT; bool HasBMI; bool HasBMI2; + bool HasPOPCNT; /// \brief Enumeration of all of the X86 CPUs supported by Clang. /// @@ -1335,7 +1336,7 @@ public: X86TargetInfo(const std::string& triple) : TargetInfo(triple), SSELevel(NoSSE), MMX3DNowLevel(NoMMX3DNow), HasAES(false), HasAVX(false), HasAVX2(false), HasLZCNT(false), - HasBMI(false), HasBMI2(false), CPU(CK_Generic) { + HasBMI(false), HasBMI2(false), HasPOPCNT(false), CPU(CK_Generic) { BigEndian = false; LongDoubleFormat = &llvm::APFloat::x87DoubleExtended; } @@ -1519,6 +1520,7 @@ void X86TargetInfo::getDefaultFeatures(llvm::StringMap<bool> &Features) const { Features["lzcnt"] = false; Features["bmi"] = false; Features["bmi2"] = false; + Features["popcnt"] = false; // FIXME: This *really* should not be here. @@ -1669,7 +1671,8 @@ bool X86TargetInfo::setFeatureEnabled(llvm::StringMap<bool> &Features, Features["ssse3"] = true; else if (Name == "sse4" || Name == "sse4.2") Features["mmx"] = Features["sse"] = Features["sse2"] = Features["sse3"] = - Features["ssse3"] = Features["sse41"] = Features["sse42"] = true; + Features["ssse3"] = Features["sse41"] = Features["sse42"] = + Features["popcnt"] = true; else if (Name == "sse4.1") Features["mmx"] = Features["sse"] = Features["sse2"] = Features["sse3"] = Features["ssse3"] = Features["sse41"] = true; @@ -1682,11 +1685,11 @@ bool X86TargetInfo::setFeatureEnabled(llvm::StringMap<bool> &Features, else if (Name == "avx") Features["mmx"] = Features["sse"] = Features["sse2"] = Features["sse3"] = Features["ssse3"] = Features["sse41"] = Features["sse42"] = - Features["avx"] = true; + Features["popcnt"] = Features["avx"] = true; else if (Name == "avx2") Features["mmx"] = Features["sse"] = Features["sse2"] = Features["sse3"] = Features["ssse3"] = Features["sse41"] = Features["sse42"] = - Features["avx"] = Features["avx2"] = true; + Features["popcnt"] = Features["avx"] = Features["avx2"] = true; else if (Name == "sse4a") Features["mmx"] = Features["sse4a"] = true; else if (Name == "lzcnt") @@ -1695,6 +1698,8 @@ bool X86TargetInfo::setFeatureEnabled(llvm::StringMap<bool> &Features, Features["bmi"] = true; else if (Name == "bmi2") Features["bmi2"] = true; + else if (Name == "popcnt") + Features["popcnt"] = true; } else { if (Name == "mmx") Features["mmx"] = Features["3dnow"] = Features["3dnowa"] = false; @@ -1731,6 +1736,8 @@ bool X86TargetInfo::setFeatureEnabled(llvm::StringMap<bool> &Features, Features["bmi"] = false; else if (Name == "bmi2") Features["bmi2"] = false; + else if (Name == "popcnt") + Features["popcnt"] = false; } return true; @@ -1765,6 +1772,11 @@ void X86TargetInfo::HandleTargetFeatures(std::vector<std::string> &Features) { continue; } + if (Features[i].substr(1) == "popcnt") { + HasPOPCNT = true; + continue; + } + // FIXME: Not sure yet how to treat AVX in regard to SSE levels. // For now let it be enabled together with other SSE levels. if (Features[i].substr(1) == "avx2") { @@ -1996,6 +2008,9 @@ void X86TargetInfo::getTargetDefines(const LangOptions &Opts, if (HasBMI2) Builder.defineMacro("__BMI2__"); + if (HasPOPCNT) + Builder.defineMacro("__POPCNT__"); + // Each case falls through to the previous one here. switch (SSELevel) { case SSE42: |