]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
Revert "AVX10.2 ymm rounding: Support vcvtdq2p{s,h} and vcvtpd2p{s,h} intrins"
authorHaochen Jiang <haochen.jiang@intel.com>
Mon, 24 Mar 2025 06:24:31 +0000 (14:24 +0800)
committerHaochen Jiang <haochen.jiang@intel.com>
Mon, 24 Mar 2025 06:24:31 +0000 (14:24 +0800)
This reverts commit 85e874d19548f0dcb9a3f14f9e4b1e3411c88c4b.

12 files changed:
gcc/config/i386/avx10_2roundingintrin.h
gcc/config/i386/i386-builtin-types.def
gcc/config/i386/i386-builtin.def
gcc/config/i386/i386-expand.cc
gcc/config/i386/sse.md
gcc/config/i386/subst.md
gcc/testsuite/gcc.target/i386/avx-1.c
gcc/testsuite/gcc.target/i386/avx10_2-rounding-1.c
gcc/testsuite/gcc.target/i386/sse-13.c
gcc/testsuite/gcc.target/i386/sse-14.c
gcc/testsuite/gcc.target/i386/sse-22.c
gcc/testsuite/gcc.target/i386/sse-23.c

index d274449125633848f0a3c341170f03678bb5af57..9d6a49742ae7948b33da3c756e9d5b9e5ba6153e 100644 (file)
@@ -216,138 +216,6 @@ _mm256_mask_cmp_round_ps_mask (__mmask8 __U, __m256 __A, __m256 __B,
                                                        (__mmask8) __U,
                                                        __R);
 }
-
-extern __inline __m128h
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_cvt_roundepi32_ph (__m256i __A, const int __R)
-{
-  return (__m128h) __builtin_ia32_vcvtdq2ph256_mask_round ((__v8si) __A,
-                                                          (__v8hf)
-                                                          _mm_setzero_ph (),
-                                                          (__mmask8) -1,
-                                                          __R);
-}
-
-extern __inline __m128h
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_mask_cvt_roundepi32_ph (__m128h __W, __mmask8 __U, __m256i __A,
-                              const int __R)
-{
-  return (__m128h) __builtin_ia32_vcvtdq2ph256_mask_round ((__v8si) __A,
-                                                          (__v8hf) __W,
-                                                          (__mmask8) __U,
-                                                          __R);
-}
-
-extern __inline __m128h
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_maskz_cvt_roundepi32_ph (__mmask8 __U, __m256i __A, const int __R)
-{
-  return (__m128h) __builtin_ia32_vcvtdq2ph256_mask_round ((__v8si) __A,
-                                                          (__v8hf)
-                                                          _mm_setzero_ph (),
-                                                          (__mmask8) __U,
-                                                          __R);
-}
-
-extern __inline __m256
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_cvt_roundepi32_ps (__m256i __A, const int __R)
-{
-  return (__m256) __builtin_ia32_cvtdq2ps256_mask_round ((__v8si) __A,
-                                                        (__v8sf)
-                                                        _mm256_undefined_ps (),
-                                                        (__mmask8) -1,
-                                                        __R);
-}
-
-extern __inline __m256
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_mask_cvt_roundepi32_ps (__m256 __W, __mmask8 __U, __m256i __A,
-                              const int __R)
-{
-  return (__m256) __builtin_ia32_cvtdq2ps256_mask_round ((__v8si) __A,
-                                                        (__v8sf) __W,
-                                                        (__mmask8) __U,
-                                                        __R);
-}
-
-extern __inline __m256
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_maskz_cvt_roundepi32_ps (__mmask8 __U, __m256i __A, const int __R)
-{
-  return (__m256) __builtin_ia32_cvtdq2ps256_mask_round ((__v8si) __A,
-                                                        (__v8sf)
-                                                        _mm256_setzero_ps (),
-                                                        (__mmask8) __U,
-                                                        __R);
-}
-
-extern __inline __m128h
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_cvt_roundpd_ph (__m256d __A, const int __R)
-{
-  return (__m128h) __builtin_ia32_vcvtpd2ph256_mask_round ((__v4df) __A,
-                                                          (__v8hf)
-                                                          _mm_setzero_ph (),
-                                                          (__mmask8) -1,
-                                                          __R);
-}
-
-extern __inline __m128h
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_mask_cvt_roundpd_ph (__m128h __W, __mmask8 __U, __m256d __A,
-                           const int __R)
-{
-  return (__m128h) __builtin_ia32_vcvtpd2ph256_mask_round ((__v4df) __A,
-                                                          (__v8hf) __W,
-                                                          (__mmask8) __U,
-                                                          __R);
-}
-
-extern __inline __m128h
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_maskz_cvt_roundpd_ph (__mmask8 __U, __m256d __A, const int __R)
-{
-  return (__m128h) __builtin_ia32_vcvtpd2ph256_mask_round ((__v4df) __A,
-                                                          (__v8hf)
-                                                          _mm_setzero_ph (),
-                                                          (__mmask8) __U,
-                                                          __R);
-}
-
-extern __inline __m128
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_cvt_roundpd_ps (__m256d __A, const int __R)
-{
-  return (__m128) __builtin_ia32_cvtpd2ps256_mask_round ((__v4df) __A,
-                                                        (__v4sf)
-                                                        _mm_undefined_ps (),
-                                                        (__mmask8) -1,
-                                                        __R);
-}
-
-extern __inline __m128
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_mask_cvt_roundpd_ps (__m128 __W, __mmask8 __U, __m256d __A,
-                           const int __R)
-{
-  return (__m128) __builtin_ia32_cvtpd2ps256_mask_round ((__v4df) __A,
-                                                        (__v4sf) __W,
-                                                        (__mmask8) __U,
-                                                        __R);
-}
-
-extern __inline __m128
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_maskz_cvt_roundpd_ps (__mmask8 __U, __m256d __A, const int __R)
-{
-  return (__m128) __builtin_ia32_cvtpd2ps256_mask_round ((__v4df) __A,
-                                                        (__v4sf)
-                                                        _mm_setzero_ps (),
-                                                        (__mmask8) __U,
-                                                        __R);
-}
 #else
 #define _mm256_add_round_pd(A, B, R) \
   ((__m256d) __builtin_ia32_addpd256_mask_round ((__v4df) (A), \
@@ -459,84 +327,6 @@ _mm256_maskz_cvt_roundpd_ps (__mmask8 __U, __m256d __A, const int __R)
                                                  (C), \
                                                  (__mmask8) (U), \
                                                  (R)))
