On 20 Feb 17:23, Uros Bizjak wrote: > On Thu, Feb 20, 2014 at 4:39 PM, Ilya Tocar <tocarip.in...@gmail.com> wrote: > > > Latest version of AVX512 spec > > http://download-software.intel.com/sites/default/files/managed/50/1a/319433-018.pdf > > Has a few changes. > > 2)Currently for scatter/gather prefetches intrinsics we accept 1 as > > possible hint parameter. This is consistent with ICC. However as > > GCC defines _MM_HINT_T0 to 3 and not to 1 as ICC > > (see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56603), gather prefethces > > are inconsistent with normal prefetches as they won't accept _MM_HINT_T0 as > > hint. We can either change gather prefetches to accept 1 instead of 3 and > > hope that everyone will use _MM_HINT_T0 and not the raw value, or we can > > change _MM_HINT_T0 to be consistent with ICC. What solution do you > > prefer? > > Builtins, including __builtin_prefetch, are considered as internal > implementation detail, so we can pass to them wharever we like. The > published interface is in *.h files, and this includes _MM_HINT_T0. > For now, I suggest to change prefetches, so they will accept > _MM_HINT_T0, as this is the least invasive change. > Patch bellow changes prefetches to accept 3 (_MM_HINT_T0), and replaces all hint's values in tests with corresponding _MM_HINT. Testing passes. Ok for trunk?
ChangeLog: 2014-02-25 Ilya Tocar <ilya.to...@intel.com> * common/config/i386/predicates.md (const1256_operand): Remove. (const2356_operand): New. (const_1_to_2_operand): Remove. * config/i386/sse.md (avx512pf_gatherpf<mode>sf): Change hint value. (*avx512pf_gatherpf<mode>sf_mask): Ditto. (*avx512pf_gatherpf<mode>sf): Ditto. (avx512pf_gatherpf<mode>df): Ditto. (*avx512pf_gatherpf<mode>df_mask): Ditto. (*avx512pf_gatherpf<mode>df): Ditto. (avx512pf_scatterpf<mode>sf): Ditto. (*avx512pf_scatterpf<mode>sf_mask): Ditto. (*avx512pf_scatterpf<mode>sf): Ditto. (avx512pf_scatterpf<mode>df): Ditto. (*avx512pf_scatterpf<mode>df_mask): Ditto. (*avx512pf_scatterpf<mode>df): Ditto. * common/config/i386/xmmintrin.h (_mm_hint): Add _MM_HINT_ET0. And for tests: 2014-02-25 Ilya Tocar <ilya.to...@intel.com> * gcc.target/i386/avx-1.c: Use _MM_HINT_T0 in __builtin_ia32_gatherpfdps, __builtin_ia32_gatherpfqps, __builtin_ia32_scatterpfdps, __builtin_ia32_scatterpfqps, __builtin_ia32_gatherpfdpd, __builtin_ia32_gatherpfqpd, __builtin_ia32_scatterpfdpd, __builtin_ia32_scatterpfqpd. * gcc.target/i386/avx512pf-vgatherpf0dpd-1.c: Use enum values instead of raw ints. * gcc.target/i386/avx512pf-vgatherpf0dps-1.c: Ditto. * gcc.target/i386/avx512pf-vgatherpf0qpd-1.c: Ditto. * gcc.target/i386/avx512pf-vgatherpf0qps-1.c: Ditto. * gcc.target/i386/avx512pf-vgatherpf1dpd-1.c: Ditto. * gcc.target/i386/avx512pf-vgatherpf1dps-1.c: Ditto. * gcc.target/i386/avx512pf-vgatherpf1qpd-1.c: Ditto. * gcc.target/i386/avx512pf-vgatherpf1qps-1.c: Ditto. * gcc.target/i386/avx512pf-vscatterpf0dpd-1.c: Ditto. * gcc.target/i386/avx512pf-vscatterpf0qpd-1.c: Ditto. * gcc.target/i386/avx512pf-vscatterpf1dpd-1.c: Ditto. * gcc.target/i386/avx512pf-vscatterpf1qpd-1.c: Ditto. * gcc.target/i386/avx512pf-vscatterpf0dps-1.c: Ditto. * gcc.target/i386/avx512pf-vscatterpf0qps-1.c: Ditto. * gcc.target/i386/avx512pf-vscatterpf1dps-1.c: Ditto. * gcc.target/i386/avx512pf-vscatterpf1qps-1.c: Ditto. * gcc.target/i386/sse-14.c: Ditto. * gcc.target/i386/sse-22.c: Ditto. * gcc.target/i386/sse-23.c: Ditto. --- gcc/config/i386/predicates.md | 11 ++---- gcc/config/i386/sse.md | 40 +++++++++++----------- gcc/config/i386/xmmintrin.h | 1 + gcc/testsuite/gcc.target/i386/avx-1.c | 16 ++++----- .../gcc.target/i386/avx512pf-vgatherpf0dpd-1.c | 2 +- .../gcc.target/i386/avx512pf-vgatherpf0dps-1.c | 2 +- .../gcc.target/i386/avx512pf-vgatherpf0qpd-1.c | 2 +- .../gcc.target/i386/avx512pf-vgatherpf0qps-1.c | 2 +- .../gcc.target/i386/avx512pf-vgatherpf1dpd-1.c | 2 +- .../gcc.target/i386/avx512pf-vgatherpf1dps-1.c | 2 +- .../gcc.target/i386/avx512pf-vgatherpf1qpd-1.c | 2 +- .../gcc.target/i386/avx512pf-vgatherpf1qps-1.c | 2 +- .../gcc.target/i386/avx512pf-vscatterpf0dpd-1.c | 4 +-- .../gcc.target/i386/avx512pf-vscatterpf0dps-1.c | 4 +-- .../gcc.target/i386/avx512pf-vscatterpf0qpd-1.c | 4 +-- .../gcc.target/i386/avx512pf-vscatterpf0qps-1.c | 4 +-- .../gcc.target/i386/avx512pf-vscatterpf1dpd-1.c | 4 +-- .../gcc.target/i386/avx512pf-vscatterpf1dps-1.c | 4 +-- .../gcc.target/i386/avx512pf-vscatterpf1qpd-1.c | 4 +-- .../gcc.target/i386/avx512pf-vscatterpf1qps-1.c | 4 +-- gcc/testsuite/gcc.target/i386/sse-14.c | 16 ++++----- gcc/testsuite/gcc.target/i386/sse-22.c | 18 +++++----- gcc/testsuite/gcc.target/i386/sse-23.c | 16 ++++----- 23 files changed, 81 insertions(+), 85 deletions(-) diff --git a/gcc/config/i386/predicates.md b/gcc/config/i386/predicates.md index 3f53e2d..70418f4 100644 --- a/gcc/config/i386/predicates.md +++ b/gcc/config/i386/predicates.md @@ -660,12 +660,12 @@ return i == 2 || i == 4 || i == 8; }) -;; Match 1, 2, 5, or 6 -(define_predicate "const1256_operand" +;; Match 2, 3, 5, or 6 +(define_predicate "const2356_operand" (match_code "const_int") { HOST_WIDE_INT i = INTVAL (op); - return i == 1 || i == 2 || i == 5 || i == 6; + return i == 2 || i == 3 || i == 5 || i == 6; }) ;; Match 1, 2, 4, or 8 @@ -754,11 +754,6 @@ return val <= 255*8 && val % 8 == 0; }) -;; Match 1 to 2. -(define_predicate "const_1_to_2_operand" - (and (match_code "const_int") - (match_test "IN_RANGE (INTVAL (op), 1, 2)"))) - ;; Return true if OP is CONST_INT >= 1 and <= 31 (a valid operand ;; for shift & compare patterns, as shifting by 0 does not change flags). (define_predicate "const_1_to_31_operand" diff --git a/gcc/config/i386/sse.md b/gcc/config/i386/sse.md index 487c917..d52fc3f 100644 --- a/gcc/config/i386/sse.md +++ b/gcc/config/i386/sse.md @@ -12508,7 +12508,7 @@ [(match_operand 2 "vsib_address_operand") (match_operand:VI48_512 1 "register_operand") (match_operand:SI 3 "const1248_operand")])) - (match_operand:SI 4 "const_1_to_2_operand")] + (match_operand:SI 4 "const_2_to_3_operand")] UNSPEC_GATHER_PREFETCH)] "TARGET_AVX512PF" { @@ -12526,13 +12526,13 @@ (match_operand:VI48_512 1 "register_operand" "v") (match_operand:SI 3 "const1248_operand" "n")] UNSPEC_VSIBADDR)]) - (match_operand:SI 4 "const_1_to_2_operand" "n")] + (match_operand:SI 4 "const_2_to_3_operand" "n")] UNSPEC_GATHER_PREFETCH)] "TARGET_AVX512PF" { switch (INTVAL (operands[4])) { - case 1: + case 3: return "vgatherpf0<ssemodesuffix>ps\t{%5%{%0%}|%5%{%0%}}"; case 2: return "vgatherpf1<ssemodesuffix>ps\t{%5%{%0%}|%5%{%0%}}"; @@ -12553,13 +12553,13 @@ (match_operand:VI48_512 0 "register_operand" "v") (match_operand:SI 2 "const1248_operand" "n")] UNSPEC_VSIBADDR)]) - (match_operand:SI 3 "const_1_to_2_operand" "n")] + (match_operand:SI 3 "const_2_to_3_operand" "n")] UNSPEC_GATHER_PREFETCH)] "TARGET_AVX512PF" { switch (INTVAL (operands[3])) { - case 1: + case 3: return "vgatherpf0<ssemodesuffix>ps\t{%4|%4}"; case 2: return "vgatherpf1<ssemodesuffix>ps\t{%4|%4}"; @@ -12580,7 +12580,7 @@ [(match_operand 2 "vsib_address_operand") (match_operand:VI4_256_8_512 1 "register_operand") (match_operand:SI 3 "const1248_operand")])) - (match_operand:SI 4 "const_1_to_2_operand")] + (match_operand:SI 4 "const_2_to_3_operand")] UNSPEC_GATHER_PREFETCH)] "TARGET_AVX512PF" { @@ -12598,13 +12598,13 @@ (match_operand:VI4_256_8_512 1 "register_operand" "v") (match_operand:SI 3 "const1248_operand" "n")] UNSPEC_VSIBADDR)]) - (match_operand:SI 4 "const_1_to_2_operand" "n")] + (match_operand:SI 4 "const_2_to_3_operand" "n")] UNSPEC_GATHER_PREFETCH)] "TARGET_AVX512PF" { switch (INTVAL (operands[4])) { - case 1: + case 3: return "vgatherpf0<ssemodesuffix>pd\t{%5%{%0%}|%5%{%0%}}"; case 2: return "vgatherpf1<ssemodesuffix>pd\t{%5%{%0%}|%5%{%0%}}"; @@ -12625,13 +12625,13 @@ (match_operand:VI4_256_8_512 0 "register_operand" "v") (match_operand:SI 2 "const1248_operand" "n")] UNSPEC_VSIBADDR)]) - (match_operand:SI 3 "const_1_to_2_operand" "n")] + (match_operand:SI 3 "const_2_to_3_operand" "n")] UNSPEC_GATHER_PREFETCH)] "TARGET_AVX512PF" { switch (INTVAL (operands[3])) { - case 1: + case 3: return "vgatherpf0<ssemodesuffix>pd\t{%4|%4}"; case 2: return "vgatherpf1<ssemodesuffix>pd\t{%4|%4}"; @@ -12652,7 +12652,7 @@ [(match_operand 2 "vsib_address_operand") (match_operand:VI48_512 1 "register_operand") (match_operand:SI 3 "const1248_operand")])) - (match_operand:SI 4 "const1256_operand")] + (match_operand:SI 4 "const2356_operand")] UNSPEC_SCATTER_PREFETCH)] "TARGET_AVX512PF" { @@ -12670,13 +12670,13 @@ (match_operand:VI48_512 1 "register_operand" "v") (match_operand:SI 3 "const1248_operand" "n")] UNSPEC_VSIBADDR)]) - (match_operand:SI 4 "const1256_operand" "n")] + (match_operand:SI 4 "const2356_operand" "n")] UNSPEC_SCATTER_PREFETCH)] "TARGET_AVX512PF" { switch (INTVAL (operands[4])) { - case 1: + case 3: case 5: return "vscatterpf0<ssemodesuffix>ps\t{%5%{%0%}|%5%{%0%}}"; case 2: @@ -12699,13 +12699,13 @@ (match_operand:VI48_512 0 "register_operand" "v") (match_operand:SI 2 "const1248_operand" "n")] UNSPEC_VSIBADDR)]) - (match_operand:SI 3 "const1256_operand" "n")] + (match_operand:SI 3 "const2356_operand" "n")] UNSPEC_SCATTER_PREFETCH)] "TARGET_AVX512PF" { switch (INTVAL (operands[3])) { - case 1: + case 3: case 5: return "vscatterpf0<ssemodesuffix>ps\t{%4|%4}"; case 2: @@ -12728,7 +12728,7 @@ [(match_operand 2 "vsib_address_operand") (match_operand:VI4_256_8_512 1 "register_operand") (match_operand:SI 3 "const1248_operand")])) - (match_operand:SI 4 "const1256_operand")] + (match_operand:SI 4 "const2356_operand")] UNSPEC_SCATTER_PREFETCH)] "TARGET_AVX512PF" { @@ -12746,13 +12746,13 @@ (match_operand:VI4_256_8_512 1 "register_operand" "v") (match_operand:SI 3 "const1248_operand" "n")] UNSPEC_VSIBADDR)]) - (match_operand:SI 4 "const1256_operand" "n")] + (match_operand:SI 4 "const2356_operand" "n")] UNSPEC_SCATTER_PREFETCH)] "TARGET_AVX512PF" { switch (INTVAL (operands[4])) { - case 1: + case 3: case 5: return "vscatterpf0<ssemodesuffix>pd\t{%5%{%0%}|%5%{%0%}}"; case 2: @@ -12775,13 +12775,13 @@ (match_operand:VI4_256_8_512 0 "register_operand" "v") (match_operand:SI 2 "const1248_operand" "n")] UNSPEC_VSIBADDR)]) - (match_operand:SI 3 "const1256_operand" "n")] + (match_operand:SI 3 "const2356_operand" "n")] UNSPEC_SCATTER_PREFETCH)] "TARGET_AVX512PF" { switch (INTVAL (operands[3])) { - case 1: + case 3: case 5: return "vscatterpf0<ssemodesuffix>pd\t{%4|%4}"; case 2: diff --git a/gcc/config/i386/xmmintrin.h b/gcc/config/i386/xmmintrin.h index 9cefa2c..619aa14 100644 --- a/gcc/config/i386/xmmintrin.h +++ b/gcc/config/i386/xmmintrin.h @@ -55,6 +55,7 @@ enum _mm_hint { /* _MM_HINT_ET is _MM_HINT_T with set 3rd bit. */ _MM_HINT_ET1 = 6, + _MM_HINT_ET0 = 5, _MM_HINT_T0 = 3, _MM_HINT_T1 = 2, _MM_HINT_T2 = 1, diff --git a/gcc/testsuite/gcc.target/i386/avx-1.c b/gcc/testsuite/gcc.target/i386/avx-1.c index 12cfc68..8f28921 100644 --- a/gcc/testsuite/gcc.target/i386/avx-1.c +++ b/gcc/testsuite/gcc.target/i386/avx-1.c @@ -358,14 +358,14 @@ #define __builtin_ia32_rsqrt28sd_round(A, B, C) __builtin_ia32_rsqrt28sd_round(A, B, 8) /* avx512pfintrin.h */ -#define __builtin_ia32_gatherpfdps(A, B, C, D, E) __builtin_ia32_gatherpfdps(A, B, C, 1, 1) -#define __builtin_ia32_gatherpfqps(A, B, C, D, E) __builtin_ia32_gatherpfqps(A, B, C, 1, 1) -#define __builtin_ia32_scatterpfdps(A, B, C, D, E) __builtin_ia32_scatterpfdps(A, B, C, 1, 1) -#define __builtin_ia32_scatterpfqps(A, B, C, D, E) __builtin_ia32_scatterpfqps(A, B, C, 1, 1) -#define __builtin_ia32_gatherpfdpd(A, B, C, D, E) __builtin_ia32_gatherpfdpd(A, B, C, 1, 1) -#define __builtin_ia32_gatherpfqpd(A, B, C, D, E) __builtin_ia32_gatherpfqpd(A, B, C, 1, 1) -#define __builtin_ia32_scatterpfdpd(A, B, C, D, E) __builtin_ia32_scatterpfdpd(A, B, C, 1, 1) -#define __builtin_ia32_scatterpfqpd(A, B, C, D, E) __builtin_ia32_scatterpfqpd(A, B, C, 1, 1) +#define __builtin_ia32_gatherpfdps(A, B, C, D, E) __builtin_ia32_gatherpfdps(A, B, C, 1, _MM_HINT_T0) +#define __builtin_ia32_gatherpfqps(A, B, C, D, E) __builtin_ia32_gatherpfqps(A, B, C, 1, _MM_HINT_T0) +#define __builtin_ia32_scatterpfdps(A, B, C, D, E) __builtin_ia32_scatterpfdps(A, B, C, 1, _MM_HINT_T0) +#define __builtin_ia32_scatterpfqps(A, B, C, D, E) __builtin_ia32_scatterpfqps(A, B, C, 1, _MM_HINT_T0) +#define __builtin_ia32_gatherpfdpd(A, B, C, D, E) __builtin_ia32_gatherpfdpd(A, B, C, 1, _MM_HINT_T0) +#define __builtin_ia32_gatherpfqpd(A, B, C, D, E) __builtin_ia32_gatherpfqpd(A, B, C, 1, _MM_HINT_T0) +#define __builtin_ia32_scatterpfdpd(A, B, C, D, E) __builtin_ia32_scatterpfdpd(A, B, C, 1, _MM_HINT_T0) +#define __builtin_ia32_scatterpfqpd(A, B, C, D, E) __builtin_ia32_scatterpfqpd(A, B, C, 1, _MM_HINT_T0) /* shaintrin.h */ #define __builtin_ia32_sha1rnds4(A, B, C) __builtin_ia32_sha1rnds4(A, B, 1) diff --git a/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf0dpd-1.c b/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf0dpd-1.c index fe366ee..9051a16 100644 --- a/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf0dpd-1.c +++ b/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf0dpd-1.c @@ -11,5 +11,5 @@ void *base; void extern avx512pf_test (void) { - _mm512_mask_prefetch_i32gather_pd (idx, m8, base, 8, 1); + _mm512_mask_prefetch_i32gather_pd (idx, m8, base, 8, _MM_HINT_T0); } diff --git a/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf0dps-1.c b/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf0dps-1.c index df13cdb..bda31d7 100644 --- a/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf0dps-1.c +++ b/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf0dps-1.c @@ -11,5 +11,5 @@ int *base; void extern avx512pf_test (void) { - _mm512_mask_prefetch_i32gather_ps (idx, m16, base, 8, 1); + _mm512_mask_prefetch_i32gather_ps (idx, m16, base, 8, _MM_HINT_T0); } diff --git a/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf0qpd-1.c b/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf0qpd-1.c index ba71335..34bcecf 100644 --- a/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf0qpd-1.c +++ b/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf0qpd-1.c @@ -11,5 +11,5 @@ int *base; void extern avx512pf_test (void) { - _mm512_mask_prefetch_i64gather_pd (idx, m8, base, 8, 1); + _mm512_mask_prefetch_i64gather_pd (idx, m8, base, 8, _MM_HINT_T0); } diff --git a/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf0qps-1.c b/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf0qps-1.c index 945ac51..a9011b0 100644 --- a/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf0qps-1.c +++ b/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf0qps-1.c @@ -11,5 +11,5 @@ int *base; void extern avx512pf_test (void) { - _mm512_mask_prefetch_i64gather_ps (idx, m8, base, 8, 1); + _mm512_mask_prefetch_i64gather_ps (idx, m8, base, 8, _MM_HINT_T0); } diff --git a/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf1dpd-1.c b/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf1dpd-1.c index 5933376..a16f4d3 100644 --- a/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf1dpd-1.c +++ b/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf1dpd-1.c @@ -11,5 +11,5 @@ int *base; void extern avx512pf_test (void) { - _mm512_mask_prefetch_i32gather_pd (idx, m8, base, 8, 2); + _mm512_mask_prefetch_i32gather_pd (idx, m8, base, 8, _MM_HINT_T1); } diff --git a/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf1dps-1.c b/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf1dps-1.c index da1046f..c43152b 100644 --- a/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf1dps-1.c +++ b/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf1dps-1.c @@ -11,5 +11,5 @@ int *base; void extern avx512pf_test (void) { - _mm512_mask_prefetch_i32gather_ps (idx, m16, base, 8, 2); + _mm512_mask_prefetch_i32gather_ps (idx, m16, base, 8, _MM_HINT_T1); } diff --git a/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf1qpd-1.c b/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf1qpd-1.c index eb2c545..ab9e351 100644 --- a/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf1qpd-1.c +++ b/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf1qpd-1.c @@ -11,5 +11,5 @@ int *base; void extern avx512pf_test (void) { - _mm512_mask_prefetch_i64gather_pd (idx, m8, base, 8, 2); + _mm512_mask_prefetch_i64gather_pd (idx, m8, base, 8, _MM_HINT_T1); } diff --git a/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf1qps-1.c b/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf1qps-1.c index 1c81836..28d7cd6 100644 --- a/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf1qps-1.c +++ b/gcc/testsuite/gcc.target/i386/avx512pf-vgatherpf1qps-1.c @@ -11,5 +11,5 @@ int *base; void extern avx512pf_test (void) { - _mm512_mask_prefetch_i64gather_ps (idx, m8, base, 8, 2); + _mm512_mask_prefetch_i64gather_ps (idx, m8, base, 8, _MM_HINT_T1); } diff --git a/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf0dpd-1.c b/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf0dpd-1.c index ff00bfa..14d5c97 100644 --- a/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf0dpd-1.c +++ b/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf0dpd-1.c @@ -12,6 +12,6 @@ void *base; void extern avx512pf_test (void) { - _mm512_prefetch_i32scatter_pd (base, idx, 8, 1); - _mm512_mask_prefetch_i32scatter_pd (base, m8, idx, 8, 5); + _mm512_prefetch_i32scatter_pd (base, idx, 8, _MM_HINT_T0); + _mm512_mask_prefetch_i32scatter_pd (base, m8, idx, 8, _MM_HINT_ET0); } diff --git a/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf0dps-1.c b/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf0dps-1.c index 25448b4..05f51f2 100644 --- a/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf0dps-1.c +++ b/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf0dps-1.c @@ -12,6 +12,6 @@ int *base; void extern avx512pf_test (void) { - _mm512_prefetch_i32scatter_ps (base, idx, 8, 1); - _mm512_mask_prefetch_i32scatter_ps (base, m16, idx, 8, 5); + _mm512_prefetch_i32scatter_ps (base, idx, 8, _MM_HINT_T0); + _mm512_mask_prefetch_i32scatter_ps (base, m16, idx, 8, _MM_HINT_ET0); } diff --git a/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf0qpd-1.c b/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf0qpd-1.c index 84ddc6d..93a65a8 100644 --- a/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf0qpd-1.c +++ b/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf0qpd-1.c @@ -12,6 +12,6 @@ void *base; void extern avx512pf_test (void) { - _mm512_prefetch_i64scatter_pd (base, idx, 8, 1); - _mm512_mask_prefetch_i64scatter_pd (base, m8, idx, 8, 5); + _mm512_prefetch_i64scatter_pd (base, idx, 8, _MM_HINT_T0); + _mm512_mask_prefetch_i64scatter_pd (base, m8, idx, 8, _MM_HINT_ET0); } diff --git a/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf0qps-1.c b/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf0qps-1.c index 847a719..1f9b973 100644 --- a/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf0qps-1.c +++ b/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf0qps-1.c @@ -12,6 +12,6 @@ int *base; void extern avx512pf_test (void) { - _mm512_prefetch_i64scatter_ps (base, idx, 8, 1); - _mm512_mask_prefetch_i64scatter_ps (base, m8, idx, 8, 5); + _mm512_prefetch_i64scatter_ps (base, idx, 8, _MM_HINT_T0); + _mm512_mask_prefetch_i64scatter_ps (base, m8, idx, 8, _MM_HINT_ET0); } diff --git a/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf1dpd-1.c b/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf1dpd-1.c index 5633138..04c367c 100644 --- a/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf1dpd-1.c +++ b/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf1dpd-1.c @@ -12,6 +12,6 @@ void *base; void extern avx512pf_test (void) { - _mm512_prefetch_i32scatter_pd (base, idx, 8, 2); - _mm512_mask_prefetch_i32scatter_pd (base, m8, idx, 8, 6); + _mm512_prefetch_i32scatter_pd (base, idx, 8, _MM_HINT_T1); + _mm512_mask_prefetch_i32scatter_pd (base, m8, idx, 8, _MM_HINT_ET1); } diff --git a/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf1dps-1.c b/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf1dps-1.c index fb70439..a76b77c 100644 --- a/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf1dps-1.c +++ b/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf1dps-1.c @@ -12,6 +12,6 @@ int *base; void extern avx512pf_test (void) { - _mm512_prefetch_i32scatter_ps (base, idx, 8, 2); - _mm512_mask_prefetch_i32scatter_ps (base, m16, idx, 8, 6); + _mm512_prefetch_i32scatter_ps (base, idx, 8, _MM_HINT_T1); + _mm512_mask_prefetch_i32scatter_ps (base, m16, idx, 8, _MM_HINT_ET1); } diff --git a/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf1qpd-1.c b/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf1qpd-1.c index 7fbd142..7a5747c 100644 --- a/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf1qpd-1.c +++ b/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf1qpd-1.c @@ -12,6 +12,6 @@ int *base; void extern avx512pf_test (void) { - _mm512_prefetch_i64scatter_pd (base, idx, 8, 2); - _mm512_mask_prefetch_i64scatter_pd (base, m8, idx, 8, 6); + _mm512_prefetch_i64scatter_pd (base, idx, 8, _MM_HINT_T1); + _mm512_mask_prefetch_i64scatter_pd (base, m8, idx, 8, _MM_HINT_ET1); } diff --git a/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf1qps-1.c b/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf1qps-1.c index c004834..d0372b7 100644 --- a/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf1qps-1.c +++ b/gcc/testsuite/gcc.target/i386/avx512pf-vscatterpf1qps-1.c @@ -12,6 +12,6 @@ int *base; void extern avx512pf_test (void) { - _mm512_prefetch_i64scatter_ps (base, idx, 8, 2); - _mm512_mask_prefetch_i64scatter_ps (base, m8, idx, 8, 6); + _mm512_prefetch_i64scatter_ps (base, idx, 8, _MM_HINT_T1); + _mm512_mask_prefetch_i64scatter_ps (base, m8, idx, 8, _MM_HINT_ET1); } diff --git a/gcc/testsuite/gcc.target/i386/sse-14.c b/gcc/testsuite/gcc.target/i386/sse-14.c index 10334a6..d9a5fed 100644 --- a/gcc/testsuite/gcc.target/i386/sse-14.c +++ b/gcc/testsuite/gcc.target/i386/sse-14.c @@ -519,14 +519,14 @@ test_4x (_mm_maskz_fixupimm_round_sd, __m128d, __mmask8, __m128d, __m128d, __m12 test_4x (_mm_maskz_fixupimm_round_ss, __m128, __mmask8, __m128, __m128, __m128i, 1, 8) /* avx512pfintrin.h */ -test_3vx (_mm512_mask_prefetch_i32gather_ps, __m512i, __mmask16, void const *, 1, 1) -test_3vx (_mm512_mask_prefetch_i32scatter_ps, void const *, __mmask16, __m512i, 1, 1) -test_3vx (_mm512_mask_prefetch_i64gather_ps, __m512i, __mmask8, void const *, 1, 1) -test_3vx (_mm512_mask_prefetch_i64scatter_ps, void const *, __mmask8, __m512i, 1, 1) -test_3vx (_mm512_mask_prefetch_i32gather_pd, __m256i, __mmask8, void const *, 1, 1) -test_3vx (_mm512_mask_prefetch_i32scatter_pd, void const *, __mmask8, __m256i, 1, 1) -test_3vx (_mm512_mask_prefetch_i64gather_pd, __m512i, __mmask8, void const *, 1, 1) -test_3vx (_mm512_mask_prefetch_i64scatter_pd, void const *, __mmask8, __m512i, 1, 1) +test_3vx (_mm512_mask_prefetch_i32gather_ps, __m512i, __mmask16, void const *, 1, _MM_HINT_T0) +test_3vx (_mm512_mask_prefetch_i32scatter_ps, void const *, __mmask16, __m512i, 1, _MM_HINT_T0) +test_3vx (_mm512_mask_prefetch_i64gather_ps, __m512i, __mmask8, void const *, 1, _MM_HINT_T0) +test_3vx (_mm512_mask_prefetch_i64scatter_ps, void const *, __mmask8, __m512i, 1, _MM_HINT_T0) +test_3vx (_mm512_mask_prefetch_i32gather_pd, __m256i, __mmask8, void const *, 1, _MM_HINT_T0) +test_3vx (_mm512_mask_prefetch_i32scatter_pd, void const *, __mmask8, __m256i, 1, _MM_HINT_T0) +test_3vx (_mm512_mask_prefetch_i64gather_pd, __m512i, __mmask8, void const *, 1, _MM_HINT_T0) +test_3vx (_mm512_mask_prefetch_i64scatter_pd, void const *, __mmask8, __m512i, 1, _MM_HINT_T0) /* avx512erintrin.h */ test_1 (_mm512_exp2a23_round_pd, __m512d, __m512d, 8) diff --git a/gcc/testsuite/gcc.target/i386/sse-22.c b/gcc/testsuite/gcc.target/i386/sse-22.c index 51f04c2..e9f227a 100644 --- a/gcc/testsuite/gcc.target/i386/sse-22.c +++ b/gcc/testsuite/gcc.target/i386/sse-22.c @@ -641,15 +641,15 @@ test_4x (_mm_maskz_fixupimm_round_sd, __m128d, __mmask8, __m128d, __m128d, __m12 test_4x (_mm_maskz_fixupimm_round_ss, __m128, __mmask8, __m128, __m128, __m128i, 1, 8) /* avx512pfintrin.h */ -test_3vx (_mm512_mask_prefetch_i32gather_ps, __m512i, __mmask16, void const *, 1, 1) -test_3vx (_mm512_mask_prefetch_i32scatter_ps, void const *, __mmask16, __m512i, 1, 1) -test_3vx (_mm512_mask_prefetch_i64gather_ps, __m512i, __mmask8, void const *, 1, 1) -test_3vx (_mm512_mask_prefetch_i64scatter_ps, void const *, __mmask8, __m512i, 1, 1) - -test_3vx (_mm512_mask_prefetch_i32gather_pd, __m256i, __mmask8, void const *, 1, 1) -test_3vx (_mm512_mask_prefetch_i32scatter_pd, void const *, __mmask8, __m256i, 1, 1) -test_3vx (_mm512_mask_prefetch_i64gather_pd, __m512i, __mmask8, long long *, 1, 1) -test_3vx (_mm512_mask_prefetch_i64scatter_pd, void const *, __mmask8, __m512i, 1, 1) +test_3vx (_mm512_mask_prefetch_i32gather_ps, __m512i, __mmask16, void const *, 1, _MM_HINT_T0) +test_3vx (_mm512_mask_prefetch_i32scatter_ps, void const *, __mmask16, __m512i, 1, _MM_HINT_T0) +test_3vx (_mm512_mask_prefetch_i64gather_ps, __m512i, __mmask8, void const *, 1, _MM_HINT_T0) +test_3vx (_mm512_mask_prefetch_i64scatter_ps, void const *, __mmask8, __m512i, 1, _MM_HINT_T0) + +test_3vx (_mm512_mask_prefetch_i32gather_pd, __m256i, __mmask8, void const *, 1, _MM_HINT_T0) +test_3vx (_mm512_mask_prefetch_i32scatter_pd, void const *, __mmask8, __m256i, 1, _MM_HINT_T0) +test_3vx (_mm512_mask_prefetch_i64gather_pd, __m512i, __mmask8, long long *, 1, _MM_HINT_T0) +test_3vx (_mm512_mask_prefetch_i64scatter_pd, void const *, __mmask8, __m512i, 1, _MM_HINT_T0) /* avx512erintrin.h */ test_1 (_mm512_exp2a23_round_pd, __m512d, __m512d, 8) diff --git a/gcc/testsuite/gcc.target/i386/sse-23.c b/gcc/testsuite/gcc.target/i386/sse-23.c index 5b24618..d227bab 100644 --- a/gcc/testsuite/gcc.target/i386/sse-23.c +++ b/gcc/testsuite/gcc.target/i386/sse-23.c @@ -361,14 +361,14 @@ #define __builtin_ia32_vpermilps512_mask(A, E, C, D) __builtin_ia32_vpermilps512_mask(A, 1, C, D) /* avx512pfintrin.h */ -#define __builtin_ia32_gatherpfdps(A, B, C, D, E) __builtin_ia32_gatherpfdps(A, B, C, 1, 1) -#define __builtin_ia32_gatherpfqps(A, B, C, D, E) __builtin_ia32_gatherpfqps(A, B, C, 1, 1) -#define __builtin_ia32_scatterpfdps(A, B, C, D, E) __builtin_ia32_scatterpfdps(A, B, C, 1, 1) -#define __builtin_ia32_scatterpfqps(A, B, C, D, E) __builtin_ia32_scatterpfqps(A, B, C, 1, 1) -#define __builtin_ia32_gatherpfdpd(A, B, C, D, E) __builtin_ia32_gatherpfdpd(A, B, C, 1, 1) -#define __builtin_ia32_gatherpfqpd(A, B, C, D, E) __builtin_ia32_gatherpfqpd(A, B, C, 1, 1) -#define __builtin_ia32_scatterpfdpd(A, B, C, D, E) __builtin_ia32_scatterpfdpd(A, B, C, 1, 1) -#define __builtin_ia32_scatterpfqpd(A, B, C, D, E) __builtin_ia32_scatterpfqpd(A, B, C, 1, 1) +#define __builtin_ia32_gatherpfdps(A, B, C, D, E) __builtin_ia32_gatherpfdps(A, B, C, 1, _MM_HINT_T0) +#define __builtin_ia32_gatherpfqps(A, B, C, D, E) __builtin_ia32_gatherpfqps(A, B, C, 1, _MM_HINT_T0) +#define __builtin_ia32_scatterpfdps(A, B, C, D, E) __builtin_ia32_scatterpfdps(A, B, C, 1, _MM_HINT_T0) +#define __builtin_ia32_scatterpfqps(A, B, C, D, E) __builtin_ia32_scatterpfqps(A, B, C, 1, _MM_HINT_T0) +#define __builtin_ia32_gatherpfdpd(A, B, C, D, E) __builtin_ia32_gatherpfdpd(A, B, C, 1, _MM_HINT_T0) +#define __builtin_ia32_gatherpfqpd(A, B, C, D, E) __builtin_ia32_gatherpfqpd(A, B, C, 1, _MM_HINT_T0) +#define __builtin_ia32_scatterpfdpd(A, B, C, D, E) __builtin_ia32_scatterpfdpd(A, B, C, 1, _MM_HINT_T0) +#define __builtin_ia32_scatterpfqpd(A, B, C, D, E) __builtin_ia32_scatterpfqpd(A, B, C, 1, _MM_HINT_T0) /* avx512erintrin.h */ #define __builtin_ia32_exp2pd_mask(A, B, C, D) __builtin_ia32_exp2pd_mask (A, B, C, 8) -- 1.8.3.1