From ffa7068ec56d96bdc1c30ef64b608dbc9cb27570 Mon Sep 17 00:00:00 2001 From: James Greenhalgh Date: Tue, 16 Jun 2015 09:17:52 +0000 Subject: [PATCH] [ARM Churn] Rename LOGICAL_OP_NON_SC to LOGICAL_OP_NON_SHORT_CIRCUIT gcc/ChangeLog: * config/arm/arm-protos.h (struct tune_params): Rename log_op_non_sc to log_op_non_short_circuit, and rename enum values to expand SC to SHORT_CIRCUIT. * config/arm/arm.c (arm_slowmul_tune): Expand LOG_OP_NON_SC to LOG_OP_NON_SHORT_CIRCUIT. (arm_fastmul_tune):Likewise (arm_strongarm_tune): Likewise. (arm_xscale_tune): Likewise. (arm_9e_tune): Likewise. (arm_marvell_pj4_tune): Likewise. (arm_v6t2_tune): Likewise. (arm_cortex_tune): Likewise. (arm_cortex_a8_tune): Likewise. (arm_cortex_a7_tune): Likewise. (arm_cortex_a15_tune): Likewise. (arm_cortex_a53_tune): Likewise. (arm_cortex_a57_tune): Likewise. (arm_xgene1_tune): Likewise. (arm_cortex_a5_tune): Likewise. (arm_cortex_a9_tune): Likewise. (arm_cortex_a12_tune): Likewise. (arm_v7m_tune): Likewise. (arm_cortex_m7_tune): Likewise. (arm_v6m_tune): Likewise. (arm_fa726te_tune): Likewise. From-SVN: r224506 --- gcc/ChangeLog | 28 +++++++++++++ gcc/config/arm/arm-protos.h | 7 ++-- gcc/config/arm/arm.c | 84 ++++++++++++++++++------------------- 3 files changed, 74 insertions(+), 45 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 019e211968b..57a41f7def5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,31 @@ +2015-06-16 James Greenhalgh + + * config/arm/arm-protos.h (struct tune_params): Rename + log_op_non_sc to log_op_non_short_circuit, and rename enum + values to expand SC to SHORT_CIRCUIT. + * config/arm/arm.c (arm_slowmul_tune): Expand LOG_OP_NON_SC + to LOG_OP_NON_SHORT_CIRCUIT. + (arm_fastmul_tune):Likewise + (arm_strongarm_tune): Likewise. + (arm_xscale_tune): Likewise. + (arm_9e_tune): Likewise. + (arm_marvell_pj4_tune): Likewise. + (arm_v6t2_tune): Likewise. + (arm_cortex_tune): Likewise. + (arm_cortex_a8_tune): Likewise. + (arm_cortex_a7_tune): Likewise. + (arm_cortex_a15_tune): Likewise. + (arm_cortex_a53_tune): Likewise. + (arm_cortex_a57_tune): Likewise. + (arm_xgene1_tune): Likewise. + (arm_cortex_a5_tune): Likewise. + (arm_cortex_a9_tune): Likewise. + (arm_cortex_a12_tune): Likewise. + (arm_v7m_tune): Likewise. + (arm_cortex_m7_tune): Likewise. + (arm_v6m_tune): Likewise. + (arm_fa726te_tune): Likewise. + 2015-06-15 David Edelsohn * altivec.md: Delete UNSPEC_VMLADDUHM. diff --git a/gcc/config/arm/arm-protos.h b/gcc/config/arm/arm-protos.h index 1abe54ecf78..62f91efc0ad 100644 --- a/gcc/config/arm/arm-protos.h +++ b/gcc/config/arm/arm-protos.h @@ -284,9 +284,10 @@ struct tune_params /* The preference for non short cirtcuit operation when optimizing for performance. The first element covers Thumb state and the second one is for ARM state. */ - enum log_op_non_sc {LOG_OP_NON_SC_FALSE, LOG_OP_NON_SC_TRUE}; - log_op_non_sc logical_op_non_short_circuit_thumb: 1; - log_op_non_sc logical_op_non_short_circuit_arm: 1; + enum log_op_non_short_circuit {LOG_OP_NON_SHORT_CIRCUIT_FALSE, + LOG_OP_NON_SHORT_CIRCUIT_TRUE}; + log_op_non_short_circuit logical_op_non_short_circuit_thumb: 1; + log_op_non_short_circuit logical_op_non_short_circuit_arm: 1; /* Prefer 32-bit encoding instead of flag-setting 16-bit encoding. */ enum {DISPARAGE_FLAGS_NEITHER, DISPARAGE_FLAGS_PARTIAL, DISPARAGE_FLAGS_ALL} disparage_flag_setting_t16_encodings: 2; diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index 5744f955f20..f5050cbf640 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -1703,8 +1703,8 @@ const struct tune_params arm_slowmul_tune = ARM_PREFETCH_NOT_BENEFICIAL, tune_params::PREF_CONST_POOL_TRUE, tune_params::PREF_LDRD_FALSE, - tune_params::LOG_OP_NON_SC_TRUE, /* Thumb. */ - tune_params::LOG_OP_NON_SC_TRUE, /* ARM. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* Thumb. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* ARM. */ tune_params::DISPARAGE_FLAGS_NEITHER, tune_params::PREF_NEON_64_FALSE, tune_params::PREF_NEON_STRINGOPS_FALSE, @@ -1726,8 +1726,8 @@ const struct tune_params arm_fastmul_tune = ARM_PREFETCH_NOT_BENEFICIAL, tune_params::PREF_CONST_POOL_TRUE, tune_params::PREF_LDRD_FALSE, - tune_params::LOG_OP_NON_SC_TRUE, /* Thumb. */ - tune_params::LOG_OP_NON_SC_TRUE, /* ARM. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* Thumb. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* ARM. */ tune_params::DISPARAGE_FLAGS_NEITHER, tune_params::PREF_NEON_64_FALSE, tune_params::PREF_NEON_STRINGOPS_FALSE, @@ -1752,8 +1752,8 @@ const struct tune_params arm_strongarm_tune = ARM_PREFETCH_NOT_BENEFICIAL, tune_params::PREF_CONST_POOL_TRUE, tune_params::PREF_LDRD_FALSE, - tune_params::LOG_OP_NON_SC_TRUE, /* Thumb. */ - tune_params::LOG_OP_NON_SC_TRUE, /* ARM. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* Thumb. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* ARM. */ tune_params::DISPARAGE_FLAGS_NEITHER, tune_params::PREF_NEON_64_FALSE, tune_params::PREF_NEON_STRINGOPS_FALSE, @@ -1775,8 +1775,8 @@ const struct tune_params arm_xscale_tune = ARM_PREFETCH_NOT_BENEFICIAL, tune_params::PREF_CONST_POOL_TRUE, tune_params::PREF_LDRD_FALSE, - tune_params::LOG_OP_NON_SC_TRUE, /* Thumb. */ - tune_params::LOG_OP_NON_SC_TRUE, /* ARM. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* Thumb. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* ARM. */ tune_params::DISPARAGE_FLAGS_NEITHER, tune_params::PREF_NEON_64_FALSE, tune_params::PREF_NEON_STRINGOPS_FALSE, @@ -1798,8 +1798,8 @@ const struct tune_params arm_9e_tune = ARM_PREFETCH_NOT_BENEFICIAL, tune_params::PREF_CONST_POOL_TRUE, tune_params::PREF_LDRD_FALSE, - tune_params::LOG_OP_NON_SC_TRUE, /* Thumb. */ - tune_params::LOG_OP_NON_SC_TRUE, /* ARM. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* Thumb. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* ARM. */ tune_params::DISPARAGE_FLAGS_NEITHER, tune_params::PREF_NEON_64_FALSE, tune_params::PREF_NEON_STRINGOPS_FALSE, @@ -1821,8 +1821,8 @@ const struct tune_params arm_marvell_pj4_tune = ARM_PREFETCH_NOT_BENEFICIAL, tune_params::PREF_CONST_POOL_TRUE, tune_params::PREF_LDRD_FALSE, - tune_params::LOG_OP_NON_SC_TRUE, /* Thumb. */ - tune_params::LOG_OP_NON_SC_TRUE, /* ARM. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* Thumb. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* ARM. */ tune_params::DISPARAGE_FLAGS_NEITHER, tune_params::PREF_NEON_64_FALSE, tune_params::PREF_NEON_STRINGOPS_FALSE, @@ -1844,8 +1844,8 @@ const struct tune_params arm_v6t2_tune = ARM_PREFETCH_NOT_BENEFICIAL, tune_params::PREF_CONST_POOL_FALSE, tune_params::PREF_LDRD_FALSE, - tune_params::LOG_OP_NON_SC_TRUE, /* Thumb. */ - tune_params::LOG_OP_NON_SC_TRUE, /* ARM. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* Thumb. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* ARM. */ tune_params::DISPARAGE_FLAGS_NEITHER, tune_params::PREF_NEON_64_FALSE, tune_params::PREF_NEON_STRINGOPS_FALSE, @@ -1869,8 +1869,8 @@ const struct tune_params arm_cortex_tune = ARM_PREFETCH_NOT_BENEFICIAL, tune_params::PREF_CONST_POOL_FALSE, tune_params::PREF_LDRD_FALSE, - tune_params::LOG_OP_NON_SC_TRUE, /* Thumb. */ - tune_params::LOG_OP_NON_SC_TRUE, /* ARM. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* Thumb. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* ARM. */ tune_params::DISPARAGE_FLAGS_NEITHER, tune_params::PREF_NEON_64_FALSE, tune_params::PREF_NEON_STRINGOPS_FALSE, @@ -1892,8 +1892,8 @@ const struct tune_params arm_cortex_a8_tune = ARM_PREFETCH_NOT_BENEFICIAL, tune_params::PREF_CONST_POOL_FALSE, tune_params::PREF_LDRD_FALSE, - tune_params::LOG_OP_NON_SC_TRUE, /* Thumb. */ - tune_params::LOG_OP_NON_SC_TRUE, /* ARM. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* Thumb. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* ARM. */ tune_params::DISPARAGE_FLAGS_NEITHER, tune_params::PREF_NEON_64_FALSE, tune_params::PREF_NEON_STRINGOPS_TRUE, @@ -1915,8 +1915,8 @@ const struct tune_params arm_cortex_a7_tune = ARM_PREFETCH_NOT_BENEFICIAL, tune_params::PREF_CONST_POOL_FALSE, tune_params::PREF_LDRD_FALSE, - tune_params::LOG_OP_NON_SC_TRUE, /* Thumb. */ - tune_params::LOG_OP_NON_SC_TRUE, /* ARM. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* Thumb. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* ARM. */ tune_params::DISPARAGE_FLAGS_NEITHER, tune_params::PREF_NEON_64_FALSE, tune_params::PREF_NEON_STRINGOPS_TRUE, @@ -1938,8 +1938,8 @@ const struct tune_params arm_cortex_a15_tune = ARM_PREFETCH_NOT_BENEFICIAL, tune_params::PREF_CONST_POOL_FALSE, tune_params::PREF_LDRD_TRUE, - tune_params::LOG_OP_NON_SC_TRUE, /* Thumb. */ - tune_params::LOG_OP_NON_SC_TRUE, /* ARM. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* Thumb. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* ARM. */ tune_params::DISPARAGE_FLAGS_ALL, tune_params::PREF_NEON_64_FALSE, tune_params::PREF_NEON_STRINGOPS_TRUE, @@ -1961,8 +1961,8 @@ const struct tune_params arm_cortex_a53_tune = ARM_PREFETCH_NOT_BENEFICIAL, tune_params::PREF_CONST_POOL_FALSE, tune_params::PREF_LDRD_FALSE, - tune_params::LOG_OP_NON_SC_TRUE, /* Thumb. */ - tune_params::LOG_OP_NON_SC_TRUE, /* ARM. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* Thumb. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* ARM. */ tune_params::DISPARAGE_FLAGS_NEITHER, tune_params::PREF_NEON_64_FALSE, tune_params::PREF_NEON_STRINGOPS_TRUE, @@ -1984,8 +1984,8 @@ const struct tune_params arm_cortex_a57_tune = ARM_PREFETCH_NOT_BENEFICIAL, tune_params::PREF_CONST_POOL_FALSE, tune_params::PREF_LDRD_TRUE, - tune_params::LOG_OP_NON_SC_TRUE, /* Thumb. */ - tune_params::LOG_OP_NON_SC_TRUE, /* ARM. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* Thumb. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* ARM. */ tune_params::DISPARAGE_FLAGS_ALL, tune_params::PREF_NEON_64_FALSE, tune_params::PREF_NEON_STRINGOPS_TRUE, @@ -2007,8 +2007,8 @@ const struct tune_params arm_xgene1_tune = ARM_PREFETCH_NOT_BENEFICIAL, tune_params::PREF_CONST_POOL_FALSE, tune_params::PREF_LDRD_TRUE, - tune_params::LOG_OP_NON_SC_TRUE, /* Thumb. */ - tune_params::LOG_OP_NON_SC_TRUE, /* ARM. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* Thumb. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* ARM. */ tune_params::DISPARAGE_FLAGS_ALL, tune_params::PREF_NEON_64_FALSE, tune_params::PREF_NEON_STRINGOPS_FALSE, @@ -2033,8 +2033,8 @@ const struct tune_params arm_cortex_a5_tune = ARM_PREFETCH_NOT_BENEFICIAL, tune_params::PREF_CONST_POOL_FALSE, tune_params::PREF_LDRD_FALSE, - tune_params::LOG_OP_NON_SC_FALSE, /* Thumb. */ - tune_params::LOG_OP_NON_SC_FALSE, /* ARM. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_FALSE, /* Thumb. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_FALSE, /* ARM. */ tune_params::DISPARAGE_FLAGS_NEITHER, tune_params::PREF_NEON_64_FALSE, tune_params::PREF_NEON_STRINGOPS_TRUE, @@ -2056,8 +2056,8 @@ const struct tune_params arm_cortex_a9_tune = ARM_PREFETCH_BENEFICIAL(4,32,32), tune_params::PREF_CONST_POOL_FALSE, tune_params::PREF_LDRD_FALSE, - tune_params::LOG_OP_NON_SC_TRUE, /* Thumb. */ - tune_params::LOG_OP_NON_SC_TRUE, /* ARM. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* Thumb. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* ARM. */ tune_params::DISPARAGE_FLAGS_NEITHER, tune_params::PREF_NEON_64_FALSE, tune_params::PREF_NEON_STRINGOPS_FALSE, @@ -2079,8 +2079,8 @@ const struct tune_params arm_cortex_a12_tune = ARM_PREFETCH_NOT_BENEFICIAL, tune_params::PREF_CONST_POOL_FALSE, tune_params::PREF_LDRD_TRUE, - tune_params::LOG_OP_NON_SC_TRUE, /* Thumb. */ - tune_params::LOG_OP_NON_SC_TRUE, /* ARM. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* Thumb. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* ARM. */ tune_params::DISPARAGE_FLAGS_ALL, tune_params::PREF_NEON_64_FALSE, tune_params::PREF_NEON_STRINGOPS_TRUE, @@ -2109,8 +2109,8 @@ const struct tune_params arm_v7m_tune = ARM_PREFETCH_NOT_BENEFICIAL, tune_params::PREF_CONST_POOL_TRUE, tune_params::PREF_LDRD_FALSE, - tune_params::LOG_OP_NON_SC_FALSE, /* Thumb. */ - tune_params::LOG_OP_NON_SC_FALSE, /* ARM. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_FALSE, /* Thumb. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_FALSE, /* ARM. */ tune_params::DISPARAGE_FLAGS_NEITHER, tune_params::PREF_NEON_64_FALSE, tune_params::PREF_NEON_STRINGOPS_FALSE, @@ -2134,8 +2134,8 @@ const struct tune_params arm_cortex_m7_tune = ARM_PREFETCH_NOT_BENEFICIAL, tune_params::PREF_CONST_POOL_TRUE, tune_params::PREF_LDRD_FALSE, - tune_params::LOG_OP_NON_SC_TRUE, /* Thumb. */ - tune_params::LOG_OP_NON_SC_TRUE, /* ARM. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* Thumb. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* ARM. */ tune_params::DISPARAGE_FLAGS_NEITHER, tune_params::PREF_NEON_64_FALSE, tune_params::PREF_NEON_STRINGOPS_FALSE, @@ -2159,8 +2159,8 @@ const struct tune_params arm_v6m_tune = ARM_PREFETCH_NOT_BENEFICIAL, tune_params::PREF_CONST_POOL_FALSE, tune_params::PREF_LDRD_FALSE, - tune_params::LOG_OP_NON_SC_FALSE, /* Thumb. */ - tune_params::LOG_OP_NON_SC_FALSE, /* ARM. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_FALSE, /* Thumb. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_FALSE, /* ARM. */ tune_params::DISPARAGE_FLAGS_NEITHER, tune_params::PREF_NEON_64_FALSE, tune_params::PREF_NEON_STRINGOPS_FALSE, @@ -2182,8 +2182,8 @@ const struct tune_params arm_fa726te_tune = ARM_PREFETCH_NOT_BENEFICIAL, tune_params::PREF_CONST_POOL_TRUE, tune_params::PREF_LDRD_FALSE, - tune_params::LOG_OP_NON_SC_TRUE, /* Thumb. */ - tune_params::LOG_OP_NON_SC_TRUE, /* ARM. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* Thumb. */ + tune_params::LOG_OP_NON_SHORT_CIRCUIT_TRUE, /* ARM. */ tune_params::DISPARAGE_FLAGS_NEITHER, tune_params::PREF_NEON_64_FALSE, tune_params::PREF_NEON_STRINGOPS_FALSE, -- 2.30.2