[cfe-commits] r147263 - in /cfe/trunk: include/clang/Basic/BuiltinsX86.def lib/CodeGen/CGBuiltin.cpp lib/Headers/bmiintrin.h lib/Headers/immintrin.h lib/Headers/lzcntintrin.h lib/Headers/x86intrin.h test/CodeGen/bmi-builtins.c test/CodeGen/lzcnt-builtins.c

Benjamin Kramer benny.kra at googlemail.com
Sun Dec 25 04:24:46 PST 2011


On 25.12.2011, at 07:25, Craig Topper wrote:

> Author: ctopper
> Date: Sun Dec 25 00:25:37 2011
> New Revision: 147263
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=147263&view=rev
> Log:
> Add intrinsics for lzcnt and tzcnt instructions.

Hi Craig,

You're codegenning the builtins with the "zero input is undefined" flag. This is odd if you're trying to
model the semantics of tzcnt/lzcnt closely.

If it is intended to leave zero undefined, why is this x86 specific at all? It looks like a version of
__builtin_clz/__builtin_ctz for 16 bit values.

- Ben


> 
> Added:
>    cfe/trunk/lib/Headers/bmiintrin.h
>    cfe/trunk/lib/Headers/lzcntintrin.h
>    cfe/trunk/test/CodeGen/bmi-builtins.c
>    cfe/trunk/test/CodeGen/lzcnt-builtins.c
> Modified:
>    cfe/trunk/include/clang/Basic/BuiltinsX86.def
>    cfe/trunk/lib/CodeGen/CGBuiltin.cpp
>    cfe/trunk/lib/Headers/immintrin.h
>    cfe/trunk/lib/Headers/x86intrin.h
> 
> Modified: cfe/trunk/include/clang/Basic/BuiltinsX86.def
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/BuiltinsX86.def?rev=147263&r1=147262&r2=147263&view=diff
> ==============================================================================
> --- cfe/trunk/include/clang/Basic/BuiltinsX86.def (original)
> +++ cfe/trunk/include/clang/Basic/BuiltinsX86.def Sun Dec 25 00:25:37 2011
> @@ -596,4 +596,10 @@
> BUILTIN(__builtin_ia32_psrlv4di, "V4LLiV4LLiV4LLi", "")
> BUILTIN(__builtin_ia32_psrlv2di, "V2LLiV2LLiV2LLi", "")
> 
> +// LZCNT
> +BUILTIN(__builtin_clzs, "UsUs", "")
> +
> +// BMI
> +BUILTIN(__builtin_ctzs, "UsUs", "")
> +
> #undef BUILTIN
> 
> Modified: cfe/trunk/lib/CodeGen/CGBuiltin.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGBuiltin.cpp?rev=147263&r1=147262&r2=147263&view=diff
> ==============================================================================
> --- cfe/trunk/lib/CodeGen/CGBuiltin.cpp (original)
> +++ cfe/trunk/lib/CodeGen/CGBuiltin.cpp Sun Dec 25 00:25:37 2011
> @@ -2063,6 +2063,32 @@
> 
>   switch (BuiltinID) {
>   default: return 0;
> +  case X86::BI__builtin_clzs: {
> +    Value *ArgValue = EmitScalarExpr(E->getArg(0));
> +
> +    llvm::Type *ArgType = ArgValue->getType();
> +    Value *F = CGM.getIntrinsic(Intrinsic::ctlz, ArgType);
> +
> +    llvm::Type *ResultType = ConvertType(E->getType());
> +    Value *Result = Builder.CreateCall2(F, ArgValue, Builder.getTrue());
> +    if (Result->getType() != ResultType)
> +      Result = Builder.CreateIntCast(Result, ResultType, /*isSigned*/true,
> +                                     "cast");
> +    return Result;
> +  }
> +  case X86::BI__builtin_ctzs: {
> +    Value *ArgValue = EmitScalarExpr(E->getArg(0));
> +
> +    llvm::Type *ArgType = ArgValue->getType();
> +    Value *F = CGM.getIntrinsic(Intrinsic::cttz, ArgType);
> +
> +    llvm::Type *ResultType = ConvertType(E->getType());
> +    Value *Result = Builder.CreateCall2(F, ArgValue, Builder.getTrue());
> +    if (Result->getType() != ResultType)
> +      Result = Builder.CreateIntCast(Result, ResultType, /*isSigned*/true,
> +                                     "cast");
> +    return Result;
> +  }
>   case X86::BI__builtin_ia32_pslldi128:
>   case X86::BI__builtin_ia32_psllqi128:
>   case X86::BI__builtin_ia32_psllwi128:
> 
> Added: cfe/trunk/lib/Headers/bmiintrin.h
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/bmiintrin.h?rev=147263&view=auto
> ==============================================================================
> --- cfe/trunk/lib/Headers/bmiintrin.h (added)
> +++ cfe/trunk/lib/Headers/bmiintrin.h Sun Dec 25 00:25:37 2011
> @@ -0,0 +1,55 @@
> +/*===---- bmiintrin.h - BMI 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.
> + *
> + *===-----------------------------------------------------------------------===
> + */
> +
> +#if !defined __X86INTRIN_H && !defined __IMMINTRIN_H
> +#error "Never use <bmiintrin.h> directly; include <x86intrin.h> instead."
> +#endif
> +
> +#ifndef __BMI__
> +# error "BMI instruction set not enabled"
> +#endif /* __BMI__ */
> +
> +#ifndef __BMIINTRIN_H
> +#define __BMIINTRIN_H
> +
> +static __inline__ unsigned short __attribute__((__always_inline__, __nodebug__))
> +__tzcnt16(unsigned short __X)
> +{
> +  return __builtin_ctzs(__X);
> +}
> +
> +static __inline__ unsigned int __attribute__((__always_inline__, __nodebug__))
> +__tzcnt32(unsigned int __X)
> +{
> +  return __builtin_ctz(__X);
> +}
> +
> +#ifdef __x86_64__
> +static __inline__ unsigned long long __attribute__((__always_inline__, __nodebug__))
> +__tzcnt64(unsigned long long __X)
> +{
> +  return __builtin_ctzll(__X);
> +}
> +#endif
> +
> +#endif /* __BMIINTRIN_H */
> 
> Modified: cfe/trunk/lib/Headers/immintrin.h
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/immintrin.h?rev=147263&r1=147262&r2=147263&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Headers/immintrin.h (original)
> +++ cfe/trunk/lib/Headers/immintrin.h Sun Dec 25 00:25:37 2011
> @@ -60,4 +60,12 @@
> #include <avx2intrin.h>
> #endif
> 
> +#ifdef __BMI__
> +#include <bmiintrin.h>
> +#endif
> +
> +#ifdef __LZCNT__
> +#include <lzcntintrin.h>
> +#endif
> +
> #endif /* __IMMINTRIN_H */
> 
> Added: cfe/trunk/lib/Headers/lzcntintrin.h
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/lzcntintrin.h?rev=147263&view=auto
> ==============================================================================
> --- cfe/trunk/lib/Headers/lzcntintrin.h (added)
> +++ cfe/trunk/lib/Headers/lzcntintrin.h Sun Dec 25 00:25:37 2011
> @@ -0,0 +1,55 @@
> +/*===---- lzcntintrin.h - LZCNT 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.
> + *
> + *===-----------------------------------------------------------------------===
> + */
> +
> +#if !defined __X86INTRIN_H && !defined __IMMINTRIN_H
> +#error "Never use <lzcntintrin.h> directly; include <x86intrin.h> instead."
> +#endif
> +
> +#ifndef __LZCNT__
> +# error "LZCNT instruction is not enabled"
> +#endif /* __LZCNT__ */
> +
> +#ifndef __LZCNTINTRIN_H
> +#define __LZCNTINTRIN_H
> +
> +static __inline__ unsigned short __attribute__((__always_inline__, __nodebug__))
> +__lzcnt16(unsigned short __X)
> +{
> +  return __builtin_clzs(__X);
> +}
> +
> +static __inline__ unsigned int __attribute__((__always_inline__, __nodebug__))
> +__lzcnt32(unsigned int __X)
> +{
> +  return __builtin_clz(__X);
> +}
> +
> +#ifdef __x86_64__
> +static __inline__ unsigned long long __attribute__((__always_inline__, __nodebug__))
> +__lzcnt64(unsigned long long __X)
> +{
> +  return __builtin_clzll(__X);
> +}
> +#endif
> +
> +#endif /* __LZCNTINTRIN_H */
> 
> Modified: cfe/trunk/lib/Headers/x86intrin.h
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/x86intrin.h?rev=147263&r1=147262&r2=147263&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Headers/x86intrin.h (original)
> +++ cfe/trunk/lib/Headers/x86intrin.h Sun Dec 25 00:25:37 2011
> @@ -26,6 +26,14 @@
> 
> #include <immintrin.h>
> 
> +#ifdef __BMI__
> +#include <bmiintrin.h>
> +#endif
> +
> +#ifdef __LZCNT__
> +#include <lzcntintrin.h>
> +#endif
> +
> // FIXME: SSE4A, 3dNOW, FMA4, XOP, LWP, ABM, POPCNT
> 
> #endif /* __X86INTRIN_H */
> 
> Added: cfe/trunk/test/CodeGen/bmi-builtins.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/bmi-builtins.c?rev=147263&view=auto
> ==============================================================================
> --- cfe/trunk/test/CodeGen/bmi-builtins.c (added)
> +++ cfe/trunk/test/CodeGen/bmi-builtins.c Sun Dec 25 00:25:37 2011
> @@ -0,0 +1,24 @@
> +// RUN: %clang_cc1 %s -O3 -triple=x86_64-apple-darwin -target-feature +bmi -S -o - | FileCheck %s
> +
> +// Don't include mm_malloc.h, it's system specific.
> +#define __MM_MALLOC_H
> +
> +#include <x86intrin.h>
> +
> +unsigned short test__tzcnt16(unsigned short __X)
> +{
> +  // CHECK: tzcntw
> +  return __tzcnt16(__X);
> +}
> +
> +unsigned int test_tzcnt32(unsigned int __X)
> +{
> +  // CHECK: tzcntl
> +  return __tzcnt32(__X);
> +}
> +
> +unsigned long long test__tzcnt64(unsigned long long __X)
> +{
> +  // CHECK: tzcntq
> +  return __tzcnt64(__X);
> +}
> 
> Added: cfe/trunk/test/CodeGen/lzcnt-builtins.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/lzcnt-builtins.c?rev=147263&view=auto
> ==============================================================================
> --- cfe/trunk/test/CodeGen/lzcnt-builtins.c (added)
> +++ cfe/trunk/test/CodeGen/lzcnt-builtins.c Sun Dec 25 00:25:37 2011
> @@ -0,0 +1,24 @@
> +// RUN: %clang_cc1 %s -O3 -triple=x86_64-apple-darwin -target-feature +lzcnt -S -o - | FileCheck %s
> +
> +// Don't include mm_malloc.h, it's system specific.
> +#define __MM_MALLOC_H
> +
> +#include <x86intrin.h>
> +
> +unsigned short test__lzcnt16(unsigned short __X)
> +{
> +  // CHECK: lzcntw
> +  return __lzcnt16(__X);
> +}
> +
> +unsigned int test_lzcnt32(unsigned int __X)
> +{
> +  // CHECK: lzcntl
> +  return __lzcnt32(__X);
> +}
> +
> +unsigned long long test__lzcnt64(unsigned long long __X)
> +{
> +  // CHECK: lzcntq
> +  return __lzcnt64(__X);
> +}
> 
> 
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits





More information about the cfe-commits mailing list