This reverts commit b70bb94aca7bc10a54f744d793c32c51f91ce195. --- gcc/config/i386/avx10_2roundingintrin.h | 220 ------------------ gcc/config/i386/i386-builtin-types.def | 3 - gcc/config/i386/i386-builtin.def | 4 - gcc/config/i386/i386-expand.cc | 3 - gcc/config/i386/sse.md | 2 +- gcc/config/i386/subst.md | 1 - gcc/testsuite/gcc.target/i386/avx-1.c | 4 - .../gcc.target/i386/avx10_2-rounding-1.c | 36 --- gcc/testsuite/gcc.target/i386/sse-13.c | 4 - gcc/testsuite/gcc.target/i386/sse-14.c | 12 - gcc/testsuite/gcc.target/i386/sse-22.c | 12 - gcc/testsuite/gcc.target/i386/sse-23.c | 4 - 12 files changed, 1 insertion(+), 304 deletions(-)
diff --git a/gcc/config/i386/avx10_2roundingintrin.h b/gcc/config/i386/avx10_2roundingintrin.h index d12d3d8f598..bddd0e091ff 100644 --- a/gcc/config/i386/avx10_2roundingintrin.h +++ b/gcc/config/i386/avx10_2roundingintrin.h @@ -726,143 +726,6 @@ _mm256_maskz_cvt_roundph_epu64 (__mmask8 __U, __m128h __A, const int __R) (__mmask8) __U, __R); } - -extern __inline __m256i -__attribute__ ((__gnu_inline__, __always_inline__, __artificial__)) -_mm256_cvt_roundph_epu16 (__m256h __A, const int __R) -{ - return - (__m256i) __builtin_ia32_vcvtph2uw256_mask_round ((__v16hf) __A, - (__v16hi) - _mm256_undefined_si256 (), - (__mmask16) -1, - __R); -} - -extern __inline __m256i -__attribute__ ((__gnu_inline__, __always_inline__, __artificial__)) -_mm256_mask_cvt_roundph_epu16 (__m256i __W, __mmask16 __U, __m256h __A, - const int __R) -{ - return (__m256i) __builtin_ia32_vcvtph2uw256_mask_round ((__v16hf) __A, - (__v16hi) __W, - (__mmask16) __U, - __R); -} - -extern __inline __m256i -__attribute__ ((__gnu_inline__, __always_inline__, __artificial__)) -_mm256_maskz_cvt_roundph_epu16 (__mmask16 __U, __m256h __A, const int __R) -{ - return - (__m256i) __builtin_ia32_vcvtph2uw256_mask_round ((__v16hf) __A, - (__v16hi) - _mm256_setzero_si256 (), - (__mmask16) __U, - __R); -} - -extern __inline __m256i -__attribute__ ((__gnu_inline__, __always_inline__, __artificial__)) -_mm256_cvt_roundph_epi16 (__m256h __A, const int __R) -{ - return - (__m256i) __builtin_ia32_vcvtph2w256_mask_round ((__v16hf) __A, - (__v16hi) - _mm256_undefined_si256 (), - (__mmask16) -1, - __R); -} - -extern __inline __m256i -__attribute__ ((__gnu_inline__, __always_inline__, __artificial__)) -_mm256_mask_cvt_roundph_epi16 (__m256i __W, __mmask16 __U, __m256h __A, - const int __R) -{ - return (__m256i) __builtin_ia32_vcvtph2w256_mask_round ((__v16hf) __A, - (__v16hi) __W, - (__mmask16) __U, - __R); -} - -extern __inline __m256i -__attribute__ ((__gnu_inline__, __always_inline__, __artificial__)) -_mm256_maskz_cvt_roundph_epi16 (__mmask16 __U, __m256h __A, const int __R) -{ - return - (__m256i) __builtin_ia32_vcvtph2w256_mask_round ((__v16hf) __A, - (__v16hi) - _mm256_setzero_si256 (), - (__mmask16) __U, - __R); -} - -extern __inline __m256d -__attribute__ ((__gnu_inline__, __always_inline__, __artificial__)) -_mm256_cvt_roundps_pd (__m128 __A, const int __R) -{ - return - (__m256d) __builtin_ia32_vcvtps2pd256_mask_round ((__v4sf) __A, - (__v4df) - _mm256_undefined_pd (), - (__mmask8) -1, - __R); -} - -extern __inline __m256d -__attribute__ ((__gnu_inline__, __always_inline__, __artificial__)) -_mm256_mask_cvt_roundps_pd (__m256d __W, __mmask8 __U, __m128 __A, - const int __R) -{ - return (__m256d) __builtin_ia32_vcvtps2pd256_mask_round ((__v4sf) __A, - (__v4df) __W, - (__mmask8) __U, - __R); -} - -extern __inline __m256d -__attribute__ ((__gnu_inline__, __always_inline__, __artificial__)) -_mm256_maskz_cvt_roundps_pd (__mmask8 __U, __m128 __A, const int __R) -{ - return (__m256d) __builtin_ia32_vcvtps2pd256_mask_round ((__v4sf) __A, - (__v4df) - _mm256_setzero_pd (), - (__mmask8) __U, - __R); -} - -extern __inline __m128h -__attribute__ ((__gnu_inline__, __always_inline__, __artificial__)) -_mm256_cvtx_roundps_ph (__m256 __A, const int __R) -{ - return (__m128h) __builtin_ia32_vcvtps2phx256_mask_round ((__v8sf) __A, - (__v8hf) - _mm_setzero_ph (), - (__mmask8) -1, - __R); -} - -extern __inline __m128h -__attribute__ ((__gnu_inline__, __always_inline__, __artificial__)) -_mm256_mask_cvtx_roundps_ph (__m128h __W, __mmask8 __U, __m256 __A, - const int __R) -{ - return (__m128h) __builtin_ia32_vcvtps2phx256_mask_round ((__v8sf) __A, - (__v8hf) __W, - (__mmask8) __U, - __R); -} - -extern __inline __m128h -__attribute__ ((__gnu_inline__, __always_inline__, __artificial__)) -_mm256_maskz_cvtx_roundps_ph (__mmask8 __U, __m256 __A, const int __R) -{ - return (__m128h) __builtin_ia32_vcvtps2phx256_mask_round ((__v8sf) __A, - (__v8hf) - _mm_setzero_ph (), - (__mmask8) __U, - __R); -} #else #define _mm256_add_round_pd(A, B, R) \ ((__m256d) __builtin_ia32_addpd256_mask_round ((__v4df) (A), \ @@ -1276,89 +1139,6 @@ _mm256_maskz_cvtx_roundps_ph (__mmask8 __U, __m256 __A, const int __R) (_mm256_setzero_si256 ()), \ (__mmask8) (U), \ (R))) - -#define _mm256_cvt_roundph_epu16(A, R) \ - ((__m256i) \ - __builtin_ia32_vcvtph2uw256_mask_round ((__v16hf) (A), \ - (__v16hi) \ - (_mm256_undefined_si256 ()), \ - (__mmask16) (-1), \ - (R))) - -#define _mm256_mask_cvt_roundph_epu16(W, U, A, R) \ - ((__m256i) __builtin_ia32_vcvtph2uw256_mask_round ((__v16hf) (A), \ - (__v16hi) (W), \ - (__mmask16) (U), \ - (R))) - -#define _mm256_maskz_cvt_roundph_epu16(U, A, R) \ - ((__m256i) \ - __builtin_ia32_vcvtph2uw256_mask_round ((__v16hf) (A), \ - (__v16hi) \ - (_mm256_setzero_si256 ()), \ - (__mmask16) (U), \ - (R))) - -#define _mm256_cvt_roundph_epi16(A, R) \ - ((__m256i) \ - __builtin_ia32_vcvtph2w256_mask_round ((__v16hf) (A), \ - (__v16hi) \ - (_mm256_undefined_si256 ()), \ - (__mmask16) (-1), \ - (R))) - -#define _mm256_mask_cvt_roundph_epi16(W, U, A, R) \ - ((__m256i) __builtin_ia32_vcvtph2w256_mask_round ((__v16hf) (A), \ - (__v16hi) (W), \ - (__mmask16) (U), \ - (R))) - -#define _mm256_maskz_cvt_roundph_epi16(U, A, R) \ - ((__m256i) __builtin_ia32_vcvtph2w256_mask_round ((__v16hf) (A), \ - (__v16hi) \ - (_mm256_setzero_si256 ()), \ - (__mmask16) (U), \ - (R))) - -#define _mm256_cvt_roundps_pd(A, R) \ - ((__m256d) __builtin_ia32_vcvtps2pd256_mask_round ((__v4sf) (A), \ - (__v4df) \ - (_mm256_undefined_pd ()), \ - (__mmask8) (-1), \ - (R))) - -#define _mm256_mask_cvt_roundps_pd(W, U, A, R) \ - ((__m256d) __builtin_ia32_vcvtps2pd256_mask_round ((__v4sf) (A), \ - (__v4df) (W), \ - (__mmask8) (U), \ - (R))) - -#define _mm256_maskz_cvt_roundps_pd(U, A, R) \ - ((__m256d) __builtin_ia32_vcvtps2pd256_mask_round ((__v4sf) (A), \ - (__v4df) \ - (_mm256_setzero_pd ()), \ - (__mmask8) (U), \ - (R))) - -#define _mm256_cvtx_roundps_ph(A, R) \ - ((__m128h) __builtin_ia32_vcvtps2phx256_mask_round ((__v8sf) (A), \ - (__v8hf) \ - (_mm_setzero_ph ()), \ - (__mmask8) (-1), \ - (R))) - -#define _mm256_mask_cvtx_roundps_ph(W, U, A, R) \ - ((__m128h) __builtin_ia32_vcvtps2phx256_mask_round ((__v8sf) (A), \ - (__v8hf) (W), \ - (__mmask8) (U), \ - (R))) - -#define _mm256_maskz_cvtx_roundps_ph(U, A, R) \ - ((__m128h) __builtin_ia32_vcvtps2phx256_mask_round ((__v8sf) (A), \ - (__v8hf) \ - (_mm_setzero_ph ()), \ - (__mmask8) (U), \ - (R))) #endif #ifdef __DISABLE_AVX10_2_256__ diff --git a/gcc/config/i386/i386-builtin-types.def b/gcc/config/i386/i386-builtin-types.def index 8b87026bd4b..f5e1ee13426 100644 --- a/gcc/config/i386/i386-builtin-types.def +++ b/gcc/config/i386/i386-builtin-types.def @@ -1432,9 +1432,6 @@ DEF_FUNCTION_TYPE (V8SI, V8HF, V8SI, UQI, INT) DEF_FUNCTION_TYPE (V4DF, V8HF, V4DF, UQI, INT) DEF_FUNCTION_TYPE (V8SF, V8HF, V8SF, UQI, INT) DEF_FUNCTION_TYPE (V4DI, V8HF, V4DI, UQI, INT) -DEF_FUNCTION_TYPE (V16HI, V16HF, V16HI, UHI, INT) -DEF_FUNCTION_TYPE (V4DF, V4SF, V4DF, UQI, INT) -DEF_FUNCTION_TYPE (V8HF, V8SF, V8HF, UQI, INT) DEF_FUNCTION_TYPE (V32HF, V16SF, V16SF, V32HF, USI, INT) DEF_FUNCTION_TYPE (V32HF, V16SF, V16SF, V32HF, USI) DEF_FUNCTION_TYPE (V16HF, V8SF, V8SF, V16HF, UHI) diff --git a/gcc/config/i386/i386-builtin.def b/gcc/config/i386/i386-builtin.def index 28b25fb75d1..29f558c6e37 100644 --- a/gcc/config/i386/i386-builtin.def +++ b/gcc/config/i386/i386-builtin.def @@ -3681,10 +3681,6 @@ BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, CODE_FOR_avx512fp16_float_extend_phv8sf2 BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, CODE_FOR_avx512fp16_vcvtph2qq_v4di_mask_round, "__builtin_ia32_vcvtph2qq256_mask_round", IX86_BUILTIN_VCVTPH2QQ256_MASK_ROUND, UNKNOWN, (int) V4DI_FTYPE_V8HF_V4DI_UQI_INT) BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, CODE_FOR_avx512fp16_vcvtph2udq_v8si_mask_round, "__builtin_ia32_vcvtph2udq256_mask_round", IX86_BUILTIN_VCVTPH2UDQ256_MASK_ROUND, UNKNOWN, (int) V8SI_FTYPE_V8HF_V8SI_UQI_INT) BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, CODE_FOR_avx512fp16_vcvtph2uqq_v4di_mask_round, "__builtin_ia32_vcvtph2uqq256_mask_round", IX86_BUILTIN_VCVTPH2UQQ256_MASK_ROUND, UNKNOWN, (int) V4DI_FTYPE_V8HF_V4DI_UQI_INT) -BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, CODE_FOR_avx512fp16_vcvtph2uw_v16hi_mask_round, "__builtin_ia32_vcvtph2uw256_mask_round", IX86_BUILTIN_VCVTPH2UW256_MASK_ROUND, UNKNOWN, (int) V16HI_FTYPE_V16HF_V16HI_UHI_INT) -BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, CODE_FOR_avx512fp16_vcvtph2w_v16hi_mask_round, "__builtin_ia32_vcvtph2w256_mask_round", IX86_BUILTIN_VCVTPH2W256_MASK_ROUND, UNKNOWN, (int) V16HI_FTYPE_V16HF_V16HI_UHI_INT) -BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, CODE_FOR_avx_cvtps2pd256_mask_round, "__builtin_ia32_vcvtps2pd256_mask_round", IX86_BUILTIN_VCVTPS2PD256_MASK_ROUND, UNKNOWN, (int) V4DF_FTYPE_V4SF_V4DF_UQI_INT) -BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, CODE_FOR_avx512fp16_vcvtps2ph_v8sf_mask_round, "__builtin_ia32_vcvtps2phx256_mask_round", IX86_BUILTIN_VCVTPS2PHX256_MASK_ROUND, UNKNOWN, (int) V8HF_FTYPE_V8SF_V8HF_UQI_INT) BDESC (0, OPTION_MASK_ISA2_AVX10_2_512, CODE_FOR_avx10_2_cvt2ps2phx_v32hf_mask_round, "__builtin_ia32_vcvt2ps2phx512_mask_round", IX86_BUILTIN_VCVT2PS2PHX_V32HF_MASK_ROUND, UNKNOWN, (int) V32HF_FTYPE_V16SF_V16SF_V32HF_USI_INT) BDESC (0, OPTION_MASK_ISA2_AVX10_2_512, CODE_FOR_avx10_2_cvtph2ibsv32hf_mask_round, "__builtin_ia32_cvtph2ibs512_mask_round", IX86_BUILTIN_CVTPH2IBS512_MASK_ROUND, UNKNOWN, (int) V32HI_FTYPE_V32HF_V32HI_USI_INT) BDESC (0, OPTION_MASK_ISA2_AVX10_2_512, CODE_FOR_avx10_2_cvtph2iubsv32hf_mask_round, "__builtin_ia32_cvtph2iubs512_mask_round", IX86_BUILTIN_CVTPH2IUBS512_MASK_ROUND, UNKNOWN, (int) V32HI_FTYPE_V32HF_V32HI_USI_INT) diff --git a/gcc/config/i386/i386-expand.cc b/gcc/config/i386/i386-expand.cc index a4c34d94666..f5a1fc23aac 100644 --- a/gcc/config/i386/i386-expand.cc +++ b/gcc/config/i386/i386-expand.cc @@ -12747,13 +12747,11 @@ ix86_expand_round_builtin (const struct builtin_description *d, case V16SI_FTYPE_V16SF_V16SI_UHI_INT: case V16SI_FTYPE_V16HF_V16SI_UHI_INT: case V16HF_FTYPE_V16SI_V16HF_UHI_INT: - case V16HI_FTYPE_V16HF_V16HI_UHI_INT: case V8DF_FTYPE_V8SF_V8DF_QI_INT: case V16SF_FTYPE_V16HI_V16SF_HI_INT: case V8SF_FTYPE_V8SI_V8SF_UQI_INT: case V8SF_FTYPE_V8HF_V8SF_UQI_INT: case V8SI_FTYPE_V8HF_V8SI_UQI_INT: - case V4DF_FTYPE_V4SF_V4DF_UQI_INT: case V4DF_FTYPE_V8HF_V4DF_UQI_INT: case V4DI_FTYPE_V8HF_V4DI_UQI_INT: case V4DI_FTYPE_V4DF_V4DI_UQI_INT: @@ -12763,7 +12761,6 @@ ix86_expand_round_builtin (const struct builtin_description *d, case V4SF_FTYPE_V4SF_V4SF_V4SF_INT: case V8HF_FTYPE_V8DI_V8HF_UQI_INT: case V8HF_FTYPE_V8DF_V8HF_UQI_INT: - case V8HF_FTYPE_V8SF_V8HF_UQI_INT: case V8HF_FTYPE_V8SI_V8HF_UQI_INT: case V8HF_FTYPE_V4DF_V8HF_UQI_INT: case V16HF_FTYPE_V16SF_V16HF_UHI_INT: diff --git a/gcc/config/i386/sse.md b/gcc/config/i386/sse.md index 543633794b0..3fbb925442a 100644 --- a/gcc/config/i386/sse.md +++ b/gcc/config/i386/sse.md @@ -8109,7 +8109,7 @@ [(set (match_operand:<ssePHmode> 0 "register_operand" "=v") (float_truncate:<ssePHmode> (match_operand:VF48H_AVX512VL 1 "<round_nimm_predicate>" "<round_constraint>")))] - "TARGET_AVX512FP16 && <round_mode_condition>" + "TARGET_AVX512FP16" "vcvt<castmode>2ph<ph2pssuffix><round_qq2phsuff>\t{<round_mask_op2>%1, %0<mask_operand2>|%0<mask_operand2>, %1<round_mask_op2>}" [(set_attr "type" "ssecvt") (set_attr "prefix" "evex") diff --git a/gcc/config/i386/subst.md b/gcc/config/i386/subst.md index d7854f9dd71..a44aa60e0b2 100644 --- a/gcc/config/i386/subst.md +++ b/gcc/config/i386/subst.md @@ -218,7 +218,6 @@ || <MODE>mode == V4DFmode || <MODE>mode == V4DImode || <MODE>mode == V8SImode - || <MODE>mode == V16HImode || <MODE>mode == V16HFmode)))") (define_subst_attr "round_applied" "round" "false" "true") diff --git a/gcc/testsuite/gcc.target/i386/avx-1.c b/gcc/testsuite/gcc.target/i386/avx-1.c index df715ac01c1..9a7fa6f1b68 100644 --- a/gcc/testsuite/gcc.target/i386/avx-1.c +++ b/gcc/testsuite/gcc.target/i386/avx-1.c @@ -864,10 +864,6 @@ #define __builtin_ia32_vcvtph2qq256_mask_round(A, B, C, D) __builtin_ia32_vcvtph2qq256_mask_round(A, B, C, 8) #define __builtin_ia32_vcvtph2udq256_mask_round(A, B, C, D) __builtin_ia32_vcvtph2udq256_mask_round(A, B, C, 8) #define __builtin_ia32_vcvtph2uqq256_mask_round(A, B, C, D) __builtin_ia32_vcvtph2uqq256_mask_round(A, B, C, 8) -#define __builtin_ia32_vcvtph2uw256_mask_round(A, B, C, D) __builtin_ia32_vcvtph2uw256_mask_round(A, B, C, 8) -#define __builtin_ia32_vcvtph2w256_mask_round(A, B, C, D) __builtin_ia32_vcvtph2w256_mask_round(A, B, C, 8) -#define __builtin_ia32_vcvtps2pd256_mask_round(A, B, C, D) __builtin_ia32_vcvtps2pd256_mask_round(A, B, C, 8) -#define __builtin_ia32_vcvtps2phx256_mask_round(A, B, C, D) __builtin_ia32_vcvtps2phx256_mask_round(A, B, C, 8) /* avx10_2-512mediaintrin.h */ #define __builtin_ia32_mpsadbw512(A, B, C) __builtin_ia32_mpsadbw512 (A, B, 1) diff --git a/gcc/testsuite/gcc.target/i386/avx10_2-rounding-1.c b/gcc/testsuite/gcc.target/i386/avx10_2-rounding-1.c index ccaed087b7d..6a2f1214e7a 100644 --- a/gcc/testsuite/gcc.target/i386/avx10_2-rounding-1.c +++ b/gcc/testsuite/gcc.target/i386/avx10_2-rounding-1.c @@ -60,18 +60,6 @@ /* { dg-final { scan-assembler-times "vcvtph2uqq\[ \\t\]+\[^\{\n\]*%xmm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */ /* { dg-final { scan-assembler-times "vcvtph2uqq\[ \\t\]+\{rn-sae\}\[^\{\n\]*%xmm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+\{%k\[0-9\]\}\[^\n\r]*(?:\n|\[ \\t\]+#)" 1 } } */ /* { dg-final { scan-assembler-times "vcvtph2uqq\[ \\t\]+\{rz-sae\}\[^\{\n\]*%xmm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+\{%k\[0-9\]\}\{z\}\[^\n\r]*(?:\n|\[ \\t\]+#)" 1 } } */ -/* { dg-final { scan-assembler-times "vcvtph2uw\[ \\t\]+\[^\{\n\]*%ymm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */ -/* { dg-final { scan-assembler-times "vcvtph2uw\[ \\t\]+\{rn-sae\}\[^\{\n\]*%ymm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+\{%k\[0-9\]\}\[^\n\r]*(?:\n|\[ \\t\]+#)" 1 } } */ -/* { dg-final { scan-assembler-times "vcvtph2uw\[ \\t\]+\{rz-sae\}\[^\{\n\]*%ymm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+\{%k\[0-9\]\}\{z\}\[^\n\r]*(?:\n|\[ \\t\]+#)" 1 } } */ -/* { dg-final { scan-assembler-times "vcvtph2w\[ \\t\]+\[^\{\n\]*%ymm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */ -/* { dg-final { scan-assembler-times "vcvtph2w\[ \\t\]+\{rn-sae\}\[^\{\n\]*%ymm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+\{%k\[0-9\]\}\[^\n\r]*(?:\n|\[ \\t\]+#)" 1 } } */ -/* { dg-final { scan-assembler-times "vcvtph2w\[ \\t\]+\{rz-sae\}\[^\{\n\]*%ymm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+\{%k\[0-9\]\}\{z\}\[^\n\r]*(?:\n|\[ \\t\]+#)" 1 } } */ -/* { dg-final { scan-assembler-times "vcvtps2pd\[ \\t\]+\[^\{\n\]*\{sae\}\[^\n\]*%xmm\[0-9\]+\[^\n\]*%ymm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */ -/* { dg-final { scan-assembler-times "vcvtps2pd\[ \\t\]+\[^\{\n\]*\{sae\}\[^\n\]*%xmm\[0-9\]+\[^\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 } } */ -/* { dg-final { scan-assembler-times "vcvtps2pd\[ \\t\]+\[^\{\n\]*\{sae\}\[^\n\]*%xmm\[0-9\]+\[^\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ \\t\]+#)" 1 } } */ -/* { dg-final { scan-assembler-times "vcvtps2phxy\[ \\t\]+\[^\{\n\]*%ymm\[0-9\]+\[^\n\r]*%xmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1 } } */ -/* { dg-final { scan-assembler-times "vcvtps2phx\[ \\t\]+\{rn-sae\}\[^\{\n\]*%ymm\[0-9\]+\[^\n\r]*%xmm\[0-9\]+\{%k\[0-9\]\}\[^\n\r]*(?:\n|\[ \\t\]+#)" 1 } } */ -/* { dg-final { scan-assembler-times "vcvtps2phx\[ \\t\]+\{rz-sae\}\[^\{\n\]*%ymm\[0-9\]+\[^\n\r]*%xmm\[0-9\]+\{%k\[0-9\]\}\{z\}\[^\n\r]*(?:\n|\[ \\t\]+#)" 1 } } */ #include <immintrin.h> @@ -194,27 +182,3 @@ avx10_2_test_7 (void) x = _mm256_mask_cvtx_roundph_ps (x, m8, hxh, 8); x = _mm256_maskz_cvtx_roundph_ps (m8, hxh, 8); } - -void extern -avx10_2_test_8 (void) -{ - xi = _mm256_cvt_roundph_epu16 (xh, 4); - xi = _mm256_mask_cvt_roundph_epu16 (xi, m16, xh, 8); - xi = _mm256_maskz_cvt_roundph_epu16 (m16, xh, 11); - - xi = _mm256_cvt_roundph_epi16 (xh, 4); - xi = _mm256_mask_cvt_roundph_epi16 (xi, m16, xh, 8); - xi = _mm256_maskz_cvt_roundph_epi16 (m16, xh, 11); -} - -void extern -avx10_2_test_9 (void) -{ - xd = _mm256_cvt_roundps_pd (hx, _MM_FROUND_NO_EXC); - xd = _mm256_mask_cvt_roundps_pd (xd, m8, hx, _MM_FROUND_NO_EXC); - xd = _mm256_maskz_cvt_roundps_pd (m8, hx, _MM_FROUND_NO_EXC); - - hxh = _mm256_cvtx_roundps_ph (x, 4); - hxh = _mm256_mask_cvtx_roundps_ph (hxh, m8, x, 8); - hxh = _mm256_maskz_cvtx_roundps_ph (m8, x, 11); -} diff --git a/gcc/testsuite/gcc.target/i386/sse-13.c b/gcc/testsuite/gcc.target/i386/sse-13.c index 6d286675298..ff70aeda3cc 100644 --- a/gcc/testsuite/gcc.target/i386/sse-13.c +++ b/gcc/testsuite/gcc.target/i386/sse-13.c @@ -871,10 +871,6 @@ #define __builtin_ia32_vcvtph2qq256_mask_round(A, B, C, D) __builtin_ia32_vcvtph2qq256_mask_round(A, B, C, 8) #define __builtin_ia32_vcvtph2udq256_mask_round(A, B, C, D) __builtin_ia32_vcvtph2udq256_mask_round(A, B, C, 8) #define __builtin_ia32_vcvtph2uqq256_mask_round(A, B, C, D) __builtin_ia32_vcvtph2uqq256_mask_round(A, B, C, 8) -#define __builtin_ia32_vcvtph2uw256_mask_round(A, B, C, D) __builtin_ia32_vcvtph2uw256_mask_round(A, B, C, 8) -#define __builtin_ia32_vcvtph2w256_mask_round(A, B, C, D) __builtin_ia32_vcvtph2w256_mask_round(A, B, C, 8) -#define __builtin_ia32_vcvtps2pd256_mask_round(A, B, C, D) __builtin_ia32_vcvtps2pd256_mask_round(A, B, C, 8) -#define __builtin_ia32_vcvtps2phx256_mask_round(A, B, C, D) __builtin_ia32_vcvtps2phx256_mask_round(A, B, C, 8) /* avx10_2-512mediaintrin.h */ #define __builtin_ia32_mpsadbw512(A, B, C) __builtin_ia32_mpsadbw512 (A, B, 1) diff --git a/gcc/testsuite/gcc.target/i386/sse-14.c b/gcc/testsuite/gcc.target/i386/sse-14.c index 1895dcfb10d..544f53748a0 100644 --- a/gcc/testsuite/gcc.target/i386/sse-14.c +++ b/gcc/testsuite/gcc.target/i386/sse-14.c @@ -1035,10 +1035,6 @@ test_1 (_mm256_cvt_roundph_ps, __m256, __m128i, 8) test_1 (_mm256_cvtx_roundph_ps, __m256, __m128h, 8) test_1 (_mm256_cvt_roundph_epi64, __m256i, __m128h, 8) test_1 (_mm256_cvt_roundph_epu64, __m256i, __m128h, 8) -test_1 (_mm256_cvt_roundph_epu16, __m256i, __m256h, 8) -test_1 (_mm256_cvt_roundph_epi16, __m256i, __m256h, 8) -test_1 (_mm256_cvt_roundps_pd, __m256d, __m128, 8) -test_1 (_mm256_cvtx_roundps_ph, __m128h, __m256, 8) test_2 (_mm256_add_round_pd, __m256d, __m256d, __m256d, 9) test_2 (_mm256_add_round_ph, __m256h, __m256h, __m256h, 8) test_2 (_mm256_add_round_ps, __m256, __m256, __m256, 9) @@ -1057,10 +1053,6 @@ test_2 (_mm256_maskz_cvtx_roundph_ps, __m256, __mmask8, __m128h, 8) test_2 (_mm256_maskz_cvt_roundph_epi64, __m256i, __mmask8, __m128h, 8) test_2 (_mm256_maskz_cvt_roundph_epu32, __m256i, __mmask8, __m128h, 8) test_2 (_mm256_maskz_cvt_roundph_epu64, __m256i, __mmask8, __m128h, 8) -test_2 (_mm256_maskz_cvt_roundph_epu16, __m256i, __mmask16, __m256h, 8) -test_2 (_mm256_maskz_cvt_roundph_epi16, __m256i, __mmask16, __m256h, 8) -test_2 (_mm256_maskz_cvt_roundps_pd, __m256d, __mmask8, __m128, 8) -test_2 (_mm256_maskz_cvtx_roundps_ph, __m128h, __mmask8, __m256, 8) test_2x (_mm256_cmp_round_pd_mask, __mmask8, __m256d, __m256d, 1, 8) test_2x (_mm256_cmp_round_ph_mask, __mmask16, __m256h, __m256h, 1, 8) test_2x (_mm256_cmp_round_ps_mask, __mmask8, __m256, __m256, 1, 8) @@ -1082,10 +1074,6 @@ test_3 (_mm256_mask_cvtx_roundph_ps, __m256, __m256, __mmask8, __m128h, 8) test_3 (_mm256_mask_cvt_roundph_epi64, __m256i, __m256i, __mmask8, __m128h, 8) test_3 (_mm256_mask_cvt_roundph_epu32, __m256i, __m256i, __mmask8, __m128h, 8) test_3 (_mm256_mask_cvt_roundph_epu64, __m256i, __m256i, __mmask8, __m128h, 8) -test_3 (_mm256_mask_cvt_roundph_epu16, __m256i, __m256i, __mmask16, __m256h, 8) -test_3 (_mm256_mask_cvt_roundph_epi16, __m256i, __m256i, __mmask16, __m256h, 8) -test_3 (_mm256_mask_cvt_roundps_pd, __m256d, __m256d, __mmask8, __m128, 8) -test_3 (_mm256_mask_cvtx_roundps_ph, __m128h, __m128h, __mmask8, __m256, 8) test_3x (_mm256_mask_cmp_round_pd_mask, __mmask8, __mmask8, __m256d, __m256d, 1, 8) test_3x (_mm256_mask_cmp_round_ph_mask, __mmask16, __mmask16, __m256h, __m256h, 1, 8) test_3x (_mm256_mask_cmp_round_ps_mask, __mmask8, __mmask8, __m256, __m256, 1, 8) diff --git a/gcc/testsuite/gcc.target/i386/sse-22.c b/gcc/testsuite/gcc.target/i386/sse-22.c index cb8af233b9f..9c14e1f75ab 100644 --- a/gcc/testsuite/gcc.target/i386/sse-22.c +++ b/gcc/testsuite/gcc.target/i386/sse-22.c @@ -1077,10 +1077,6 @@ test_1 (_mm256_cvtx_roundph_ps, __m256, __m128h, 8) test_1 (_mm256_cvt_roundph_epi64, __m256i, __m128h, 8) test_1 (_mm256_cvt_roundph_epu32, __m256i, __m128h, 8) test_1 (_mm256_cvt_roundph_epu64, __m256i, __m128h, 8) -test_1 (_mm256_cvt_roundph_epu16, __m256i, __m256h, 8) -test_1 (_mm256_cvt_roundph_epi16, __m256i, __m256h, 8) -test_1 (_mm256_cvt_roundps_pd, __m256d, __m128, 8) -test_1 (_mm256_cvtx_roundps_ph, __m128h, __m256, 8) test_2 (_mm256_add_round_pd, __m256d, __m256d, __m256d, 9) test_2 (_mm256_add_round_ph, __m256h, __m256h, __m256h, 8) test_2 (_mm256_add_round_ps, __m256, __m256, __m256, 9) @@ -1099,10 +1095,6 @@ test_2 (_mm256_maskz_cvtx_roundph_ps, __m256, __mmask8, __m128h, 8) test_2 (_mm256_maskz_cvt_roundph_epi64, __m256i, __mmask8, __m128h, 8) test_2 (_mm256_maskz_cvt_roundph_epu32, __m256i, __mmask8, __m128h, 8) test_2 (_mm256_maskz_cvt_roundph_epu64, __m256i, __mmask8, __m128h, 8) -test_2 (_mm256_maskz_cvt_roundph_epu16, __m256i, __mmask16, __m256h, 8) -test_2 (_mm256_maskz_cvt_roundph_epi16, __m256i, __mmask16, __m256h, 8) -test_2 (_mm256_maskz_cvt_roundps_pd, __m256d, __mmask8, __m128, 8) -test_2 (_mm256_maskz_cvtx_roundps_ph, __m128h, __mmask8, __m256, 8) test_2x (_mm256_cmp_round_pd_mask, __mmask8, __m256d, __m256d, 1, 8) test_2x (_mm256_cmp_round_ph_mask, __mmask16, __m256h, __m256h, 1, 8) test_2x (_mm256_cmp_round_ps_mask, __mmask8, __m256, __m256, 1, 8) @@ -1124,10 +1116,6 @@ test_3 (_mm256_mask_cvtx_roundph_ps, __m256, __m256, __mmask8, __m128h, 8) test_3 (_mm256_mask_cvt_roundph_epi64, __m256i, __m256i, __mmask8, __m128h, 8) test_3 (_mm256_mask_cvt_roundph_epu32, __m256i, __m256i, __mmask8, __m128h, 8) test_3 (_mm256_mask_cvt_roundph_epu64, __m256i, __m256i, __mmask8, __m128h, 8) -test_3 (_mm256_mask_cvt_roundph_epu16, __m256i, __m256i, __mmask16, __m256h, 8) -test_3 (_mm256_mask_cvt_roundph_epi16, __m256i, __m256i, __mmask16, __m256h, 8) -test_3 (_mm256_mask_cvt_roundps_pd, __m256d, __m256d, __mmask8, __m128, 8) -test_3 (_mm256_mask_cvtx_roundps_ph, __m128h, __m128h, __mmask8, __m256, 8) test_3x (_mm256_mask_cmp_round_pd_mask, __mmask8, __mmask8, __m256d, __m256d, 1, 8) test_3x (_mm256_mask_cmp_round_ph_mask, __mmask16, __mmask16, __m256h, __m256h, 1, 8) test_3x (_mm256_mask_cmp_round_ps_mask, __mmask8, __mmask8, __m256, __m256, 1, 8) diff --git a/gcc/testsuite/gcc.target/i386/sse-23.c b/gcc/testsuite/gcc.target/i386/sse-23.c index b23a7f4131b..773ee5227fa 100644 --- a/gcc/testsuite/gcc.target/i386/sse-23.c +++ b/gcc/testsuite/gcc.target/i386/sse-23.c @@ -846,10 +846,6 @@ #define __builtin_ia32_vcvtph2qq256_mask_round(A, B, C, D) __builtin_ia32_vcvtph2qq256_mask_round(A, B, C, 8) #define __builtin_ia32_vcvtph2udq256_mask_round(A, B, C, D) __builtin_ia32_vcvtph2udq256_mask_round(A, B, C, 8) #define __builtin_ia32_vcvtph2uqq256_mask_round(A, B, C, D) __builtin_ia32_vcvtph2uqq256_mask_round(A, B, C, 8) -#define __builtin_ia32_vcvtph2uw256_mask_round(A, B, C, D) __builtin_ia32_vcvtph2uw256_mask_round(A, B, C, 8) -#define __builtin_ia32_vcvtph2w256_mask_round(A, B, C, D) __builtin_ia32_vcvtph2w256_mask_round(A, B, C, 8) -#define __builtin_ia32_vcvtps2pd256_mask_round(A, B, C, D) __builtin_ia32_vcvtps2pd256_mask_round(A, B, C, 8) -#define __builtin_ia32_vcvtps2phx256_mask_round(A, B, C, D) __builtin_ia32_vcvtps2phx256_mask_round(A, B, C, 8) /* avx10_2-512mediaintrin.h */ #define __builtin_ia32_mpsadbw512(A, B, C) __builtin_ia32_mpsadbw512 (A, B, 1) -- 2.31.1