r239883 - Update the intel intrinsic headers to use the target attribute support.
Robinson, Paul
Paul_Robinson at playstation.sony.com
Thu Jun 18 17:04:00 PDT 2015
| I'm not sure what you mean here. You would already have to protect against a user defining a macro that would conditionally include a header so you'll either need to keep local patches to the headers already or just ship them all.
This falls under "that's a reserved name, users don't get to define it." Preprocessor symbols like __FMA__ were predefined based on the target's attributes. If somebody did decide to #define one, and it was a problem because we didn't provide the corresponding header, we would say "you shouldn't do that." End of story. We didn't need local patches to the headers because the headers already had all the necessary guards.
So, you took out the guards we were relying on; we're gonna have to put them back, or something like them, for the headers we don't provide. I freely admit it would be inappropriate to put that sort of customization back upstream, but I reserve the right to be grumpy about it. ☺
Thanks,
--paulr
From: Eric Christopher [mailto:echristo at gmail.com]
Sent: Thursday, June 18, 2015 4:42 PM
To: Robinson, Paul; Sean Silva
Cc: cfe-commits at cs.uiuc.edu
Subject: Re: r239883 - Update the intel intrinsic headers to use the target attribute support.
On Thu, Jun 18, 2015 at 4:21 PM Robinson, Paul <Paul_Robinson at playstation.sony.com<mailto:Paul_Robinson at playstation.sony.com>> wrote:
| identifies certain headers as requiring specific target features, while with this change those headers can be legally included textually.
Um. So this change actually is not optimal for us, as a vendor targeting exactly one chip we don't ship a complete set of clang headers, we omit the ones that are useless. We'd need to carry a local patch that continues to not-include the headers that we do not provide.
I'm not sure what you mean here. You would already have to protect against a user defining a macro that would conditionally include a header so you'll either need to keep local patches to the headers already or just ship them all.
-eric
--paulr
From: Sean Silva [mailto:chisophugis at gmail.com<mailto:chisophugis at gmail.com>]
Sent: Wednesday, June 17, 2015 3:23 PM
To: Robinson, Paul
Cc: Eric Christopher; cfe-commits at cs.uiuc.edu<mailto:cfe-commits at cs.uiuc.edu>
Subject: Re: r239883 - Update the intel intrinsic headers to use the target attribute support.
On Wed, Jun 17, 2015 at 2:19 PM, Robinson, Paul <Paul_Robinson at playstation.sony.com<mailto:Paul_Robinson at playstation.sony.com>> wrote:
Fewer conditionals oughta be better for modules, yes? Nice.
This change does not really affect modules. Actually it sort of makes the situation worse because now the module map properly identifies certain headers as requiring specific target features, while with this change those headers can be legally included textually.
-- Sean Silva
A few inline suggestions.
--paulr
> -----Original Message-----
> From: cfe-commits-bounces at cs.uiuc.edu<mailto:cfe-commits-bounces at cs.uiuc.edu> [mailto:cfe-commits-<mailto:cfe-commits->
> bounces at cs.uiuc.edu<mailto:bounces at cs.uiuc.edu>] On Behalf Of Eric Christopher
> Sent: Wednesday, June 17, 2015 12:10 AM
> To: cfe-commits at cs.uiuc.edu<mailto:cfe-commits at cs.uiuc.edu>
> Subject: r239883 - Update the intel intrinsic headers to use the target
> attribute support.
>
> Author: echristo
> Date: Wed Jun 17 02:09:32 2015
> New Revision: 239883
>
> URL: http://llvm.org/viewvc/llvm-project?rev=239883&view=rev
> Log:
> Update the intel intrinsic headers to use the target attribute support.
>
> This involved removing the conditional inclusion and replacing them
> with target attributes matching the original conditional inclusion
> and checks. The testcase update removes the macro checks for each
> file and replaces them with usage of the __target__ attribute, e.g.:
>
> int __attribute__((__target__(("sse3")))) foo(int a) {
> _mm_mwait(0, 0);
> return 4;
> }
>
> This usage does require the enclosing function have the requisite
> __target__ attribute for inlining and code generation - also for
> any macro intrinsic uses in the enclosing function. There's no change
> for existing uses of the intrinsic headers.
>
> Added:
> cfe/trunk/test/Headers/pmmintrin.c
> cfe/trunk/test/Headers/x86intrin-2.c
> Modified:
> cfe/trunk/lib/Headers/__wmmintrin_aes.h
> cfe/trunk/lib/Headers/__wmmintrin_pclmul.h
> cfe/trunk/lib/Headers/adxintrin.h
> cfe/trunk/lib/Headers/ammintrin.h
> cfe/trunk/lib/Headers/avx2intrin.h
> cfe/trunk/lib/Headers/avx512bwintrin.h
> cfe/trunk/lib/Headers/avx512dqintrin.h
> cfe/trunk/lib/Headers/avx512fintrin.h
> cfe/trunk/lib/Headers/avx512vlbwintrin.h
> cfe/trunk/lib/Headers/avx512vldqintrin.h
> cfe/trunk/lib/Headers/avx512vlintrin.h
> cfe/trunk/lib/Headers/avxintrin.h
> cfe/trunk/lib/Headers/bmi2intrin.h
> cfe/trunk/lib/Headers/bmiintrin.h
> cfe/trunk/lib/Headers/emmintrin.h
> cfe/trunk/lib/Headers/f16cintrin.h
> cfe/trunk/lib/Headers/fma4intrin.h
> cfe/trunk/lib/Headers/fmaintrin.h
> cfe/trunk/lib/Headers/immintrin.h
> cfe/trunk/lib/Headers/lzcntintrin.h
> cfe/trunk/lib/Headers/mm3dnow.h
> cfe/trunk/lib/Headers/mmintrin.h
> cfe/trunk/lib/Headers/nmmintrin.h
> cfe/trunk/lib/Headers/pmmintrin.h
> cfe/trunk/lib/Headers/popcntintrin.h
> cfe/trunk/lib/Headers/rdseedintrin.h
> cfe/trunk/lib/Headers/rtmintrin.h
> cfe/trunk/lib/Headers/shaintrin.h
> cfe/trunk/lib/Headers/smmintrin.h
> cfe/trunk/lib/Headers/tbmintrin.h
> cfe/trunk/lib/Headers/tmmintrin.h
> cfe/trunk/lib/Headers/wmmintrin.h
> cfe/trunk/lib/Headers/x86intrin.h
> cfe/trunk/lib/Headers/xmmintrin.h
> cfe/trunk/lib/Headers/xopintrin.h
> cfe/trunk/test/Headers/x86intrin.c
>
> Modified: cfe/trunk/lib/Headers/__wmmintrin_aes.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/__wmmintrin_aes.h?rev=239883&r1=239882&r2=23
> 9883&view=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/__wmmintrin_aes.h (original)
> +++ cfe/trunk/lib/Headers/__wmmintrin_aes.h Wed Jun 17 02:09:32 2015
> @@ -25,12 +25,8 @@
>
> #include <emmintrin.h>
>
> -#if !defined (__AES__)
> -# error "AES instructions not enabled"
> -#else
> -
> /* Define the default attributes for the functions in this file. */
> -#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
> +#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__,
> __target__("aes")))
>
> static __inline__ __m128i DEFAULT_FN_ATTRS
> _mm_aesenc_si128(__m128i __V, __m128i __R)
> @@ -67,6 +63,4 @@ _mm_aesimc_si128(__m128i __V)
>
> #undef DEFAULT_FN_ATTRS
>
> -#endif
> -
> #endif /* _WMMINTRIN_AES_H */
>
> Modified: cfe/trunk/lib/Headers/__wmmintrin_pclmul.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/__wmmintrin_pclmul.h?rev=239883&r1=239882&r2
> =239883&view=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/__wmmintrin_pclmul.h (original)
> +++ cfe/trunk/lib/Headers/__wmmintrin_pclmul.h Wed Jun 17 02:09:32 2015
> @@ -23,12 +23,8 @@
> #ifndef _WMMINTRIN_PCLMUL_H
> #define _WMMINTRIN_PCLMUL_H
>
> -#if !defined (__PCLMUL__)
> -# error "PCLMUL instruction is not enabled"
> -#else
> #define _mm_clmulepi64_si128(__X, __Y, __I) \
> ((__m128i)__builtin_ia32_pclmulqdq128((__v2di)(__m128i)(__X), \
> (__v2di)(__m128i)(__Y),
> (char)(__I)))
> -#endif
>
> #endif /* _WMMINTRIN_PCLMUL_H */
>
> Modified: cfe/trunk/lib/Headers/adxintrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/adxintrin.h?rev=239883&r1=239882&r2=239883&v
> iew=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/adxintrin.h (original)
> +++ cfe/trunk/lib/Headers/adxintrin.h Wed Jun 17 02:09:32 2015
> @@ -32,8 +32,7 @@
> #define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
>
> /* Intrinsics that are available only if __ADX__ defined */
> -#ifdef __ADX__
> -static __inline unsigned char DEFAULT_FN_ATTRS
> +static __inline unsigned char __attribute__((__always_inline__,
> __nodebug__, __target__("adx")))
You can repeat __attribute__, right? Would be more robust to do this:
static __inline unsigned char DEFAULT_FN_ATTRS __attribute__((__target("adx)))
> _addcarryx_u32(unsigned char __cf, unsigned int __x, unsigned int __y,
> unsigned int *__p)
> {
> @@ -41,14 +40,13 @@ _addcarryx_u32(unsigned char __cf, unsig
> }
>
> #ifdef __x86_64__
> -static __inline unsigned char DEFAULT_FN_ATTRS
> +static __inline unsigned char __attribute__((__always_inline__,
> __nodebug__, __target__("adx")))
Ditto.
> _addcarryx_u64(unsigned char __cf, unsigned long long __x,
> unsigned long long __y, unsigned long long *__p)
> {
> return __builtin_ia32_addcarryx_u64(__cf, __x, __y, __p);
> }
> #endif
> -#endif
>
> /* Intrinsics that are also available if __ADX__ undefined */
> static __inline unsigned char DEFAULT_FN_ATTRS
>
> Modified: cfe/trunk/lib/Headers/ammintrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/ammintrin.h?rev=239883&r1=239882&r2=239883&v
> iew=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/ammintrin.h (original)
> +++ cfe/trunk/lib/Headers/ammintrin.h Wed Jun 17 02:09:32 2015
> @@ -24,14 +24,10 @@
> #ifndef __AMMINTRIN_H
> #define __AMMINTRIN_H
>
> -#ifndef __SSE4A__
> -#error "SSE4A instruction set not enabled"
> -#else
> -
> #include <pmmintrin.h>
>
> /* Define the default attributes for the functions in this file. */
> -#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
> +#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__,
> __target__("sse4a")))
>
> /// \brief Extracts the specified bits from the lower 64 bits of the 128-
> bit
> /// integer vector operand at the index idx and of the length len.
> @@ -210,6 +206,4 @@ _mm_stream_ss(float *__p, __m128 __a)
>
> #undef DEFAULT_FN_ATTRS
>
> -#endif /* __SSE4A__ */
> -
> #endif /* __AMMINTRIN_H */
>
> Modified: cfe/trunk/lib/Headers/avx2intrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/avx2intrin.h?rev=239883&r1=239882&r2=239883&
> view=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/avx2intrin.h (original)
> +++ cfe/trunk/lib/Headers/avx2intrin.h Wed Jun 17 02:09:32 2015
> @@ -29,7 +29,7 @@
> #define __AVX2INTRIN_H
>
> /* Define the default attributes for the functions in this file. */
> -#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
> +#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__,
> __target__("avx2")))
>
> /* SSE4 Multiple Packed Sums of Absolute Difference. */
> #define _mm256_mpsadbw_epu8(X, Y, M) __builtin_ia32_mpsadbw256((X), (Y),
> (M))
>
> Modified: cfe/trunk/lib/Headers/avx512bwintrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/avx512bwintrin.h?rev=239883&r1=239882&r2=239
> 883&view=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/avx512bwintrin.h (original)
> +++ cfe/trunk/lib/Headers/avx512bwintrin.h Wed Jun 17 02:09:32 2015
> @@ -34,7 +34,7 @@ typedef char __v64qi __attribute__ ((__v
> typedef short __v32hi __attribute__ ((__vector_size__ (64)));
>
> /* Define the default attributes for the functions in this file. */
> -#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
> +#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__,
> __target__("avx512bw")))
>
> static __inline __v64qi DEFAULT_FN_ATTRS
> _mm512_setzero_qi (void) {
>
> Modified: cfe/trunk/lib/Headers/avx512dqintrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/avx512dqintrin.h?rev=239883&r1=239882&r2=239
> 883&view=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/avx512dqintrin.h (original)
> +++ cfe/trunk/lib/Headers/avx512dqintrin.h Wed Jun 17 02:09:32 2015
> @@ -29,7 +29,7 @@
> #define __AVX512DQINTRIN_H
>
> /* Define the default attributes for the functions in this file. */
> -#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
> +#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__,
> __target__("avx512dq")))
>
> static __inline__ __m512i DEFAULT_FN_ATTRS
> _mm512_mullo_epi64 (__m512i __A, __m512i __B) {
>
> Modified: cfe/trunk/lib/Headers/avx512fintrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/avx512fintrin.h?rev=239883&r1=239882&r2=2398
> 83&view=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/avx512fintrin.h (original)
> +++ cfe/trunk/lib/Headers/avx512fintrin.h Wed Jun 17 02:09:32 2015
> @@ -47,7 +47,7 @@ typedef unsigned short __mmask16;
> #define _MM_FROUND_CUR_DIRECTION 0x04
>
> /* Define the default attributes for the functions in this file. */
> -#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
> +#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__,
> __target__("avx512f")))
>
> /* Create vectors with repeated elements */
>
>
> Modified: cfe/trunk/lib/Headers/avx512vlbwintrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/avx512vlbwintrin.h?rev=239883&r1=239882&r2=2
> 39883&view=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/avx512vlbwintrin.h (original)
> +++ cfe/trunk/lib/Headers/avx512vlbwintrin.h Wed Jun 17 02:09:32 2015
> @@ -29,7 +29,7 @@
> #define __AVX512VLBWINTRIN_H
>
> /* Define the default attributes for the functions in this file. */
> -#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
> +#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__,
> __target__("avx512vl,avx512bw")))
>
> /* Integer compare */
>
>
> Modified: cfe/trunk/lib/Headers/avx512vldqintrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/avx512vldqintrin.h?rev=239883&r1=239882&r2=2
> 39883&view=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/avx512vldqintrin.h (original)
> +++ cfe/trunk/lib/Headers/avx512vldqintrin.h Wed Jun 17 02:09:32 2015
> @@ -29,7 +29,7 @@
> #define __AVX512VLDQINTRIN_H
>
> /* Define the default attributes for the functions in this file. */
> -#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
> +#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__,
> __target__("avx512vl,avx512dq")))
>
> static __inline__ __m256i DEFAULT_FN_ATTRS
> _mm256_mullo_epi64 (__m256i __A, __m256i __B) {
>
> Modified: cfe/trunk/lib/Headers/avx512vlintrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/avx512vlintrin.h?rev=239883&r1=239882&r2=239
> 883&view=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/avx512vlintrin.h (original)
> +++ cfe/trunk/lib/Headers/avx512vlintrin.h Wed Jun 17 02:09:32 2015
> @@ -29,7 +29,7 @@
> #define __AVX512VLINTRIN_H
>
> /* Define the default attributes for the functions in this file. */
> -#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
> +#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__,
> __target__("avx512vl")))
>
> /* Integer compare */
>
>
> Modified: cfe/trunk/lib/Headers/avxintrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/avxintrin.h?rev=239883&r1=239882&r2=239883&v
> iew=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/avxintrin.h (original)
> +++ cfe/trunk/lib/Headers/avxintrin.h Wed Jun 17 02:09:32 2015
> @@ -40,7 +40,7 @@ typedef double __m256d __attribute__((__
> typedef long long __m256i __attribute__((__vector_size__(32)));
>
> /* Define the default attributes for the functions in this file. */
> -#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
> +#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__,
> __target__("avx")))
>
> /* Arithmetic */
> static __inline __m256d DEFAULT_FN_ATTRS
>
> Modified: cfe/trunk/lib/Headers/bmi2intrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/bmi2intrin.h?rev=239883&r1=239882&r2=239883&
> view=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/bmi2intrin.h (original)
> +++ cfe/trunk/lib/Headers/bmi2intrin.h Wed Jun 17 02:09:32 2015
> @@ -25,15 +25,11 @@
> #error "Never use <bmi2intrin.h> directly; include <x86intrin.h>
> instead."
> #endif
>
> -#ifndef __BMI2__
> -# error "BMI2 instruction set not enabled"
> -#endif /* __BMI2__ */
> -
> #ifndef __BMI2INTRIN_H
> #define __BMI2INTRIN_H
>
> /* Define the default attributes for the functions in this file. */
> -#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
> +#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__,
> __target__("bmi2")))
>
> static __inline__ unsigned int DEFAULT_FN_ATTRS
> _bzhi_u32(unsigned int __X, unsigned int __Y)
>
> Modified: cfe/trunk/lib/Headers/bmiintrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/bmiintrin.h?rev=239883&r1=239882&r2=239883&v
> iew=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/bmiintrin.h (original)
> +++ cfe/trunk/lib/Headers/bmiintrin.h Wed Jun 17 02:09:32 2015
> @@ -25,10 +25,6 @@
> #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
>
> @@ -41,7 +37,7 @@
> #define _tzcnt_u32(a) (__tzcnt_u32((a)))
>
> /* Define the default attributes for the functions in this file. */
> -#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
> +#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__,
> __target__("bmi")))
>
> static __inline__ unsigned short DEFAULT_FN_ATTRS
> __tzcnt_u16(unsigned short __X)
>
> Modified: cfe/trunk/lib/Headers/emmintrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/emmintrin.h?rev=239883&r1=239882&r2=239883&v
> iew=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/emmintrin.h (original)
> +++ cfe/trunk/lib/Headers/emmintrin.h Wed Jun 17 02:09:32 2015
> @@ -24,10 +24,6 @@
> #ifndef __EMMINTRIN_H
> #define __EMMINTRIN_H
>
> -#ifndef __SSE2__
> -#error "SSE2 instruction set not enabled"
> -#else
> -
> #include <xmmintrin.h>
>
> typedef double __m128d __attribute__((__vector_size__(16)));
> @@ -40,7 +36,7 @@ typedef short __v8hi __attribute__((__ve
> typedef char __v16qi __attribute__((__vector_size__(16)));
>
> /* Define the default attributes for the functions in this file. */
> -#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
> +#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__,
> __target__("sse2")))
>
> static __inline__ __m128d DEFAULT_FN_ATTRS
> _mm_add_sd(__m128d __a, __m128d __b)
> @@ -1475,6 +1471,4 @@ _mm_pause(void)
>
> #define _MM_SHUFFLE2(x, y) (((x) << 1) | (y))
>
> -#endif /* __SSE2__ */
> -
> #endif /* __EMMINTRIN_H */
>
> Modified: cfe/trunk/lib/Headers/f16cintrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/f16cintrin.h?rev=239883&r1=239882&r2=239883&
> view=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/f16cintrin.h (original)
> +++ cfe/trunk/lib/Headers/f16cintrin.h Wed Jun 17 02:09:32 2015
> @@ -25,10 +25,6 @@
> #error "Never use <f16cintrin.h> directly; include <x86intrin.h>
> instead."
> #endif
>
> -#ifndef __F16C__
> -# error "F16C instruction is not enabled"
> -#endif /* __F16C__ */
> -
> #ifndef __F16CINTRIN_H
> #define __F16CINTRIN_H
>
> @@ -36,7 +32,7 @@ typedef float __v8sf __attribute__ ((__v
> typedef float __m256 __attribute__ ((__vector_size__ (32)));
>
> /* Define the default attributes for the functions in this file. */
> -#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
> +#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__,
> __target__("f16c")))
>
> #define _mm_cvtps_ph(a, imm) __extension__ ({ \
> __m128 __a = (a); \
>
> Modified: cfe/trunk/lib/Headers/fma4intrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/fma4intrin.h?rev=239883&r1=239882&r2=239883&
> view=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/fma4intrin.h (original)
> +++ cfe/trunk/lib/Headers/fma4intrin.h Wed Jun 17 02:09:32 2015
> @@ -28,14 +28,10 @@
> #ifndef __FMA4INTRIN_H
> #define __FMA4INTRIN_H
>
> -#ifndef __FMA4__
> -# error "FMA4 instruction set is not enabled"
> -#else
> -
> #include <pmmintrin.h>
>
> /* Define the default attributes for the functions in this file. */
> -#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
> +#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__,
> __target__("fma4")))
>
> static __inline__ __m128 DEFAULT_FN_ATTRS
> _mm_macc_ps(__m128 __A, __m128 __B, __m128 __C)
> @@ -231,6 +227,4 @@ _mm256_msubadd_pd(__m256d __A, __m256d _
>
> #undef DEFAULT_FN_ATTRS
>
> -#endif /* __FMA4__ */
> -
> #endif /* __FMA4INTRIN_H */
>
> Modified: cfe/trunk/lib/Headers/fmaintrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/fmaintrin.h?rev=239883&r1=239882&r2=239883&v
> iew=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/fmaintrin.h (original)
> +++ cfe/trunk/lib/Headers/fmaintrin.h Wed Jun 17 02:09:32 2015
> @@ -28,12 +28,8 @@
> #ifndef __FMAINTRIN_H
> #define __FMAINTRIN_H
>
> -#ifndef __FMA__
> -# error "FMA instruction set is not enabled"
> -#else
> -
> /* Define the default attributes for the functions in this file. */
> -#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
> +#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__,
> __target__("fma")))
>
> static __inline__ __m128 DEFAULT_FN_ATTRS
> _mm_fmadd_ps(__m128 __A, __m128 __B, __m128 __C)
> @@ -229,6 +225,4 @@ _mm256_fmsubadd_pd(__m256d __A, __m256d
>
> #undef DEFAULT_FN_ATTRS
>
> -#endif /* __FMA__ */
> -
> #endif /* __FMAINTRIN_H */
>
> Modified: cfe/trunk/lib/Headers/immintrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/immintrin.h?rev=239883&r1=239882&r2=239883&v
> iew=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/immintrin.h (original)
> +++ cfe/trunk/lib/Headers/immintrin.h Wed Jun 17 02:09:32 2015
> @@ -24,176 +24,126 @@
> #ifndef __IMMINTRIN_H
> #define __IMMINTRIN_H
>
> -#ifdef __MMX__
> #include <mmintrin.h>
> -#endif
>
> -#ifdef __SSE__
> #include <xmmintrin.h>
> -#endif
>
> -#ifdef __SSE2__
> #include <emmintrin.h>
> -#endif
>
> -#ifdef __SSE3__
> #include <pmmintrin.h>
> -#endif
>
> -#ifdef __SSSE3__
> #include <tmmintrin.h>
> -#endif
>
> -#if defined (__SSE4_2__) || defined (__SSE4_1__)
> #include <smmintrin.h>
> -#endif
>
> -#if defined (__AES__) || defined (__PCLMUL__)
> #include <wmmintrin.h>
> -#endif
>
> -#ifdef __AVX__
> #include <avxintrin.h>
> -#endif
>
> -#ifdef __AVX2__
> #include <avx2intrin.h>
> -#endif
>
> -#ifdef __BMI__
> #include <bmiintrin.h>
> -#endif
>
> -#ifdef __BMI2__
> #include <bmi2intrin.h>
> -#endif
>
> -#ifdef __LZCNT__
> #include <lzcntintrin.h>
> -#endif
>
> -#ifdef __FMA__
> #include <fmaintrin.h>
> -#endif
>
> -#ifdef __AVX512F__
> #include <avx512fintrin.h>
> -#endif
>
> -#ifdef __AVX512VL__
> #include <avx512vlintrin.h>
> -#endif
>
> -#ifdef __AVX512BW__
> #include <avx512bwintrin.h>
> -#endif
>
> -#ifdef __AVX512DQ__
> #include <avx512dqintrin.h>
> -#endif
>
> -#if defined (__AVX512VL__) && defined (__AVX512BW__)
> #include <avx512vlbwintrin.h>
> -#endif
>
> -#if defined (__AVX512VL__) && defined (__AVX512DQ__)
> #include <avx512vldqintrin.h>
> -#endif
>
> -#ifdef __AVX512ER__
> #include <avx512erintrin.h>
> -#endif
>
> -#ifdef __RDRND__
> -static __inline__ int __attribute__((__always_inline__, __nodebug__))
> +static __inline__ int __attribute__((__always_inline__, __nodebug__,
> __target__("rdrnd")))
Seems like this sequence could also benefit from having a DEFAULT_FN_ATTRS.
> _rdrand16_step(unsigned short *__p)
> {
> return __builtin_ia32_rdrand16_step(__p);
> }
>
> -static __inline__ int __attribute__((__always_inline__, __nodebug__))
> +static __inline__ int __attribute__((__always_inline__, __nodebug__,
> __target__("rdrnd")))
> _rdrand32_step(unsigned int *__p)
> {
> return __builtin_ia32_rdrand32_step(__p);
> }
>
> #ifdef __x86_64__
> -static __inline__ int __attribute__((__always_inline__, __nodebug__))
> +static __inline__ int __attribute__((__always_inline__, __nodebug__,
> __target__("rdrnd")))
> _rdrand64_step(unsigned long long *__p)
> {
> return __builtin_ia32_rdrand64_step(__p);
> }
> #endif
> -#endif /* __RDRND__ */
>
> -#ifdef __FSGSBASE__
> #ifdef __x86_64__
> -static __inline__ unsigned int __attribute__((__always_inline__,
> __nodebug__))
> +static __inline__ unsigned int __attribute__((__always_inline__,
> __nodebug__, __target__("fsgsbase")))
> _readfsbase_u32(void)
> {
> return __builtin_ia32_rdfsbase32();
> }
>
> -static __inline__ unsigned long long __attribute__((__always_inline__,
> __nodebug__))
> +static __inline__ unsigned long long __attribute__((__always_inline__,
> __nodebug__, __target__("fsgsbase")))
> _readfsbase_u64(void)
> {
> return __builtin_ia32_rdfsbase64();
> }
>
> -static __inline__ unsigned int __attribute__((__always_inline__,
> __nodebug__))
> +static __inline__ unsigned int __attribute__((__always_inline__,
> __nodebug__, __target__("fsgsbase")))
> _readgsbase_u32(void)
> {
> return __builtin_ia32_rdgsbase32();
> }
>
> -static __inline__ unsigned long long __attribute__((__always_inline__,
> __nodebug__))
> +static __inline__ unsigned long long __attribute__((__always_inline__,
> __nodebug__, __target__("fsgsbase")))
> _readgsbase_u64(void)
> {
> return __builtin_ia32_rdgsbase64();
> }
>
> -static __inline__ void __attribute__((__always_inline__, __nodebug__))
> +static __inline__ void __attribute__((__always_inline__, __nodebug__,
> __target__("fsgsbase")))
> _writefsbase_u32(unsigned int __V)
> {
> return __builtin_ia32_wrfsbase32(__V);
> }
>
> -static __inline__ void __attribute__((__always_inline__, __nodebug__))
> +static __inline__ void __attribute__((__always_inline__, __nodebug__,
> __target__("fsgsbase")))
> _writefsbase_u64(unsigned long long __V)
> {
> return __builtin_ia32_wrfsbase64(__V);
> }
>
> -static __inline__ void __attribute__((__always_inline__, __nodebug__))
> +static __inline__ void __attribute__((__always_inline__, __nodebug__,
> __target__("fsgsbase")))
> _writegsbase_u32(unsigned int __V)
> {
> return __builtin_ia32_wrgsbase32(__V);
> }
>
> -static __inline__ void __attribute__((__always_inline__, __nodebug__))
> +static __inline__ void __attribute__((__always_inline__, __nodebug__,
> __target__("fsgsbase")))
> _writegsbase_u64(unsigned long long __V)
> {
> return __builtin_ia32_wrgsbase64(__V);
> }
> #endif
> -#endif /* __FSGSBASE__ */
>
> -#ifdef __RTM__
> #include <rtmintrin.h>
> -#endif
>
> /* FIXME: check __HLE__ as well when HLE is supported. */
> -#if defined (__RTM__)
> -static __inline__ int __attribute__((__always_inline__, __nodebug__))
> +static __inline__ int __attribute__((__always_inline__, __nodebug__,
> __target__("rtm")))
> _xtest(void)
> {
> return __builtin_ia32_xtest();
> }
> -#endif
>
> -#ifdef __SHA__
> #include <shaintrin.h>
> -#endif
>
> /* Some intrinsics inside adxintrin.h are available only if __ADX__
> defined,
> * whereas others are also available if __ADX__ undefined */
>
> Modified: cfe/trunk/lib/Headers/lzcntintrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/lzcntintrin.h?rev=239883&r1=239882&r2=239883
> &view=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/lzcntintrin.h (original)
> +++ cfe/trunk/lib/Headers/lzcntintrin.h Wed Jun 17 02:09:32 2015
> @@ -25,15 +25,11 @@
> #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
>
> /* Define the default attributes for the functions in this file. */
> -#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
> +#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__,
> __target__("lzcnt")))
>
> static __inline__ unsigned short DEFAULT_FN_ATTRS
> __lzcnt16(unsigned short __X)
>
> Modified: cfe/trunk/lib/Headers/mm3dnow.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/mm3dnow.h?rev=239883&r1=239882&r2=239883&vie
> w=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/mm3dnow.h (original)
> +++ cfe/trunk/lib/Headers/mm3dnow.h Wed Jun 17 02:09:32 2015
> @@ -30,7 +30,7 @@
> typedef float __v2sf __attribute__((__vector_size__(8)));
>
> /* Define the default attributes for the functions in this file. */
> -#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
> +#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__,
> __target__("3dnow")))
>
> static __inline__ void DEFAULT_FN_ATTRS
> _m_femms() {
>
> Modified: cfe/trunk/lib/Headers/mmintrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/mmintrin.h?rev=239883&r1=239882&r2=239883&vi
> ew=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/mmintrin.h (original)
> +++ cfe/trunk/lib/Headers/mmintrin.h Wed Jun 17 02:09:32 2015
> @@ -24,10 +24,6 @@
> #ifndef __MMINTRIN_H
> #define __MMINTRIN_H
>
> -#ifndef __MMX__
> -#error "MMX instruction set not enabled"
> -#else
> -
> typedef long long __m64 __attribute__((__vector_size__(8)));
>
> typedef int __v2si __attribute__((__vector_size__(8)));
> @@ -35,7 +31,7 @@ typedef short __v4hi __attribute__((__ve
> typedef char __v8qi __attribute__((__vector_size__(8)));
>
> /* Define the default attributes for the functions in this file. */
> -#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
> +#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__,
> __target__("mmx")))
>
> static __inline__ void DEFAULT_FN_ATTRS
> _mm_empty(void)
> @@ -501,7 +497,5 @@ _mm_setr_pi8(char __b0, char __b1, char
> #define _m_pcmpgtw _mm_cmpgt_pi16
> #define _m_pcmpgtd _mm_cmpgt_pi32
>
> -#endif /* __MMX__ */
> -
> #endif /* __MMINTRIN_H */
>
>
> Modified: cfe/trunk/lib/Headers/nmmintrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/nmmintrin.h?rev=239883&r1=239882&r2=239883&v
> iew=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/nmmintrin.h (original)
> +++ cfe/trunk/lib/Headers/nmmintrin.h Wed Jun 17 02:09:32 2015
> @@ -24,12 +24,7 @@
> #ifndef _NMMINTRIN_H
> #define _NMMINTRIN_H
>
> -#ifndef __SSE4_2__
> -#error "SSE4.2 instruction set not enabled"
> -#else
> -
> /* To match expectations of gcc we put the sse4.2 definitions into
> smmintrin.h,
> just include it now then. */
> #include <smmintrin.h>
> -#endif /* __SSE4_2__ */
> #endif /* _NMMINTRIN_H */
>
> Modified: cfe/trunk/lib/Headers/pmmintrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/pmmintrin.h?rev=239883&r1=239882&r2=239883&v
> iew=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/pmmintrin.h (original)
> +++ cfe/trunk/lib/Headers/pmmintrin.h Wed Jun 17 02:09:32 2015
> @@ -24,14 +24,10 @@
> #ifndef __PMMINTRIN_H
> #define __PMMINTRIN_H
>
> -#ifndef __SSE3__
> -#error "SSE3 instruction set not enabled"
> -#else
> -
> #include <emmintrin.h>
>
> /* Define the default attributes for the functions in this file. */
> -#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
> +#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__,
> __target__("sse3")))
>
> static __inline__ __m128i DEFAULT_FN_ATTRS
> _mm_lddqu_si128(__m128i const *__p)
> @@ -117,6 +113,4 @@ _mm_mwait(unsigned __extensions, unsigne
>
> #undef DEFAULT_FN_ATTRS
>
> -#endif /* __SSE3__ */
> -
> #endif /* __PMMINTRIN_H */
>
> Modified: cfe/trunk/lib/Headers/popcntintrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/popcntintrin.h?rev=239883&r1=239882&r2=23988
> 3&view=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/popcntintrin.h (original)
> +++ cfe/trunk/lib/Headers/popcntintrin.h Wed Jun 17 02:09:32 2015
> @@ -21,15 +21,11 @@
> *===--------------------------------------------------------------------
> ---===
> */
>
> -#ifndef __POPCNT__
> -#error "POPCNT instruction set not enabled"
> -#endif
> -
> #ifndef _POPCNTINTRIN_H
> #define _POPCNTINTRIN_H
>
> /* Define the default attributes for the functions in this file. */
> -#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
> +#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__,
> __target__("popcnt")))
>
> static __inline__ int DEFAULT_FN_ATTRS
> _mm_popcnt_u32(unsigned int __A)
>
> Modified: cfe/trunk/lib/Headers/rdseedintrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/rdseedintrin.h?rev=239883&r1=239882&r2=23988
> 3&view=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/rdseedintrin.h (original)
> +++ cfe/trunk/lib/Headers/rdseedintrin.h Wed Jun 17 02:09:32 2015
> @@ -28,10 +28,8 @@
> #ifndef __RDSEEDINTRIN_H
> #define __RDSEEDINTRIN_H
>
> -#ifdef __RDSEED__
> -
> /* Define the default attributes for the functions in this file. */
> -#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
> +#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__,
> __target__("rdseed")))
>
> static __inline__ int DEFAULT_FN_ATTRS
> _rdseed16_step(unsigned short *__p)
> @@ -55,5 +53,4 @@ _rdseed64_step(unsigned long long *__p)
>
> #undef DEFAULT_FN_ATTRS
>
> -#endif /* __RDSEED__ */
> #endif /* __RDSEEDINTRIN_H */
>
> Modified: cfe/trunk/lib/Headers/rtmintrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/rtmintrin.h?rev=239883&r1=239882&r2=239883&v
> iew=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/rtmintrin.h (original)
> +++ cfe/trunk/lib/Headers/rtmintrin.h Wed Jun 17 02:09:32 2015
> @@ -38,7 +38,7 @@
> #define _XABORT_CODE(x) (((x) >> 24) & 0xFF)
>
> /* Define the default attributes for the functions in this file. */
> -#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
> +#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__,
> __target__("rtm")))
>
> static __inline__ unsigned int DEFAULT_FN_ATTRS
> _xbegin(void)
>
> Modified: cfe/trunk/lib/Headers/shaintrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/shaintrin.h?rev=239883&r1=239882&r2=239883&v
> iew=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/shaintrin.h (original)
> +++ cfe/trunk/lib/Headers/shaintrin.h Wed Jun 17 02:09:32 2015
> @@ -28,12 +28,8 @@
> #ifndef __SHAINTRIN_H
> #define __SHAINTRIN_H
>
> -#if !defined (__SHA__)
> -# error "SHA instructions not enabled"
> -#endif
> -
> /* Define the default attributes for the functions in this file. */
> -#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
> +#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__,
> __target__("sha")))
>
> #define _mm_sha1rnds4_epu32(V1, V2, M) __extension__ ({ \
> __builtin_ia32_sha1rnds4((V1), (V2), (M)); })
>
> Modified: cfe/trunk/lib/Headers/smmintrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/smmintrin.h?rev=239883&r1=239882&r2=239883&v
> iew=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/smmintrin.h (original)
> +++ cfe/trunk/lib/Headers/smmintrin.h Wed Jun 17 02:09:32 2015
> @@ -24,14 +24,10 @@
> #ifndef _SMMINTRIN_H
> #define _SMMINTRIN_H
>
> -#ifndef __SSE4_1__
> -#error "SSE4.1 instruction set not enabled"
> -#else
> -
> #include <tmmintrin.h>
>
> /* Define the default attributes for the functions in this file. */
> -#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
> +#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__,
> __target__("sse4.1")))
>
> /* SSE4 Rounding macros. */
> #define _MM_FROUND_TO_NEAREST_INT 0x00
> @@ -379,9 +375,13 @@ _mm_minpos_epu16(__m128i __V)
> return (__m128i) __builtin_ia32_phminposuw128((__v8hi)__V);
> }
>
> +/* Handle the sse4.2 definitions here. */
> +
> /* These definitions are normally in nmmintrin.h, but gcc puts them in
> here
> so we'll do the same. */
> -#ifdef __SSE4_2__
> +
> +#undef DEFAULT_FN_ATTRS
> +#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__,
> __target__("sse4.2")))
>
> /* These specify the type of data that we're comparing. */
> #define _SIDD_UBYTE_OPS 0x00
> @@ -481,7 +481,4 @@ _mm_crc32_u64(unsigned long long __C, un
> #include <popcntintrin.h>
> #endif
>
> -#endif /* __SSE4_2__ */
> -#endif /* __SSE4_1__ */
> -
> #endif /* _SMMINTRIN_H */
>
> Modified: cfe/trunk/lib/Headers/tbmintrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/tbmintrin.h?rev=239883&r1=239882&r2=239883&v
> iew=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/tbmintrin.h (original)
> +++ cfe/trunk/lib/Headers/tbmintrin.h Wed Jun 17 02:09:32 2015
> @@ -21,10 +21,6 @@
> *===--------------------------------------------------------------------
> ---===
> */
>
> -#ifndef __TBM__
> -#error "TBM instruction set is not enabled"
> -#endif
> -
> #ifndef __X86INTRIN_H
> #error "Never use <tbmintrin.h> directly; include <x86intrin.h> instead."
> #endif
> @@ -33,7 +29,7 @@
> #define __TBMINTRIN_H
>
> /* Define the default attributes for the functions in this file. */
> -#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
> +#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__,
> __target__("tbm")))
>
> #define __bextri_u32(a, b) (__builtin_ia32_bextri_u32((a), (b)))
>
>
> Modified: cfe/trunk/lib/Headers/tmmintrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/tmmintrin.h?rev=239883&r1=239882&r2=239883&v
> iew=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/tmmintrin.h (original)
> +++ cfe/trunk/lib/Headers/tmmintrin.h Wed Jun 17 02:09:32 2015
> @@ -24,14 +24,10 @@
> #ifndef __TMMINTRIN_H
> #define __TMMINTRIN_H
>
> -#ifndef __SSSE3__
> -#error "SSSE3 instruction set not enabled"
> -#else
> -
> #include <pmmintrin.h>
>
> /* Define the default attributes for the functions in this file. */
> -#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
> +#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__,
> __target__("ssse3")))
>
> static __inline__ __m64 DEFAULT_FN_ATTRS
> _mm_abs_pi8(__m64 __a)
> @@ -225,6 +221,4 @@ _mm_sign_pi32(__m64 __a, __m64 __b)
>
> #undef DEFAULT_FN_ATTRS
>
> -#endif /* __SSSE3__ */
> -
> #endif /* __TMMINTRIN_H */
>
> Modified: cfe/trunk/lib/Headers/wmmintrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/wmmintrin.h?rev=239883&r1=239882&r2=239883&v
> iew=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/wmmintrin.h (original)
> +++ cfe/trunk/lib/Headers/wmmintrin.h Wed Jun 17 02:09:32 2015
> @@ -26,17 +26,8 @@
>
> #include <emmintrin.h>
>
> -#if !defined (__AES__) && !defined (__PCLMUL__)
> -# error "AES/PCLMUL instructions not enabled"
> -#else
> -
> -#ifdef __AES__
> #include <__wmmintrin_aes.h>
> -#endif /* __AES__ */
>
> -#ifdef __PCLMUL__
> #include <__wmmintrin_pclmul.h>
> -#endif /* __PCLMUL__ */
>
> -#endif /* __AES__ || __PCLMUL__ */
> #endif /* _WMMINTRIN_H */
>
> Modified: cfe/trunk/lib/Headers/x86intrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/x86intrin.h?rev=239883&r1=239882&r2=239883&v
> iew=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/x86intrin.h (original)
> +++ cfe/trunk/lib/Headers/x86intrin.h Wed Jun 17 02:09:32 2015
> @@ -28,53 +28,29 @@
>
> #include <immintrin.h>
>
> -#ifdef __3dNOW__
> #include <mm3dnow.h>
> -#endif
>
> -#ifdef __BMI__
> #include <bmiintrin.h>
> -#endif
>
> -#ifdef __BMI2__
> #include <bmi2intrin.h>
> -#endif
>
> -#ifdef __LZCNT__
> #include <lzcntintrin.h>
> -#endif
>
> -#ifdef __POPCNT__
> #include <popcntintrin.h>
> -#endif
>
> -#ifdef __RDSEED__
> #include <rdseedintrin.h>
> -#endif
>
> -#ifdef __PRFCHW__
> #include <prfchwintrin.h>
> -#endif
>
> -#ifdef __SSE4A__
> #include <ammintrin.h>
> -#endif
>
> -#ifdef __FMA4__
> #include <fma4intrin.h>
> -#endif
>
> -#ifdef __XOP__
> #include <xopintrin.h>
> -#endif
>
> -#ifdef __TBM__
> #include <tbmintrin.h>
> -#endif
>
> -#ifdef __F16C__
> #include <f16cintrin.h>
> -#endif
>
> /* FIXME: LWP */
>
>
> Modified: cfe/trunk/lib/Headers/xmmintrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/xmmintrin.h?rev=239883&r1=239882&r2=239883&v
> iew=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/xmmintrin.h (original)
> +++ cfe/trunk/lib/Headers/xmmintrin.h Wed Jun 17 02:09:32 2015
> @@ -24,10 +24,6 @@
> #ifndef __XMMINTRIN_H
> #define __XMMINTRIN_H
>
> -#ifndef __SSE__
> -#error "SSE instruction set not enabled"
> -#else
> -
> #include <mmintrin.h>
>
> typedef int __v4si __attribute__((__vector_size__(16)));
> @@ -41,7 +37,7 @@ typedef float __m128 __attribute__((__ve
> #endif
>
> /* Define the default attributes for the functions in this file. */
> -#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
> +#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__,
> __target__("sse")))
>
> static __inline__ __m128 DEFAULT_FN_ATTRS
> _mm_add_ss(__m128 __a, __m128 __b)
> @@ -1003,6 +999,4 @@ do { \
> #include <emmintrin.h>
> #endif
>
> -#endif /* __SSE__ */
> -
> #endif /* __XMMINTRIN_H */
>
> Modified: cfe/trunk/lib/Headers/xopintrin.h
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/lib/Headers/xopintrin.h?rev=239883&r1=239882&r2=239883&v
> iew=diff
> ==========================================================================
> ====
> --- cfe/trunk/lib/Headers/xopintrin.h (original)
> +++ cfe/trunk/lib/Headers/xopintrin.h Wed Jun 17 02:09:32 2015
> @@ -28,14 +28,10 @@
> #ifndef __XOPINTRIN_H
> #define __XOPINTRIN_H
>
> -#ifndef __XOP__
> -# error "XOP instruction set is not enabled"
> -#else
> -
> #include <fma4intrin.h>
>
> /* Define the default attributes for the functions in this file. */
> -#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
> +#define DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__,
> __target__("xop")))
>
> static __inline__ __m128i DEFAULT_FN_ATTRS
> _mm_maccs_epi16(__m128i __A, __m128i __B, __m128i __C)
> @@ -804,6 +800,4 @@ _mm256_frcz_pd(__m256d __A)
>
> #undef DEFAULT_FN_ATTRS
>
> -#endif /* __XOP__ */
> -
> #endif /* __XOPINTRIN_H */
>
> Added: cfe/trunk/test/Headers/pmmintrin.c
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/test/Headers/pmmintrin.c?rev=239883&view=auto
> ==========================================================================
> ====
> --- cfe/trunk/test/Headers/pmmintrin.c (added)
> +++ cfe/trunk/test/Headers/pmmintrin.c Wed Jun 17 02:09:32 2015
> @@ -0,0 +1,12 @@
> +// RUN: %clang_cc1 -fsyntax-only -ffreestanding %s -verify
> +// RUN: %clang_cc1 -fsyntax-only -ffreestanding -x c++ %s -verify
> +// expected-no-diagnostics
> +
> +#if defined(i386) || defined(__x86_64__)
> +#include <pmmintrin.h>
> +
> +int __attribute__((__target__(("sse3")))) foo(int a) {
> + _mm_mwait(0, 0);
> + return 4;
> +}
> +#endif
>
> Added: cfe/trunk/test/Headers/x86intrin-2.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Headers/x86intrin-
> 2.c?rev=239883&view=auto
> ==========================================================================
> ====
> --- cfe/trunk/test/Headers/x86intrin-2.c (added)
> +++ cfe/trunk/test/Headers/x86intrin-2.c Wed Jun 17 02:09:32 2015
> @@ -0,0 +1,131 @@
> +// RUN: %clang_cc1 -fsyntax-only -ffreestanding %s -verify
> +// RUN: %clang_cc1 -fsyntax-only -ffreestanding -fno-lax-vector-
> conversions %s -verify
> +// RUN: %clang_cc1 -fsyntax-only -ffreestanding -x c++ %s -verify
> +// expected-no-diagnostics
> +
> +#if defined(i386) || defined(__x86_64__)
> +
> +// Include the metaheader that includes all x86 intrinsic headers.
> +#include <x86intrin.h>
> +
> +void __attribute__((__target__("mmx"))) mm_empty_wrap(void) {
> + _mm_empty();
> +}
> +
> +__m128 __attribute__((__target__("sse"))) mm_add_ss_wrap(__m128 a, __m128
> b) {
> + return _mm_add_ss(a, b);
> +}
> +
> +__m128d __attribute__((__target__("sse2"))) mm_sqrt_sd_wrap(__m128d a,
> __m128d b) {
> + return _mm_sqrt_sd(a, b);
> +}
> +
> +void __attribute__((__target__("sse3"))) mm_mwait_wrap(int a) {
> + _mm_mwait(0, 0);
> +}
> +
> +__m64 __attribute__((__target__("ssse3"))) mm_abs_pi8_wrap(__m64 a) {
> + return _mm_abs_pi8(a);
> +}
> +
> +__m128i __attribute__((__target__("sse4.1")))
> mm_minpos_epu16_wrap(__m128i v) {
> + return _mm_minpos_epu16(v);
> +}
> +
> +unsigned int __attribute__((__target__("sse4.2")))
> mm_crc32_u8_wrap(unsigned int c, unsigned char d) {
> + return _mm_crc32_u8(c, d);
> +}
> +
> +__m128i __attribute__((__target__("aes"))) mm_aesenc_si128_wrap(__m128i
> v, __m128i r) {
> + return _mm_aesenc_si128(v, r);
> +}
> +
> +__m256d __attribute__((__target__("avx"))) mm256_add_pd_wrap(__m256d a,
> __m256d b) {
> + return _mm256_add_pd(a, b);
> +}
> +
> +__m256i __attribute__((__target__("avx2"))) mm256_abs_epi8_wrap(__m256i
> a) {
> + return _mm256_abs_epi8(a);
> +}
> +
> +unsigned short __attribute__((__target__("bmi"))) tzcnt_u16_wrap(unsigned
> short x) {
> + return __tzcnt_u16(x);
> +}
> +
> +unsigned int __attribute__((__target__("bmi2"))) bzhi_u32_wrap(unsigned
> int x, unsigned int y) {
> + return _bzhi_u32(x, y);
> +}
> +
> +unsigned short __attribute__((__target__("lzcnt"))) lzcnt16_wrap(unsigned
> short x) {
> + return __lzcnt16(x);
> +}
> +
> +__m256d __attribute__((__target__("fma"))) mm256_fmsubadd_pd_wrap(__m256d
> a, __m256d b, __m256d c) {
> + return _mm256_fmsubadd_pd(a, b, c);
> +}
> +
> +__m512i __attribute__((__target__("avx512f")))
> mm512_setzero_si512_wrap(void) {
> + return _mm512_setzero_si512();
> +}
> +
> +__mmask8 __attribute__((__target__("avx512vl")))
> mm_cmpeq_epi32_mask_wrap(__m128i a, __m128i b) {
> + return _mm_cmpeq_epi32_mask(a, b);
> +}
> +
> +__v64qi __attribute__((__target__("avx512bw")))
> mm512_setzero_qi_wrap(void) {
> + return _mm512_setzero_qi();
> +}
> +
> +__m512i __attribute__((__target__("avx512dq")))
> mm512_mullo_epi64_wrap(__m512i a, __m512i b) {
> + return _mm512_mullo_epi64(a, b);
> +}
> +
> +__mmask16 __attribute__((__target__("avx512vl,avx512bw")))
> mm_cmpeq_epi8_mask_wrap(__m128i a, __m128i b) {
> + return _mm_cmpeq_epi8_mask(a, b);
> +}
> +
> +__m256i __attribute__((__target__("avx512vl,avx512dq")))
> mm256_mullo_epi64_wrap(__m256i a, __m256i b) {
> + return _mm256_mullo_epi64(a, b);
> +}
> +
> +int __attribute__((__target__("rdrnd"))) rdrand16_step_wrap(unsigned
> short *p) {
> + return _rdrand16_step(p);
> +}
> +
> +unsigned int __attribute__((__target__("fsgsbase")))
> readfsbase_u32_wrap(void) {
> + return _readfsbase_u32();
> +}
> +
> +unsigned int __attribute__((__target__("rtm"))) xbegin_wrap(void) {
> + return _xbegin();
> +}
> +
> +__m128i __attribute__((__target__("sha")))
> mm_sha1nexte_epu32_wrap(__m128i x, __m128i y) {
> + return _mm_sha1nexte_epu32(x, y);
> +}
> +
> +int __attribute__((__target__("rdseed"))) rdseed16_step_wrap(unsigned
> short *p) {
> + return _rdseed16_step(p);
> +}
> +
> +__m128i __attribute__((__target__("sse4a"))) mm_extract_si64_wrap(__m128i
> x, __m128i y) {
> + return _mm_extract_si64(x, y);
> +}
> +
> +__m128 __attribute__((__target__("fma4"))) mm_macc_ps_wrap(__m128 a,
> __m128 b, __m128 c) {
> + return _mm_macc_ps(a, b, c);
> +}
> +
> +__m256 __attribute__((__target__("xop"))) mm256_frcz_ps_wrap(__m256 a) {
> + return _mm256_frcz_ps(a);
> +}
> +
> +unsigned int __attribute__((__target__("tbm"))) blcfill_u32_wrap(unsigned
> int a) {
> + return __blcfill_u32(a);
> +}
> +
> +__m128 __attribute__((__target__("f16c"))) mm_cvtph_ps_wrap(__m128i a) {
> + return _mm_cvtph_ps(a);
> +}
> +
> +#endif
>
> Modified: cfe/trunk/test/Headers/x86intrin.c
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/test/Headers/x86intrin.c?rev=239883&r1=239882&r2=239883&
> view=diff
> ==========================================================================
> ====
> --- cfe/trunk/test/Headers/x86intrin.c (original)
> +++ cfe/trunk/test/Headers/x86intrin.c Wed Jun 17 02:09:32 2015
> @@ -5,126 +5,7 @@
>
> #if defined(i386) || defined(__x86_64__)
>
> -// Pretend to enable all features.
> -#ifndef __3dNOW__
> -#define __3dNOW__
> -#endif
> -#ifndef __BMI__
> -#define __BMI__
> -#endif
> -#ifndef __BMI2__
> -#define __BMI2__
> -#endif
> -#ifndef __LZCNT__
> -#define __LZCNT__
> -#endif
> -#ifndef __POPCNT__
> -#define __POPCNT__
> -#endif
> -#ifndef __RDSEED__
> -#define __RDSEED__
> -#endif
> -#ifndef __PRFCHW__
> -#define __PRFCHW__
> -#endif
> -#ifndef __SSE4A__
> -#define __SSE4A__
> -#endif
> -#ifndef __FMA4__
> -#define __FMA4__
> -#endif
> -#ifndef __XOP__
> -#define __XOP__
> -#endif
> -#ifndef __F16C__
> -#define __F16C__
> -#endif
> -#ifndef __MMX__
> -#define __MMX__
> -#endif
> -#ifndef __SSE__
> -#define __SSE__
> -#endif
> -#ifndef __SSE2__
> -#define __SSE2__
> -#endif
> -#ifndef __SSE3__
> -#define __SSE3__
> -#endif
> -#ifndef __SSSE3__
> -#define __SSSE3__
> -#endif
> -#ifndef __SSE4_1__
> -#define __SSE4_1__
> -#endif
> -#ifndef __SSE4_2__
> -#define __SSE4_2__
> -#endif
> -#ifndef __AES__
> -#define __AES__
> -#endif
> -#ifndef __AVX__
> -#define __AVX__
> -#endif
> -#ifndef __AVX2__
> -#define __AVX2__
> -#endif
> -#ifndef __BMI__
> -#define __BMI__
> -#endif
> -#ifndef __BMI2__
> -#define __BMI2__
> -#endif
> -#ifndef __LZCNT__
> -#define __LZCNT__
> -#endif
> -#ifndef __FMA__
> -#define __FMA__
> -#endif
> -#ifndef __RDRND__
> -#define __RDRND__
> -#endif
> -#ifndef __SHA__
> -#define __SHA__
> -#endif
> -#ifndef __ADX__
> -#define __ADX__
> -#endif
> -#ifndef __TBM__
> -#define __TBM__
> -#endif
> -#ifndef __RTM__
> -#define __RTM__
> -#endif
> -#ifndef __PCLMUL__
> -#define __PCLMUL__
> -#endif
> -#ifndef __FSGSBASE__
> -#define __FSGSBASE__
> -#endif
> -#ifndef __AVX512F__
> -#define __AVX512F__
> -#endif
> -#ifndef __AVX512VL__
> -#define __AVX512VL__
> -#endif
> -#ifndef __AVX512BW__
> -#define __AVX512BW__
> -#endif
> -#ifndef __AVX512ER__
> -#define __AVX512ER__
> -#endif
> -#ifndef __AVX512PF__
> -#define __AVX512PF__
> -#endif
> -#ifndef __AVX512DQ__
> -#define __AVX512DQ__
> -#endif
> -#ifndef __AVX512CD__
> -#define __AVX512CD__
> -#endif
> -
> -// Now include the metaheader that includes all x86 intrinsic headers.
> +// Include the metaheader that includes all x86 intrinsic headers.
> #include <x86intrin.h>
>
> #endif
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu<mailto:cfe-commits at cs.uiuc.edu>
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
_______________________________________________
cfe-commits mailing list
cfe-commits at cs.uiuc.edu<mailto:cfe-commits at cs.uiuc.edu>
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20150619/8248ee8a/attachment.html>
More information about the cfe-commits
mailing list