From fe1447a1d7ed8945404176fc0941a380682e5f11 Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Wed, 1 Nov 2017 20:47:50 +0000 Subject: [PATCH] [AArch64] Minor rtx costs tweak aarch64_rtx_costs uses the number of registers in a mode as the basis of SET costs. This patch makes it get the number of registers from aarch64_hard_regno_nregs rather than repeating the calcalation inline. Handling SVE modes in aarch64_hard_regno_nregs is then enough to get the correct SET cost as well. 2017-11-01 Richard Sandiford Alan Hayward David Sherwood gcc/ * config/aarch64/aarch64.c (aarch64_rtx_costs): Use aarch64_hard_regno_nregs to get the number of registers in a mode. Reviewed-By: James Greenhalgh Co-Authored-By: Alan Hayward Co-Authored-By: David Sherwood From-SVN: r254327 --- gcc/ChangeLog | 8 ++++++++ gcc/config/aarch64/aarch64.c | 10 ++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 98fc25ee90f..7ef2988ba2d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2017-11-01 Richard Sandiford + Alan Hayward + David Sherwood + + * config/aarch64/aarch64.c (aarch64_rtx_costs): Use + aarch64_hard_regno_nregs to get the number of registers + in a mode. + 2017-11-01 Richard Sandiford Alan Hayward David Sherwood diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c index 39ba21876ba..62682a476a4 100644 --- a/gcc/config/aarch64/aarch64.c +++ b/gcc/config/aarch64/aarch64.c @@ -6939,18 +6939,16 @@ aarch64_rtx_costs (rtx x, machine_mode mode, int outer ATTRIBUTE_UNUSED, /* The cost is one per vector-register copied. */ if (VECTOR_MODE_P (GET_MODE (op0)) && REG_P (op1)) { - int n_minus_1 = (GET_MODE_SIZE (GET_MODE (op0)) - 1) - / GET_MODE_SIZE (V4SImode); - *cost = COSTS_N_INSNS (n_minus_1 + 1); + int nregs = aarch64_hard_regno_nregs (V0_REGNUM, GET_MODE (op0)); + *cost = COSTS_N_INSNS (nregs); } /* const0_rtx is in general free, but we will use an instruction to set a register to 0. */ else if (REG_P (op1) || op1 == const0_rtx) { /* The cost is 1 per register copied. */ - int n_minus_1 = (GET_MODE_SIZE (GET_MODE (op0)) - 1) - / UNITS_PER_WORD; - *cost = COSTS_N_INSNS (n_minus_1 + 1); + int nregs = aarch64_hard_regno_nregs (R0_REGNUM, GET_MODE (op0)); + *cost = COSTS_N_INSNS (nregs); } else /* Cost is just the cost of the RHS of the set. */ -- 2.30.2