From: Craig Topper Date: Thu, 29 Dec 2011 16:10:46 +0000 (+0000) Subject: Add popcnt feature flag to match gcc. This flag is implied when sse42 is enabled... X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e14e08b2552b43d81a295401ddf9b8da2c499233;p=clang 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 --- diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td index aafea88a0f..4dfda54c8e 100644 --- a/include/clang/Driver/Options.td +++ b/include/clang/Driver/Options.td @@ -615,6 +615,7 @@ def mno_avx2 : Flag<"-mno-avx2">, Group; def mno_lzcnt : Flag<"-mno-lzcnt">, Group; def mno_bmi : Flag<"-mno-bmi">, Group; def mno_bmi2 : Flag<"-mno-bmi2">, Group; +def mno_popcnt : Flag<"-mno-popcnt">, Group; def mno_thumb : Flag<"-mno-thumb">, Group; def marm : Flag<"-marm">, Alias; @@ -643,6 +644,7 @@ def mavx2 : Flag<"-mavx2">, Group; def mlzcnt : Flag<"-mlzcnt">, Group; def mbmi : Flag<"-mbmi">, Group; def mbmi2 : Flag<"-mbmi2">, Group; +def mpopcnt : Flag<"-mpopcnt">, Group; def mthumb : Flag<"-mthumb">, Group; def mtune_EQ : Joined<"-mtune=">, Group; def multi__module : Flag<"-multi_module">; 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 &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 &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 &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 &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 &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 &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: diff --git a/lib/Headers/popcntintrin.h b/lib/Headers/popcntintrin.h new file mode 100644 index 0000000000..d439daa8d6 --- /dev/null +++ b/lib/Headers/popcntintrin.h @@ -0,0 +1,45 @@ +/*===---- popcntintrin.h - POPCNT intrinsics -------------------------------=== + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + *===-----------------------------------------------------------------------=== + */ + +#ifndef __POPCNT__ +#error "POPCNT instruction set not enabled" +#endif + +#ifndef _POPCNTINTRIN_H +#define _POPCNTINTRIN_H + +static __inline__ int __attribute__((__always_inline__, __nodebug__)) +_mm_popcnt_u32(unsigned int __A) +{ + return __builtin_popcount(__A); +} + +#ifdef __x86_64__ +static __inline__ long long __attribute__((__always_inline__, __nodebug__)) +_mm_popcnt_u64(unsigned long long __A) +{ + return __builtin_popcountll(__A); +} +#endif /* __x86_64__ */ + +#endif /* _POPCNTINTRIN_H */ diff --git a/lib/Headers/smmintrin.h b/lib/Headers/smmintrin.h index 2e376ddb46..1ca70f8d36 100644 --- a/lib/Headers/smmintrin.h +++ b/lib/Headers/smmintrin.h @@ -428,20 +428,9 @@ _mm_crc32_u64(unsigned long long __C, unsigned long long __D) } #endif /* __x86_64__ */ -/* SSE4.2 Population Count. */ -static __inline__ int __attribute__((__always_inline__, __nodebug__)) -_mm_popcnt_u32(unsigned int __A) -{ - return __builtin_popcount(__A); -} - -#ifdef __x86_64__ -static __inline__ long long __attribute__((__always_inline__, __nodebug__)) -_mm_popcnt_u64(unsigned long long __A) -{ - return __builtin_popcountll(__A); -} -#endif /* __x86_64__ */ +#ifdef __POPCNT__ +#include +#endif #endif /* __SSE4_2__ */ #endif /* __SSE4_1__ */ diff --git a/lib/Headers/x86intrin.h b/lib/Headers/x86intrin.h index e64ee37413..181330d0bb 100644 --- a/lib/Headers/x86intrin.h +++ b/lib/Headers/x86intrin.h @@ -38,6 +38,10 @@ #include #endif -// FIXME: SSE4A, 3dNOW, FMA4, XOP, LWP, ABM, POPCNT +#ifdef __POPCNT__ +#include +#endif + +// FIXME: SSE4A, 3dNOW, FMA4, XOP, LWP, ABM #endif /* __X86INTRIN_H */ diff --git a/test/CodeGen/popcnt-builtins.c b/test/CodeGen/popcnt-builtins.c new file mode 100644 index 0000000000..f072b29cd1 --- /dev/null +++ b/test/CodeGen/popcnt-builtins.c @@ -0,0 +1,16 @@ +// RUN: %clang_cc1 %s -O3 -triple=x86_64-apple-darwin -target-feature +popcnt -emit-llvm -o - | FileCheck %s + +// Don't include mm_malloc.h, it's system specific. +#define __MM_MALLOC_H + +#include + +unsigned int test_mm_popcnt_u32(unsigned int __X) { + // CHECK: @llvm.ctpop.i32 + return _mm_popcnt_u32(__X); +} + +unsigned long long test_mm_popcnt_u64(unsigned long long __X) { + // CHECK: @llvm.ctpop.i64 + return _mm_popcnt_u64(__X); +}