Index: clang/include/clang/Basic/BuiltinsX86.def =================================================================== --- clang/include/clang/Basic/BuiltinsX86.def +++ clang/include/clang/Basic/BuiltinsX86.def @@ -261,6 +261,7 @@ TARGET_BUILTIN(__builtin_ia32_packssdw128, "V8sV4iV4i", "ncV:128:", "sse2") TARGET_BUILTIN(__builtin_ia32_packuswb128, "V16cV8sV8s", "ncV:128:", "sse2") TARGET_BUILTIN(__builtin_ia32_pmulhuw128, "V8sV8sV8s", "ncV:128:", "sse2") +TARGET_BUILTIN(__builtin_ia32_vec_ext_v2di, "OiV2OiIi", "ncV:128:", "sse2") TARGET_BUILTIN(__builtin_ia32_vec_ext_v4si, "iV4iIi", "ncV:128:", "sse2") TARGET_BUILTIN(__builtin_ia32_vec_ext_v4sf, "fV4fIi", "ncV:128:", "sse2") TARGET_BUILTIN(__builtin_ia32_vec_ext_v8hi, "sV8sIi", "ncV:128:", "sse2") Index: clang/include/clang/Basic/BuiltinsX86_64.def =================================================================== --- clang/include/clang/Basic/BuiltinsX86_64.def +++ clang/include/clang/Basic/BuiltinsX86_64.def @@ -42,7 +42,6 @@ TARGET_BUILTIN(__builtin_ia32_cvtsd2si64, "OiV2d", "ncV:128:", "sse2") TARGET_BUILTIN(__builtin_ia32_cvttsd2si64, "OiV2d", "ncV:128:", "sse2") TARGET_BUILTIN(__builtin_ia32_movnti64, "vOi*Oi", "n", "sse2") -TARGET_BUILTIN(__builtin_ia32_vec_ext_v2di, "OiV2OiIi", "ncV:128:", "sse2") TARGET_BUILTIN(__builtin_ia32_vec_set_v2di, "V2OiV2OiOiIi", "ncV:128:", "sse4.1") TARGET_BUILTIN(__builtin_ia32_crc32di, "UOiUOiUOi", "nc", "crc32") TARGET_BUILTIN(__builtin_ia32_vec_ext_v4di, "OiV4OiIi", "ncV:256:", "avx") Index: clang/lib/Headers/emmintrin.h =================================================================== --- clang/lib/Headers/emmintrin.h +++ clang/lib/Headers/emmintrin.h @@ -3467,13 +3467,13 @@ return __extension__ (__m128i)(__v4si){ __a, 0, 0, 0 }; } -#ifdef __x86_64__ /// Returns a vector of [2 x i64] where the lower element is the input /// operand and the upper element is zero. /// /// \headerfile /// -/// This intrinsic corresponds to the VMOVQ / MOVQ instruction. +/// This intrinsic corresponds to the VMOVQ / MOVQ instruction +/// in 64 bits. /// /// \param __a /// A 64-bit signed integer operand containing the value to be converted. @@ -3483,7 +3483,6 @@ { return __extension__ (__m128i)(__v2di){ __a, 0 }; } -#endif /// Moves the least significant 32 bits of a vector of [4 x i32] to a /// 32-bit signed integer value. @@ -3503,7 +3502,6 @@ return __b[0]; } -#ifdef __x86_64__ /// Moves the least significant 64 bits of a vector of [2 x i64] to a /// 64-bit signed integer value. /// @@ -3520,7 +3518,6 @@ { return __a[0]; } -#endif /// Moves packed integer values from an aligned 128-bit memory location /// to elements in a 128-bit integer vector. Index: clang/lib/Headers/smmintrin.h =================================================================== --- clang/lib/Headers/smmintrin.h +++ clang/lib/Headers/smmintrin.h @@ -1061,7 +1061,6 @@ #define _mm_extract_epi32(X, N) \ ((int)__builtin_ia32_vec_ext_v4si((__v4si)(__m128i)(X), (int)(N))) -#ifdef __x86_64__ /// Extracts a 64-bit element from the 128-bit integer vector of /// [2 x i64], using the immediate value parameter \a N as a selector. /// @@ -1071,7 +1070,8 @@ /// long long _mm_extract_epi64(__m128i X, const int N); /// \endcode /// -/// This intrinsic corresponds to the VPEXTRQ / PEXTRQ instruction. +/// This intrinsic corresponds to the VPEXTRQ / PEXTRQ instruction +/// in 64-bit target. /// /// \param X /// A 128-bit integer vector. @@ -1083,7 +1083,6 @@ /// \returns A 64-bit integer. #define _mm_extract_epi64(X, N) \ ((long long)__builtin_ia32_vec_ext_v2di((__v2di)(__m128i)(X), (int)(N))) -#endif /* __x86_64 */ /* SSE4 128-bit Packed Integer Comparisons. */ /// Tests whether the specified bits in a 128-bit integer vector are all Index: clang/test/CodeGen/X86/sse2-builtins.c =================================================================== --- clang/test/CodeGen/X86/sse2-builtins.c +++ clang/test/CodeGen/X86/sse2-builtins.c @@ -1,7 +1,7 @@ // RUN: %clang_cc1 -no-opaque-pointers -flax-vector-conversions=none -ffreestanding %s -triple=x86_64-apple-darwin -target-feature +sse2 -emit-llvm -o - -Wall -Werror | FileCheck %s // RUN: %clang_cc1 -no-opaque-pointers -flax-vector-conversions=none -ffreestanding %s -triple=x86_64-apple-darwin -target-feature +sse2 -fno-signed-char -emit-llvm -o - -Wall -Werror | FileCheck %s // RUN: %clang_cc1 -no-opaque-pointers -flax-vector-conversions=none -fms-extensions -fms-compatibility -ffreestanding %s -triple=x86_64-windows-msvc -target-feature +sse2 -emit-llvm -o - -Wall -Werror | FileCheck %s - +// RUN: %clang_cc1 -no-opaque-pointers -flax-vector-conversions=none -ffreestanding %s -triple=i386-apple-darwin -target-feature +sse2 -emit-llvm -o - -Wall -Werror | FileCheck %s --check-prefix=X86 #include @@ -520,13 +520,13 @@ return _mm_cvtsi128_si32(A); } -#ifdef __x86_64__ long long test_mm_cvtsi128_si64(__m128i A) { // CHECK-LABEL: test_mm_cvtsi128_si64 // CHECK: extractelement <2 x i64> %{{.*}}, i32 0 + // X86-LABEL: test_mm_cvtsi128_si64 + // X86: extractelement <2 x i64> %{{.*}}, i32 0 return _mm_cvtsi128_si64(A); } -#endif __m128d test_mm_cvtsi32_sd(__m128d A, int B) { // CHECK-LABEL: test_mm_cvtsi32_sd @@ -551,14 +551,17 @@ // CHECK: insertelement <2 x double> %{{.*}}, double %{{.*}}, i32 0 return _mm_cvtsi64_sd(A, B); } +#endif __m128i test_mm_cvtsi64_si128(long long A) { // CHECK-LABEL: test_mm_cvtsi64_si128 // CHECK: insertelement <2 x i64> undef, i64 %{{.*}}, i32 0 // CHECK: insertelement <2 x i64> %{{.*}}, i64 0, i32 1 + // X86-LABEL: test_mm_cvtsi64_si128 + // X86: insertelement <2 x i64> undef, i64 %{{.*}}, i32 0 + // X86: insertelement <2 x i64> %{{.*}}, i64 0, i32 1 return _mm_cvtsi64_si128(A); } -#endif __m128d test_mm_cvtss_sd(__m128d A, __m128 B) { // CHECK-LABEL: test_mm_cvtss_sd Index: clang/test/CodeGen/X86/sse41-builtins.c =================================================================== --- clang/test/CodeGen/X86/sse41-builtins.c +++ clang/test/CodeGen/X86/sse41-builtins.c @@ -1,6 +1,6 @@ // RUN: %clang_cc1 -no-opaque-pointers -flax-vector-conversions=none -ffreestanding %s -triple=x86_64-apple-darwin -target-feature +sse4.1 -emit-llvm -o - -Wall -Werror | FileCheck %s // RUN: %clang_cc1 -no-opaque-pointers -flax-vector-conversions=none -ffreestanding %s -triple=x86_64-apple-darwin -target-feature +sse4.1 -fno-signed-char -emit-llvm -o - -Wall -Werror | FileCheck %s - +// RUN: %clang_cc1 -no-opaque-pointers -flax-vector-conversions=none -ffreestanding %s -triple=i386-apple-darwin -target-feature +sse4.1 -fno-signed-char -emit-llvm -o - -Wall -Werror | FileCheck %s --check-prefix=X86 #include @@ -182,13 +182,13 @@ return _mm_extract_epi32(x, 1); } -#ifdef __x86_64__ long long test_mm_extract_epi64(__m128i x) { // CHECK-LABEL: test_mm_extract_epi64 // CHECK: extractelement <2 x i64> %{{.*}}, {{i32|i64}} 1 + // X86-LABEL: test_mm_extract_epi64 + // X86: extractelement <2 x i64> %{{.*}}, {{i32|i64}} 1 return _mm_extract_epi64(x, 1); } -#endif int test_mm_extract_ps(__m128 x) { // CHECK-LABEL: test_mm_extract_ps