-
-#define _mm256_cvt_roundepi32_ph(A, R) \
-  ((__m128h) __builtin_ia32_vcvtdq2ph256_mask_round ((__v8si) (A), \
-                                                    (__v8hf) \
-                                                    (_mm_setzero_ph ()), \
-                                                    (__mmask8) (-1), \
-                                                    (R)))
-
-#define _mm256_mask_cvt_roundepi32_ph(W, U, A, R) \
-  ((__m128h) __builtin_ia32_vcvtdq2ph256_mask_round ((__v8si) (A), \
-                                                    (__v8hf) (W), \
-                                                    (__mmask8) (U), \
-                                                    (R)))
-
-#define _mm256_maskz_cvt_roundepi32_ph(U, A, R) \
-  ((__m128h) __builtin_ia32_vcvtdq2ph256_mask_round ((__v8si) (A), \
-                                                    (__v8hf) \
-                                                    (_mm_setzero_ph ()), \
-                                                    (__mmask8) (U), \
-                                                    (R)))
-
-#define _mm256_cvt_roundepi32_ps(A, R) \
-  ((__m256) __builtin_ia32_cvtdq2ps256_mask_round ((__v8si) (A), \
-                                                  (__v8sf) \
-                                                  (_mm256_undefined_ps ()), \
-                                                  (__mmask8) (-1), \
-                                                  (R)))
-
-#define _mm256_mask_cvt_roundepi32_ps(W, U, A, R) \
-  ((__m256) __builtin_ia32_cvtdq2ps256_mask_round ((__v8si) (A), \
-                                                  (__v8sf) (W), \
-                                                  (__mmask8) (U), \
-                                                  (R)))
-
-#define _mm256_maskz_cvt_roundepi32_ps(U, A, R) \
-  ((__m256) __builtin_ia32_cvtdq2ps256_mask_round ((__v8si) (A), \
-                                                  (__v8sf) \
-                                                  (_mm256_setzero_ps ()), \
-                                                  (__mmask8) (U), \
-                                                  (R)))
-
-#define _mm256_cvt_roundpd_ph(A, R) \
-  ((__m128h) __builtin_ia32_vcvtpd2ph256_mask_round ((__v4df) (A), \
-                                                    (_mm_setzero_ph ()), \
-                                                    (__mmask8) (-1), \
-                                                    (R)))
-
-#define _mm256_mask_cvt_roundpd_ph(W, U, A, R) \
-  ((__m128h) __builtin_ia32_vcvtpd2ph256_mask_round ((__v4df) (A), \
-                                                    (__v8hf) (W), \
-                                                    (__mmask8) (U), \
-                                                    (R)))
-
-#define _mm256_maskz_cvt_roundpd_ph(U, A, R) \
-  ((__m128h) __builtin_ia32_vcvtpd2ph256_mask_round ((__v4df) (A), \
-                                                    (_mm_setzero_ph ()), \
-                                                    (__mmask8) (U), \
-                                                    (R)))
-
-#define _mm256_cvt_roundpd_ps(A, R) \
-  ((__m128) __builtin_ia32_cvtpd2ps256_mask_round ((__v4df) (A), \
-                                                  (__v4sf) \
-                                                  (_mm_undefined_ps ()), \
-                                                  (__mmask8) (-1), \
-                                                  (R)))
-
-#define _mm256_mask_cvt_roundpd_ps(W, U, A, R) \
-  ((__m128) __builtin_ia32_cvtpd2ps256_mask_round ((__v4df) (A), \
-                                                  (__v4sf) (W), \
-                                                  (__mmask8) (U), \
-                                                  (R)))
-
-#define _mm256_maskz_cvt_roundpd_ps(U, A, R) \
-  ((__m128) __builtin_ia32_cvtpd2ps256_mask_round ((__v4df) (A), \
-                                                  (__v4sf) \
-                                                  (_mm_setzero_ps ()), \
-                                                  (__mmask8) (U), \
-                                                  (R)))
 #endif
 
 #ifdef __DISABLE_AVX10_2_256__
