[Bug target/121699] [16 regression] ICE when building mesa-25.1.8 with -march=znver4 (RTL check: expected code 'const_int', have 'reg' in ix86_vgf2p8affine_shift_matrix)

[liuhongt at gcc dot gnu.org via Gcc-bugs]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=121699

--- Comment #4 from Hongtao Liu <liuhongt at gcc dot gnu.org> ---
This fixs the ICE.

diff --git a/gcc/config/i386/predicates.md b/gcc/config/i386/predicates.md
index 175798cff69..5dbe444847f 100644
--- a/gcc/config/i386/predicates.md
+++ b/gcc/config/i386/predicates.md
@@ -1319,6 +1319,9 @@ (define_predicate "nonimmediate_or_const_vec_dup_operand"
   (ior (match_operand 0 "nonimmediate_operand")
        (match_test "const_vec_duplicate_p (op)")))

+(define_predicate "const_vec_dup_operand"
+       (match_test "const_vec_duplicate_p (op)"))
+
 ;; Return true when OP is either register operand, or any
 ;; CONST_VECTOR.
 (define_predicate "reg_or_const_vector_operand"
diff --git a/gcc/config/i386/sse.md b/gcc/config/i386/sse.md
index 505095040f7..e5c1e5c045c 100644
--- a/gcc/config/i386/sse.md
+++ b/gcc/config/i386/sse.md
@@ -27007,13 +27007,14 @@ (define_expand "cond_<insn><mode>"
        (vec_merge:VI1_AVX512VL
          (any_shift:VI1_AVX512VL
            (match_operand:VI1_AVX512VL 2 "register_operand")
-           (match_operand:VI1_AVX512VL 3
"nonimmediate_or_const_vec_dup_operand"))
+           (match_operand:VI1_AVX512VL 3 "const_vec_dup_operand"))
          (match_operand:VI1_AVX512VL 4 "nonimm_or_0_operand")
        (match_operand:<avx512fmaskmode> 1 "register_operand")))]
   "TARGET_GFNI && TARGET_AVX512F"
 {
-  rtx matrix = ix86_vgf2p8affine_shift_matrix (operands[0], operands[2],
<CODE>);
-  emit_insn (gen_vgf2p8affineqb_<mode>_mask (operands[0], operands[1], matrix,
+  rtx count = XVECEXP (operands[3], 0, 0);
+  rtx matrix = ix86_vgf2p8affine_shift_matrix (operands[0], count, <CODE>);
+  emit_insn (gen_vgf2p8affineqb_<mode>_mask (operands[0], operands[2], matrix,
                                             const0_rtx, operands[4],
                                             operands[1]));
   DONE;