From b505225ba4de6de34a791571354a0df5d1bd2ed7 Mon Sep 17 00:00:00 2001 From: Trevor Saunders Date: Thu, 28 Jul 2016 11:01:49 +0000 Subject: merge adjust_cost and adjust_cost_2 target hooks gcc/ChangeLog: 2016-07-28 Trevor Saunders * config/alpha/alpha.c (alpha_adjust_cost): Adjust. * config/arm/arm-protos.h (struct tune_params): Likewise. * config/arm/arm.c (xscale_sched_adjust_cost): Likewise. (cortex_a9_sched_adjust_cost): Likewise. (fa726te_sched_adjust_cost): Likewise. (arm_adjust_cost): Likewise. * config/bfin/bfin.c (bfin_adjust_cost): Likewise. * config/c6x/c6x.c (c6x_adjust_cost): Likewise. * config/epiphany/epiphany.c (epiphany_adjust_cost): Likewise. * config/i386/i386.c (ix86_adjust_cost): Likewise. * config/ia64/ia64.c: Likewise. * config/m68k/m68k.c: Likewise. * config/mep/mep.c (mep_adjust_cost): Likewise. * config/microblaze/microblaze.c (microblaze_adjust_cost): * Likewise. * config/mips/mips.c (mips_adjust_cost): Likewise. * config/mn10300/mn10300.c (mn10300_adjust_sched_cost): * Likewise. * config/pa/pa.c (pa_adjust_cost): Likewise. * config/rs6000/rs6000.c (rs6000_adjust_cost): Likewise. (rs6000_debug_adjust_cost): Likewise. * config/sh/sh.c (sh_adjust_cost): Likewise. * config/sparc/sparc.c (supersparc_adjust_cost): Likewise. (hypersparc_adjust_cost): Likewise. (sparc_adjust_cost): Likewise. * config/spu/spu.c (spu_sched_adjust_cost): Likewise. * config/tilegx/tilegx.c (tilegx_sched_adjust_cost): Likewise. * config/tilepro/tilepro.c (tilepro_sched_adjust_cost): * Likewise. * config/visium/visium.c (visium_adjust_cost): Likewise. * doc/tm.texi: Regenerate. * haifa-sched.c (dep_cost_1): Adjust. * target.def: Merge adjust_cost and adjust_cost_2. From-SVN: r238814 --- gcc/config/pa/pa.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gcc/config/pa/pa.c') diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c index 67aa55b..251c1ad 100644 --- a/gcc/config/pa/pa.c +++ b/gcc/config/pa/pa.c @@ -117,7 +117,7 @@ static bool pa_function_value_regno_p (const unsigned int); static void pa_output_function_prologue (FILE *, HOST_WIDE_INT); static void update_total_code_bytes (unsigned int); static void pa_output_function_epilogue (FILE *, HOST_WIDE_INT); -static int pa_adjust_cost (rtx_insn *, rtx, rtx_insn *, int); +static int pa_adjust_cost (rtx_insn *, int, rtx_insn *, int, unsigned int); static int pa_adjust_priority (rtx_insn *, int); static int pa_issue_rate (void); static int pa_reloc_rw_mask (void); @@ -4759,13 +4759,14 @@ pa_emit_bcond_fp (rtx operands[]) a dependency LINK or INSN on DEP_INSN. COST is the current cost. */ static int -pa_adjust_cost (rtx_insn *insn, rtx link, rtx_insn *dep_insn, int cost) +pa_adjust_cost (rtx_insn *insn, int dep_type, rtx_insn *dep_insn, int cost, + unsigned int) { enum attr_type attr_type; /* Don't adjust costs for a pa8000 chip, also do not adjust any true dependencies as they are described with bypasses now. */ - if (pa_cpu >= PROCESSOR_8000 || REG_NOTE_KIND (link) == 0) + if (pa_cpu >= PROCESSOR_8000 || dep_type == 0) return cost; if (! recog_memoized (insn)) @@ -4773,7 +4774,7 @@ pa_adjust_cost (rtx_insn *insn, rtx link, rtx_insn *dep_insn, int cost) attr_type = get_attr_type (insn); - switch (REG_NOTE_KIND (link)) + switch (dep_type) { case REG_DEP_ANTI: /* Anti dependency; DEP_INSN reads a register that INSN writes some -- cgit v1.1