index eaf6fbd4a21b7162d87cda574a97d5c2da8d4af2..1974a35c9ae92211b158e3ee4250022b92309d4c 100644 (file)
@@ -1422,10 +1422,6 @@ DEF_FUNCTION_TYPE (V8SF, V8SF, V8SF, V8SF, UQI, INT)
 DEF_FUNCTION_TYPE (UQI, V4DF, V4DF, INT, UQI, INT)
 DEF_FUNCTION_TYPE (UHI, V16HF, V16HF, INT, UHI, INT)
 DEF_FUNCTION_TYPE (UQI, V8SF, V8SF, INT, UQI, INT)
-DEF_FUNCTION_TYPE (V8HF, V8SI, V8HF, UQI, INT)
-DEF_FUNCTION_TYPE (V8SF, V8SI, V8SF, UQI, INT)
-DEF_FUNCTION_TYPE (V8HF, V4DF, V8HF, UQI, INT)
-DEF_FUNCTION_TYPE (V4SF, V4DF, V4SF, 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)
index 99c2e67e4485984d30c971468e17b4cb742587f8..cce2e9568aff94145aba7ddb802b90f8c3e25997 100644 (file)
@@ -3666,10 +3666,6 @@ BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, CODE_FOR_addv8sf3_mask_round, "__builtin
 BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, CODE_FOR_avx512vl_cmpv4df3_mask_round, "__builtin_ia32_cmppd256_mask_round", IX86_BUILTIN_CMPPD256_MASK_ROUND, UNKNOWN, (int) UQI_FTYPE_V4DF_V4DF_INT_UQI_INT)
 BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, CODE_FOR_avx512vl_cmpv16hf3_mask_round, "__builtin_ia32_cmpph256_mask_round", IX86_BUILTIN_CMPPH256_MASK_ROUND, UNKNOWN, (int) UHI_FTYPE_V16HF_V16HF_INT_UHI_INT)
 BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, CODE_FOR_avx512vl_cmpv8sf3_mask_round, "__builtin_ia32_cmpps256_mask_round", IX86_BUILTIN_CMPPS256_MASK_ROUND, UNKNOWN, (int) UQI_FTYPE_V8SF_V8SF_INT_UQI_INT)
-BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, CODE_FOR_avx512fp16_vcvtdq2ph_v8si_mask_round, "__builtin_ia32_vcvtdq2ph256_mask_round", IX86_BUILTIN_VCVTDQ2PH256_MASK_ROUND, UNKNOWN, (int) V8HF_FTYPE_V8SI_V8HF_UQI_INT)
-BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, CODE_FOR_floatv8siv8sf2_mask_round, "__builtin_ia32_cvtdq2ps256_mask_round", IX86_BUILTIN_VCVTDQ2PS256_MASK_ROUND, UNKNOWN, (int) V8SF_FTYPE_V8SI_V8SF_UQI_INT)
-BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, CODE_FOR_avx512fp16_vcvtpd2ph_v4df_mask_round, "__builtin_ia32_vcvtpd2ph256_mask_round", IX86_BUILTIN_VCVTPD2PH256_MASK_ROUND, UNKNOWN, (int) V8HF_FTYPE_V4DF_V8HF_UQI_INT)
-BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, CODE_FOR_avx_cvtpd2ps256_mask_round, "__builtin_ia32_cvtpd2ps256_mask_round", IX86_BUILTIN_CVTPD2PS256_MASK_ROUND, UNKNOWN, (int) V4SF_FTYPE_V4DF_V4SF_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)
index c454be55f445b539bac3282d6447f8064adf50f9..e0e357ce53bd1bfdf4c7d5dc6c14f14d217aa470 100644 (file)
@@ -12749,14 +12749,10 @@ ix86_expand_round_builtin (const struct builtin_description *d,
     case V16HF_FTYPE_V16SI_V16HF_UHI_INT:
     case V8DF_FTYPE_V8SF_V8DF_QI_INT:
     case V16SF_FTYPE_V16HI_V16SF_HI_INT:
-    case V8SF_FTYPE_V8SI_V8SF_UQI_INT:
     case V2DF_FTYPE_V2DF_V2DF_V2DF_INT:
-    case V4SF_FTYPE_V4DF_V4SF_UQI_INT:
     case V4SF_FTYPE_V4SF_V4SF_V4SF_INT:
     case V8HF_FTYPE_V8DI_V8HF_UQI_INT:
     case V8HF_FTYPE_V8DF_V8HF_UQI_INT:
-    case V8HF_FTYPE_V8SI_V8HF_UQI_INT:
-    case V8HF_FTYPE_V4DF_V8HF_UQI_INT:
     case V16HF_FTYPE_V16SF_V16HF_UHI_INT:
     case V16HI_FTYPE_V16BF_V16HI_UHI_INT:
     case V8HF_FTYPE_V8HF_V8HF_V8HF_INT:
index 3dbe58a6a4cdec896beb8b66e862e27bec9ca875..4dbe60e3cf0c18dd8a95c87d8bd126d2e47494a3 100644 (file)
   [(set (match_operand:<ssePHmode> 0 "register_operand" "=v")
        (any_float:<ssePHmode>
          (match_operand:VI2H_AVX512VL 1 "<round_nimm_predicate>" "<round_constraint>")))]
-  "TARGET_AVX512FP16 && <round_mode_condition>"
+  "TARGET_AVX512FP16"
   "vcvt<floatsuffix><sseintconvert>2ph<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")
    (set_attr "prefix" "evex")
    (set_attr "mode" "<sseinsnmode>")])
 
-(define_expand "avx512fp16_vcvtpd2ph_v4df_mask_round"
-  [(match_operand:V8HF 0 "register_operand")
-   (match_operand:V4DF 1 "register_operand")
-   (match_operand:V8HF 2 "nonimm_or_0_operand")
-   (match_operand:QI 3 "register_operand")
-   (unspec [(match_operand:SI 4 "const_4_or_8_to_11_operand")] UNSPEC_EMBEDDED_ROUNDING)]
-  "TARGET_AVX10_2_256"
-{
-  emit_insn (gen_avx512fp16_vcvtpd2ph_v4df_mask_round_1 (
-    operands[0], operands[1], operands[2], operands[3], CONST0_RTX (V4HFmode), operands[4]));
-  DONE;
-})
-
 (define_expand "avx512fp16_vcvt<castmode>2ph_<mode>_mask"
   [(set (match_operand:V8HF 0 "register_operand" "=v")
        (vec_concat:V8HF
   "TARGET_AVX512FP16 && TARGET_AVX512VL"
   "operands[4] = CONST0_RTX (V4HFmode);")
 
-(define_insn "avx512fp16_vcvt<castmode>2ph_<mode>_mask<round_name>_1"
+(define_insn "*avx512fp16_vcvt<castmode>2ph_<mode>_mask"
   [(set (match_operand:V8HF 0 "register_operand" "=v")
        (vec_concat:V8HF
          (vec_merge:V4HF
            (float_truncate:V4HF
-             (match_operand:VF4_128_8_256 1 "<round_nimm_predicate>" "<round_constraint>"))
+             (match_operand:VF4_128_8_256 1 "vector_operand" "vm"))
            (vec_select:V4HF
              (match_operand:V8HF 2 "nonimm_or_0_operand" "0C")
              (parallel [(const_int 0) (const_int 1)
                         (const_int 2) (const_int 3)]))
            (match_operand:QI 3 "register_operand" "Yk"))
          (match_operand:V4HF 4 "const0_operand")))]
-  "TARGET_AVX512FP16 && TARGET_AVX512VL && <round_mode_condition>"
-  "vcvt<castmode>2ph<ph2pssuffix><round_qq2phsuff>\t{<round_op5>%1, %0%{%3%}%N2|%0%{%3%}%N2, %1<round_op5>}"
+  "TARGET_AVX512FP16 && TARGET_AVX512VL"
+  "vcvt<castmode>2ph<ph2pssuffix><qq2phsuff>\t{%1, %0%{%3%}%N2|%0%{%3%}%N2, %1}"
   [(set_attr "type" "ssecvt")
    (set_attr "prefix" "evex")
    (set_attr "mode" "<sseinsnmode>")])
    (set_attr "prefix" "evex")
    (set_attr "mode" "V8SF")])
 
-(define_insn "avx_cvtpd2ps256<mask_name><round_name>"
+(define_insn "avx_cvtpd2ps256<mask_name>"
   [(set (match_operand:V4SF 0 "register_operand" "=v")
        (float_truncate:V4SF
-         (match_operand:V4DF 1 "<round_nimm_predicate>" "<round_constraint>")))]
-  "TARGET_AVX && <mask_avx512vl_condition>
-   && (!<round_applied> || TARGET_AVX10_2_256)"
-  "vcvtpd2ps<round_suff>\t{<round_mask_op2>%1, %0<mask_operand2>|%0<mask_operand2>, %1<round_mask_op2>}"
+         (match_operand:V4DF 1 "nonimmediate_operand" "vm")))]
+  "TARGET_AVX && <mask_avx512vl_condition>"
+  "vcvtpd2ps{y}\t{%1, %0<mask_operand2>|%0<mask_operand2>, %1}"
   [(set_attr "type" "ssecvt")
    (set_attr "prefix" "maybe_evex")
    (set_attr "btver2_decode" "vector")
index a2bbafce9945d844849cfe02c82113247b7bfa9e..88d16869fccf3682e18c18df0fadf35af2d8c855 100644 (file)
 (define_subst_attr "round_sd_mask_op4" "round" "" "<round_sd_mask_operand4>")
 (define_subst_attr "round_sdc_mask_op4" "round" "" "<round_sdc_mask_operand4>")
 (define_subst_attr "round_constraint" "round" "vm" "v")
-(define_subst_attr "round_suff" "round" "{y}" "")
 (define_subst_attr "round_qq2phsuff" "round" "<qq2phsuff>" "")
 (define_subst_attr "bcst_round_constraint" "round" "vmBr" "v")
 (define_subst_attr "round_constraint2" "round" "m" "v")
                                                               || <MODE>mode == V8DFmode
                                                               || <MODE>mode == V8DImode
                                                               || <MODE>mode == V16SImode
-                                                              || <MODE>mode == V32HImode
                                                               || <MODE>mode == V32HFmode)
                                                               || (TARGET_AVX10_2_256
                                                                   && (<MODE>mode == V8SFmode
                                                                       || <MODE>mode == V4DImode
                                                                       || <MODE>mode == V8SImode
                                                                       || <MODE>mode == V16HFmode)))")
