This is an archive of the discontinued LLVM Phabricator instance.

Differential D70348

Add header guards for header files that should not be included on the PS4 platform
AbandonedPublic

Authored by dyung on Nov 15 2019, 3:42 PM.

Details

Reviewers
craig.topper
Summary

For the PS4 platform, we want to exclude certain headers from being included because we do not support the features they provide. So for the headers we want to exclude, this change adds a check whether ORBIS is defined and excludes the header from being included when it is. Compilers targeting the PS4 define ORBIS.

Diff Detail

Event Timeline

dyung created this revision.Nov 15 2019, 3:42 PM
craig.topper added a comment.Nov 15 2019, 4:14 PM

You could probably just define add ORBIS to every line and then rely on the individual feature defines at the end of the line to re-enable the ones that are really supported. I assume the target-cpu is set to btver for ps4?

clang/lib/Headers/immintrin.h
460

you don't need this one either

dyung added a comment.Nov 15 2019, 6:10 PM
In D70348#1748580, @craig.topper wrote:

You could probably just define add ORBIS to every line and then rely on the individual feature defines at the end of the line to re-enable the ones that are really supported. I assume the target-cpu is set to btver for ps4?

Good point. I talked it over internally with a few other people and think this is a good way to go. I'll revise and upload a new patch later.

dyung abandoned this revision.Nov 21 2019, 2:02 AM

Revision Contents

PathSize
clang/
lib/
Headers/
129 lines
9 lines

Diff 229654

clang/lib/Headers/immintrin.h

