diff options
| author | Chad Rosier <mcrosier@apple.com> | 2011-12-16 21:40:31 +0000 |
|---|---|---|
| committer | Chad Rosier <mcrosier@apple.com> | 2011-12-16 21:40:31 +0000 |
| commit | b95ddf15e75a6ea27f10c410bbc7a82308b19f4b (patch) | |
| tree | 094fe48fa320b10173d18abdc5df3c2f71a2e417 | |
| parent | c5cda1121e270548ecf258d0ed72919a5211a94e (diff) | |
Fix vinsertf128_* AVX intrinsics to use "I" (ICE) markings. Fix avxintrin.h to
take them into account.
rdar://10590282
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@146758 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/clang/Basic/BuiltinsX86.def | 6 | ||||
| -rw-r--r-- | lib/Headers/avxintrin.h | 27 |
2 files changed, 15 insertions, 18 deletions
diff --git a/include/clang/Basic/BuiltinsX86.def b/include/clang/Basic/BuiltinsX86.def index 2eb8b09b47..1e1e8f6306 100644 --- a/include/clang/Basic/BuiltinsX86.def +++ b/include/clang/Basic/BuiltinsX86.def @@ -429,9 +429,9 @@ BUILTIN(__builtin_ia32_vpermilpd, "V2dV2dc", "") BUILTIN(__builtin_ia32_vpermilps, "V4fV4fc", "") BUILTIN(__builtin_ia32_vpermilpd256, "V4dV4dc", "") BUILTIN(__builtin_ia32_vpermilps256, "V8fV8fc", "") -BUILTIN(__builtin_ia32_vinsertf128_pd256, "V4dV4dV2dc", "") -BUILTIN(__builtin_ia32_vinsertf128_ps256, "V8fV8fV4fc", "") -BUILTIN(__builtin_ia32_vinsertf128_si256, "V8iV8iV4ic", "") +BUILTIN(__builtin_ia32_vinsertf128_pd256, "V4dV4dV2dIc", "") +BUILTIN(__builtin_ia32_vinsertf128_ps256, "V8fV8fV4fIc", "") +BUILTIN(__builtin_ia32_vinsertf128_si256, "V8iV8iV4iIc", "") BUILTIN(__builtin_ia32_sqrtpd256, "V4dV4d", "") BUILTIN(__builtin_ia32_sqrtps256, "V8fV8f", "") BUILTIN(__builtin_ia32_rsqrtps256, "V8fV8f", "") diff --git a/lib/Headers/avxintrin.h b/lib/Headers/avxintrin.h index 3ae5dc76fc..4c7c4ced91 100644 --- a/lib/Headers/avxintrin.h +++ b/lib/Headers/avxintrin.h @@ -463,23 +463,20 @@ _mm256_extract_epi64(__m256i a, const int imm) #endif /* Vector insert */ -static __inline __m256d __attribute__((__always_inline__, __nodebug__)) -_mm256_insertf128_pd(__m256d a, __m128d b, const int o) -{ - return (__m256d)__builtin_ia32_vinsertf128_pd256((__v4df)a, (__v2df)b, o); -} +#define _mm256_insertf128_pd(V1, V2, O) __extension__ ({ \ + __m256d __V1 = (V1); \ + __m128d __V2 = (V2); \ + (__m256d)__builtin_ia32_vinsertf128_pd256((__v4df)__V1, (__v2df)__V2, O); }) -static __inline __m256 __attribute__((__always_inline__, __nodebug__)) -_mm256_insertf128_ps(__m256 a, __m128 b, const int o) -{ - return (__m256)__builtin_ia32_vinsertf128_ps256((__v8sf)a, (__v4sf)b, o); -} +#define _mm256_insertf128_ps(V1, V2, O) __extension__ ({ \ + __m256 __V1 = (V1); \ + __m128 __V2 = (V2); \ + (__m256)__builtin_ia32_vinsertf128_ps256((__v8sf)__V1, (__v4sf)__V2, O); }) -static __inline __m256i __attribute__((__always_inline__, __nodebug__)) -_mm256_insertf128_si256(__m256i a, __m128i b, const int o) -{ - return (__m256i)__builtin_ia32_vinsertf128_si256((__v8si)a, (__v4si)b, o); -} +#define _mm256_insertf128_si256(V1, V2, O) __extension__ ({ \ + __m256i __V1 = (V1); \ + __m128i __V2 = (V2); \ + (__m256i)__builtin_ia32_vinsertf128_si256((__v8si)__V1, (__v4si)__V2, O); }) static __inline __m256i __attribute__((__always_inline__, __nodebug__)) _mm256_insert_epi32(__m256i a, int b, int const imm) |