From 91afd29bd7824ff07ffe61f327af86f189c59188 Mon Sep 17 00:00:00 2001 From: Oleg Endo Date: Thu, 29 Dec 2011 15:11:47 +0000 Subject: [PATCH] sh.h (BRANCH_COST): Use sh_branch_cost variable. * config/sh/sh.h (BRANCH_COST): Use sh_branch_cost variable. * config/sh/sh.c (sh_option_override): Simplify sh_branch_cost expression. From-SVN: r182723 --- gcc/ChangeLog | 6 ++++++ gcc/config/sh/sh.c | 11 +++++++++-- gcc/config/sh/sh.h | 8 ++------ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5e319121cb4..4c8ff343f36 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2011-12-29 Oleg Endo + + * config/sh/sh.h (BRANCH_COST): Use sh_branch_cost variable. + * config/sh/sh.c (sh_option_override): Simplify sh_branch_cost + expression. + 2011-12-28 Ian Lance Taylor * dwarf2out.c (gen_compile_unit_die): Use DW_LANG_Go for Go. diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c index 1b289ad29d3..744c49a5fa8 100644 --- a/gcc/config/sh/sh.c +++ b/gcc/config/sh/sh.c @@ -724,8 +724,15 @@ sh_option_override (void) else sh_divsi3_libfunc = "__sdivsi3"; if (sh_branch_cost == -1) - sh_branch_cost - = TARGET_SH5 ? 1 : ! TARGET_SH2 || TARGET_HARD_SH4 ? 2 : 1; + { + sh_branch_cost = 1; + + /* The SH1 does not have delay slots, hence we get a pipeline stall + at every branch. The SH4 is superscalar, so the single delay slot + is not sufficient to keep both pipelines filled. */ + if (! TARGET_SH2 || TARGET_HARD_SH4) + sh_branch_cost = 2; + } for (regno = 0; regno < FIRST_PSEUDO_REGISTER; regno++) if (! VALID_REGISTER_P (regno)) diff --git a/gcc/config/sh/sh.h b/gcc/config/sh/sh.h index f873b9d72a3..0f06fb8de24 100644 --- a/gcc/config/sh/sh.h +++ b/gcc/config/sh/sh.h @@ -2088,12 +2088,8 @@ struct sh_args { different code that does fewer memory accesses. */ /* A C expression for the cost of a branch instruction. A value of 1 - is the default; other values are interpreted relative to that. - The SH1 does not have delay slots, hence we get a pipeline stall - at every branch. The SH4 is superscalar, so the single delay slot - is not sufficient to keep both pipelines filled. */ -#define BRANCH_COST(speed_p, predictable_p) \ - (TARGET_SH5 ? 1 : ! TARGET_SH2 || TARGET_HARD_SH4 ? 2 : 1) + is the default; other values are interpreted relative to that. */ +#define BRANCH_COST(speed_p, predictable_p) sh_branch_cost /* Assembler output control. */ -- 2.30.2