This is an archive of the discontinued LLVM Phabricator instance.

Differential D47182

[X86] Move all Intel defined intrinsic includes into immintrin.h
ClosedPublic

Authored by craig.topper on May 21 2018, 11:08 PM.

Details

Reviewers
DavidKreitzer
echristo
RKSimon
rnk
Commits
rG664af9bc345e: [X86] Move all Intel defined intrinsic includes into immintrin.h
rC333110: [X86] Move all Intel defined intrinsic includes into immintrin.h
rL333110: [X86] Move all Intel defined intrinsic includes into immintrin.h
Summary

This matches the Intel documentation which shows them available by importing immintrin.h. x86intrin.h also includes immintrin.h so anyone including x86intrin.h will still get them.

This is different than gcc, but I don't think we were a perfect match there already. I'm unclear what gcc's policy is about how they choose which to add things to.

Diff Detail

Event Timeline

craig.topper created this revision.May 21 2018, 11:08 PM
GBuella added a subscriber: GBuella.May 22 2018, 7:23 AM

What does "imm" mean anyways?

craig.topper added a comment.May 22 2018, 8:25 AM

First there was mmintrin.h which covered MMX instructions. Then xmmintrin.h came along to support SSE1 and implicitly included mmintrin.h. The emmintrin.h to support SSE2 and implicitly included xmmintrin.h. This repeated for each new version of SSE. With each header file including the previous header file. I think most of the later SSE headers start with the first letter of the code name of the CPU that added that SSE level including cancelled projects. So nmmintrin.h refers to Nehalem. tmmintrin.h came from the cancelled Tejas CPU. wmmintrin.h referes to Westmere. pmmintrin.h refers to Penryn. Eventually this was determined to not be very scalable to remember which header file contained what intrinsics and you have to change it with each generation to get the latest.. So immintrin.h was created to just include everything. I assume the 'i' here just stands for Intel. The 'mm' is just historic legacy due to the earlier file names. x86intrin.h was created by gcc to hold the intrinsics not specified by Intel. I think icc has an x86intrin.h that just includes immintrin.h.

rnk accepted this revision.May 22 2018, 10:22 AM
In D47182#1107900, @craig.topper wrote:

Eventually this was determined to not be very scalable to remember which header file contained what intrinsics and you have to change it with each generation to get the latest.. So immintrin.h was created to just include everything.

Speaking of things that aren't scalable... immintrin.h is like the new windows.h. :(

The reorganization looks good to me, though.

This revision is now accepted and ready to land.May 22 2018, 10:22 AM
DavidKreitzer added a comment.May 22 2018, 2:18 PM

I agree with the changes in x86intrin.h and immintrin.h. For the others, I question whether we ought to recommend inclusion of x86intrin.h or immintrin.h. The distinction as I understand it is that immintrin.h is used for Intel-specific intrinsics while x86intrin.h covers all intrinsics for x86-based architectures.

craig.topper updated this revision to Diff 148115.May 22 2018, 3:35 PM

Leave the message still saying x86intrin.h. Change the error checks to look for either x86intrin.h or immintrin.h to have been included. Really only the immintrin.h check is necessary since that's the header that does the include, but I put both so the error message saying x86intrin.h would be less confusing.

craig.topper requested review of this revision.May 22 2018, 3:35 PM
DavidKreitzer added a comment.May 23 2018, 9:04 AM

Hi Craig, just one comment on the details. Everything else looks good.

lib/Headers/x86intrin.h
47

I see that you are removing this popcntintrin.h inclusion without adding it to immintrin.h. Is that because you are relying on the inclusion from smmintrin.h?

If so, won't that cause a problem on Windows with -mpopcnt for targets that don't include smmintrin.h?

craig.topper updated this revision to Diff 148252.May 23 2018, 10:59 AM

Add back popcntintrin.h

DavidKreitzer accepted this revision.May 23 2018, 11:07 AM

Thanks, Craig. LGTM.