-(define_subst_attr "round_applied" "round" "false" "true")
 
 (define_subst_attr "round_modev4sf_condition" "round" "1" "(<MODE>mode == V4SFmode)")
 (define_subst_attr "round_codefor" "round" "*" "")
                                                                               || <MODE>mode == V8DFmode
                                                                               || <MODE>mode == V8DImode
                                                                               || <MODE>mode == V16SImode
-                                                                              || <MODE>mode == V32HImode
                                                                               || <MODE>mode == V32HFmode)
                                                                               || (TARGET_AVX10_2_256
                                                                                   && (<MODE>mode == V8SFmode
index dd26202a7c02edccdc560df622e400fda6146311..b4f290d8230748febd0e9ac7719852d5dff6b964 100644 (file)
 #define __builtin_ia32_cmppd256_mask_round(A, B, C, D, E) __builtin_ia32_cmppd256_mask_round(A, B, 1, D, 8)
 #define __builtin_ia32_cmpph256_mask_round(A, B, C, D, E) __builtin_ia32_cmpph256_mask_round(A, B, 1, D, 8)
 #define __builtin_ia32_cmpps256_mask_round(A, B, C, D, E) __builtin_ia32_cmpps256_mask_round(A, B, 1, D, 8)
-#define __builtin_ia32_vcvtdq2ph256_mask_round(A, B, C, D) __builtin_ia32_vcvtdq2ph256_mask_round(A, B, C, 8)
-#define __builtin_ia32_cvtdq2ps256_mask_round(A, B, C, D) __builtin_ia32_cvtdq2ps256_mask_round(A, B, C, 8)
-#define __builtin_ia32_vcvtpd2ph256_mask_round(A, B, C, D) __builtin_ia32_vcvtpd2ph256_mask_round(A, B, C, 8)
-#define __builtin_ia32_cvtpd2ps256_mask_round(A, B, C, D) __builtin_ia32_cvtpd2ps256_mask_round(A, B, C, 8)
 
 /* avx10_2-512mediaintrin.h */
 #define __builtin_ia32_mpsadbw512(A, B, C) __builtin_ia32_mpsadbw512 (A, B, 1)
index 7016d2c30eb3df390da3b1904e304b37fc6c12ce..f1f143c1f2c91a117a0b356e28002c5296a2191d 100644 (file)
 /* { dg-final { scan-assembler-times "vcmpph\[ \\t\]+\[^\{\n\]*\\\$4\[^\n\r]*%ymm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+\[^\n\r]*%k\[0-9\]\{%k\[0-9\]\}\[^\n\r]*(?:\n|\[ \\t\]+#)" 1  }  } */
 /* { dg-final { scan-assembler-times "vcmpps\[ \\t\]+\[^\{\n\]*\{sae\}\[^\n\]*%ymm\[0-9\]+\[^\n^k\]*%k\[0-7\](?:\n|\[ \\t\]+#)" 1  }  } */
 /* { dg-final { scan-assembler-times "vcmpps\[ \\t\]+\[^\{\n\]*\{sae\}\[^\n\]*%ymm\[0-9\]+\[^\n^k\]*%k\[0-7\]\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1  }  } */
-/* { dg-final { scan-assembler-times "vcvtdq2phy\[ \\t\]+\[^\{\n\]*%ymm\[0-9\]+\[^\n\r]*%xmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1  }  } */
-/* { dg-final { scan-assembler-times "vcvtdq2ph\[ \\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 "vcvtdq2ph\[ \\t\]+\{rz-sae\}\[^\{\n\]*%ymm\[0-9\]+\[^\n\r]*%xmm\[0-9\]+\{%k\[0-9\]\}\{z\}\[^\n\r]*(?:\n|\[ \\t\]+#)" 1  }  } */
-/* { dg-final { scan-assembler-times "vcvtdq2ps\[ \\t\]+\[^\n\]*\{rn-sae\}\[^\{\n\]*%ymm\[0-9\]+(?:\n|\[ \\t\]+#)" 1  }  } */
-/* { dg-final { scan-assembler-times "vcvtdq2ps\[ \\t\]+\[^\n\]*\{ru-sae\}\[^\{\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1  }  } */
-/* { dg-final { scan-assembler-times "vcvtdq2ps\[ \\t\]+\[^\n\]*\{rz-sae\}\[^\{\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ \\t\]+#)" 1  }  } */
-/* { dg-final { scan-assembler-times "vcvtpd2phy\[ \\t\]+\[^\{\n\]*%ymm\[0-9\]+\[^\n\r]*%xmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1  }  } */
-/* { dg-final { scan-assembler-times "vcvtpd2ph\[ \\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 "vcvtpd2ph\[ \\t\]+\{rz-sae\}\[^\{\n\]*%ymm\[0-9\]+\[^\n\r]*%xmm\[0-9\]+\{%k\[0-9\]\}\{z\}\[^\n\r]*(?:\n|\[ \\t\]+#)" 1  }  } */
-/* { dg-final { scan-assembler-times "vcvtpd2ps\[ \\t\]+\[^\n\]*\{rn-sae\}\[^\{\n\]*%xmm\[0-9\]+(?:\n|\[ \\t\]+#)" 1  }  } */
-/* { dg-final { scan-assembler-times "vcvtpd2ps\[ \\t\]+\[^\n\]*\{rd-sae\}\[^\{\n\]*%xmm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1  }  } */
-/* { dg-final { scan-assembler-times "vcvtpd2ps\[ \\t\]+\[^\n\]*\{rz-sae\}\[^\{\n\]*%xmm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ \\t\]+#)" 1  }  } */
 
 #include <immintrin.h>
 
-volatile __m128 hx;
-volatile __m128h hxh;
 volatile __m256 x;
 volatile __m256d xd;
 volatile __m256h xh;
-volatile __m256i xi;
 volatile __mmask8 m8;
 volatile __mmask16 m16;
 volatile __mmask32 m32;
@@ -54,11 +39,7 @@ avx10_2_test_1 (void)
   x = _mm256_add_round_ps (x, x, _MM_FROUND_TO_NEAREST_INT | _MM_FROUND_NO_EXC);
   x = _mm256_mask_add_round_ps (x, m16, x, x, _MM_FROUND_TO_POS_INF | _MM_FROUND_NO_EXC);
   x = _mm256_maskz_add_round_ps (m16, x, x, _MM_FROUND_TO_ZERO | _MM_FROUND_NO_EXC);
-}
 
-void extern
-avx10_2_test_2 (void)
-{
   m8 = _mm256_cmp_round_pd_mask (xd, xd, _CMP_FALSE_OQ, _MM_FROUND_NO_EXC);
   m8 = _mm256_mask_cmp_round_pd_mask (m8, xd, xd, _CMP_FALSE_OQ, _MM_FROUND_NO_EXC);
 
@@ -70,25 +51,14 @@ avx10_2_test_2 (void)
 }
 
 void extern
-avx10_2_test_3 (void)
+avx10_2_test_2 (void)
 {
-  hxh = _mm256_cvt_roundepi32_ph (xi, 4);
-  hxh = _mm256_mask_cvt_roundepi32_ph (hxh, m8, xi, 8);
-  hxh = _mm256_maskz_cvt_roundepi32_ph (m8, xi, 11);
-
-  x = _mm256_cvt_roundepi32_ps (xi, _MM_FROUND_TO_NEAREST_INT | _MM_FROUND_NO_EXC);
-  x = _mm256_mask_cvt_roundepi32_ps (x, m8, xi, _MM_FROUND_TO_POS_INF | _MM_FROUND_NO_EXC);
-  x = _mm256_maskz_cvt_roundepi32_ps (m8, xi, _MM_FROUND_TO_ZERO | _MM_FROUND_NO_EXC);
-}
+  m8 = _mm256_cmp_round_pd_mask (xd, xd, _CMP_FALSE_OQ, _MM_FROUND_NO_EXC);
+  m8 = _mm256_mask_cmp_round_pd_mask (m8, xd, xd, _CMP_FALSE_OQ, _MM_FROUND_NO_EXC);
 
-void extern
-avx10_2_test_4 (void)
-{
-  hxh = _mm256_cvt_roundpd_ph (xd, 4);
-  hxh = _mm256_mask_cvt_roundpd_ph (hxh, m8, xd, 8);
-  hxh = _mm256_maskz_cvt_roundpd_ph (m8, xd, 11);
+  m16 = _mm256_cmp_round_ph_mask (xh, xh, 3, 8);
+  m16 = _mm256_mask_cmp_round_ph_mask (m16, xh, xh, 4, 4);
 
-  hx = _mm256_cvt_roundpd_ps (xd, _MM_FROUND_TO_NEAREST_INT | _MM_FROUND_NO_EXC);
-  hx = _mm256_mask_cvt_roundpd_ps (hx, 4, xd, _MM_FROUND_TO_NEG_INF | _MM_FROUND_NO_EXC);
-  hx = _mm256_maskz_cvt_roundpd_ps (6, xd, _MM_FROUND_TO_ZERO | _MM_FROUND_NO_EXC);
+  m8 = _mm256_cmp_round_ps_mask (x, x, _CMP_FALSE_OQ, _MM_FROUND_NO_EXC);
+  m8 = _mm256_mask_cmp_round_ps_mask (m8, x, x, _CMP_FALSE_OQ, _MM_FROUND_NO_EXC);
 }
index 8e05035a2b495574e43ec30605ceaed973952274..74d9664d8ed4c57bfe5f2d4a28fd424cf4a26138 100644 (file)
 #define __builtin_ia32_cmppd256_mask_round(A, B, C, D, E) __builtin_ia32_cmppd256_mask_round(A, B, 1, D, 8)
 #define __builtin_ia32_cmpph256_mask_round(A, B, C, D, E) __builtin_ia32_cmpph256_mask_round(A, B, 1, D, 8)
 #define __builtin_ia32_cmpps256_mask_round(A, B, C, D, E) __builtin_ia32_cmpps256_mask_round(A, B, 1, D, 8)
-#define __builtin_ia32_vcvtdq2ph256_mask_round(A, B, C, D) __builtin_ia32_vcvtdq2ph256_mask_round(A, B, C, 8)
-#define __builtin_ia32_cvtdq2ps256_mask_round(A, B, C, D) __builtin_ia32_cvtdq2ps256_mask_round(A, B, C, 8)
-#define __builtin_ia32_vcvtpd2ph256_mask_round(A, B, C, D) __builtin_ia32_vcvtpd2ph256_mask_round(A, B, C, 8)
-#define __builtin_ia32_cvtpd2ps256_mask_round(A, B, C, D) __builtin_ia32_cvtpd2ps256_mask_round(A, B, C, 8)
 
 /* avx10_2-512mediaintrin.h */
 #define __builtin_ia32_mpsadbw512(A, B, C) __builtin_ia32_mpsadbw512 (A, B, 1)
index d392903abdadd00580b6fdea7452bf58fa8b817d..1a285653c36a32a1da0d063ff519e41a787484da 100644 (file)
@@ -1021,27 +1021,15 @@ test_2 (_mm512_gf2p8affine_epi64_epi8, __m512i, __m512i, __m512i, 1)
 test_3 (_mm_sm3rnds2_epi32, __m128i, __m128i, __m128i, __m128i, 1)
 
 /* avx10_2roundingintrin.h */
-test_1 (_mm256_cvt_roundepi32_ph, __m128h, __m256i, 8)
-test_1 (_mm256_cvt_roundepi32_ps, __m256, __m256i, 9)
-test_1 (_mm256_cvt_roundpd_ph, __m128h, __m256d, 8)
-test_1 (_mm256_cvt_roundpd_ps, __m128, __m256d, 9)
 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)
