This is an archive of the discontinued LLVM Phabricator instance.

Differential D27896

Remove the feature guards from the Clang intrinsics header files.
Needs ReviewPublic

Authored by eladcohen on Dec 17 2016, 10:39 PM.
This revision needs review, but there are no reviewers specified.

Details

Reviewers
None
Summary

These were re-introduced to get better compile times in cases that don't actually require all the features. However, it creates compatibility issues with MSVC (in which all the intrinsics are available all the time).
With Clang's Modules feature we can remove these guards and still prevent large header files from compiling over and over again.

See also the thread "clang-cl's <intrin.h>, _tzcnt_u32, and compatibility with MSVC's <intrin.h>" in cfe-dev.

Diff Detail

Event Timeline

eladcohen updated this revision to Diff 81873.Dec 17 2016, 10:39 PM
eladcohen retitled this revision from to Remove the feature guards from the Clang intrinsics header files. .
eladcohen updated this object.
eladcohen added a subscriber: cfe-commits.

Revision Contents

PathSize
lib/
Headers/
83 lines
26 lines

Diff 81873

lib/Headers/immintrin.h

Show All 18 Lines
* THE SOFTWARE. * THE SOFTWARE.
* *
*===-----------------------------------------------------------------------=== *===-----------------------------------------------------------------------===
*/ */
#ifndef __IMMINTRIN_H #ifndef __IMMINTRIN_H
#define __IMMINTRIN_H #define __IMMINTRIN_H
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__MMX__)
#include <mmintrin.h> #include <mmintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__SSE__)
#include <xmmintrin.h> #include <xmmintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__SSE2__)
#include <emmintrin.h> #include <emmintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__SSE3__)
#include <pmmintrin.h> #include <pmmintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__SSSE3__)
#include <tmmintrin.h> #include <tmmintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || \
(defined(__SSE4_2__) || defined(__SSE4_1__))
#include <smmintrin.h> #include <smmintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || \
(defined(__AES__) || defined(__PCLMUL__))
#include <wmmintrin.h> #include <wmmintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__CLFLUSHOPT__)
#include <clflushoptintrin.h> #include <clflushoptintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__AVX__)
#include <avxintrin.h> #include <avxintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__AVX2__)
#include <avx2intrin.h> #include <avx2intrin.h>
/* The 256-bit versions of functions in f16cintrin.h. /* The 256-bit versions of functions in f16cintrin.h.
Intel documents these as being in immintrin.h, and Intel documents these as being in immintrin.h, and
they depend on typedefs from avxintrin.h. */ they depend on typedefs from avxintrin.h. */
/// \brief Converts a 256-bit vector of [8 x float] into a 128-bit vector /// \brief Converts a 256-bit vector of [8 x float] into a 128-bit vector
/// containing 16-bit half-precision float values. /// containing 16-bit half-precision float values.
Show All 33 Lines
/// converted to 32-bit single-precision float values. /// converted to 32-bit single-precision float values.
/// \returns A vector of [8 x float] containing the converted 32-bit /// \returns A vector of [8 x float] containing the converted 32-bit
/// single-precision float values. /// single-precision float values.
static __inline __m256 __attribute__((__always_inline__, __nodebug__, __target__("f16c"))) static __inline __m256 __attribute__((__always_inline__, __nodebug__, __target__("f16c")))
_mm256_cvtph_ps(__m128i __a) _mm256_cvtph_ps(__m128i __a)
{ {
return (__m256)__builtin_ia32_vcvtph2ps256((__v8hi)__a); return (__m256)__builtin_ia32_vcvtph2ps256((__v8hi)__a);
} }
#endif /* __AVX2__ */
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__BMI__)
#include <bmiintrin.h> #include <bmiintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__BMI2__)
#include <bmi2intrin.h> #include <bmi2intrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__LZCNT__)
#include <lzcntintrin.h> #include <lzcntintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__FMA__)
#include <fmaintrin.h> #include <fmaintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__AVX512F__)
#include <avx512fintrin.h> #include <avx512fintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__AVX512VL__)
#include <avx512vlintrin.h> #include <avx512vlintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__AVX512BW__)
#include <avx512bwintrin.h> #include <avx512bwintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__AVX512CD__)
#include <avx512cdintrin.h> #include <avx512cdintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__AVX512DQ__)
#include <avx512dqintrin.h> #include <avx512dqintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || \
(defined(__AVX512VL__) && defined(__AVX512BW__))
#include <avx512vlbwintrin.h> #include <avx512vlbwintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || \
(defined(__AVX512VL__) && defined(__AVX512CD__))
#include <avx512vlcdintrin.h> #include <avx512vlcdintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || \
(defined(__AVX512VL__) && defined(__AVX512DQ__))
#include <avx512vldqintrin.h> #include <avx512vldqintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__AVX512ER__)
#include <avx512erintrin.h> #include <avx512erintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__AVX512IFMA__)
#include <avx512ifmaintrin.h> #include <avx512ifmaintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || \
(defined(__AVX512IFMA__) && defined(__AVX512VL__))
#include <avx512ifmavlintrin.h> #include <avx512ifmavlintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__AVX512VBMI__)
#include <avx512vbmiintrin.h> #include <avx512vbmiintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || \
(defined(__AVX512VBMI__) && defined(__AVX512VL__))
#include <avx512vbmivlintrin.h> #include <avx512vbmivlintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__AVX512PF__)
#include <avx512pfintrin.h> #include <avx512pfintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__PKU__)
#include <pkuintrin.h> #include <pkuintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__RDRND__)
static __inline__ int __attribute__((__always_inline__, __nodebug__, __target__("rdrnd"))) static __inline__ int __attribute__((__always_inline__, __nodebug__, __target__("rdrnd")))
_rdrand16_step(unsigned short *__p) _rdrand16_step(unsigned short *__p)
{ {
return __builtin_ia32_rdrand16_step(__p); return __builtin_ia32_rdrand16_step(__p);
} }
static __inline__ int __attribute__((__always_inline__, __nodebug__, __target__("rdrnd"))) static __inline__ int __attribute__((__always_inline__, __nodebug__, __target__("rdrnd")))
_rdrand32_step(unsigned int *__p) _rdrand32_step(unsigned int *__p)
Show All 15 Lines
#ifdef __x86_64__ #ifdef __x86_64__
static __inline__ int __attribute__((__always_inline__, __nodebug__, __target__("rdrnd"))) static __inline__ int __attribute__((__always_inline__, __nodebug__, __target__("rdrnd")))
_rdrand64_step(unsigned long long *__p) _rdrand64_step(unsigned long long *__p)
{ {
return __builtin_ia32_rdrand64_step(__p); return __builtin_ia32_rdrand64_step(__p);
} }
#endif #endif
#endif /* __RDRND__ */
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__FSGSBASE__)
#ifdef __x86_64__ #ifdef __x86_64__
static __inline__ unsigned int __attribute__((__always_inline__, __nodebug__, __target__("fsgsbase"))) static __inline__ unsigned int __attribute__((__always_inline__, __nodebug__, __target__("fsgsbase")))
_readfsbase_u32(void) _readfsbase_u32(void)
{ {
return __builtin_ia32_rdfsbase32(); return __builtin_ia32_rdfsbase32();
} }
static __inline__ unsigned long long __attribute__((__always_inline__, __nodebug__, __target__("fsgsbase"))) static __inline__ unsigned long long __attribute__((__always_inline__, __nodebug__, __target__("fsgsbase")))
Show All 34 Lines
static __inline__ void __attribute__((__always_inline__, __nodebug__, __target__("fsgsbase"))) static __inline__ void __attribute__((__always_inline__, __nodebug__, __target__("fsgsbase")))
_writegsbase_u64(unsigned long long __V) _writegsbase_u64(unsigned long long __V)
{ {
return __builtin_ia32_wrgsbase64(__V); return __builtin_ia32_wrgsbase64(__V);
} }
#endif #endif
#endif /* __FSGSBASE__ */
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__RTM__)
#include <rtmintrin.h> #include <rtmintrin.h>
#include <xtestintrin.h> #include <xtestintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__SHA__)
#include <shaintrin.h> #include <shaintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__FXSR__)
#include <fxsrintrin.h> #include <fxsrintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__XSAVE__)
#include <xsaveintrin.h> #include <xsaveintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__XSAVEOPT__)
#include <xsaveoptintrin.h> #include <xsaveoptintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__XSAVEC__)
#include <xsavecintrin.h> #include <xsavecintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__XSAVES__)
#include <xsavesintrin.h> #include <xsavesintrin.h>
#endif
/* Some intrinsics inside adxintrin.h are available only on processors with ADX, /* Some intrinsics inside adxintrin.h are available only on processors with ADX,
* whereas others are also available at all times. */ * whereas others are also available at all times. */
#include <adxintrin.h> #include <adxintrin.h>
#endif /* __IMMINTRIN_H */ #endif /* __IMMINTRIN_H */