This revision is now accepted and ready to land.May 23 2018, 11:07 AM
Closed by commit rL333110: [X86] Move all Intel defined intrinsic includes into immintrin.h (authored by ctopper). · Explain WhyMay 23 2018, 11:36 AM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: llvm-commits. · View Herald TranscriptMay 23 2018, 11:36 AM

Revision Contents

Diff 147950

lib/Headers/bmi2intrin.h

Show All 15 Lines
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * 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 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
* *
*===-----------------------------------------------------------------------=== *===-----------------------------------------------------------------------===
*/ */
#if !defined __X86INTRIN_H && !defined __IMMINTRIN_H #if !defined __IMMINTRIN_H
#error "Never use <bmi2intrin.h> directly; include <x86intrin.h> instead." #error "Never use <bmi2intrin.h> directly; include <immintrin.h> instead."
#endif #endif
#ifndef __BMI2INTRIN_H #ifndef __BMI2INTRIN_H
#define __BMI2INTRIN_H #define __BMI2INTRIN_H
/* Define the default attributes for the functions in this file. */ /* Define the default attributes for the functions in this file. */
#define __DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__, __target__("bmi2"))) #define __DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__, __target__("bmi2")))
▲ Show 20 Lines • Show All 62 Lines • Show Last 20 Lines

lib/Headers/bmiintrin.h

Show All 15 Lines
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * 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 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
* *
*===-----------------------------------------------------------------------=== *===-----------------------------------------------------------------------===
*/ */
#if !defined __X86INTRIN_H && !defined __IMMINTRIN_H #if !defined __IMMINTRIN_H
#error "Never use <bmiintrin.h> directly; include <x86intrin.h> instead." #error "Never use <bmiintrin.h> directly; include <immintrin.h> instead."
#endif #endif
#ifndef __BMIINTRIN_H #ifndef __BMIINTRIN_H
#define __BMIINTRIN_H #define __BMIINTRIN_H
#define _tzcnt_u16(a) (__tzcnt_u16((a))) #define _tzcnt_u16(a) (__tzcnt_u16((a)))
#define _andn_u32(a, b) (__andn_u32((a), (b))) #define _andn_u32(a, b) (__andn_u32((a), (b)))
▲ Show 20 Lines • Show All 349 Lines • Show Last 20 Lines

lib/Headers/cldemoteintrin.h

Show All 15 Lines
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * 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 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
* *
*===-----------------------------------------------------------------------=== *===-----------------------------------------------------------------------===
*/ */
#ifndef __X86INTRIN_H #ifndef __IMMINTRIN_H
#error "Never use <cldemoteintrin.h> directly; include <x86intrin.h> instead." #error "Never use <cldemoteintrin.h> directly; include <immintrin.h> instead."
#endif #endif
#ifndef __CLDEMOTEINTRIN_H #ifndef __CLDEMOTEINTRIN_H
#define __CLDEMOTEINTRIN_H #define __CLDEMOTEINTRIN_H
/* Define the default attributes for the functions in this file. */ /* Define the default attributes for the functions in this file. */
#define __DEFAULT_FN_ATTRS \ #define __DEFAULT_FN_ATTRS \
__attribute__((__always_inline__, __nodebug__, __target__("cldemote"))) __attribute__((__always_inline__, __nodebug__, __target__("cldemote")))
Show All 9 Lines

lib/Headers/clzerointrin.h

Show All 14 Lines
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * 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 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
* *
*===-----------------------------------------------------------------------=== *===-----------------------------------------------------------------------===
*/ */
#ifndef __X86INTRIN_H #ifndef __IMMINTRIN_H
#error "Never use <clzerointrin.h> directly; include <x86intrin.h> instead." #error "Never use <clzerointrin.h> directly; include <immintrin.h> instead."
#endif #endif
#ifndef __CLZEROINTRIN_H #ifndef __CLZEROINTRIN_H
#define __CLZEROINTRIN_H #define __CLZEROINTRIN_H
/* Define the default attributes for the functions in this file. */ /* Define the default attributes for the functions in this file. */
#define __DEFAULT_FN_ATTRS \ #define __DEFAULT_FN_ATTRS \
__attribute__((__always_inline__, __nodebug__, __target__("clzero"))) __attribute__((__always_inline__, __nodebug__, __target__("clzero")))
Show All 18 Lines