-test_2 (_mm256_maskz_cvt_roundepi32_ph, __m128h, __mmask8, __m256i, 8)
-test_2 (_mm256_maskz_cvt_roundepi32_ps, __m256, __mmask8, __m256i, 9)
-test_2 (_mm256_maskz_cvt_roundpd_ph, __m128h, __mmask8, __m256d, 8)
-test_2 (_mm256_maskz_cvt_roundpd_ps, __m128, __mmask8, __m256d, 9)
 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)
 test_3 (_mm256_maskz_add_round_pd, __m256d, __mmask8, __m256d, __m256d, 9)
 test_3 (_mm256_maskz_add_round_ph, __m256h, __mmask16, __m256h, __m256h, 8)
 test_3 (_mm256_maskz_add_round_ps, __m256, __mmask8, __m256, __m256, 9)
-test_3 (_mm256_mask_cvt_roundepi32_ph, __m128h, __m128h, __mmask8, __m256i, 8)
-test_3 (_mm256_mask_cvt_roundepi32_ps, __m256, __m256, __mmask8, __m256i, 9)
-test_3 (_mm256_mask_cvt_roundpd_ph, __m128h, __m128h, __mmask8, __m256d, 8)
-test_3 (_mm256_mask_cvt_roundpd_ps, __m128, __m128, __mmask8, __m256d, 9)
 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)
