This reverts commit 0683ca355a87fd36a2e7ae1721199204ceff4c4c.
---
 gcc/config/i386/avx10_2roundingintrin.h       | 176 ------------------
 gcc/config/i386/i386-builtin.def              |   9 -
 gcc/config/i386/sse.md                        |   2 +-
 gcc/testsuite/gcc.target/i386/avx-1.c         |   9 -
 .../gcc.target/i386/avx10_2-rounding-3.c      |  31 ---
 gcc/testsuite/gcc.target/i386/sse-13.c        |   9 -
 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        |   9 -
 9 files changed, 1 insertion(+), 268 deletions(-)

diff --git a/gcc/config/i386/avx10_2roundingintrin.h 
b/gcc/config/i386/avx10_2roundingintrin.h
index 10cd2e71ee0..f65533b1681 100644
--- a/gcc/config/i386/avx10_2roundingintrin.h
+++ b/gcc/config/i386/avx10_2roundingintrin.h
@@ -2092,146 +2092,6 @@ _mm256_maskz_fixupimm_round_ps (__mmask8 __U, __m256 
__A, __m256 __B,
                                                            (__mmask8) __U,
                                                            __R);
 }
-
-extern __inline __m256d
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_fmadd_round_pd (__m256d __A, __m256d __B, __m256d __D, const int __R)
-{
-  return (__m256d) __builtin_ia32_vfmaddpd256_mask_round ((__v4df) __A,
-                                                         (__v4df) __B,
-                                                         (__v4df) __D,
-                                                         (__mmask8) -1,
-                                                         __R);
-}
-
-extern __inline __m256d
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_mask_fmadd_round_pd (__m256d __A, __mmask8 __U, __m256d __B,
-                           __m256d __D, const int __R)
-{
-  return (__m256d) __builtin_ia32_vfmaddpd256_mask_round ((__v4df) __A,
-                                                         (__v4df) __B,
-                                                         (__v4df) __D,
-                                                         (__mmask8) __U, __R);
-}
-
-extern __inline __m256d
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_mask3_fmadd_round_pd (__m256d __A, __m256d __B, __m256d __D,
-                            __mmask8 __U, const int __R)
-{
-  return (__m256d) __builtin_ia32_vfmaddpd256_mask3_round ((__v4df) __A,
-                                                          (__v4df) __B,
-                                                          (__v4df) __D,
-                                                          (__mmask8) __U,
-                                                          __R);
-}
-
-extern __inline __m256d
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_maskz_fmadd_round_pd (__mmask8 __U, __m256d __A, __m256d __B,
-                            __m256d __D, const int __R)
-{
-  return (__m256d) __builtin_ia32_vfmaddpd256_maskz_round ((__v4df) __A,
-                                                          (__v4df) __B,
-                                                          (__v4df) __D,
-                                                          (__mmask8) __U,
-                                                          __R);
-}
-
-extern __inline __m256h
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_fmadd_round_ph (__m256h __A, __m256h __B, __m256h __D, const int __R)
-{
-  return (__m256h) __builtin_ia32_vfmaddph256_mask_round ((__v16hf) __A,
-                                                         (__v16hf) __B,
-                                                         (__v16hf) __D,
-                                                         (__mmask16) -1,
-                                                         __R);
-}
-
-extern __inline __m256h
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_mask_fmadd_round_ph (__m256h __A, __mmask16 __U, __m256h __B,
-                           __m256h __D, const int __R)
-{
-  return (__m256h) __builtin_ia32_vfmaddph256_mask_round ((__v16hf) __A,
-                                                         (__v16hf) __B,
-                                                         (__v16hf) __D,
-                                                         (__mmask16) __U,
-                                                         __R);
-}
-
-extern __inline __m256h
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_mask3_fmadd_round_ph (__m256h __A, __m256h __B, __m256h __D,
-                            __mmask16 __U, const int __R)
-{
-  return (__m256h) __builtin_ia32_vfmaddph256_mask3_round ((__v16hf) __A,
-                                                          (__v16hf) __B,
-                                                          (__v16hf) __D,
-                                                          (__mmask16) __U,
-                                                          __R);
-}
-
-extern __inline __m256h
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_maskz_fmadd_round_ph (__mmask16 __U, __m256h __A, __m256h __B,
-                            __m256h __D, const int __R)
-{
-  return (__m256h) __builtin_ia32_vfmaddph256_maskz_round ((__v16hf) __A,
-                                                          (__v16hf) __B,
-                                                          (__v16hf) __D,
-                                                          (__mmask16) __U,
-                                                          __R);
-}
-
-extern __inline __m256
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_fmadd_round_ps (__m256 __A, __m256 __B, __m256 __D, const int __R)
-{
-  return (__m256) __builtin_ia32_vfmaddps256_mask_round ((__v8sf) __A,
-                                                        (__v8sf) __B,
-                                                        (__v8sf) __D,
-                                                        (__mmask8) -1,
-                                                        __R);
-}
-
-extern __inline __m256
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_mask_fmadd_round_ps (__m256 __A, __mmask8 __U, __m256 __B,
-                           __m256 __D, const int __R)
-{
-  return (__m256) __builtin_ia32_vfmaddps256_mask_round ((__v8sf) __A,
-                                                        (__v8sf) __B,
-                                                        (__v8sf) __D,
-                                                        (__mmask8) __U,
-                                                        __R);
-}
-
-extern __inline __m256
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_mask3_fmadd_round_ps (__m256 __A, __m256 __B, __m256 __D,
-                            __mmask8 __U, const int __R)
-{
-  return (__m256) __builtin_ia32_vfmaddps256_mask3_round ((__v8sf) __A,
-                                                         (__v8sf) __B,
-                                                         (__v8sf) __D,
-                                                         (__mmask8) __U,
-                                                         __R);
-}
-
-extern __inline __m256
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_maskz_fmadd_round_ps (__mmask8 __U, __m256 __A, __m256 __B,
-                            __m256 __D, const int __R)
-{
-  return (__m256) __builtin_ia32_vfmaddps256_maskz_round ((__v8sf) __A,
-                                                         (__v8sf) __B,
-                                                         (__v8sf) __D,
-                                                         (__mmask8) __U,
-                                                         __R);
-}
 #else
 #define _mm256_add_round_pd(A, B, R) \
   ((__m256d) __builtin_ia32_addpd256_mask_round ((__v4df) (A), \
@@ -3469,42 +3329,6 @@ _mm256_maskz_fmadd_round_ps (__mmask8 __U, __m256 __A, 
__m256 __B,
                                                      (C),  \
                                                      (__mmask8) (U),  \
                                                      (R)))
-
-#define _mm256_fmadd_round_pd(A, B, D, R) \
-  ((__m256d) __builtin_ia32_vfmaddpd256_mask_round (A, B, D, -1, R))
-
-#define _mm256_mask_fmadd_round_pd(A, U, B, D, R) \
-  ((__m256d) __builtin_ia32_vfmaddpd256_mask_round (A, B, D, U, R))
-
-#define _mm256_mask3_fmadd_round_pd(A, B, D, U, R) \
-  ((__m256d) __builtin_ia32_vfmaddpd256_mask3_round (A, B, D, U, R))
-
-#define _mm256_maskz_fmadd_round_pd(U, A, B, D, R) \
-  ((__m256d) __builtin_ia32_vfmaddpd256_maskz_round (A, B, D, U, R))
-
-#define _mm256_fmadd_round_ph(A, B, D, R) \
-  ((__m256h) __builtin_ia32_vfmaddph256_mask_round (A, B, D, -1, R))
-
-#define _mm256_mask_fmadd_round_ph(A, U, B, D, R) \
-  ((__m256h) __builtin_ia32_vfmaddph256_mask_round (A, B, D, U, R))
-
-#define _mm256_mask3_fmadd_round_ph(A, B, D, U, R) \
-  ((__m256h) __builtin_ia32_vfmaddph256_mask3_round (A, B, D, U, R))
-
-#define _mm256_maskz_fmadd_round_ph(U, A, B, D, R) \
-  ((__m256h) __builtin_ia32_vfmaddph256_maskz_round (A, B, D, U, R))
-
-#define _mm256_fmadd_round_ps(A, B, D, R) \
-  ((__m256)__builtin_ia32_vfmaddps256_mask_round (A, B, D, -1, R))
-
-#define _mm256_mask_fmadd_round_ps(A, U, B, D, R)    \
-  ((__m256)__builtin_ia32_vfmaddps256_mask_round (A, B, D, U, R))
-
-#define _mm256_mask3_fmadd_round_ps(A, B, D, U, R)   \
-  ((__m256)__builtin_ia32_vfmaddps256_mask3_round (A, B, D, U, R))
-
-#define _mm256_maskz_fmadd_round_ps(U, A, B, D, R)   \
-  ((__m256)__builtin_ia32_vfmaddps256_maskz_round (A, B, D, U, R))
 #endif
 
 #define _mm256_cmul_round_pch(A, B, R) _mm256_fcmul_round_pch ((A), (B), (R))
diff --git a/gcc/config/i386/i386-builtin.def b/gcc/config/i386/i386-builtin.def
index b22cb8713e7..01c4ce6cb1d 100644
--- a/gcc/config/i386/i386-builtin.def
+++ b/gcc/config/i386/i386-builtin.def
@@ -3726,15 +3726,6 @@ BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_fixupimmv4df_mask_roun
 BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_fixupimmv4df_maskz_round, 
"__builtin_ia32_fixupimmpd256_maskz_round", 
IX86_BUILTIN_VFIXUPIMMPD256_MASKZ_ROUND, UNKNOWN, (int) 
V4DF_FTYPE_V4DF_V4DF_V4DI_INT_UQI_INT)
 BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_fixupimmv8sf_mask_round, 
