RISC-V: Reorder insn cost match order to match corresponding expander match order

The corresponding expander (riscv-v.cc:expand_const_vector) matches
const_vec_duplicate_p before const_vec_series_p. Reorder to match this
behavior when calculating costs.

gcc/ChangeLog:

	* config/riscv/riscv.cc (riscv_const_insns): Relocate.

Signed-off-by: Patrick O'Neill <patrick@rivosinc.com>

diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc
index 1f544c1287ecf68fd881f75c1219d9ef6d150c0d..ca86754ec8bf470540bf2f73d305a36410292199 100644 (file)
--- a/gcc/config/riscv/riscv.cc
+++ b/gcc/config/riscv/riscv.cc
@@ -2142,15 +2142,6 @@ riscv_const_insns (rtx x, bool allow_new_pseudos)
          ...etc.  */
        if (riscv_v_ext_mode_p (GET_MODE (x)))
          {
-           /* const series vector.  */
-           rtx base, step;
-           if (const_vec_series_p (x, &base, &step))
-             {
-               /* This is not accurate, we will need to adapt the COST
-                * accurately according to BASE && STEP.  */
-               return 1;
-             }
-
            rtx elt;
            if (const_vec_duplicate_p (x, &elt))
              {
@@ -2186,6 +2177,15 @@ riscv_const_insns (rtx x, bool allow_new_pseudos)
                      return 1 + 4; /*vmv.v.x + memory access.  */
                  }
              }
+
+           /* const series vector.  */
+           rtx base, step;
+           if (const_vec_series_p (x, &base, &step))
+             {
+               /* This cost is not accurate, we will need to adapt the COST
+                  accurately according to BASE && STEP.  */
+               return 1;
+             }
          }
 
        /* TODO: We may support more const vector in the future.  */