lib/Headers/immintrin.h

Show First 20 Lines • Show All 377 Lines • ▼ Show 20 Lines
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__SHSTK__) #if !defined(_MSC_VER) || __has_feature(modules) || defined(__SHSTK__)
#include <cetintrin.h> #include <cetintrin.h>
#endif #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>
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__RDSEED__)
#include <rdseedintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__CLZERO__)
#include <clzerointrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__WBNOINVD__)
#include <wbnoinvdintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__CLDEMOTE__)
#include <cldemoteintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__WAITPKG__)
#include <waitpkgintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || \
defined(__MOVDIRI__) || defined(__MOVDIR64B__)
#include <movdirintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__PCONFIG__)
#include <pconfigintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__SGX__)
#include <sgxintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__PTWRITE__)
#include <ptwriteintrin.h>
#endif
#endif /* __IMMINTRIN_H */ #endif /* __IMMINTRIN_H */

lib/Headers/lzcntintrin.h

Show All 15 Lines
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * 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 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
* *
*===-----------------------------------------------------------------------=== *===-----------------------------------------------------------------------===
*/ */
#if !defined __X86INTRIN_H && !defined __IMMINTRIN_H #if !defined __IMMINTRIN_H
#error "Never use <lzcntintrin.h> directly; include <x86intrin.h> instead." #error "Never use <lzcntintrin.h> directly; include <immintrin.h> instead."
#endif #endif
#ifndef __LZCNTINTRIN_H #ifndef __LZCNTINTRIN_H
#define __LZCNTINTRIN_H #define __LZCNTINTRIN_H
/* Define the default attributes for the functions in this file. */ /* Define the default attributes for the functions in this file. */
#define __DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__, __target__("lzcnt"))) #define __DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__, __target__("lzcnt")))
▲ Show 20 Lines • Show All 85 Lines • Show Last 20 Lines

lib/Headers/movdirintrin.h

Show All 14 Lines
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * 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 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
* *
*===-----------------------------------------------------------------------=== *===-----------------------------------------------------------------------===
*/ */
#ifndef __X86INTRIN_H #ifndef __IMMINTRIN_H
#error "Never use <movdirintrin.h> directly; include <x86intrin.h> instead." #error "Never use <movdirintrin.h> directly; include <immintrin.h> instead."
#endif #endif
#ifndef _MOVDIRINTRIN_H #ifndef _MOVDIRINTRIN_H
#define _MOVDIRINTRIN_H #define _MOVDIRINTRIN_H
// Move doubleword as direct store // Move doubleword as direct store
static __inline__ void static __inline__ void
__attribute__((__always_inline__, __nodebug__, __target__("movdiri"))) __attribute__((__always_inline__, __nodebug__, __target__("movdiri")))
Show All 31 Lines

lib/Headers/pconfigintrin.h

Show All 15 Lines
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * 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 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
* *
*===-----------------------------------------------------------------------=== *===-----------------------------------------------------------------------===
*/ */
#ifndef __X86INTRIN_H #ifndef __IMMINTRIN_H
#error "Never use <pconfigintrin.h> directly; include <x86intrin.h> instead." #error "Never use <pconfigintrin.h> directly; include <immintrin.h> instead."
#endif #endif
#ifndef __PCONFIGINTRIN_H #ifndef __PCONFIGINTRIN_H
#define __PCONFIGINTRIN_H #define __PCONFIGINTRIN_H
#define __PCONFIG_KEY_PROGRAM 0x00000001 #define __PCONFIG_KEY_PROGRAM 0x00000001
/* Define the default attributes for the functions in this file. */ /* Define the default attributes for the functions in this file. */
Show All 17 Lines