"__builtin_ia32_fixupimmps256_mask_round", 
IX86_BUILTIN_VFIXUPIMMPS256_MASK_ROUND, UNKNOWN, (int) 
V8SF_FTYPE_V8SF_V8SF_V8SI_INT_UQI_INT)
 BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_fixupimmv8sf_maskz_round, 
"__builtin_ia32_fixupimmps256_maskz_round", 
IX86_BUILTIN_VFIXUPIMMPS256_MASKZ_ROUND, UNKNOWN, (int) 
V8SF_FTYPE_V8SF_V8SF_V8SI_INT_UQI_INT)
-BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_fmadd_v4df_mask_round, 
"__builtin_ia32_vfmaddpd256_mask_round", IX86_BUILTIN_VFMADDPD256_MASK_ROUND, 
UNKNOWN, (int) V4DF_FTYPE_V4DF_V4DF_V4DF_UQI_INT)
-BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_fmadd_v4df_mask3_round, 
"__builtin_ia32_vfmaddpd256_mask3_round", IX86_BUILTIN_VFMADDPD256_MASK3_ROUND, 
UNKNOWN, (int) V4DF_FTYPE_V4DF_V4DF_V4DF_UQI_INT)
-BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_fmadd_v4df_maskz_round, 
"__builtin_ia32_vfmaddpd256_maskz_round", IX86_BUILTIN_VFMADDPD256_MASKZ_ROUND, 
UNKNOWN, (int) V4DF_FTYPE_V4DF_V4DF_V4DF_UQI_INT)
-BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_fmadd_v16hf_mask_round, 
"__builtin_ia32_vfmaddph256_mask_round", IX86_BUILTIN_VFMADDPH256_MASK_ROUND, 
UNKNOWN, (int) V16HF_FTYPE_V16HF_V16HF_V16HF_UHI_INT)
-BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_fmadd_v16hf_mask3_round, 
"__builtin_ia32_vfmaddph256_mask3_round", IX86_BUILTIN_VFMADDPH512_MASK3_ROUND, 
UNKNOWN, (int) V16HF_FTYPE_V16HF_V16HF_V16HF_UHI_INT)
-BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_fmadd_v16hf_maskz_round, 
"__builtin_ia32_vfmaddph256_maskz_round", IX86_BUILTIN_VFMADDPH256_MASKZ_ROUND, 
UNKNOWN, (int) V16HF_FTYPE_V16HF_V16HF_V16HF_UHI_INT)
-BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_fmadd_v8sf_mask_round, 
"__builtin_ia32_vfmaddps256_mask_round", IX86_BUILTIN_VFMADDPS256_MASK_ROUND, 
UNKNOWN, (int) V8SF_FTYPE_V8SF_V8SF_V8SF_UQI_INT)
-BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_fmadd_v8sf_mask3_round, 
"__builtin_ia32_vfmaddps256_mask3_round", IX86_BUILTIN_VFMADDPS512_MASK3_ROUND, 
UNKNOWN, (int) V8SF_FTYPE_V8SF_V8SF_V8SF_UQI_INT)
-BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_fmadd_v8sf_maskz_round, 
"__builtin_ia32_vfmaddps256_maskz_round", IX86_BUILTIN_VFMADDPS256_MASKZ_ROUND, 
UNKNOWN, (int) V8SF_FTYPE_V8SF_V8SF_V8SF_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/sse.md b/gcc/config/i386/sse.md
index 145982c5688..2f0d2bb0033 100644
--- a/gcc/config/i386/sse.md
+++ b/gcc/config/i386/sse.md
@@ -5997,7 +5997,7 @@
            (match_operand:VFH_AVX512VL 3 "nonimmediate_operand" "0"))
          (match_dup 3)
          (match_operand:<avx512fmaskmode> 4 "register_operand" "Yk")))]
-  "TARGET_AVX512F && <round_mode_condition>"
+  "TARGET_AVX512F"
   "vfmadd231<ssemodesuffix>\t{<round_op5>%2, %1, %0%{%4%}|%0%{%4%}, %1, 
%2<round_op5>}"
   [(set_attr "type" "ssemuladd")
    (set_attr "prefix" "evex")
diff --git a/gcc/testsuite/gcc.target/i386/avx-1.c 
b/gcc/testsuite/gcc.target/i386/avx-1.c
index 25622466ebd..b1b2cfec193 100644
--- a/gcc/testsuite/gcc.target/i386/avx-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx-1.c
@@ -909,15 +909,6 @@
 #define __builtin_ia32_fixupimmpd256_maskz_round(A, B, C, I, E, F) 
__builtin_ia32_fixupimmpd256_maskz_round(A, B, C, 1, E, 8)
 #define __builtin_ia32_fixupimmps256_mask_round(A, B, C, I, E, F) 
__builtin_ia32_fixupimmps256_mask_round(A, B, C, 1, E, 8)
 #define __builtin_ia32_fixupimmps256_maskz_round(A, B, C, I, E, F) 
__builtin_ia32_fixupimmps256_maskz_round(A, B, C, 1, E, 8)
-#define __builtin_ia32_vfmaddpd256_mask_round(A, B, C, D, E) 
__builtin_ia32_vfmaddpd256_mask_round(A, B, C, D, 8)
-#define __builtin_ia32_vfmaddpd256_mask3_round(A, B, C, D, E) 
__builtin_ia32_vfmaddpd256_mask3_round(A, B, C, D, 8)
-#define __builtin_ia32_vfmaddpd256_maskz_round(A, B, C, D, E) 
__builtin_ia32_vfmaddpd256_maskz_round(A, B, C, D, 8)
-#define __builtin_ia32_vfmaddph256_mask_round(A, B, C, D, E) 
__builtin_ia32_vfmaddph256_mask_round(A, B, C, D, 8)
-#define __builtin_ia32_vfmaddph256_mask3_round(A, B, C, D, E) 
__builtin_ia32_vfmaddph256_mask3_round(A, B, C, D, 8)
-#define __builtin_ia32_vfmaddph256_maskz_round(A, B, C, D, E) 
__builtin_ia32_vfmaddph256_maskz_round(A, B, C, D, 8)
-#define __builtin_ia32_vfmaddps256_mask_round(A, B, C, D, E) 
__builtin_ia32_vfmaddps256_mask_round(A, B, C, D, 8)
-#define __builtin_ia32_vfmaddps256_mask3_round(A, B, C, D, E) 
__builtin_ia32_vfmaddps256_mask3_round(A, B, C, D, 8)
-#define __builtin_ia32_vfmaddps256_maskz_round(A, B, C, D, E) 
__builtin_ia32_vfmaddps256_maskz_round(A, B, C, D, 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-3.c 
b/gcc/testsuite/gcc.target/i386/avx10_2-rounding-3.c
index 4926882d54c..d61054f3058 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-rounding-3.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-rounding-3.c
@@ -27,18 +27,6 @@
 /* { dg-final { scan-assembler-times "vfixupimmps\[ 
\\t\]+\[^\{\n\]*\{sae\}\[^\n\]*%ymm\[0-9\]+(?:\n|\[ \\t\]+#)"  1  }  } */
 /* { dg-final { scan-assembler-times "vfixupimmps\[ 
\\t\]+\[^\{\n\]*\{sae\}\[^\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1  } 
 } */
 /* { dg-final { scan-assembler-times "vfixupimmps\[ 
\\t\]+\[^\{\n\]*\{sae\}\[^\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ \\t\]+#)" 
1  }  } */
-/* { dg-final { scan-assembler-times "vfmadd...pd\[ 
\\t\]+\[^\n\]*\{rn-sae\}\[^\{\n\]*%ymm\[0-9\]+(?:\n|\[ \\t\]+#)" 1  }  } */
-/* { dg-final { scan-assembler-times "vfmadd...pd\[ 
\\t\]+\[^\n\]*\{rd-sae\}\[^\{\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 
 }  } */
-/* { dg-final { scan-assembler-times "vfmadd231pd\[ 
\\t\]+\[^\n\]*\{ru-sae\}\[^\{\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 
 }  } */
-/* { dg-final { scan-assembler-times "vfmadd...pd\[ 
\\t\]+\[^\n\]*\{rz-sae\}\[^\{\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ 
\\t\]+#)" 1  }  } */
-/* { dg-final { scan-assembler-times "vfmadd...ph\[ 
\\t\]+\[^\n\]*\{rn-sae\}\[^\{\n\]*%ymm\[0-9\]+(?:\n|\[ \\t\]+#)" 1  }  } */
-/* { dg-final { scan-assembler-times "vfmadd...ph\[ 
\\t\]+\[^\n\]*\{rd-sae\}\[^\{\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 
 }  } */
-/* { dg-final { scan-assembler-times "vfmadd231ph\[ 
\\t\]+\[^\n\]*\{ru-sae\}\[^\{\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 
 }  } */
-/* { dg-final { scan-assembler-times "vfmadd...ph\[ 
\\t\]+\[^\n\]*\{rz-sae\}\[^\{\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ 
\\t\]+#)" 1  }  } */
-/* { dg-final { scan-assembler-times "vfmadd...ps\[ 
\\t\]+\[^\n\]*\{rn-sae\}\[^\{\n\]*%ymm\[0-9\]+(?:\n|\[ \\t\]+#)" 1  }  } */
-/* { dg-final { scan-assembler-times "vfmadd...ps\[ 
\\t\]+\[^\n\]*\{rd-sae\}\[^\{\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 
 }  } */
-/* { dg-final { scan-assembler-times "vfmadd231ps\[ 
\\t\]+\[^\n\]*\{ru-sae\}\[^\{\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 
 }  } */
-/* { dg-final { scan-assembler-times "vfmadd...ps\[ 
\\t\]+\[^\n\]*\{rz-sae\}\[^\{\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ 
\\t\]+#)" 1  }  } */
 
 #include <immintrin.h>
 
@@ -117,22 +105,3 @@ avx10_2_test_6 (void)
   x = _mm256_mask_fixupimm_round_ps (x, m8, x, xi, 3, _MM_FROUND_NO_EXC);
   x = _mm256_maskz_fixupimm_round_ps (m8, x, x, xi, 3, _MM_FROUND_NO_EXC);
 }
-
-void extern
-avx10_2_test_7 (void)
-{
-  xd = _mm256_fmadd_round_pd (xd, xd, xd, _MM_FROUND_TO_NEAREST_INT | 
_MM_FROUND_NO_EXC);
-  xd = _mm256_mask_fmadd_round_pd (xd, m8, xd, xd, _MM_FROUND_TO_NEG_INF | 
_MM_FROUND_NO_EXC);
-  xd = _mm256_mask3_fmadd_round_pd (xd, xd, xd, m8, _MM_FROUND_TO_POS_INF | 
_MM_FROUND_NO_EXC);
-  xd = _mm256_maskz_fmadd_round_pd (m8, xd, xd, xd, _MM_FROUND_TO_ZERO | 
_MM_FROUND_NO_EXC);
-
-  xh = _mm256_fmadd_round_ph (xh, xh, xh, _MM_FROUND_TO_NEAREST_INT | 
_MM_FROUND_NO_EXC);
-  xh = _mm256_mask_fmadd_round_ph (xh, m16, xh, xh, _MM_FROUND_TO_NEG_INF | 
_MM_FROUND_NO_EXC);
-  xh = _mm256_mask3_fmadd_round_ph (xh, xh, xh, m16, _MM_FROUND_TO_POS_INF | 
_MM_FROUND_NO_EXC);
-  xh = _mm256_maskz_fmadd_round_ph (m16, xh, xh, xh, _MM_FROUND_TO_ZERO | 
_MM_FROUND_NO_EXC);
-
-  x = _mm256_fmadd_round_ps (x, x, x, _MM_FROUND_TO_NEAREST_INT | 
_MM_FROUND_NO_EXC);
-  x = _mm256_mask_fmadd_round_ps (x, m8, x, x, _MM_FROUND_TO_NEG_INF | 
_MM_FROUND_NO_EXC);
-  x = _mm256_mask3_fmadd_round_ps (x, x, x, m8, _MM_FROUND_TO_POS_INF | 
_MM_FROUND_NO_EXC);
-  x = _mm256_maskz_fmadd_round_ps (m8, x, x, x, _MM_FROUND_TO_ZERO | 
_MM_FROUND_NO_EXC);
-}
diff --git a/gcc/testsuite/gcc.target/i386/sse-13.c 
b/gcc/testsuite/gcc.target/i386/sse-13.c
index 6189424fc8a..870fbe24525 100644
--- a/gcc/testsuite/gcc.target/i386/sse-13.c
+++ b/gcc/testsuite/gcc.target/i386/sse-13.c
@@ -916,15 +916,6 @@
 #define __builtin_ia32_fixupimmpd256_maskz_round(A, B, C, D, E, F) 
__builtin_ia32_fixupimmpd256_maskz_round(A, B, C, 1, E, 8)
 #define __builtin_ia32_fixupimmps256_mask_round(A, B, C, D, E, F) 
__builtin_ia32_fixupimmps256_mask_round(A, B, C, 1, E, 8)
 #define __builtin_ia32_fixupimmps256_maskz_round(A, B, C, D, E, F) 
__builtin_ia32_fixupimmps256_maskz_round(A, B, C, 1, E, 8)
-#define __builtin_ia32_vfmaddpd256_mask_round(A, B, C, D, E) 
__builtin_ia32_vfmaddpd256_mask_round(A, B, C, D, 8)
-#define __builtin_ia32_vfmaddpd256_mask3_round(A, B, C, D, E) 
__builtin_ia32_vfmaddpd256_mask3_round(A, B, C, D, 8)
-#define __builtin_ia32_vfmaddpd256_maskz_round(A, B, C, D, E) 
__builtin_ia32_vfmaddpd256_maskz_round(A, B, C, D, 8)
-#define __builtin_ia32_vfmaddph256_mask_round(A, B, C, D, E) 
__builtin_ia32_vfmaddph256_mask_round(A, B, C, D, 8)
-#define __builtin_ia32_vfmaddph256_mask3_round(A, B, C, D, E) 
__builtin_ia32_vfmaddph256_mask3_round(A, B, C, D, 8)
-#define __builtin_ia32_vfmaddph256_maskz_round(A, B, C, D, E) 
__builtin_ia32_vfmaddph256_maskz_round(A, B, C, D, 8)
-#define __builtin_ia32_vfmaddps256_mask_round(A, B, C, D, E) 
__builtin_ia32_vfmaddps256_mask_round(A, B, C, D, 8)
-#define __builtin_ia32_vfmaddps256_mask3_round(A, B, C, D, E) 
__builtin_ia32_vfmaddps256_mask3_round(A, B, C, D, 8)
-#define __builtin_ia32_vfmaddps256_maskz_round(A, B, C, D, E) 
__builtin_ia32_vfmaddps256_maskz_round(A, B, C, D, 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 f837fc66787..25eaca6bf1d 100644
--- a/gcc/testsuite/gcc.target/i386/sse-14.c
+++ b/gcc/testsuite/gcc.target/i386/sse-14.c
@@ -1178,9 +1178,6 @@ test_3 (_mm256_maskz_div_round_ph, __m256h, __mmask8, 
__m256h, __m256h, 9)
 test_3 (_mm256_maskz_div_round_ps, __m256, __mmask8, __m256, __m256, 9)
 test_3 (_mm256_fcmadd_round_pch, __m256h, __m256h, __m256h, __m256h, 8)
 test_3 (_mm256_maskz_fcmul_round_pch, __m256h, __mmask8, __m256h, __m256h, 8)
-test_3 (_mm256_fmadd_round_pd, __m256d, __m256d, __m256d, __m256d, 9)
-test_3 (_mm256_fmadd_round_ph, __m256h, __m256h, __m256h, __m256h, 9)
-test_3 (_mm256_fmadd_round_ps, __m256, __m256, __m256, __m256, 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)
@@ -1196,15 +1193,6 @@ test_4 (_mm256_mask_fcmadd_round_pch, __m256h, __m256h, 
__mmask8, __m256h, __m25
 test_4 (_mm256_mask3_fcmadd_round_pch, __m256h, __m256h, __m256h, __m256h, 
__mmask8, 9)
 test_4 (_mm256_maskz_fcmadd_round_pch, __m256h, __mmask8,  __m256h, __m256h, 
__m256h, 9)
 test_4 (_mm256_mask_fcmul_round_pch, __m256h, __m256h, __mmask8, __m256h, 
__m256h, 8)
-test_4 (_mm256_mask_fmadd_round_pd, __m256d, __m256d, __mmask8, __m256d, 
__m256d, 9)
-test_4 (_mm256_mask3_fmadd_round_pd, __m256d, __m256d, __m256d, __m256d, 
__mmask8, 9)
-test_4 (_mm256_maskz_fmadd_round_pd, __m256d, __mmask8, __m256d, __m256d, 
__m256d, 9)
-test_4 (_mm256_mask_fmadd_round_ph, __m256h, __m256h, __mmask16, __m256h, 
__m256h, 9)
-test_4 (_mm256_mask3_fmadd_round_ph, __m256h, __m256h, __m256h, __m256h, 
__mmask16, 9)
-test_4 (_mm256_maskz_fmadd_round_ph, __m256h,__mmask16, __m256h, __m256h, 
__m256h, 9)
-test_4 (_mm256_mask_fmadd_round_ps, __m256, __m256, __mmask8, __m256, __m256, 
9)
-test_4 (_mm256_mask3_fmadd_round_ps, __m256, __m256, __m256, __m256, __mmask8, 
9)
-test_4 (_mm256_maskz_fmadd_round_ps, __m256,__mmask8, __m256, __m256, __m256, 
9)
 test_4x (_mm256_maskz_fixupimm_round_pd, __m256d, __mmask8, __m256d, __m256d, 
__m256i, 3, 8)
 test_4x (_mm256_maskz_fixupimm_round_ps, __m256, __mmask8, __m256, __m256, 
__m256i, 3, 8)
 test_4x (_mm256_mask_fixupimm_round_pd, __m256d, __m256d, __mmask8, __m256d, 
__m256i, 3, 8)
diff --git a/gcc/testsuite/gcc.target/i386/sse-22.c 
b/gcc/testsuite/gcc.target/i386/sse-22.c
index 593edd8a10b..d66f0a0900c 100644
--- a/gcc/testsuite/gcc.target/i386/sse-22.c
+++ b/gcc/testsuite/gcc.target/i386/sse-22.c
@@ -1221,9 +1221,6 @@ test_3 (_mm256_maskz_div_round_ph, __m256h, __mmask8, 
__m256h, __m256h, 9)
 test_3 (_mm256_maskz_div_round_ps, __m256, __mmask8, __m256, __m256, 9)
 test_3 (_mm256_fcmadd_round_pch, __m256h, __m256h, __m256h, __m256h, 8)
 test_3 (_mm256_maskz_fcmul_round_pch, __m256h, __mmask8, __m256h, __m256h, 8)
-test_3 (_mm256_fmadd_round_pd, __m256d, __m256d, __m256d, __m256d, 9)
-test_3 (_mm256_fmadd_round_ph, __m256h, __m256h, __m256h, __m256h, 9)
-test_3 (_mm256_fmadd_round_ps, __m256, __m256, __m256, __m256, 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)
@@ -1239,15 +1236,6 @@ test_4 (_mm256_mask_fcmadd_round_pch, __m256h, __m256h, 
__mmask8, __m256h, __m25
 test_4 (_mm256_mask3_fcmadd_round_pch, __m256h, __m256h, __m256h, __m256h, 
__mmask8, 9)
 test_4 (_mm256_maskz_fcmadd_round_pch, __m256h, __mmask8,  __m256h, __m256h, 
__m256h, 9)
 test_4 (_mm256_mask_fcmul_round_pch, __m256h, __m256h, __mmask8, __m256h, 
__m256h, 8)
-test_4 (_mm256_mask_fmadd_round_pd, __m256d, __m256d, __mmask8, __m256d, 
__m256d, 9)
-test_4 (_mm256_mask3_fmadd_round_pd, __m256d, __m256d, __m256d, __m256d, 
__mmask8, 9)
-test_4 (_mm256_maskz_fmadd_round_pd, __m256d,__mmask8, __m256d, __m256d, 
__m256d, 9)
-test_4 (_mm256_mask_fmadd_round_ph, __m256h, __m256h, __mmask16, __m256h, 
__m256h, 9)
-test_4 (_mm256_mask3_fmadd_round_ph, __m256h, __m256h, __m256h, __m256h, 
__mmask16, 9)
-test_4 (_mm256_maskz_fmadd_round_ph, __m256h,__mmask16, __m256h, __m256h, 
__m256h, 9)
-test_4 (_mm256_mask_fmadd_round_ps, __m256, __m256, __mmask8, __m256, __m256, 
9)
-test_4 (_mm256_mask3_fmadd_round_ps, __m256, __m256, __m256, __m256, __mmask8, 
9)
-test_4 (_mm256_maskz_fmadd_round_ps, __m256,__mmask8, __m256, __m256, __m256, 
9)
 test_4x (_mm256_maskz_fixupimm_round_pd, __m256d, __mmask8, __m256d, __m256d, 
__m256i, 3, 8)
 test_4x (_mm256_maskz_fixupimm_round_ps, __m256, __mmask8, __m256, __m256, 
__m256i, 3, 8)
 test_4x (_mm256_mask_fixupimm_round_pd, __m256d, __m256d, __mmask8, __m256d, 
__m256i, 3, 8)
diff --git a/gcc/testsuite/gcc.target/i386/sse-23.c 
b/gcc/testsuite/gcc.target/i386/sse-23.c
index ce814568fb5..aa40d001b89 100644
--- a/gcc/testsuite/gcc.target/i386/sse-23.c
+++ b/gcc/testsuite/gcc.target/i386/sse-23.c
@@ -891,15 +891,6 @@
 #define __builtin_ia32_fixupimmpd256_maskz_round(A, B, C, D, E, F) 
__builtin_ia32_fixupimmpd256_maskz_round(A, B, C, 1, E, 8)
 #define __builtin_ia32_fixupimmps256_mask_round(A, B, C, D, E, F) 
__builtin_ia32_fixupimmps256_mask_round(A, B, C, 1, E, 8)
 #define __builtin_ia32_fixupimmps256_maskz_round(A, B, C, D, E, F) 
__builtin_ia32_fixupimmps256_maskz_round(A, B, C, 1, E, 8)
-#define __builtin_ia32_vfmaddpd256_mask_round(A, B, C, D, E) 
__builtin_ia32_vfmaddpd256_mask_round(A, B, C, D, 8)
-#define __builtin_ia32_vfmaddpd256_mask3_round(A, B, C, D, E) 
__builtin_ia32_vfmaddpd256_mask3_round(A, B, C, D, 8)
-#define __builtin_ia32_vfmaddpd256_maskz_round(A, B, C, D, E) 
__builtin_ia32_vfmaddpd256_maskz_round(A, B, C, D, 8)
-#define __builtin_ia32_vfmaddph256_mask_round(A, B, C, D, E) 
__builtin_ia32_vfmaddph256_mask_round(A, B, C, D, 8)
-#define __builtin_ia32_vfmaddph256_mask3_round(A, B, C, D, E) 
__builtin_ia32_vfmaddph256_mask3_round(A, B, C, D, 8)
-#define __builtin_ia32_vfmaddph256_maskz_round(A, B, C, D, E) 
__builtin_ia32_vfmaddph256_maskz_round(A, B, C, D, 8)
-#define __builtin_ia32_vfmaddps256_mask_round(A, B, C, D, E) 
__builtin_ia32_vfmaddps256_mask_round(A, B, C, D, 8)
-#define __builtin_ia32_vfmaddps256_mask3_round(A, B, C, D, E) 
__builtin_ia32_vfmaddps256_mask3_round(A, B, C, D, 8)
-#define __builtin_ia32_vfmaddps256_maskz_round(A, B, C, D, E) 
__builtin_ia32_vfmaddps256_maskz_round(A, B, C, D, 8)
 
 /* avx10_2-512mediaintrin.h  */
 #define __builtin_ia32_mpsadbw512(A, B, C) __builtin_ia32_mpsadbw512 (A, B, 1)
-- 
2.31.1

Reply via email to