| Message ID | 58A2D7CD.4030602@foss.arm.com |
|---|---|
| State | New |
| Headers | show |
On 14/02/17 10:11, Kyrill Tkachov wrote: > Hi all, > > And this is the arm implementation of the hook. It is the same as the > aarch64 one since the two ports > share their instruction types for scheduling purposes. > > Bootstrapped and tested on arm-none-linux-gnueabihf. > > Ok for trunk? > > Thanks, > Kyrill > > 2016-02-07 Kyrylo Tkachov <kyrylo.tkachov@arm.com> > > PR rtl-optimization/68664 > * config/arm/arm.c (arm_sched_can_speculate_insn): > New function. Declare prototype. > (TARGET_SCHED_CAN_SPECULATE_INSN): Define. > OK. R. > arm-spec.patch > > > diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c > index b7f7179d99ff211e6be518fdbbc4bdff312d6a07..08a472f8658b49455a57bf324eada2b674436541 100644 > --- a/gcc/config/arm/arm.c > +++ b/gcc/config/arm/arm.c > @@ -240,6 +240,7 @@ static bool arm_can_inline_p (tree, tree); > static void arm_relayout_function (tree); > static bool arm_valid_target_attribute_p (tree, tree, tree, int); > static unsigned HOST_WIDE_INT arm_shift_truncation_mask (machine_mode); > +static bool arm_sched_can_speculate_insn (rtx_insn *); > static bool arm_macro_fusion_p (void); > static bool arm_cannot_copy_insn_p (rtx_insn *); > static int arm_issue_rate (void); > @@ -419,6 +420,9 @@ static const struct attribute_spec arm_attribute_table[] = > #undef TARGET_COMP_TYPE_ATTRIBUTES > #define TARGET_COMP_TYPE_ATTRIBUTES arm_comp_type_attributes > > +#undef TARGET_SCHED_CAN_SPECULATE_INSN > +#define TARGET_SCHED_CAN_SPECULATE_INSN arm_sched_can_speculate_insn > + > #undef TARGET_SCHED_MACRO_FUSION_P > #define TARGET_SCHED_MACRO_FUSION_P arm_macro_fusion_p > > @@ -30085,6 +30089,35 @@ arm_fusion_enabled_p (tune_params::fuse_ops op) > return current_tune->fusible_ops & op; > } > > +/* Implement TARGET_SCHED_CAN_SPECULATE_INSN. Return true if INSN can be > + scheduled for speculative execution. Reject the long-running division > + and square-root instructions. */ > + > +static bool > +arm_sched_can_speculate_insn (rtx_insn *insn) > +{ > + switch (get_attr_type (insn)) > + { > + case TYPE_SDIV: > + case TYPE_UDIV: > + case TYPE_FDIVS: > + case TYPE_FDIVD: > + case TYPE_FSQRTS: > + case TYPE_FSQRTD: > + case TYPE_NEON_FP_SQRT_S: > + case TYPE_NEON_FP_SQRT_D: > + case TYPE_NEON_FP_SQRT_S_Q: > + case TYPE_NEON_FP_SQRT_D_Q: > + case TYPE_NEON_FP_DIV_S: > + case TYPE_NEON_FP_DIV_D: > + case TYPE_NEON_FP_DIV_S_Q: > + case TYPE_NEON_FP_DIV_D_Q: > + return false; > + default: > + return true; > + } > +} > + > /* Implement the TARGET_ASAN_SHADOW_OFFSET hook. */ > > static unsigned HOST_WIDE_INT >
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index b7f7179d99ff211e6be518fdbbc4bdff312d6a07..08a472f8658b49455a57bf324eada2b674436541 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -240,6 +240,7 @@ static bool arm_can_inline_p (tree, tree); static void arm_relayout_function (tree); static bool arm_valid_target_attribute_p (tree, tree, tree, int); static unsigned HOST_WIDE_INT arm_shift_truncation_mask (machine_mode); +static bool arm_sched_can_speculate_insn (rtx_insn *); static bool arm_macro_fusion_p (void); static bool arm_cannot_copy_insn_p (rtx_insn *); static int arm_issue_rate (void); @@ -419,6 +420,9 @@ static const struct attribute_spec arm_attribute_table[] = #undef TARGET_COMP_TYPE_ATTRIBUTES #define TARGET_COMP_TYPE_ATTRIBUTES arm_comp_type_attributes +#undef TARGET_SCHED_CAN_SPECULATE_INSN +#define TARGET_SCHED_CAN_SPECULATE_INSN arm_sched_can_speculate_insn + #undef TARGET_SCHED_MACRO_FUSION_P #define TARGET_SCHED_MACRO_FUSION_P arm_macro_fusion_p @@ -30085,6 +30089,35 @@ arm_fusion_enabled_p (tune_params::fuse_ops op) return current_tune->fusible_ops & op; } +/* Implement TARGET_SCHED_CAN_SPECULATE_INSN. Return true if INSN can be + scheduled for speculative execution. Reject the long-running division + and square-root instructions. */ + +static bool +arm_sched_can_speculate_insn (rtx_insn *insn) +{ + switch (get_attr_type (insn)) + { + case TYPE_SDIV: + case TYPE_UDIV: + case TYPE_FDIVS: + case TYPE_FDIVD: + case TYPE_FSQRTS: + case TYPE_FSQRTD: + case TYPE_NEON_FP_SQRT_S: + case TYPE_NEON_FP_SQRT_D: + case TYPE_NEON_FP_SQRT_S_Q: + case TYPE_NEON_FP_SQRT_D_Q: + case TYPE_NEON_FP_DIV_S: + case TYPE_NEON_FP_DIV_D: + case TYPE_NEON_FP_DIV_S_Q: + case TYPE_NEON_FP_DIV_D_Q: + return false; + default: + return true; + } +} + /* Implement the TARGET_ASAN_SHADOW_OFFSET hook. */ static unsigned HOST_WIDE_INT
Hi all, And this is the arm implementation of the hook. It is the same as the aarch64 one since the two ports share their instruction types for scheduling purposes. Bootstrapped and tested on arm-none-linux-gnueabihf. Ok for trunk? Thanks, Kyrill 2016-02-07 Kyrylo Tkachov <kyrylo.tkachov@arm.com> PR rtl-optimization/68664 * config/arm/arm.c (arm_sched_can_speculate_insn): New function. Declare prototype. (TARGET_SCHED_CAN_SPECULATE_INSN): Define.