[Bug target/91454] [10 Regression] ICE in get_attr_avx_partial_xmm_update, at config/i386/i386.md:1804 since r274481

[rguenth at gcc dot gnu.org]

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

--- Comment #4 from Richard Biener <rguenth at gcc dot gnu.org> ---
Btw, remove_partial_avx_dependency suggests the VEC_MERGE/DUPLICATE form
is canonical for V2DFmode ... (is it?).

Otherwise untested fix:

Index: gcc/config/i386/i386-features.c
===================================================================
--- gcc/config/i386/i386-features.c     (revision 274504)
+++ gcc/config/i386/i386-features.c     (working copy)
@@ -658,6 +658,25 @@ scalar_chain::emit_conversion_insns (rtx
   emit_insn_after (insns, BB_HEAD (new_bb));
 }

+/* Generate the canonical SET_SRC to move GPR to a VMODE vector register,
+   zeroing the upper parts.  */
+
+static rtx
+gen_gpr_to_xmm_move_src (enum machine_mode vmode, rtx gpr)
+{
+  switch (GET_MODE_NUNITS (vmode))
+    {
+    case 1:
+      return gen_rtx_SUBREG (vmode, gpr, 0);
+    case 2:
+      return gen_rtx_VEC_CONCAT (vmode, gpr,
+                                CONST0_RTX (GET_MODE_INNER (vmode)));
+    default:
+      return gen_rtx_VEC_MERGE (vmode, gen_rtx_VEC_DUPLICATE (vmode, gpr),
+                               CONST0_RTX (vmode), GEN_INT
(HOST_WIDE_INT_1U));
+    }
+}
+
 /* Make vector copies for all register REGNO definitions
    and replace its uses in a chain.  */

@@ -684,13 +703,8 @@ general_scalar_chain::make_vector_copies
              }
            else
              emit_move_insn (tmp, reg);
-           emit_insn (gen_rtx_SET
-                       (gen_rtx_SUBREG (vmode, vreg, 0),
-                        gen_rtx_VEC_MERGE (vmode,
-                                           gen_rtx_VEC_DUPLICATE (vmode,
-                                                                  tmp),
-                                           CONST0_RTX (vmode),
-                                           GEN_INT (HOST_WIDE_INT_1U))));
+           emit_insn (gen_rtx_SET (gen_rtx_SUBREG (vmode, vreg, 0),
+                                   gen_gpr_to_xmm_move_src (vmode, tmp)));
          }
        else if (!TARGET_64BIT && smode == DImode)
          {
@@ -720,13 +734,8 @@ general_scalar_chain::make_vector_copies
              }
          }
        else
-         emit_insn (gen_rtx_SET
-                      (gen_rtx_SUBREG (vmode, vreg, 0),
-                       gen_rtx_VEC_MERGE (vmode,
-                                          gen_rtx_VEC_DUPLICATE (vmode,
-                                                                 reg),
-                                          CONST0_RTX (vmode),
-                                          GEN_INT (HOST_WIDE_INT_1U))));
+         emit_insn (gen_rtx_SET (gen_rtx_SUBREG (vmode, vreg, 0),
+                                 gen_gpr_to_xmm_move_src (vmode, reg)));
        rtx_insn *seq = get_insns ();
        end_sequence ();
        rtx_insn *insn = DF_REF_INSN (ref);