index 0ecca0dcaf166a00b56908b65d119882a8f55c5f..cbfbb13d75ac0699c681f59d5bf676873b11316e 100644 (file)
@@ -1062,27 +1062,15 @@ test_1 ( __bextri_u64, unsigned long long, unsigned long long, 1)
 test_3 (_mm_sm3rnds2_epi32, __m128i, __m128i, __m128i, __m128i, 1)
 
 /* avx10_2roundingintrin.h */
-test_1 (_mm256_cvt_roundepi32_ph, __m128h, __m256i, 8)
-test_1 (_mm256_cvt_roundepi32_ps, __m256, __m256i, 9)
-test_1 (_mm256_cvt_roundpd_ph, __m128h, __m256d, 8)
-test_1 (_mm256_cvt_roundpd_ps, __m128, __m256d, 9)
 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)
-test_2 (_mm256_maskz_cvt_roundepi32_ph, __m128h, __mmask8, __m256i, 8)
-test_2 (_mm256_maskz_cvt_roundepi32_ps, __m256, __mmask8, __m256i, 9)
-test_2 (_mm256_maskz_cvt_roundpd_ph, __m128h, __mmask8, __m256d, 8)
-test_2 (_mm256_maskz_cvt_roundpd_ps, __m128, __mmask8, __m256d, 9)
 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)
 test_3 (_mm256_maskz_add_round_pd, __m256d, __mmask8, __m256d, __m256d, 9)
 test_3 (_mm256_maskz_add_round_ph, __m256h, __mmask16, __m256h, __m256h, 8)
 test_3 (_mm256_maskz_add_round_ps, __m256, __mmask8, __m256, __m256, 9)
