diff options
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/config/arm/arm-protos.h | 4 | ||||
| -rw-r--r-- | gcc/config/arm/arm.c | 8 |
3 files changed, 14 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 92b99b8..51e21e3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,13 @@ 2015-06-01 James Greenhalgh <james.greenhalgh@arm.com> + * gcc/config/arm/arm-protos.h (tune_params): Rename fuseable_ops + to fusible_ops. + * gcc/config/arm/arm.c (arm_print_tune_info): Likewise. + (arm_macro_fusion_p): Likewise. + (arm_macro_fusion_pair_p): Likewise. + +2015-06-01 James Greenhalgh <james.greenhalgh@arm.com> + * config/aarch64/aarch64-protos.h (tune_params): Rename fuseable_ops to fusible_ops. * config/aarch64/aarch64.c (generic_tunings): Rename diff --git a/gcc/config/arm/arm-protos.h b/gcc/config/arm/arm-protos.h index 91907b8..d1f2d4e 100644 --- a/gcc/config/arm/arm-protos.h +++ b/gcc/config/arm/arm-protos.h @@ -291,14 +291,14 @@ struct tune_params /* Prefer to inline string operations like memset by using Neon. */ enum {PREF_NEON_STRINGOPS_FALSE, PREF_NEON_STRINGOPS_TRUE} string_ops_prefer_neon: 1; - /* Bitfield encoding the fuseable pairs of instructions. Use FUSE_OPS + /* Bitfield encoding the fusible pairs of instructions. Use FUSE_OPS in an initializer if multiple fusion operations are supported on a target. */ enum fuse_ops { FUSE_NOTHING = 0, FUSE_MOVW_MOVT = 1 << 0 - } fuseable_ops: 1; + } fusible_ops: 1; /* Depth of scheduling queue to check for L2 autoprefetcher. */ enum {SCHED_AUTOPREF_OFF, SCHED_AUTOPREF_RANK, SCHED_AUTOPREF_FULL} sched_autopref: 2; diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index 888813b..ea1ed43 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -25522,8 +25522,8 @@ arm_print_tune_info (void) (int) current_tune->string_ops_prefer_neon); asm_fprintf (asm_out_file, "\t\t@max_insns_inline_memset:\t%d\n", current_tune->max_insns_inline_memset); - asm_fprintf (asm_out_file, "\t\t@fuseable_ops:\t%u\n", - current_tune->fuseable_ops); + asm_fprintf (asm_out_file, "\t\t@fusible_ops:\t%u\n", + current_tune->fusible_ops); asm_fprintf (asm_out_file, "\t\t@sched_autopref:\t%d\n", (int) current_tune->sched_autopref); } @@ -29160,7 +29160,7 @@ arm_gen_setmem (rtx *operands) static bool arm_macro_fusion_p (void) { - return current_tune->fuseable_ops != tune_params::FUSE_NOTHING; + return current_tune->fusible_ops != tune_params::FUSE_NOTHING; } @@ -29181,7 +29181,7 @@ aarch_macro_fusion_pair_p (rtx_insn* prev, rtx_insn* curr) if (!arm_macro_fusion_p ()) return false; - if (current_tune->fuseable_ops & tune_params::FUSE_MOVW_MOVT) + if (current_tune->fusible_ops & tune_params::FUSE_MOVW_MOVT) { /* We are trying to fuse movw imm / movt imm |