From aca97ef824afa3186a2fe43eadc705878ba5129f Mon Sep 17 00:00:00 2001 From: James Greenhalgh Date: Wed, 26 Jul 2017 17:39:12 +0000 Subject: [PATCH] [Patch AArch64 Obvious] Unify branch costs to generic_branch_cost All the cores in AArch64 use the pair {1, 3} for their branch costs. As that is covered by generic_branch_cost, we can just use that directly and save the tiny amount of redundant code. If in future any core wants to modify this, they can always add a special-case branch-cost back. gcc/ * config/aarch64/aarch64.c (cortexa57_branch_cost): Remove. (thunderx2t99_branch_cost): Likewise. (cortexa35_tunings): Update to use generic_branch_cost. (cortexa53_tunings): Likewise. (cortexa57_tunings): Likewise. (cortexa72_tunings): Likewise. (cortexa73_tunings): Likewise. (thunderx2t99_tunings): Likewise. From-SVN: r250582 --- gcc/ChangeLog | 11 +++++++++++ gcc/config/aarch64/aarch64.c | 26 ++++++-------------------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f2697b12b60..188b0f3bbd2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,14 @@ +2017-07-26 James Greenhalgh + + * config/aarch64/aarch64.c (cortexa57_branch_cost): Remove. + (thunderx2t99_branch_cost): Likewise. + (cortexa35_tunings): Update to use generic_branch_cost. + (cortexa53_tunings): Likewise. + (cortexa57_tunings): Likewise. + (cortexa72_tunings): Likewise. + (cortexa73_tunings): Likewise. + (thunderx2t99_tunings): Likewise. + 2017-07-26 Sebastian Huber * config/sparc/sparc.c (dump_target_flag_bits): Dump MASK_FSMULD. diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c index d753666ef67..31c0d8b6920 100644 --- a/gcc/config/aarch64/aarch64.c +++ b/gcc/config/aarch64/aarch64.c @@ -488,20 +488,6 @@ static const struct cpu_branch_cost generic_branch_cost = 3 /* Unpredictable. */ }; -/* Branch costs for Cortex-A57. */ -static const struct cpu_branch_cost cortexa57_branch_cost = -{ - 1, /* Predictable. */ - 3 /* Unpredictable. */ -}; - -/* Branch costs for Vulcan. */ -static const struct cpu_branch_cost thunderx2t99_branch_cost = -{ - 1, /* Predictable. */ - 3 /* Unpredictable. */ -}; - /* Generic approximation modes. */ static const cpu_approx_modes generic_approx_modes = { @@ -612,7 +598,7 @@ static const struct tune_params cortexa35_tunings = &generic_addrcost_table, &cortexa53_regmove_cost, &generic_vector_cost, - &cortexa57_branch_cost, + &generic_branch_cost, &generic_approx_modes, 4, /* memmov_cost */ 1, /* issue_rate */ @@ -638,7 +624,7 @@ static const struct tune_params cortexa53_tunings = &generic_addrcost_table, &cortexa53_regmove_cost, &generic_vector_cost, - &cortexa57_branch_cost, + &generic_branch_cost, &generic_approx_modes, 4, /* memmov_cost */ 2, /* issue_rate */ @@ -664,7 +650,7 @@ static const struct tune_params cortexa57_tunings = &cortexa57_addrcost_table, &cortexa57_regmove_cost, &cortexa57_vector_cost, - &cortexa57_branch_cost, + &generic_branch_cost, &generic_approx_modes, 4, /* memmov_cost */ 3, /* issue_rate */ @@ -690,7 +676,7 @@ static const struct tune_params cortexa72_tunings = &cortexa57_addrcost_table, &cortexa57_regmove_cost, &cortexa57_vector_cost, - &cortexa57_branch_cost, + &generic_branch_cost, &generic_approx_modes, 4, /* memmov_cost */ 3, /* issue_rate */ @@ -716,7 +702,7 @@ static const struct tune_params cortexa73_tunings = &cortexa57_addrcost_table, &cortexa57_regmove_cost, &cortexa57_vector_cost, - &cortexa57_branch_cost, + &generic_branch_cost, &generic_approx_modes, 4, /* memmov_cost. */ 2, /* issue_rate. */ @@ -871,7 +857,7 @@ static const struct tune_params thunderx2t99_tunings = &thunderx2t99_addrcost_table, &thunderx2t99_regmove_cost, &thunderx2t99_vector_cost, - &thunderx2t99_branch_cost, + &generic_branch_cost, &generic_approx_modes, 4, /* memmov_cost. */ 4, /* issue_rate. */ -- 2.30.2