lib/Headers/ptwriteintrin.h

Show All 15 Lines
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * 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 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
* *
*===-----------------------------------------------------------------------=== *===-----------------------------------------------------------------------===
*/ */
#ifndef __X86INTRIN_H #ifndef __IMMINTRIN_H
#error "Never use <ptwriteintrin.h> directly; include <x86intrin.h> instead." #error "Never use <ptwriteintrin.h> directly; include <immintrin.h> instead."
#endif #endif
#ifndef __PTWRITEINTRIN_H #ifndef __PTWRITEINTRIN_H
#define __PTWRITEINTRIN_H #define __PTWRITEINTRIN_H
/* Define the default attributes for the functions in this file. */ /* Define the default attributes for the functions in this file. */
#define __DEFAULT_FN_ATTRS \ #define __DEFAULT_FN_ATTRS \
__attribute__((__always_inline__, __nodebug__, __target__("ptwrite"))) __attribute__((__always_inline__, __nodebug__, __target__("ptwrite")))
Show All 18 Lines

lib/Headers/rdseedintrin.h

Show All 15 Lines
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * 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 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
* *
*===-----------------------------------------------------------------------=== *===-----------------------------------------------------------------------===
*/ */
#ifndef __X86INTRIN_H #ifndef __IMMINTRIN_H
#error "Never use <rdseedintrin.h> directly; include <x86intrin.h> instead." #error "Never use <rdseedintrin.h> directly; include <immintrin.h> instead."
#endif #endif
#ifndef __RDSEEDINTRIN_H #ifndef __RDSEEDINTRIN_H
#define __RDSEEDINTRIN_H #define __RDSEEDINTRIN_H
/* Define the default attributes for the functions in this file. */ /* Define the default attributes for the functions in this file. */
#define __DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__, __target__("rdseed"))) #define __DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__, __target__("rdseed")))
Show All 23 Lines

lib/Headers/sgxintrin.h

Show All 15 Lines
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * 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 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
* *
*===-----------------------------------------------------------------------=== *===-----------------------------------------------------------------------===
*/ */
#ifndef __X86INTRIN_H #ifndef __IMMINTRIN_H
#error "Never use <sgxintrin.h> directly; include <x86intrin.h> instead." #error "Never use <sgxintrin.h> directly; include <immintrin.h> instead."
#endif #endif
#ifndef __SGXINTRIN_H #ifndef __SGXINTRIN_H
#define __SGXINTRIN_H #define __SGXINTRIN_H
/* Define the default attributes for the functions in this file. */ /* Define the default attributes for the functions in this file. */
#define __DEFAULT_FN_ATTRS \ #define __DEFAULT_FN_ATTRS \
__attribute__((__always_inline__, __nodebug__, __target__("sgx"))) __attribute__((__always_inline__, __nodebug__, __target__("sgx")))
Show All 37 Lines

lib/Headers/waitpkgintrin.h

Show All 14 Lines
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * 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 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
* *
*===-----------------------------------------------------------------------=== *===-----------------------------------------------------------------------===
*/ */
#ifndef __X86INTRIN_H #ifndef __IMMINTRIN_H
#error "Never use <waitpkgintrin.h> directly; include <x86intrin.h> instead." #error "Never use <waitpkgintrin.h> directly; include <immintrin.h> instead."
#endif #endif
#ifndef __WAITPKGINTRIN_H #ifndef __WAITPKGINTRIN_H
#define __WAITPKGINTRIN_H #define __WAITPKGINTRIN_H
/* Define the default attributes for the functions in this file. */ /* Define the default attributes for the functions in this file. */
#define __DEFAULT_FN_ATTRS \ #define __DEFAULT_FN_ATTRS \
__attribute__((__always_inline__, __nodebug__, __target__("waitpkg"))) __attribute__((__always_inline__, __nodebug__, __target__("waitpkg")))
Show All 24 Lines

