From e9a3a1750a836e1611d0f72f0372b0a79ecd6358 Mon Sep 17 00:00:00 2001 From: James Greenhalgh Date: Mon, 1 Jun 2015 11:57:54 +0000 Subject: [PATCH] [AArch64 Obvious] "Fuseable" is not a word -> s/fuseable/fusible/g gcc/ * config/aarch64/aarch64-protos.h (tune_params): Rename fuseable_ops to fusible_ops. * config/aarch64/aarch64.c (generic_tunings): Rename fuseable_ops to fusible_ops. (cortexa53_tunings): Likewise. (cortexa57_tunings): Likewise. (thunderx_tunings): Likewise. (xgene1_tunings): Likewise. (aarch64_macro_fusion_p): Likewise. (aarch64_macro_fusion_pair_p): Likewise. From-SVN: r223938 --- gcc/ChangeLog | 13 +++++++++++++ gcc/config/aarch64/aarch64-protos.h | 2 +- gcc/config/aarch64/aarch64.c | 22 +++++++++++----------- 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 72ef1e45d5c..92b99b86965 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,16 @@ +2015-06-01 James Greenhalgh + + * config/aarch64/aarch64-protos.h (tune_params): Rename + fuseable_ops to fusible_ops. + * config/aarch64/aarch64.c (generic_tunings): Rename + fuseable_ops to fusible_ops. + (cortexa53_tunings): Likewise. + (cortexa57_tunings): Likewise. + (thunderx_tunings): Likewise. + (xgene1_tunings): Likewise. + (aarch64_macro_fusion_p): Likewise. + (aarch64_macro_fusion_pair_p): Likewise. + 2015-06-01 Dominik Vogt * config/s390/driver-native.c: New file. diff --git a/gcc/config/aarch64/aarch64-protos.h b/gcc/config/aarch64/aarch64-protos.h index 931c8b81cc0..965a11b7bee 100644 --- a/gcc/config/aarch64/aarch64-protos.h +++ b/gcc/config/aarch64/aarch64-protos.h @@ -178,7 +178,7 @@ struct tune_params const struct cpu_branch_cost *const branch_costs; const int memmov_cost; const int issue_rate; - const unsigned int fuseable_ops; + const unsigned int fusible_ops; const int function_align; const int jump_align; const int loop_align; diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c index 083b9b40ccb..648a548e0e0 100644 --- a/gcc/config/aarch64/aarch64.c +++ b/gcc/config/aarch64/aarch64.c @@ -356,7 +356,7 @@ static const struct tune_params generic_tunings = &generic_branch_cost, 4, /* memmov_cost */ 2, /* issue_rate */ - AARCH64_FUSE_NOTHING, /* fuseable_ops */ + AARCH64_FUSE_NOTHING, /* fusible_ops */ 8, /* function_align. */ 8, /* jump_align. */ 4, /* loop_align. */ @@ -377,7 +377,7 @@ static const struct tune_params cortexa53_tunings = 4, /* memmov_cost */ 2, /* issue_rate */ (AARCH64_FUSE_MOV_MOVK | AARCH64_FUSE_ADRP_ADD - | AARCH64_FUSE_MOVK_MOVK | AARCH64_FUSE_ADRP_LDR), /* fuseable_ops */ + | AARCH64_FUSE_MOVK_MOVK | AARCH64_FUSE_ADRP_LDR), /* fusible_ops */ 8, /* function_align. */ 8, /* jump_align. */ 4, /* loop_align. */ @@ -398,7 +398,7 @@ static const struct tune_params cortexa57_tunings = 4, /* memmov_cost */ 3, /* issue_rate */ (AARCH64_FUSE_MOV_MOVK | AARCH64_FUSE_ADRP_ADD - | AARCH64_FUSE_MOVK_MOVK), /* fuseable_ops */ + | AARCH64_FUSE_MOVK_MOVK), /* fusible_ops */ 16, /* function_align. */ 8, /* jump_align. */ 4, /* loop_align. */ @@ -418,7 +418,7 @@ static const struct tune_params thunderx_tunings = &generic_branch_cost, 6, /* memmov_cost */ 2, /* issue_rate */ - AARCH64_FUSE_CMP_BRANCH, /* fuseable_ops */ + AARCH64_FUSE_CMP_BRANCH, /* fusible_ops */ 8, /* function_align. */ 8, /* jump_align. */ 8, /* loop_align. */ @@ -438,7 +438,7 @@ static const struct tune_params xgene1_tunings = &generic_branch_cost, 6, /* memmov_cost */ 4, /* issue_rate */ - AARCH64_FUSE_NOTHING, /* fuseable_ops */ + AARCH64_FUSE_NOTHING, /* fusible_ops */ 16, /* function_align. */ 8, /* jump_align. */ 16, /* loop_align. */ @@ -10892,7 +10892,7 @@ aarch64_gen_ccmp_next (rtx *prep_seq, rtx *gen_seq, rtx prev, int cmp_code, static bool aarch64_macro_fusion_p (void) { - return aarch64_tune_params->fuseable_ops != AARCH64_FUSE_NOTHING; + return aarch64_tune_params->fusible_ops != AARCH64_FUSE_NOTHING; } @@ -10912,7 +10912,7 @@ aarch_macro_fusion_pair_p (rtx_insn *prev, rtx_insn *curr) return false; if (simple_sets_p - && (aarch64_tune_params->fuseable_ops & AARCH64_FUSE_MOV_MOVK)) + && (aarch64_tune_params->fusible_ops & AARCH64_FUSE_MOV_MOVK)) { /* We are trying to match: prev (mov) == (set (reg r0) (const_int imm16)) @@ -10937,7 +10937,7 @@ aarch_macro_fusion_pair_p (rtx_insn *prev, rtx_insn *curr) } if (simple_sets_p - && (aarch64_tune_params->fuseable_ops & AARCH64_FUSE_ADRP_ADD)) + && (aarch64_tune_params->fusible_ops & AARCH64_FUSE_ADRP_ADD)) { /* We're trying to match: @@ -10963,7 +10963,7 @@ aarch_macro_fusion_pair_p (rtx_insn *prev, rtx_insn *curr) } if (simple_sets_p - && (aarch64_tune_params->fuseable_ops & AARCH64_FUSE_MOVK_MOVK)) + && (aarch64_tune_params->fusible_ops & AARCH64_FUSE_MOVK_MOVK)) { /* We're trying to match: @@ -10992,7 +10992,7 @@ aarch_macro_fusion_pair_p (rtx_insn *prev, rtx_insn *curr) } if (simple_sets_p - && (aarch64_tune_params->fuseable_ops & AARCH64_FUSE_ADRP_LDR)) + && (aarch64_tune_params->fusible_ops & AARCH64_FUSE_ADRP_LDR)) { /* We're trying to match: prev (adrp) == (set (reg r0) @@ -11023,7 +11023,7 @@ aarch_macro_fusion_pair_p (rtx_insn *prev, rtx_insn *curr) } } - if ((aarch64_tune_params->fuseable_ops & AARCH64_FUSE_CMP_BRANCH) + if ((aarch64_tune_params->fusible_ops & AARCH64_FUSE_CMP_BRANCH) && any_condjump_p (curr)) { enum attr_type prev_type = get_attr_type (prev); -- 2.30.2