From 3759108f07fed59b39110d864e43e7ca5df2e6ad Mon Sep 17 00:00:00 2001 From: Andrew Pinski Date: Tue, 9 Dec 2014 17:32:58 +0000 Subject: [PATCH] [AARCH64][5/5] Add macro fusion support for cmp/b.X for ThunderX * config/aarch64/aarch64.c (AARCH64_FUSE_CMP_BRANCH): New define. (thunderx_tunings): Add AARCH64_FUSE_CMP_BRANCH to fuseable_ops. (aarch_macro_fusion_pair_p): Handle AARCH64_FUSE_CMP_BRANCH. From-SVN: r218525 --- gcc/ChangeLog | 7 +++++++ gcc/config/aarch64/aarch64.c | 17 ++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 532ac255f09..e680ae9404c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2014-12-09 Andrew Pinski apinski@cavium.com + Kyrylo Tkachov kyrylo.tkachov@arm.com + + * config/aarch64/aarch64.c (AARCH64_FUSE_CMP_BRANCH): New define. + (thunderx_tunings): Add AARCH64_FUSE_CMP_BRANCH to fuseable_ops. + (aarch_macro_fusion_pair_p): Handle AARCH64_FUSE_CMP_BRANCH. + 2014-12-09 David Malcolm PR jit/64166 diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c index e682edda86b..03f3ac497f8 100644 --- a/gcc/config/aarch64/aarch64.c +++ b/gcc/config/aarch64/aarch64.c @@ -310,6 +310,7 @@ static const struct cpu_vector_cost cortexa57_vector_cost = #define AARCH64_FUSE_ADRP_ADD (1 << 1) #define AARCH64_FUSE_MOVK_MOVK (1 << 2) #define AARCH64_FUSE_ADRP_LDR (1 << 3) +#define AARCH64_FUSE_CMP_BRANCH (1 << 4) #if HAVE_DESIGNATED_INITIALIZERS && GCC_VERSION >= 2007 __extension__ @@ -356,7 +357,7 @@ static const struct tune_params thunderx_tunings = &generic_vector_cost, NAMED_PARAM (memmov_cost, 6), NAMED_PARAM (issue_rate, 2), - NAMED_PARAM (fuseable_ops, AARCH64_FUSE_NOTHING) + NAMED_PARAM (fuseable_ops, AARCH64_FUSE_CMP_BRANCH) }; /* A processor implementing AArch64. */ @@ -10379,6 +10380,20 @@ aarch_macro_fusion_pair_p (rtx_insn *prev, rtx_insn *curr) } } + if ((aarch64_tune_params->fuseable_ops & AARCH64_FUSE_CMP_BRANCH) + && any_condjump_p (curr)) + { + enum attr_type prev_type = get_attr_type (prev); + + /* FIXME: this misses some which is considered simple arthematic + instructions for ThunderX. Simple shifts are missed here. */ + if (prev_type == TYPE_ALUS_SREG + || prev_type == TYPE_ALUS_IMM + || prev_type == TYPE_LOGICS_REG + || prev_type == TYPE_LOGICS_IMM) + return true; + } + return false; }