lib/Headers/wbnoinvdintrin.h

Show All 15 Lines
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * 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 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
* *
*===-----------------------------------------------------------------------=== *===-----------------------------------------------------------------------===
*/ */
#ifndef __X86INTRIN_H #ifndef __IMMINTRIN_H
#error "Never use <wbnoinvdintrin.h> directly; include <x86intrin.h> instead." #error "Never use <wbnoinvdintrin.h> directly; include <immintrin.h> instead."
#endif #endif
#ifndef __WBNOINVDINTRIN_H #ifndef __WBNOINVDINTRIN_H
#define __WBNOINVDINTRIN_H #define __WBNOINVDINTRIN_H
static __inline__ void static __inline__ void
__attribute__((__always_inline__, __nodebug__, __target__("wbnoinvd"))) __attribute__((__always_inline__, __nodebug__, __target__("wbnoinvd")))
_wbnoinvd (void) _wbnoinvd (void)
{ {
__builtin_ia32_wbnoinvd (); __builtin_ia32_wbnoinvd ();
} }
#endif /* __WBNOINVDINTRIN_H */ #endif /* __WBNOINVDINTRIN_H */

lib/Headers/x86intrin.h

Show All 26 Lines
#include <ia32intrin.h> #include <ia32intrin.h>
#include <immintrin.h> #include <immintrin.h>
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__3dNOW__) #if !defined(_MSC_VER) || __has_feature(modules) || defined(__3dNOW__)
#include <mm3dnow.h> #include <mm3dnow.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__BMI__)
#include <bmiintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__BMI2__)
#include <bmi2intrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__LZCNT__)
#include <lzcntintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__POPCNT__)
DavidKreitzerUnsubmitted
Not Done
ReplyInline Actions

I see that you are removing this popcntintrin.h inclusion without adding it to immintrin.h. Is that because you are relying on the inclusion from smmintrin.h?

If so, won't that cause a problem on Windows with -mpopcnt for targets that don't include smmintrin.h?

DavidKreitzer: I see that you are removing this popcntintrin.h inclusion without adding it to immintrin.h. Is…
#include <popcntintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__RDSEED__)
#include <rdseedintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__PRFCHW__) #if !defined(_MSC_VER) || __has_feature(modules) || defined(__PRFCHW__)
#include <prfchwintrin.h> #include <prfchwintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__SSE4A__) #if !defined(_MSC_VER) || __has_feature(modules) || defined(__SSE4A__)
#include <ammintrin.h> #include <ammintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__FMA4__) #if !defined(_MSC_VER) || __has_feature(modules) || defined(__FMA4__)
#include <fma4intrin.h> #include <fma4intrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__XOP__) #if !defined(_MSC_VER) || __has_feature(modules) || defined(__XOP__)
#include <xopintrin.h> #include <xopintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__TBM__) #if !defined(_MSC_VER) || __has_feature(modules) || defined(__TBM__)
#include <tbmintrin.h> #include <tbmintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__LWP__) #if !defined(_MSC_VER) || __has_feature(modules) || defined(__LWP__)
#include <lwpintrin.h> #include <lwpintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__F16C__)
#include <f16cintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__MWAITX__) #if !defined(_MSC_VER) || __has_feature(modules) || defined(__MWAITX__)
#include <mwaitxintrin.h> #include <mwaitxintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__CLZERO__)
#include <clzerointrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__WBNOINVD__)
#include <wbnoinvdintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__CLDEMOTE__)
#include <cldemoteintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__WAITPKG__)
#include <waitpkgintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || \
defined(__MOVDIRI__) || defined(__MOVDIR64B__)
#include <movdirintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__PCONFIG__)
#include <pconfigintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__SGX__)
#include <sgxintrin.h>
#endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__PTWRITE__)
#include <ptwriteintrin.h>
#endif
#endif /* __X86INTRIN_H */ #endif /* __X86INTRIN_H */