-test_3 (_mm256_mask_cvt_roundepi32_ph, __m128h, __m128h, __mmask8, __m256i, 8)
-test_3 (_mm256_mask_cvt_roundepi32_ps, __m256, __m256, __mmask8, __m256i, 9)
-test_3 (_mm256_mask_cvt_roundpd_ph, __m128h, __m128h, __mmask8, __m256d, 8)
-test_3 (_mm256_mask_cvt_roundpd_ps, __m128, __m128, __mmask8, __m256d, 9)
 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)
index 1f1c0e12ac6bb6e7fb755b7323cf75aae17d0378..8b263a8195f3963d38bc7b379073786df4abed95 100644 (file)
 #define __builtin_ia32_cmppd256_mask_round(A, B, C, D, E) __builtin_ia32_cmppd256_mask_round(A, B, 1, D, 8)
 #define __builtin_ia32_cmpph256_mask_round(A, B, C, D, E) __builtin_ia32_cmpph256_mask_round(A, B, 1, D, 8)
 #define __builtin_ia32_cmpps256_mask_round(A, B, C, D, E) __builtin_ia32_cmpps256_mask_round(A, B, 1, D, 8)
-#define __builtin_ia32_vcvtdq2ph256_mask_round(A, B, C, D) __builtin_ia32_vcvtdq2ph256_mask_round(A, B, C, 8)
-#define __builtin_ia32_cvtdq2ps256_mask_round(A, B, C, D) __builtin_ia32_cvtdq2ps256_mask_round(A, B, C, 8)
-#define __builtin_ia32_vcvtpd2ph256_mask_round(A, B, C, D) __builtin_ia32_vcvtpd2ph256_mask_round(A, B, C, 8)
-#define __builtin_ia32_cvtpd2ps256_mask_round(A, B, C, D) __builtin_ia32_cvtpd2ps256_mask_round(A, B, C, 8)
 
 /* avx10_2-512mediaintrin.h  */
 #define __builtin_ia32_mpsadbw512(A, B, C) __builtin_ia32_mpsadbw512 (A, B, 1)