Show All 34 Lines
#include <smmintrin.h> #include <smmintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || \ #if !defined(_MSC_VER) || __has_feature(modules) || \
(defined(__AES__) || defined(__PCLMUL__)) (defined(__AES__) || defined(__PCLMUL__))
#include <wmmintrin.h> #include <wmmintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__CLFLUSHOPT__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__CLFLUSHOPT__)
#include <clflushoptintrin.h> #include <clflushoptintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__CLWB__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__CLWB__)
#include <clwbintrin.h> #include <clwbintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__AVX__) #if !defined(_MSC_VER) || __has_feature(modules) || defined(__AVX__)
#include <avxintrin.h> #include <avxintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__AVX2__) #if !defined(_MSC_VER) || __has_feature(modules) || defined(__AVX2__)
#include <avx2intrin.h> #include <avx2intrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__F16C__) #if !defined(_MSC_VER) || __has_feature(modules) || defined(__F16C__)
#include <f16cintrin.h> #include <f16cintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__VPCLMULQDQ__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__VPCLMULQDQ__)
#include <vpclmulqdqintrin.h> #include <vpclmulqdqintrin.h>
#endif #endif
/* No feature check desired due to internal checks */ /* No feature check desired due to internal checks */
#include <bmiintrin.h> #include <bmiintrin.h>
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__BMI2__) #if !defined(_MSC_VER) || __has_feature(modules) || defined(__BMI2__)
#include <bmi2intrin.h> #include <bmi2intrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__LZCNT__) #if !defined(_MSC_VER) || __has_feature(modules) || defined(__LZCNT__)
#include <lzcntintrin.h> #include <lzcntintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__POPCNT__) #if !defined(_MSC_VER) || __has_feature(modules) || defined(__POPCNT__)
#include <popcntintrin.h> #include <popcntintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__FMA__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__FMA__)
#include <fmaintrin.h> #include <fmaintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__AVX512F__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__AVX512F__)
#include <avx512fintrin.h> #include <avx512fintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__AVX512VL__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__AVX512VL__)
#include <avx512vlintrin.h> #include <avx512vlintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__AVX512BW__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__AVX512BW__)
#include <avx512bwintrin.h> #include <avx512bwintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__AVX512BITALG__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__AVX512BITALG__)
#include <avx512bitalgintrin.h> #include <avx512bitalgintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__AVX512CD__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__AVX512CD__)
#include <avx512cdintrin.h> #include <avx512cdintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__AVX512VPOPCNTDQ__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__AVX512VPOPCNTDQ__)
#include <avx512vpopcntdqintrin.h> #include <avx512vpopcntdqintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || \ #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
(defined(__AVX512VL__) && defined(__AVX512VPOPCNTDQ__)) (defined(__AVX512VL__) && defined(__AVX512VPOPCNTDQ__))
#include <avx512vpopcntdqvlintrin.h> #include <avx512vpopcntdqvlintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__AVX512VNNI__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__AVX512VNNI__)
#include <avx512vnniintrin.h> #include <avx512vnniintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || \ #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
(defined(__AVX512VL__) && defined(__AVX512VNNI__)) (defined(__AVX512VL__) && defined(__AVX512VNNI__))
#include <avx512vlvnniintrin.h> #include <avx512vlvnniintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__AVX512DQ__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__AVX512DQ__)
#include <avx512dqintrin.h> #include <avx512dqintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || \ #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
(defined(__AVX512VL__) && defined(__AVX512BITALG__)) (defined(__AVX512VL__) && defined(__AVX512BITALG__))
#include <avx512vlbitalgintrin.h> #include <avx512vlbitalgintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || \ #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
(defined(__AVX512VL__) && defined(__AVX512BW__)) (defined(__AVX512VL__) && defined(__AVX512BW__))
#include <avx512vlbwintrin.h> #include <avx512vlbwintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || \ #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
(defined(__AVX512VL__) && defined(__AVX512CD__)) (defined(__AVX512VL__) && defined(__AVX512CD__))
#include <avx512vlcdintrin.h> #include <avx512vlcdintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || \ #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
(defined(__AVX512VL__) && defined(__AVX512DQ__)) (defined(__AVX512VL__) && defined(__AVX512DQ__))
#include <avx512vldqintrin.h> #include <avx512vldqintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__AVX512ER__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__AVX512ER__)
#include <avx512erintrin.h> #include <avx512erintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__AVX512IFMA__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__AVX512IFMA__)
#include <avx512ifmaintrin.h> #include <avx512ifmaintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || \ #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
(defined(__AVX512IFMA__) && defined(__AVX512VL__)) (defined(__AVX512IFMA__) && defined(__AVX512VL__))
#include <avx512ifmavlintrin.h> #include <avx512ifmavlintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__AVX512VBMI__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__AVX512VBMI__)
#include <avx512vbmiintrin.h> #include <avx512vbmiintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || \ #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
(defined(__AVX512VBMI__) && defined(__AVX512VL__)) (defined(__AVX512VBMI__) && defined(__AVX512VL__))
#include <avx512vbmivlintrin.h> #include <avx512vbmivlintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__AVX512VBMI2__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__AVX512VBMI2__)
#include <avx512vbmi2intrin.h> #include <avx512vbmi2intrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || \ #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
(defined(__AVX512VBMI2__) && defined(__AVX512VL__)) (defined(__AVX512VBMI2__) && defined(__AVX512VL__))
#include <avx512vlvbmi2intrin.h> #include <avx512vlvbmi2intrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__AVX512PF__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__AVX512PF__)
#include <avx512pfintrin.h> #include <avx512pfintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__AVX512BF16__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__AVX512BF16__)
#include <avx512bf16intrin.h> #include <avx512bf16intrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || \ #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
(defined(__AVX512VL__) && defined(__AVX512BF16__)) (defined(__AVX512VL__) && defined(__AVX512BF16__))
#include <avx512vlbf16intrin.h> #include <avx512vlbf16intrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__PKU__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__PKU__)
#include <pkuintrin.h> #include <pkuintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__VAES__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__VAES__)
#include <vaesintrin.h> #include <vaesintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__GFNI__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__GFNI__)
#include <gfniintrin.h> #include <gfniintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__RDPID__) #if !defined(_MSC_VER) || __has_feature(modules) || defined(__RDPID__)
/// Returns the value of the IA32_TSC_AUX MSR (0xc0000103). /// Returns the value of the IA32_TSC_AUX MSR (0xc0000103).
/// ///
/// \headerfile <immintrin.h> /// \headerfile <immintrin.h>
/// ///
▲ Show 20 Lines • Show All 133 Lines • ▼ Show 20 Lines_storebe_i64(void * __P, long long __D) {
struct __storeu_i64 { struct __storeu_i64 {
long long __v; long long __v;
} __attribute__((__packed__, __may_alias__)); } __attribute__((__packed__, __may_alias__));
((struct __storeu_i64*)__P)->__v = __builtin_bswap64(__D); ((struct __storeu_i64*)__P)->__v = __builtin_bswap64(__D);
} }
#endif #endif
#endif /* __MOVBE */ #endif /* __MOVBE */
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__RTM__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__RTM__)
#include <rtmintrin.h> #include <rtmintrin.h>
#include <xtestintrin.h> #include <xtestintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__SHA__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__SHA__)
#include <shaintrin.h> #include <shaintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__FXSR__) #if !defined(_MSC_VER) || __has_feature(modules) || defined(__FXSR__)
#include <fxsrintrin.h> #include <fxsrintrin.h>
#endif #endif
/* No feature check desired due to internal MSC_VER checks */ /* No feature check desired due to internal MSC_VER checks */
#include <xsaveintrin.h> #include <xsaveintrin.h>
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__XSAVEOPT__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__XSAVEOPT__)
#include <xsaveoptintrin.h> #include <xsaveoptintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__XSAVEC__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__XSAVEC__)
#include <xsavecintrin.h> #include <xsavecintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__XSAVES__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__XSAVES__)
#include <xsavesintrin.h> #include <xsavesintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__SHSTK__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __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__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__RDSEED__)
#include <rdseedintrin.h> #include <rdseedintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__WBNOINVD__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__WBNOINVD__)
#include <wbnoinvdintrin.h> #include <wbnoinvdintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__CLDEMOTE__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__CLDEMOTE__)
#include <cldemoteintrin.h> #include <cldemoteintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__WAITPKG__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__WAITPKG__)
#include <waitpkgintrin.h> #include <waitpkgintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || \ #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__MOVDIRI__) || defined(__MOVDIR64B__) defined(__MOVDIRI__) || defined(__MOVDIR64B__)
#include <movdirintrin.h> #include <movdirintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__PCONFIG__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__PCONFIG__)
#include <pconfigintrin.h> #include <pconfigintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__SGX__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__SGX__)
#include <sgxintrin.h> #include <sgxintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__PTWRITE__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__PTWRITE__)
#include <ptwriteintrin.h> #include <ptwriteintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__INVPCID__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__INVPCID__)
#include <invpcidintrin.h> #include <invpcidintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || \ #if !defined(_MSC_VER) || __has_feature(modules) || \
defined(__AVX512VP2INTERSECT__) defined(__AVX512VP2INTERSECT__)
#include <avx512vp2intersectintrin.h> #include <avx512vp2intersectintrin.h>
craig.topperUnsubmitted
Not Done
ReplyInline Actions

you don't need this one either

craig.topper: you don't need this one either
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || \ #if !defined(_MSC_VER) || __has_feature(modules) || \
(defined(__AVX512VL__) && defined(__AVX512VP2INTERSECT__)) (defined(__AVX512VL__) && defined(__AVX512VP2INTERSECT__))
#include <avx512vlvp2intersectintrin.h> #include <avx512vlvp2intersectintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__ENQCMD__) #if !defined(_MSC_VER) || __has_feature(modules) || defined(__ENQCMD__)
▲ Show 20 Lines • Show All 88 Lines • Show Last 20 Lines

clang/lib/Headers/x86intrin.h

Show All 32 Lines
#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) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__LWP__)
#include <lwpintrin.h> #include <lwpintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__MWAITX__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__MWAITX__)
#include <mwaitxintrin.h> #include <mwaitxintrin.h>
#endif #endif
#if !defined(_MSC_VER) || __has_feature(modules) || defined(__CLZERO__) #if !(defined(_MSC_VER) || defined(__ORBIS__)) || __has_feature(modules) || \
defined(__CLZERO__)
#include <clzerointrin.h> #include <clzerointrin.h>
#endif #endif
#endif /* __X86INTRIN_H */ #endif /* __X86INTRIN_H */