This reverts commit 0983d406ae2e84394b25248865f51c686b119a57.
---
 gcc/config/i386/avx10_2roundingintrin.h       | 181 ------------------
 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(+), 273 deletions(-)

diff --git a/gcc/config/i386/avx10_2roundingintrin.h 
b/gcc/config/i386/avx10_2roundingintrin.h
index cf9ba411c30..034e722da03 100644
--- a/gcc/config/i386/avx10_2roundingintrin.h
+++ b/gcc/config/i386/avx10_2roundingintrin.h
@@ -2876,151 +2876,6 @@ _mm256_maskz_fnmadd_round_ps (__mmask8 __U, __m256 __A, 
__m256 __B,
                                                           (__mmask8) __U,
                                                           __R);
 }
-
-extern __inline __m256d
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_fnmsub_round_pd (__m256d __A, __m256d __B, __m256d __D, const int __R)
-{
-  return (__m256d) __builtin_ia32_vfnmsubpd256_mask_round ((__v4df) __A,
-                                                          (__v4df) __B,
-                                                          (__v4df) __D,
-                                                          (__mmask8) -1,
-                                                          __R);
-}
-
-extern __inline __m256d
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_mask_fnmsub_round_pd (__m256d __A, __mmask8 __U, __m256d __B,
-                            __m256d __D, const int __R)
-{
-  return (__m256d) __builtin_ia32_vfnmsubpd256_mask_round ((__v4df) __A,
-                                                          (__v4df) __B,
-                                                          (__v4df) __D,
-                                                          (__mmask8) __U,
-                                                          __R);
-}
-
-extern __inline __m256d
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_mask3_fnmsub_round_pd (__m256d __A, __m256d __B, __m256d __D,
-                             __mmask8 __U, const int __R)
-{
-  return (__m256d) __builtin_ia32_vfnmsubpd256_mask3_round ((__v4df) __A,
-                                                           (__v4df) __B,
-                                                           (__v4df) __D,
-                                                           (__mmask8) __U,
-                                                           __R);
-}
-
-extern __inline __m256d
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_maskz_fnmsub_round_pd (__mmask8 __U, __m256d __A, __m256d __B,
-                             __m256d __D, const int __R)
-{
-  return (__m256d) __builtin_ia32_vfnmsubpd256_maskz_round ((__v4df) __A,
-                                                           (__v4df) __B,
-                                                           (__v4df) __D,
-                                                           (__mmask8) __U,
-                                                           __R);
-}
-
-extern __inline __m256h
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_fnmsub_round_ph (__m256h __A, __m256h __B, __m256h __D, const int __R)
-{
-  return (__m256h)
-    __builtin_ia32_vfnmsubph256_mask_round ((__v16hf) __A,
-                                           (__v16hf) __B,
-                                           (__v16hf) __D,
-                                           (__mmask16) -1,
-                                           __R);
-}
-
-extern __inline __m256h
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_mask_fnmsub_round_ph (__m256h __A, __mmask16 __U, __m256h __B,
-                            __m256h __D, const int __R)
-{
-  return (__m256h)
-    __builtin_ia32_vfnmsubph256_mask_round ((__v16hf) __A,
-                                           (__v16hf) __B,
-                                           (__v16hf) __D,
-                                           (__mmask16) __U,
-                                           __R);
-}
-
-extern __inline __m256h
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_mask3_fnmsub_round_ph (__m256h __A, __m256h __B, __m256h __D,
-                             __mmask16 __U, const int __R)
-{
-  return (__m256h)
-    __builtin_ia32_vfnmsubph256_mask3_round ((__v16hf) __A,
-                                            (__v16hf) __B,
-                                            (__v16hf) __D,
-                                            (__mmask16) __U,
-                                            __R);
-}
-
-extern __inline __m256h
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_maskz_fnmsub_round_ph (__mmask16 __U, __m256h __A, __m256h __B,
-                             __m256h __D, const int __R)
-{
-  return (__m256h)
-    __builtin_ia32_vfnmsubph256_maskz_round ((__v16hf) __A,
-                                            (__v16hf) __B,
-                                            (__v16hf) __D,
-                                            (__mmask16) __U,
-                                            __R);
-}
-
-extern __inline __m256
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_fnmsub_round_ps (__m256 __A, __m256 __B, __m256 __D, const int __R)
-{
-  return (__m256) __builtin_ia32_vfnmsubps256_mask_round ((__v8sf) __A,
-                                                         (__v8sf) __B,
-                                                         (__v8sf) __D,
-                                                         (__mmask8) -1,
-                                                         __R);
-}
-
-extern __inline __m256
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_mask_fnmsub_round_ps (__m256 __A, __mmask8 __U, __m256 __B,
-                            __m256 __D, const int __R)
-{
-  return (__m256) __builtin_ia32_vfnmsubps256_mask_round ((__v8sf) __A,
-                                                         (__v8sf) __B,
-                                                         (__v8sf) __D,
-                                                         (__mmask8) __U,
-                                                         __R);
-}
-
-extern __inline __m256
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_mask3_fnmsub_round_ps (__m256 __A, __m256 __B, __m256 __D,
-                             __mmask8 __U, const int __R)
-{
-  return (__m256) __builtin_ia32_vfnmsubps256_mask3_round ((__v8sf) __A,
-                                                          (__v8sf) __B,
-                                                          (__v8sf) __D,
-                                                          (__mmask8) __U,
-                                                          __R);
-}
-
-extern __inline __m256
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_maskz_fnmsub_round_ps (__mmask8 __U, __m256 __A, __m256 __B,
-                             __m256 __D, const int __R)
-{
-  return (__m256) __builtin_ia32_vfnmsubps256_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), \
@@ -4473,42 +4328,6 @@ _mm256_maskz_fnmsub_round_ps (__mmask8 __U, __m256 __A, 
__m256 __B,
 
 #define _mm256_maskz_fnmadd_round_ps(U, A, B, D, R)   \
   (__m256)__builtin_ia32_vfnmaddps256_maskz_round (A, B, D, U, R)
-
-#define _mm256_fnmsub_round_pd(A, B, D, R)           \
-  (__m256d)__builtin_ia32_vfnmsubpd256_mask_round (A, B, D, -1, R)
-
-#define _mm256_mask_fnmsub_round_pd(A, U, B, D, R)    \
-  (__m256d)__builtin_ia32_vfnmsubpd256_mask_round (A, B, D, U, R)
-
-#define _mm256_mask3_fnmsub_round_pd(A, B, D, U, R)   \
-  (__m256d)__builtin_ia32_vfnmsubpd256_mask3_round (A, B, D, U, R)
-
-#define _mm256_maskz_fnmsub_round_pd(U, A, B, D, R)   \
-  (__m256d)__builtin_ia32_vfnmsubpd256_maskz_round (A, B, D, U, R)
-
-#define _mm256_fnmsub_round_ph(A, B, D, R)         \
-  ((__m256h)__builtin_ia32_vfnmsubph256_mask_round ((A), (B), (D), -1, (R)))
-
-#define _mm256_mask_fnmsub_round_ph(A, U, B, D, R)       \
-  ((__m256h)__builtin_ia32_vfnmsubph256_mask_round ((A), (B), (D), (U), (R)))
-
-#define _mm256_mask3_fnmsub_round_ph(A, B, D, U, R)      \
-  ((__m256h)__builtin_ia32_vfnmsubph256_mask3_round ((A), (B), (D), (U), (R)))
-
-#define _mm256_maskz_fnmsub_round_ph(U, A, B, D, R)      \
-  ((__m256h)__builtin_ia32_vfnmsubph256_maskz_round ((A), (B), (D), (U), (R)))
-
-#define _mm256_fnmsub_round_ps(A, B, D, R)           \
-  (__m256)__builtin_ia32_vfnmsubps256_mask_round (A, B, D, -1, R)
-
-#define _mm256_mask_fnmsub_round_ps(A, U, B, D, R)    \
-  (__m256)__builtin_ia32_vfnmsubps256_mask_round (A, B, D, U, R)
-
-#define _mm256_mask3_fnmsub_round_ps(A, B, D, U, R)   \
-  (__m256)__builtin_ia32_vfnmsubps256_mask3_round (A, B, D, U, R)
-
-#define _mm256_maskz_fnmsub_round_ps(U, A, B, D, R)   \
-  (__m256)__builtin_ia32_vfnmsubps256_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 a6d3d2ad178..006fa9a6762 100644
--- a/gcc/config/i386/i386-builtin.def
+++ b/gcc/config/i386/i386-builtin.def
@@ -3777,15 +3777,6 @@ BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_fnmadd_v16hf_maskz_rou
 BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_fnmadd_v8sf_mask_round, 
"__builtin_ia32_vfnmaddps256_mask_round", IX86_BUILTIN_VFNMADDPS256_MASK_ROUND, 
UNKNOWN, (int) V8SF_FTYPE_V8SF_V8SF_V8SF_UQI_INT)
 BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_fnmadd_v8sf_mask3_round, 
"__builtin_ia32_vfnmaddps256_mask3_round", 
IX86_BUILTIN_VFNMADDPS512_MASK3_ROUND, UNKNOWN, (int) 
V8SF_FTYPE_V8SF_V8SF_V8SF_UQI_INT)
 BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_fnmadd_v8sf_maskz_round, 
"__builtin_ia32_vfnmaddps256_maskz_round", 
IX86_BUILTIN_VFNMADDPS256_MASKZ_ROUND, UNKNOWN, (int) 
V8SF_FTYPE_V8SF_V8SF_V8SF_UQI_INT)
-BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_fnmsub_v4df_mask_round, 
"__builtin_ia32_vfnmsubpd256_mask_round", IX86_BUILTIN_VFNMSUBPD256_MASK_ROUND, 
UNKNOWN, (int) V4DF_FTYPE_V4DF_V4DF_V4DF_UQI_INT)
-BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_fnmsub_v4df_mask3_round, 
"__builtin_ia32_vfnmsubpd256_mask3_round", 
IX86_BUILTIN_VFNMSUBPD256_MASK3_ROUND, UNKNOWN, (int) 
V4DF_FTYPE_V4DF_V4DF_V4DF_UQI_INT)
-BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_fnmsub_v4df_maskz_round, 
"__builtin_ia32_vfnmsubpd256_maskz_round", 
IX86_BUILTIN_VFNMSUBPD256_MASKZ_ROUND, UNKNOWN, (int) 
V4DF_FTYPE_V4DF_V4DF_V4DF_UQI_INT)
-BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_fnmsub_v16hf_mask_round, 
"__builtin_ia32_vfnmsubph256_mask_round", IX86_BUILTIN_VFNMSUBPH256_MASK_ROUND, 
UNKNOWN, (int) V16HF_FTYPE_V16HF_V16HF_V16HF_UHI_INT)
-BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_fnmsub_v16hf_mask3_round, 
"__builtin_ia32_vfnmsubph256_mask3_round", 
IX86_BUILTIN_VFNMSUBPH256_MASK3_ROUND, UNKNOWN, (int) 
V16HF_FTYPE_V16HF_V16HF_V16HF_UHI_INT)
-BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_fnmsub_v16hf_maskz_round, 
"__builtin_ia32_vfnmsubph256_maskz_round", 
IX86_BUILTIN_VFNMSUBPH256_MASKZ_ROUND, UNKNOWN, (int) 
V16HF_FTYPE_V16HF_V16HF_V16HF_UHI_INT)
-BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_fnmsub_v8sf_mask_round, 
"__builtin_ia32_vfnmsubps256_mask_round", IX86_BUILTIN_VFNMSUBPS256_MASK_ROUND, 
UNKNOWN, (int) V8SF_FTYPE_V8SF_V8SF_V8SF_UQI_INT)
-BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_fnmsub_v8sf_mask3_round, 
"__builtin_ia32_vfnmsubps256_mask3_round", 
IX86_BUILTIN_VFNMSUBPS512_MASK3_ROUND, UNKNOWN, (int) 
V8SF_FTYPE_V8SF_V8SF_V8SF_UQI_INT)
-BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_fnmsub_v8sf_maskz_round, 
"__builtin_ia32_vfnmsubps256_maskz_round", 
IX86_BUILTIN_VFNMSUBPS256_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 504aa852418..07117ec7b24 100644
--- a/gcc/config/i386/sse.md
+++ b/gcc/config/i386/sse.md
@@ -6320,7 +6320,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"
   "vfnmsub231<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 208b5b90ed9..f7361e07597 100644
--- a/gcc/testsuite/gcc.target/i386/avx-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx-1.c
@@ -960,15 +960,6 @@
 #define __builtin_ia32_vfnmaddps256_mask_round(A, B, C, D, E) 
__builtin_ia32_vfnmaddps256_mask_round(A, B, C, D, 8)
 #define __builtin_ia32_vfnmaddps256_mask3_round(A, B, C, D, E) 
__builtin_ia32_vfnmaddps256_mask3_round(A, B, C, D, 8)
 #define __builtin_ia32_vfnmaddps256_maskz_round(A, B, C, D, E) 
__builtin_ia32_vfnmaddps256_maskz_round(A, B, C, D, 8)
-#define __builtin_ia32_vfnmsubpd256_mask_round(A, B, C, D, E) 
__builtin_ia32_vfnmsubpd256_mask_round(A, B, C, D, 8)
-#define __builtin_ia32_vfnmsubpd256_mask3_round(A, B, C, D, E) 
__builtin_ia32_vfnmsubpd256_mask3_round(A, B, C, D, 8)
-#define __builtin_ia32_vfnmsubpd256_maskz_round(A, B, C, D, E) 
__builtin_ia32_vfnmsubpd256_maskz_round(A, B, C, D, 8)
-#define __builtin_ia32_vfnmsubph256_mask_round(A, B, C, D, E) 
__builtin_ia32_vfnmsubph256_mask_round(A, B, C, D, 8)
-#define __builtin_ia32_vfnmsubph256_mask3_round(A, B, C, D, E) 
__builtin_ia32_vfnmsubph256_mask3_round(A, B, C, D, 8)
-#define __builtin_ia32_vfnmsubph256_maskz_round(A, B, C, D, E) 
__builtin_ia32_vfnmsubph256_maskz_round(A, B, C, D, 8)
-#define __builtin_ia32_vfnmsubps256_mask_round(A, B, C, D, E) 
__builtin_ia32_vfnmsubps256_mask_round(A, B, C, D, 8)
-#define __builtin_ia32_vfnmsubps256_mask3_round(A, B, C, D, E) 
__builtin_ia32_vfnmsubps256_mask3_round(A, B, C, D, 8)
-#define __builtin_ia32_vfnmsubps256_maskz_round(A, B, C, D, E) 
__builtin_ia32_vfnmsubps256_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 c1630c5ef1b..d9e2a3b2f36 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-rounding-3.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-rounding-3.c
@@ -93,18 +93,6 @@
 /* { dg-final { scan-assembler-times "vfnmadd...ps\[ 
\\t\]+\[^\n\]*\{rd-sae\}\[^\{\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 
 }  } */
 /* { dg-final { scan-assembler-times "vfnmadd231ps\[ 
\\t\]+\[^\n\]*\{ru-sae\}\[^\{\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 
 }  } */
 /* { dg-final { scan-assembler-times "vfnmadd...ps\[ 
\\t\]+\[^\n\]*\{rz-sae\}\[^\{\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ 
\\t\]+#)" 1  }  } */
-/* { dg-final { scan-assembler-times "vfnmsub...ps\[ 
\\t\]+\[^\n\]*\{rn-sae\}\[^\{\n\]*%ymm\[0-9\]+(?:\n|\[ \\t\]+#)" 1  }  } */
-/* { dg-final { scan-assembler-times "vfnmsub...ps\[ 
\\t\]+\[^\n\]*\{rd-sae\}\[^\{\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 
 }  } */
-/* { dg-final { scan-assembler-times "vfnmsub231ps\[ 
\\t\]+\[^\n\]*\{ru-sae\}\[^\{\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 
 }  } */
-/* { dg-final { scan-assembler-times "vfnmsub...ps\[ 
\\t\]+\[^\n\]*\{rz-sae\}\[^\{\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ 
\\t\]+#)" 1  }  } */
-/* { dg-final { scan-assembler-times "vfnmsub...pd\[ 
\\t\]+\[^\n\]*\{rn-sae\}\[^\{\n\]*%ymm\[0-9\]+(?:\n|\[ \\t\]+#)" 1  }  } */
-/* { dg-final { scan-assembler-times "vfnmsub...pd\[ 
\\t\]+\[^\n\]*\{rd-sae\}\[^\{\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 
 }  } */
-/* { dg-final { scan-assembler-times "vfnmsub231pd\[ 
\\t\]+\[^\n\]*\{ru-sae\}\[^\{\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 
 }  } */
-/* { dg-final { scan-assembler-times "vfnmsub...pd\[ 
\\t\]+\[^\n\]*\{rz-sae\}\[^\{\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ 
\\t\]+#)" 1  }  } */
-/* { dg-final { scan-assembler-times "vfnmsub...ph\[ 
\\t\]+\[^\n\]*\{rn-sae\}\[^\{\n\]*%ymm\[0-9\]+(?:\n|\[ \\t\]+#)" 1  }  } */
-/* { dg-final { scan-assembler-times "vfnmsub...ph\[ 
\\t\]+\[^\n\]*\{rd-sae\}\[^\{\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 
 }  } */
-/* { dg-final { scan-assembler-times "vfnmsub231ph\[ 
\\t\]+\[^\n\]*\{ru-sae\}\[^\{\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 
 }  } */
-/* { dg-final { scan-assembler-times "vfnmsub...ph\[ 
\\t\]+\[^\n\]*\{rz-sae\}\[^\{\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ 
\\t\]+#)" 1  }  } */
 
 #include <immintrin.h>
 
@@ -303,22 +291,3 @@ avx10_2_test_14 (void)
   x = _mm256_mask3_fnmadd_round_ps (x, x, x, m8, _MM_FROUND_TO_POS_INF | 
_MM_FROUND_NO_EXC);
   x = _mm256_maskz_fnmadd_round_ps (m8, x, x, x, _MM_FROUND_TO_ZERO | 
_MM_FROUND_NO_EXC);
 }
-
-void extern
-avx10_2_test_15 (void)
-{
-  xd = _mm256_fnmsub_round_pd (xd, xd, xd, _MM_FROUND_TO_NEAREST_INT | 
_MM_FROUND_NO_EXC);
-  xd = _mm256_mask_fnmsub_round_pd (xd, m8, xd, xd, _MM_FROUND_TO_NEG_INF | 
_MM_FROUND_NO_EXC);
-  xd = _mm256_mask3_fnmsub_round_pd (xd, xd, xd, m8, _MM_FROUND_TO_POS_INF | 
_MM_FROUND_NO_EXC);
-  xd = _mm256_maskz_fnmsub_round_pd (m8, xd, xd, xd, _MM_FROUND_TO_ZERO | 
_MM_FROUND_NO_EXC);
-
-  xh = _mm256_fnmsub_round_ph (xh, xh, xh, _MM_FROUND_TO_NEAREST_INT | 
_MM_FROUND_NO_EXC);
-  xh = _mm256_mask_fnmsub_round_ph (xh, m8, xh, xh, _MM_FROUND_TO_NEG_INF | 
_MM_FROUND_NO_EXC);
-  xh = _mm256_mask3_fnmsub_round_ph (xh, xh, xh, m8, _MM_FROUND_TO_POS_INF | 
_MM_FROUND_NO_EXC);
-  xh = _mm256_maskz_fnmsub_round_ph (m8, xh, xh, xh, _MM_FROUND_TO_ZERO | 
_MM_FROUND_NO_EXC);
-
-  x = _mm256_fnmsub_round_ps (x, x, x, _MM_FROUND_TO_NEAREST_INT | 
_MM_FROUND_NO_EXC);
-  x = _mm256_mask_fnmsub_round_ps (x, m8, x, x, _MM_FROUND_TO_NEG_INF | 
_MM_FROUND_NO_EXC);
-  x = _mm256_mask3_fnmsub_round_ps (x, x, x, m8, _MM_FROUND_TO_POS_INF | 
_MM_FROUND_NO_EXC);
-  x = _mm256_maskz_fnmsub_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 2604ea69b53..39759ee9157 100644
--- a/gcc/testsuite/gcc.target/i386/sse-13.c
+++ b/gcc/testsuite/gcc.target/i386/sse-13.c
@@ -967,15 +967,6 @@
 #define __builtin_ia32_vfnmaddps256_mask_round(A, B, C, D, E) 
__builtin_ia32_vfnmaddps256_mask_round(A, B, C, D, 8)
 #define __builtin_ia32_vfnmaddps256_mask3_round(A, B, C, D, E) 
__builtin_ia32_vfnmaddps256_mask3_round(A, B, C, D, 8)
 #define __builtin_ia32_vfnmaddps256_maskz_round(A, B, C, D, E) 
__builtin_ia32_vfnmaddps256_maskz_round(A, B, C, D, 8)
-#define __builtin_ia32_vfnmsubpd256_mask_round(A, B, C, D, E) 
__builtin_ia32_vfnmsubpd256_mask_round(A, B, C, D, 8)
-#define __builtin_ia32_vfnmsubpd256_mask3_round(A, B, C, D, E) 
__builtin_ia32_vfnmsubpd256_mask3_round(A, B, C, D, 8)
-#define __builtin_ia32_vfnmsubpd256_maskz_round(A, B, C, D, E) 
__builtin_ia32_vfnmsubpd256_maskz_round(A, B, C, D, 8)
-#define __builtin_ia32_vfnmsubph256_mask_round(A, B, C, D, E) 
__builtin_ia32_vfnmsubph256_mask_round(A, B, C, D, 8)
-#define __builtin_ia32_vfnmsubph256_mask3_round(A, B, C, D, E) 
__builtin_ia32_vfnmsubph256_mask3_round(A, B, C, D, 8)
-#define __builtin_ia32_vfnmsubph256_maskz_round(A, B, C, D, E) 
__builtin_ia32_vfnmsubph256_maskz_round(A, B, C, D, 8)
-#define __builtin_ia32_vfnmsubps256_mask_round(A, B, C, D, E) 
__builtin_ia32_vfnmsubps256_mask_round(A, B, C, D, 8)
-#define __builtin_ia32_vfnmsubps256_mask3_round(A, B, C, D, E) 
__builtin_ia32_vfnmsubps256_mask3_round(A, B, C, D, 8)
-#define __builtin_ia32_vfnmsubps256_maskz_round(A, B, C, D, E) 
__builtin_ia32_vfnmsubps256_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 1c46350e811..38f09c9ca3f 100644
--- a/gcc/testsuite/gcc.target/i386/sse-14.c
+++ b/gcc/testsuite/gcc.target/i386/sse-14.c
@@ -1195,9 +1195,6 @@ test_3 (_mm256_maskz_fmul_round_pch, __m256h, __mmask8, 
__m256h, __m256h, 8)
 test_3 (_mm256_fnmadd_round_pd, __m256d, __m256d, __m256d, __m256d, 9)
 test_3 (_mm256_fnmadd_round_ph, __m256h, __m256h, __m256h, __m256h, 9)
 test_3 (_mm256_fnmadd_round_ps, __m256, __m256, __m256, __m256, 9)
-test_3 (_mm256_fnmsub_round_pd, __m256d, __m256d, __m256d, __m256d, 9)
-test_3 (_mm256_fnmsub_round_ph, __m256h, __m256h, __m256h, __m256h, 9)
-test_3 (_mm256_fnmsub_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)
@@ -1262,15 +1259,6 @@ test_4 (_mm256_maskz_fnmadd_round_ph, __m256h,__mmask16, 
__m256h, __m256h, __m25
 test_4 (_mm256_mask_fnmadd_round_ps, __m256, __m256, __mmask8, __m256, __m256, 
9)
 test_4 (_mm256_mask3_fnmadd_round_ps, __m256, __m256, __m256, __m256, 
__mmask8, 9)
 test_4 (_mm256_maskz_fnmadd_round_ps, __m256,__mmask8, __m256, __m256, __m256, 
9)
-test_4 (_mm256_mask_fnmsub_round_pd, __m256d, __m256d, __mmask8, __m256d, 
__m256d, 9)
-test_4 (_mm256_mask3_fnmsub_round_pd, __m256d, __m256d, __m256d, __m256d, 
__mmask8, 9)
-test_4 (_mm256_maskz_fnmsub_round_pd, __m256d,__mmask8, __m256d, __m256d, 
__m256d, 9)
-test_4 (_mm256_mask_fnmsub_round_ph, __m256h, __m256h, __mmask16, __m256h, 
__m256h, 9)
-test_4 (_mm256_mask3_fnmsub_round_ph, __m256h, __m256h, __m256h, __m256h, 
__mmask16, 9)
-test_4 (_mm256_maskz_fnmsub_round_ph, __m256h,__mmask16, __m256h, __m256h, 
__m256h, 9)
-test_4 (_mm256_mask_fnmsub_round_ps, __m256, __m256, __mmask8, __m256, __m256, 
9)
-test_4 (_mm256_mask3_fnmsub_round_ps, __m256, __m256, __m256, __m256, 
__mmask8, 9)
-test_4 (_mm256_maskz_fnmsub_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 cadfc0016f0..61330cfddec 100644
--- a/gcc/testsuite/gcc.target/i386/sse-22.c
+++ b/gcc/testsuite/gcc.target/i386/sse-22.c
@@ -1237,9 +1237,6 @@ test_3 (_mm256_maskz_fmul_round_pch, __m256h, __mmask8, 
__m256h, __m256h, 8)
 test_3 (_mm256_fnmadd_round_pd, __m256d, __m256d, __m256d, __m256d, 9)
 test_3 (_mm256_fnmadd_round_ph, __m256h, __m256h, __m256h, __m256h, 9)
 test_3 (_mm256_fnmadd_round_ps, __m256, __m256, __m256, __m256, 9)
-test_3 (_mm256_fnmsub_round_pd, __m256d, __m256d, __m256d, __m256d, 9)
-test_3 (_mm256_fnmsub_round_ph, __m256h, __m256h, __m256h, __m256h, 9)
-test_3 (_mm256_fnmsub_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)
@@ -1304,15 +1301,6 @@ test_4 (_mm256_maskz_fnmadd_round_ph, __m256h,__mmask16, 
__m256h, __m256h, __m25
 test_4 (_mm256_mask_fnmadd_round_ps, __m256, __m256, __mmask8, __m256, __m256, 
9)
 test_4 (_mm256_mask3_fnmadd_round_ps, __m256, __m256, __m256, __m256, 
__mmask8, 9)
 test_4 (_mm256_maskz_fnmadd_round_ps, __m256,__mmask8, __m256, __m256, __m256, 
9)
-test_4 (_mm256_mask_fnmsub_round_pd, __m256d, __m256d, __mmask8, __m256d, 
__m256d, 9)
-test_4 (_mm256_mask3_fnmsub_round_pd, __m256d, __m256d, __m256d, __m256d, 
__mmask8, 9)
-test_4 (_mm256_maskz_fnmsub_round_pd, __m256d,__mmask8, __m256d, __m256d, 
__m256d, 9)
-test_4 (_mm256_mask_fnmsub_round_ph, __m256h, __m256h, __mmask16, __m256h, 
__m256h, 9)
-test_4 (_mm256_mask3_fnmsub_round_ph, __m256h, __m256h, __m256h, __m256h, 
__mmask16, 9)
-test_4 (_mm256_maskz_fnmsub_round_ph, __m256h,__mmask16, __m256h, __m256h, 
__m256h, 9)
-test_4 (_mm256_mask_fnmsub_round_ps, __m256, __m256, __mmask8, __m256, __m256, 
9)
-test_4 (_mm256_mask3_fnmsub_round_ps, __m256, __m256, __m256, __m256, 
__mmask8, 9)
-test_4 (_mm256_maskz_fnmsub_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 57c81a6cf74..8d4a5c001cd 100644
--- a/gcc/testsuite/gcc.target/i386/sse-23.c
+++ b/gcc/testsuite/gcc.target/i386/sse-23.c
@@ -942,15 +942,6 @@
 #define __builtin_ia32_vfnmaddps256_mask_round(A, B, C, D, E) 
__builtin_ia32_vfnmaddps256_mask_round(A, B, C, D, 8)
 #define __builtin_ia32_vfnmaddps256_mask3_round(A, B, C, D, E) 
__builtin_ia32_vfnmaddps256_mask3_round(A, B, C, D, 8)
 #define __builtin_ia32_vfnmaddps256_maskz_round(A, B, C, D, E) 
__builtin_ia32_vfnmaddps256_maskz_round(A, B, C, D, 8)
-#define __builtin_ia32_vfnmsubpd256_mask_round(A, B, C, D, E) 
__builtin_ia32_vfnmsubpd256_mask_round(A, B, C, D, 8)
-#define __builtin_ia32_vfnmsubpd256_mask3_round(A, B, C, D, E) 
__builtin_ia32_vfnmsubpd256_mask3_round(A, B, C, D, 8)
-#define __builtin_ia32_vfnmsubpd256_maskz_round(A, B, C, D, E) 
__builtin_ia32_vfnmsubpd256_maskz_round(A, B, C, D, 8)
-#define __builtin_ia32_vfnmsubph256_mask_round(A, B, C, D, E) 
__builtin_ia32_vfnmsubph256_mask_round(A, B, C, D, 8)
-#define __builtin_ia32_vfnmsubph256_mask3_round(A, B, C, D, E) 
__builtin_ia32_vfnmsubph256_mask3_round(A, B, C, D, 8)
-#define __builtin_ia32_vfnmsubph256_maskz_round(A, B, C, D, E) 
__builtin_ia32_vfnmsubph256_maskz_round(A, B, C, D, 8)
-#define __builtin_ia32_vfnmsubps256_mask_round(A, B, C, D, E) 
__builtin_ia32_vfnmsubps256_mask_round(A, B, C, D, 8)
-#define __builtin_ia32_vfnmsubps256_mask3_round(A, B, C, D, E) 
__builtin_ia32_vfnmsubps256_mask3_round(A, B, C, D, 8)
-#define __builtin_ia32_vfnmsubps256_maskz_round(A, B, C, D, E) 
__builtin_ia32_vfnmsubps256_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