lib/Headers/x86intrin.h

Show All 22 Lines
#ifndef __X86INTRIN_H #ifndef __X86INTRIN_H
#define __X86INTRIN_H #define __X86INTRIN_H
#include <ia32intrin.h> #include <ia32intrin.h>
#include <immintrin.h> #include <immintrin.h>
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__3dNOW__)
#include <mm3dnow.h> #include <mm3dnow.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__BMI__)
#include <bmiintrin.h> #include <bmiintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__BMI2__)
#include <bmi2intrin.h> #include <bmi2intrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__LZCNT__)
#include <lzcntintrin.h> #include <lzcntintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__POPCNT__)
#include <popcntintrin.h> #include <popcntintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__RDSEED__)
#include <rdseedintrin.h> #include <rdseedintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__PRFCHW__)
#include <prfchwintrin.h> #include <prfchwintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__SSE4A__)
#include <ammintrin.h> #include <ammintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__FMA4__)
#include <fma4intrin.h> #include <fma4intrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__XOP__)
#include <xopintrin.h> #include <xopintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__TBM__)
#include <tbmintrin.h> #include <tbmintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__F16C__)
#include <f16cintrin.h> #include <f16cintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__MWAITX__)
#include <mwaitxintrin.h> #include <mwaitxintrin.h>
#endif
/* FIXME: LWP */ /* FIXME: LWP */
#endif /* __X86INTRIN_H */ #endif /* __X86INTRIN_H */