Author: ctopper Date: Fri Mar 31 12:22:30 2017 New Revision: 299233 URL: http://llvm.org/viewvc/llvm-project?rev=299233&view=rev Log: [Sema][X86] Update immediate check for gather/scatter prefetch instructions to match the _MM_HINT_T0/T1 constant definitions
Our _MM_HINT_T0/T1 constant values are 3/2 which matches gcc, but not icc or Intel documentation. Interestingly gcc had this same bug on their implementation of the gather/scatter builtins at one point too. Fixes PR32411. Modified: cfe/trunk/lib/Sema/SemaChecking.cpp cfe/trunk/test/CodeGen/avx512pf-builtins.c cfe/trunk/test/Sema/builtins-x86.c Modified: cfe/trunk/lib/Sema/SemaChecking.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaChecking.cpp?rev=299233&r1=299232&r2=299233&view=diff ============================================================================== --- cfe/trunk/lib/Sema/SemaChecking.cpp (original) +++ cfe/trunk/lib/Sema/SemaChecking.cpp Fri Mar 31 12:22:30 2017 @@ -2308,7 +2308,7 @@ bool Sema::CheckX86BuiltinFunctionCall(u case X86::BI__builtin_ia32_scatterpfdps: case X86::BI__builtin_ia32_scatterpfqpd: case X86::BI__builtin_ia32_scatterpfqps: - i = 4; l = 1; u = 2; + i = 4; l = 2; u = 3; break; case X86::BI__builtin_ia32_pcmpestrm128: case X86::BI__builtin_ia32_pcmpestri128: Modified: cfe/trunk/test/CodeGen/avx512pf-builtins.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/avx512pf-builtins.c?rev=299233&r1=299232&r2=299233&view=diff ============================================================================== --- cfe/trunk/test/CodeGen/avx512pf-builtins.c (original) +++ cfe/trunk/test/CodeGen/avx512pf-builtins.c Fri Mar 31 12:22:30 2017 @@ -6,95 +6,95 @@ void test_mm512_mask_prefetch_i32gather_pd(__m256i index, __mmask8 mask, void const *addr, int hint) { // CHECK-LABEL: @test_mm512_mask_prefetch_i32gather_pd // CHECK: @llvm.x86.avx512.gatherpf.dpd - return _mm512_mask_prefetch_i32gather_pd(index, mask, addr, 2, 1); + return _mm512_mask_prefetch_i32gather_pd(index, mask, addr, 2, _MM_HINT_T0); } void test_mm512_prefetch_i32gather_pd(__m256i index, void const *addr, int hint) { // CHECK-LABEL: @test_mm512_prefetch_i32gather_pd // CHECK: @llvm.x86.avx512.gatherpf.dpd - return _mm512_prefetch_i32gather_pd(index, addr, 2, 1); + return _mm512_prefetch_i32gather_pd(index, addr, 2, _MM_HINT_T0); } void test_mm512_mask_prefetch_i32gather_ps(__m512i index, __mmask16 mask, void const *addr, int hint) { // CHECK-LABEL: @test_mm512_mask_prefetch_i32gather_ps // CHECK: @llvm.x86.avx512.gatherpf.dps - return _mm512_mask_prefetch_i32gather_ps(index, mask, addr, 2, 1); + return _mm512_mask_prefetch_i32gather_ps(index, mask, addr, 2, _MM_HINT_T0); } void test_mm512_prefetch_i32gather_ps(__m512i index, void const *addr, int hint) { // CHECK-LABEL: @test_mm512_prefetch_i32gather_ps // CHECK: @llvm.x86.avx512.gatherpf.dps - return _mm512_prefetch_i32gather_ps(index, addr, 2, 1); + return _mm512_prefetch_i32gather_ps(index, addr, 2, _MM_HINT_T0); } void test_mm512_mask_prefetch_i64gather_pd(__m512i index, __mmask8 mask, void const *addr, int hint) { // CHECK-LABEL: @test_mm512_mask_prefetch_i64gather_pd // CHECK: @llvm.x86.avx512.gatherpf.qpd - return _mm512_mask_prefetch_i64gather_pd(index, mask, addr, 2, 1); + return _mm512_mask_prefetch_i64gather_pd(index, mask, addr, 2, _MM_HINT_T0); } void test_mm512_prefetch_i64gather_pd(__m512i index, void const *addr, int hint) { // CHECK-LABEL: @test_mm512_prefetch_i64gather_pd // CHECK: @llvm.x86.avx512.gatherpf.qpd - return _mm512_prefetch_i64gather_pd(index, addr, 2, 1); + return _mm512_prefetch_i64gather_pd(index, addr, 2, _MM_HINT_T0); } void test_mm512_mask_prefetch_i64gather_ps(__m512i index, __mmask8 mask, void const *addr, int hint) { // CHECK-LABEL: @test_mm512_mask_prefetch_i64gather_ps // CHECK: @llvm.x86.avx512.gatherpf.qps - return _mm512_mask_prefetch_i64gather_ps(index, mask, addr, 2, 1); + return _mm512_mask_prefetch_i64gather_ps(index, mask, addr, 2, _MM_HINT_T0); } void test_mm512_prefetch_i64gather_ps(__m512i index, void const *addr, int hint) { // CHECK-LABEL: @test_mm512_prefetch_i64gather_ps // CHECK: @llvm.x86.avx512.gatherpf.qps - return _mm512_prefetch_i64gather_ps(index, addr, 2, 1); + return _mm512_prefetch_i64gather_ps(index, addr, 2, _MM_HINT_T0); } void test_mm512_prefetch_i32scatter_pd(void *addr, __m256i index) { // CHECK-LABEL: @test_mm512_prefetch_i32scatter_pd // CHECK: @llvm.x86.avx512.scatterpf.dpd.512 - return _mm512_prefetch_i32scatter_pd(addr, index, 1, 2); + return _mm512_prefetch_i32scatter_pd(addr, index, 1, _MM_HINT_T1); } void test_mm512_mask_prefetch_i32scatter_pd(void *addr, __mmask8 mask, __m256i index) { // CHECK-LABEL: @test_mm512_mask_prefetch_i32scatter_pd // CHECK: @llvm.x86.avx512.scatterpf.dpd.512 - return _mm512_mask_prefetch_i32scatter_pd(addr, mask, index, 1, 2); + return _mm512_mask_prefetch_i32scatter_pd(addr, mask, index, 1, _MM_HINT_T1); } void test_mm512_prefetch_i32scatter_ps(void *addr, __m512i index) { // CHECK-LABEL: @test_mm512_prefetch_i32scatter_ps // CHECK: @llvm.x86.avx512.scatterpf.dps.512 - return _mm512_prefetch_i32scatter_ps(addr, index, 1, 2); + return _mm512_prefetch_i32scatter_ps(addr, index, 1, _MM_HINT_T1); } void test_mm512_mask_prefetch_i32scatter_ps(void *addr, __mmask16 mask, __m512i index) { // CHECK-LABEL: @test_mm512_mask_prefetch_i32scatter_ps // CHECK: @llvm.x86.avx512.scatterpf.dps.512 - return _mm512_mask_prefetch_i32scatter_ps(addr, mask, index, 1, 2); + return _mm512_mask_prefetch_i32scatter_ps(addr, mask, index, 1, _MM_HINT_T1); } void test_mm512_prefetch_i64scatter_pd(void *addr, __m512i index) { // CHECK-LABEL: @test_mm512_prefetch_i64scatter_pd // CHECK: @llvm.x86.avx512.scatterpf.qpd.512 - return _mm512_prefetch_i64scatter_pd(addr, index, 1, 2); + return _mm512_prefetch_i64scatter_pd(addr, index, 1, _MM_HINT_T1); } void test_mm512_mask_prefetch_i64scatter_pd(void *addr, __mmask16 mask, __m512i index) { // CHECK-LABEL: @test_mm512_mask_prefetch_i64scatter_pd // CHECK: @llvm.x86.avx512.scatterpf.qpd.512 - return _mm512_mask_prefetch_i64scatter_pd(addr, mask, index, 1, 2); + return _mm512_mask_prefetch_i64scatter_pd(addr, mask, index, 1, _MM_HINT_T1); } void test_mm512_prefetch_i64scatter_ps(void *addr, __m512i index) { // CHECK-LABEL: @test_mm512_prefetch_i64scatter_ps // CHECK: @llvm.x86.avx512.scatterpf.qps.512 - return _mm512_prefetch_i64scatter_ps(addr, index, 1, 2); + return _mm512_prefetch_i64scatter_ps(addr, index, 1, _MM_HINT_T1); } void test_mm512_mask_prefetch_i64scatter_ps(void *addr, __mmask16 mask, __m512i index) { // CHECK-LABEL: @test_mm512_mask_prefetch_i64scatter_ps // CHECK: @llvm.x86.avx512.scatterpf.qps.512 - return _mm512_mask_prefetch_i64scatter_ps(addr, mask, index, 1, 2); + return _mm512_mask_prefetch_i64scatter_ps(addr, mask, index, 1, _MM_HINT_T1); } Modified: cfe/trunk/test/Sema/builtins-x86.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/builtins-x86.c?rev=299233&r1=299232&r2=299233&view=diff ============================================================================== --- cfe/trunk/test/Sema/builtins-x86.c (original) +++ cfe/trunk/test/Sema/builtins-x86.c Fri Mar 31 12:22:30 2017 @@ -80,6 +80,6 @@ __m512i _mm512_mask_prefetch_i32gather_p } __m512 _mm512_mask_prefetch_i32gather_ps_2(__m512i index, __mmask16 mask, int const *addr) { - return __builtin_ia32_gatherpfdps(mask, index, addr, 1, 3); // expected-error {{argument should be a value from 1 to 2}} + return __builtin_ia32_gatherpfdps(mask, index, addr, 1, 1); // expected-error {{argument should be a value from 2 to 3}} } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits