This reverts commit 1f86cf06c7897f6ab467443b5fe8789cc95fe0c4.
---
 gcc/config/i386/avx10_2roundingintrin.h       | 182 ------------------
 gcc/config/i386/i386-builtin.def              |   3 -
 gcc/config/i386/sse.md                        |   2 +-
 gcc/testsuite/gcc.target/i386/avx-1.c         |   3 -
 .../gcc.target/i386/avx10_2-rounding-3.c      |  25 ---
 gcc/testsuite/gcc.target/i386/sse-13.c        |   3 -
 gcc/testsuite/gcc.target/i386/sse-14.c        |   9 -
 gcc/testsuite/gcc.target/i386/sse-22.c        |   9 -
 gcc/testsuite/gcc.target/i386/sse-23.c        |   3 -
 9 files changed, 1 insertion(+), 238 deletions(-)

diff --git a/gcc/config/i386/avx10_2roundingintrin.h 
b/gcc/config/i386/avx10_2roundingintrin.h
index b40ef031ae5..6815688c1d0 100644
--- a/gcc/config/i386/avx10_2roundingintrin.h
+++ b/gcc/config/i386/avx10_2roundingintrin.h
@@ -3873,119 +3873,6 @@ _mm256_maskz_roundscale_round_ps (__mmask8 __U, __m256 
__A, const int __C,
                                                           (__mmask8) __U,
                                                           __R);
 }
-
-extern __inline __m256d
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_scalef_round_pd (__m256d __A, __m256d __B, const int __R)
-{
-  return
-    (__m256d) __builtin_ia32_scalefpd256_mask_round ((__v4df) __A,
-                                                    (__v4df) __B,
-                                                    (__v4df)
-                                                    _mm256_undefined_pd (),
-                                                    (__mmask8) -1,
-                                                    __R);
-}
-
-extern __inline __m256d
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_mask_scalef_round_pd (__m256d __W, __mmask8 __U, __m256d __A,
-                            __m256d __B, const int __R)
-{
-  return (__m256d) __builtin_ia32_scalefpd256_mask_round ((__v4df) __A,
-                                                         (__v4df) __B,
-                                                         (__v4df) __W,
-                                                         (__mmask8) __U,
-                                                         __R);
-}
-
-extern __inline __m256d
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_maskz_scalef_round_pd (__mmask8 __U, __m256d __A, __m256d __B,
-                             const int __R)
-{
-  return (__m256d) __builtin_ia32_scalefpd256_mask_round ((__v4df) __A,
-                                                         (__v4df) __B,
-                                                         (__v4df)
-                                                         _mm256_setzero_pd (),
-                                                         (__mmask8) __U,
-                                                         __R);
-}
-
-extern __inline __m256h
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_scalef_round_ph (__m256h __A, __m256h __B, const int __R)
-{
-  return
-    (__m256h) __builtin_ia32_scalefph256_mask_round ((__v16hf) __A,
-                                                    (__v16hf) __B,
-                                                    (__v16hf)
-                                                    _mm256_undefined_ph (),
-                                                    (__mmask16) -1,
-                                                    __R);
-}
-
-extern __inline __m256h
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_mask_scalef_round_ph (__m256h __W, __mmask16 __U, __m256h __A,
-                            __m256h __B, const int __R)
-{
-  return (__m256h) __builtin_ia32_scalefph256_mask_round ((__v16hf) __A,
-                                                         (__v16hf) __B,
-                                                         (__v16hf) __W,
-                                                         (__mmask16) __U,
-                                                         __R);
-}
-
-extern __inline __m256h
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_maskz_scalef_round_ph (__mmask16 __U, __m256h __A, __m256h __B,
-                             const int __R)
-{
-  return (__m256h) __builtin_ia32_scalefph256_mask_round ((__v16hf) __A,
-                                                         (__v16hf) __B,
-                                                         (__v16hf)
-                                                         _mm256_setzero_ph (),
-                                                         (__mmask16) __U,
-                                                         __R);
-}
-
-extern __inline __m256
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_scalef_round_ps (__m256 __A, __m256 __B, const int __R)
-{
-  return (__m256) __builtin_ia32_scalefps256_mask_round ((__v8sf) __A,
-                                                        (__v8sf) __B,
-                                                        (__v8sf)
-                                                        _mm256_undefined_ps (),
-                                                        (__mmask8) -1,
-                                                        __R);
-}
-
-extern __inline __m256
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_mask_scalef_round_ps (__m256 __W, __mmask8 __U, __m256 __A,
-                            __m256 __B, const int __R)
-{
-  return (__m256) __builtin_ia32_scalefps256_mask_round ((__v8sf) __A,
-                                                        (__v8sf) __B,
-                                                        (__v8sf) __W,
-                                                        (__mmask8) __U,
-                                                        __R);
-}
-
-extern __inline __m256
-__attribute__ ((__gnu_inline__, __always_inline__, __artificial__))
-_mm256_maskz_scalef_round_ps (__mmask8 __U, __m256 __A, __m256 __B,
-                             const int __R)
-{
-  return (__m256) __builtin_ia32_scalefps256_mask_round ((__v8sf) __A,
-                                                        (__v8sf) __B,
-                                                        (__v8sf)
-                                                        _mm256_setzero_ps (),
-                                                        (__mmask8) __U,
-                                                        __R);
-}
 #else
 #define _mm256_add_round_pd(A, B, R) \
   ((__m256d) __builtin_ia32_addpd256_mask_round ((__v4df) (A), \
@@ -6003,75 +5890,6 @@ _mm256_maskz_scalef_round_ps (__mmask8 __U, __m256 __A, 
__m256 __B,
                                                     (_mm256_setzero_ps ()), \
                                                     (__mmask8) (U), \
                                                     (R)))
-
-#define _mm256_scalef_round_pd(A, B, R) \
-  ((__m256d) __builtin_ia32_scalefpd256_mask_round ((__v4df) (A), \
-                                                   (__v4df) (B), \
-                                                   (__v4df) \
-                                                   (_mm256_undefined_pd ()), \
-                                                   (__mmask8) (-1), \
-                                                   (R)))
-
-#define _mm256_mask_scalef_round_pd(W, U, A, B, R) \
-  ((__m256d) __builtin_ia32_scalefpd256_mask_round ((__v4df) (A), \
-                                                   (__v4df) (B), \
-                                                   (__v4df) (W), \
-                                                   (__mmask8) (U), \
-                                                   (R)))
-
-#define _mm256_maskz_scalef_round_pd(U, A, B, R) \
-  ((__m256d) __builtin_ia32_scalefpd256_mask_round ((__v4df) (A), \
-                                                   (__v4df) (B), \
-                                                   (__v4df) \
-                                                   (_mm256_setzero_pd ()), \
-                                                   (__mmask8) (U), \
-                                                   (R)))
-
-#define _mm256_scalef_round_ph(A, B, R) \
-  ((__m256h) __builtin_ia32_scalefph256_mask_round ((__v16hf) (A), \
-                                                   (__v16hf) (B), \
-                                                   (__v16hf) \
-                                                   (_mm256_undefined_ph ()), \
-                                                   (__mmask16) (-1), \
-                                                   (R)))
-
-#define _mm256_mask_scalef_round_ph(W, U, A, B, R) \
-  ((__m256h) __builtin_ia32_scalefph256_mask_round ((__v16hf) (A), \
-                                                   (__v16hf) (B), \
-                                                   (__v16hf) (W), \
-                                                   (__mmask16) (U), \
-                                                   (R)))
-
-#define _mm256_maskz_scalef_round_ph(U, A, B, R) \
-  ((__m256h) __builtin_ia32_scalefph256_mask_round ((__v16hf) (A), \
-                                                   (__v16hf) (B), \
-                                                   (__v16hf) \
-                                                   (_mm256_setzero_ph ()), \
-                                                   (__mmask16) (U), \
-                                                   (R)))
-
-#define _mm256_scalef_round_ps(A, B, R) \
-  ((__m256) __builtin_ia32_scalefps256_mask_round ((__v8sf) (A), \
-                                                  (__v8sf) (B), \
-                                                  (__v8sf) \
-                                                  (_mm256_undefined_ps ()), \
-                                                  (__mmask8) (-1), \
-                                                  (R)))
-
-#define _mm256_mask_scalef_round_ps(W, U, A, B, R) \
-  ((__m256) __builtin_ia32_scalefps256_mask_round ((__v8sf) (A), \
-                                                  (__v8sf) (B), \
-                                                  (__v8sf) (W), \
-                                                  (__mmask8) (U), \
-                                                  (R)))
-
-#define _mm256_maskz_scalef_round_ps(U, A, B, R) \
-  ((__m256) __builtin_ia32_scalefps256_mask_round ((__v8sf) (A), \
-                                                  (__v8sf) (B), \
-                                                  (__v8sf) \
-                                                  (_mm256_setzero_ps ()), \
-                                                  (__mmask8) (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 97c74e70a60..0d08e1f73a5 100644
--- a/gcc/config/i386/i386-builtin.def
+++ b/gcc/config/i386/i386-builtin.def
@@ -3809,9 +3809,6 @@ BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_reducepv8sf_mask_round, "__buil
 BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_rndscalev4df_mask_round, 
"__builtin_ia32_rndscalepd256_mask_round", 
IX86_BUILTIN_VRNDSCALEPD256_MASK_ROUND, UNKNOWN, (int) 
V4DF_FTYPE_V4DF_INT_V4DF_UQI_INT)
 BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_rndscalev16hf_mask_round, 
"__builtin_ia32_rndscaleph256_mask_round", 
IX86_BUILTIN_VRNDSCALEPH256_MASK_ROUND, UNKNOWN, (int) 
V16HF_FTYPE_V16HF_INT_V16HF_UHI_INT)
 BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_rndscalev8sf_mask_round, 
"__builtin_ia32_rndscaleps256_mask_round", 
IX86_BUILTIN_VRNDSCALEPS256_MASK_ROUND, UNKNOWN, (int) 
V8SF_FTYPE_V8SF_INT_V8SF_UQI_INT)
-BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_scalefv4df_mask_round, 
"__builtin_ia32_scalefpd256_mask_round", IX86_BUILTIN_VSCALEFPD256_MASK_ROUND, 
UNKNOWN, (int) V4DF_FTYPE_V4DF_V4DF_V4DF_UQI_INT)
-BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_scalefv16hf_mask_round, 
"__builtin_ia32_scalefph256_mask_round", IX86_BUILTIN_VSCALEFPH256_MASK_ROUND, 
UNKNOWN, (int) V16HF_FTYPE_V16HF_V16HF_V16HF_UHI_INT)
-BDESC (0, OPTION_MASK_ISA2_AVX10_2_256, 
CODE_FOR_avx512vl_scalefv8sf_mask_round, 
"__builtin_ia32_scalefps256_mask_round", IX86_BUILTIN_VSCALEFPS256_MASK_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 7b39103d99f..b02f2d7f102 100644
--- a/gcc/config/i386/sse.md
+++ b/gcc/config/i386/sse.md
@@ -13633,7 +13633,7 @@
          [(match_operand:VFH_AVX512VL 1 "register_operand" "v")
           (match_operand:VFH_AVX512VL 2 "nonimmediate_operand" 
"<round_constraint>")]
          UNSPEC_SCALEF))]
-  "TARGET_AVX512F && <round_mode_condition>"
+  "TARGET_AVX512F"
   "vscalef<ssemodesuffix>\t{<round_mask_op3>%2, %1, 
%0<mask_operand3>|%0<mask_operand3>, %1, %2<round_mask_op3>}"
   [(set_attr "prefix" "evex")
    (set_attr "mode"  "<MODE>")])
diff --git a/gcc/testsuite/gcc.target/i386/avx-1.c 
b/gcc/testsuite/gcc.target/i386/avx-1.c
index 8062274a20d..70db5297997 100644
--- a/gcc/testsuite/gcc.target/i386/avx-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx-1.c
@@ -992,9 +992,6 @@
 #define __builtin_ia32_rndscalepd256_mask_round(A, B, C, D, E) 
__builtin_ia32_rndscalepd256_mask_round(A, 1, C, D, 8)
 #define __builtin_ia32_rndscaleph256_mask_round(A, B, C, D, E) 
__builtin_ia32_rndscaleph256_mask_round(A, 1, C, D, 8)
 #define __builtin_ia32_rndscaleps256_mask_round(A, B, C, D, E) 
__builtin_ia32_rndscaleps256_mask_round(A, 1, C, D, 8)
-#define __builtin_ia32_scalefpd256_mask_round(A, B, C, D, E) 
__builtin_ia32_scalefpd256_mask_round(A, B, C, D, 8)
-#define __builtin_ia32_scalefph256_mask_round(A, B, C, D, E) 
__builtin_ia32_scalefph256_mask_round(A, B, C, D, 8)
-#define __builtin_ia32_scalefps256_mask_round(A, B, C, D, E) 
__builtin_ia32_scalefps256_mask_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 c0199179692..10bc3884a4b 100644
--- a/gcc/testsuite/gcc.target/i386/avx10_2-rounding-3.c
+++ b/gcc/testsuite/gcc.target/i386/avx10_2-rounding-3.c
@@ -174,15 +174,6 @@
 /* { dg-final { scan-assembler-times "vrndscaleps\[ \\t\]+\\S*,\[ 
\\t\]+\{sae\}\[^\n\]*%ymm\[0-9\]+\[^\n\]*%ymm\[0-9\]+(?:\n|\[ \\t\]+#)" 1  }  } 
*/
 /* { dg-final { scan-assembler-times "vrndscaleps\[ \\t\]+\\S*,\[ 
\\t\]+\{sae\}\[^\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1  }  } */
 /* { dg-final { scan-assembler-times "vrndscaleps\[ \\t\]+\\S*,\[ 
\\t\]+\{sae\}\[^\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ \\t\]+#)" 1  }  } */
-/* { dg-final { scan-assembler-times "vscalefpd\[ 
\\t\]+\[^\n\]*\{rn-sae\}\[^\{\n\]*%ymm\[0-9\]+(?:\n|\[ \\t\]+#)" 1  }  } */
-/* { dg-final { scan-assembler-times "vscalefpd\[ 
\\t\]+\[^\n\]*\{rd-sae\}\[^\{\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 
 }  } */
-/* { dg-final { scan-assembler-times "vscalefpd\[ 
\\t\]+\[^\n\]*\{rz-sae\}\[^\{\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ 
\\t\]+#)" 1  }  } */
-/* { dg-final { scan-assembler-times "vscalefph\[ 
\\t\]+\{rn-sae\}\[^\{\n\]*%ymm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+(?:\n|\[
 \\t\]+#)" 1  }  } */
-/* { dg-final { scan-assembler-times "vscalefph\[ 
\\t\]+\{rn-sae\}\[^\{\n\]*%ymm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+\{%k\[0-9\]\}\[^\n\r]*(?:\n|\[
 \\t\]+#)" 1  }  } */
-/* { dg-final { scan-assembler-times "vscalefph\[ 
\\t\]+\{rz-sae\}\[^\{\n\]*%ymm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+\[^\n\r]*%ymm\[0-9\]+\{%k\[0-9\]\}\{z\}\[^\n\r]*(?:\n|\[
 \\t\]+#)" 1  }  } */
-/* { dg-final { scan-assembler-times "vscalefps\[ 
\\t\]+\[^\n\]*\{rn-sae\}\[^\{\n\]*%ymm\[0-9\]+(?:\n|\[ \\t\]+#)" 1  }  } */
-/* { dg-final { scan-assembler-times "vscalefps\[ 
\\t\]+\[^\n\]*\{ru-sae\}\[^\{\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}(?:\n|\[ \\t\]+#)" 1 
 }  } */
-/* { dg-final { scan-assembler-times "vscalefps\[ 
\\t\]+\[^\n\]*\{rz-sae\}\[^\{\n\]*%ymm\[0-9\]+\{%k\[1-7\]\}\{z\}(?:\n|\[ 
\\t\]+#)" 1  }  } */
 
 #include <immintrin.h>
 
@@ -533,19 +524,3 @@ avx10_2_test_23 (void)
   x = _mm256_mask_roundscale_round_ps (x, 2, x, 0x42, _MM_FROUND_NO_EXC);
   x = _mm256_maskz_roundscale_round_ps (2, x, 0x42, _MM_FROUND_NO_EXC);
 }
-
-void extern
-avx10_2_test_24 (void)
-{
-  xd = _mm256_scalef_round_pd (xd, xd, _MM_FROUND_TO_NEAREST_INT | 
_MM_FROUND_NO_EXC);
-  xd = _mm256_mask_scalef_round_pd (xd, m8, xd, xd, _MM_FROUND_TO_NEG_INF | 
_MM_FROUND_NO_EXC);
-  xd = _mm256_maskz_scalef_round_pd (m8, xd, xd, _MM_FROUND_TO_ZERO | 
_MM_FROUND_NO_EXC);
-
-  xh = _mm256_scalef_round_ph (xh, xh, 8);
-  xh = _mm256_mask_scalef_round_ph (xh, m16, xh, xh, 8);
-  xh = _mm256_maskz_scalef_round_ph (m16, xh, xh, 11);
-
-  x = _mm256_scalef_round_ps (x, x, _MM_FROUND_TO_NEAREST_INT | 
_MM_FROUND_NO_EXC);
-  x = _mm256_mask_scalef_round_ps (x, m8, x, x, _MM_FROUND_TO_POS_INF | 
_MM_FROUND_NO_EXC);
-  x = _mm256_maskz_scalef_round_ps (m8, 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 7fa5da1ccd7..0c142dfd677 100644
--- a/gcc/testsuite/gcc.target/i386/sse-13.c
+++ b/gcc/testsuite/gcc.target/i386/sse-13.c
@@ -999,9 +999,6 @@
 #define __builtin_ia32_rndscalepd256_mask_round(A, B, C, D, E) 
__builtin_ia32_rndscalepd256_mask_round(A, 1, C, D, 8)
 #define __builtin_ia32_rndscaleph256_mask_round(A, B, C, D, E) 
__builtin_ia32_rndscaleph256_mask_round(A, 1, C, D, 8)
 #define __builtin_ia32_rndscaleps256_mask_round(A, B, C, D, E) 
__builtin_ia32_rndscaleps256_mask_round(A, 1, C, D, 8)
-#define __builtin_ia32_scalefpd256_mask_round(A, B, C, D, E) 
__builtin_ia32_scalefpd256_mask_round(A, B, C, D, 8)
-#define __builtin_ia32_scalefph256_mask_round(A, B, C, D, E) 
__builtin_ia32_scalefph256_mask_round(A, B, C, D, 8)
-#define __builtin_ia32_scalefps256_mask_round(A, B, C, D, E) 
__builtin_ia32_scalefps256_mask_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 cd8c02dbaae..3b915b3a350 100644
--- a/gcc/testsuite/gcc.target/i386/sse-14.c
+++ b/gcc/testsuite/gcc.target/i386/sse-14.c
@@ -1144,9 +1144,6 @@ test_2 (_mm256_min_round_ps, __m256, __m256, __m256, 8)
 test_2 (_mm256_mul_round_pd, __m256d, __m256d, __m256d, 9)
 test_2 (_mm256_mul_round_ph, __m256h, __m256h, __m256h, 9)
 test_2 (_mm256_mul_round_ps, __m256, __m256, __m256, 9)
-test_2 (_mm256_scalef_round_pd, __m256d, __m256d, __m256d, 9)
-test_2 (_mm256_scalef_round_ph, __m256h, __m256h, __m256h, 9)
-test_2 (_mm256_scalef_round_ps, __m256, __m256, __m256, 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)
@@ -1248,9 +1245,6 @@ test_3 (_mm256_maskz_min_round_ps, __m256, __mmask8, 
__m256, __m256, 8)
 test_3 (_mm256_maskz_mul_round_pd, __m256d, __mmask8, __m256d, __m256d, 9)
 test_3 (_mm256_maskz_mul_round_ph, __m256h, __mmask16, __m256h, __m256h, 9)
 test_3 (_mm256_maskz_mul_round_ps, __m256, __mmask8, __m256, __m256, 9)
-test_3 (_mm256_maskz_scalef_round_pd, __m256d, __mmask8, __m256d, __m256d, 9)
-test_3 (_mm256_maskz_scalef_round_ph, __m256h, __mmask16, __m256h, __m256h, 9)
-test_3 (_mm256_maskz_scalef_round_ps, __m256, __mmask8, __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)
@@ -1344,9 +1338,6 @@ test_4 (_mm256_mask_min_round_ps, __m256, __m256, 
__mmask8, __m256, __m256, 8)
 test_4 (_mm256_mask_mul_round_pd, __m256d, __m256d, __mmask8, __m256d, 
__m256d, 9)
 test_4 (_mm256_mask_mul_round_ph, __m256h, __m256h, __mmask16, __m256h, 
__m256h, 9)
 test_4 (_mm256_mask_mul_round_ps, __m256, __m256, __mmask8, __m256, __m256, 9)
-test_4 (_mm256_mask_scalef_round_pd, __m256d, __m256d, __mmask8, __m256d, 
__m256d, 9)
-test_4 (_mm256_mask_scalef_round_ph, __m256h, __m256h, __mmask16, __m256h, 
__m256h, 9)
-test_4 (_mm256_mask_scalef_round_ps, __m256, __m256, __mmask8, __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 c538f779bcf..e261c0d00a1 100644
--- a/gcc/testsuite/gcc.target/i386/sse-22.c
+++ b/gcc/testsuite/gcc.target/i386/sse-22.c
@@ -1187,9 +1187,6 @@ test_2 (_mm256_min_round_ps, __m256, __m256, __m256, 8)
 test_2 (_mm256_mul_round_pd, __m256d, __m256d, __m256d, 9)
 test_2 (_mm256_mul_round_ph, __m256h, __m256h, __m256h, 9)
 test_2 (_mm256_mul_round_ps, __m256, __m256, __m256, 9)
-test_2 (_mm256_scalef_round_pd, __m256d, __m256d, __m256d, 9)
-test_2 (_mm256_scalef_round_ph, __m256h, __m256h, __m256h, 9)
-test_2 (_mm256_scalef_round_ps, __m256, __m256, __m256, 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)
@@ -1290,9 +1287,6 @@ test_3 (_mm256_maskz_min_round_ps, __m256, __mmask8, 
__m256, __m256, 8)
 test_3 (_mm256_maskz_mul_round_pd, __m256d, __mmask8, __m256d, __m256d, 9)
 test_3 (_mm256_maskz_mul_round_ph, __m256h, __mmask16, __m256h, __m256h, 9)
 test_3 (_mm256_maskz_mul_round_ps, __m256, __mmask8, __m256, __m256, 9)
-test_3 (_mm256_maskz_scalef_round_pd, __m256d, __mmask8, __m256d, __m256d, 9)
-test_3 (_mm256_maskz_scalef_round_ph, __m256h, __mmask16, __m256h, __m256h, 9)
-test_3 (_mm256_maskz_scalef_round_ps, __m256, __mmask8, __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)
@@ -1386,9 +1380,6 @@ test_4 (_mm256_mask_min_round_ps, __m256, __m256, 
__mmask8, __m256, __m256, 8)
 test_4 (_mm256_mask_mul_round_pd, __m256d, __m256d, __mmask8, __m256d, 
__m256d, 9)
 test_4 (_mm256_mask_mul_round_ph, __m256h, __m256h, __mmask16, __m256h, 
__m256h, 9)
 test_4 (_mm256_mask_mul_round_ps, __m256, __m256, __mmask8, __m256, __m256, 9)
-test_4 (_mm256_mask_scalef_round_pd, __m256d, __m256d, __mmask8, __m256d, 
__m256d, 9)
-test_4 (_mm256_mask_scalef_round_ph, __m256h, __m256h, __mmask16, __m256h, 
__m256h, 9)
-test_4 (_mm256_mask_scalef_round_ps, __m256, __m256, __mmask8, __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 82039f02d79..09549f8e9ba 100644
--- a/gcc/testsuite/gcc.target/i386/sse-23.c
+++ b/gcc/testsuite/gcc.target/i386/sse-23.c
@@ -974,9 +974,6 @@
 #define __builtin_ia32_rndscalepd256_mask_round(A, B, C, D, E) 
__builtin_ia32_rndscalepd256_mask_round(A, 1, C, D, 8)
 #define __builtin_ia32_rndscaleph256_mask_round(A, B, C, D, E) 
__builtin_ia32_rndscaleph256_mask_round(A, 1, C, D, 8)
 #define __builtin_ia32_rndscaleps256_mask_round(A, B, C, D, E) 
__builtin_ia32_rndscaleps256_mask_round(A, 1, C, D, 8)
-#define __builtin_ia32_scalefpd256_mask_round(A, B, C, D, E) 
__builtin_ia32_scalefpd256_mask_round(A, B, C, D, 8)
-#define __builtin_ia32_scalefph256_mask_round(A, B, C, D, E) 
__builtin_ia32_scalefph256_mask_round(A, B, C, D, 8)
-#define __builtin_ia32_scalefps256_mask_round(A, B, C, D, E) 
__builtin_ia32_scalefps256_mask_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