From 7cc237a633b6b488a3950baa23833b6f78e8d26b Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Wed, 30 Aug 2017 11:14:32 +0000 Subject: [PATCH] [37/77] Use scalar_int_mode when emitting cstores cstore patterns always have a scalar integer result, which has the value 0 for "false" and STORE_FLAG_VALUE for "true". This patch makes that explicit using scalar_int_mode. 2017-08-30 Richard Sandiford Alan Hayward David Sherwood gcc/ * target.def (cstore_mode): Return a scalar_int_mode. * doc/tm.texi: Regenerate. * config/sparc/sparc.c (sparc_cstore_mode): Return a scalar_int_mode. * targhooks.h (default_cstore_mode): Likewise. * targhooks.c (default_cstore_mode): Likewise, using a forced conversion. * expmed.c (emit_cstore): Expect the target of the cstore to be a scalar_int_mode. Co-Authored-By: Alan Hayward Co-Authored-By: David Sherwood From-SVN: r251489 --- gcc/ChangeLog | 13 +++++++++++++ gcc/config/sparc/sparc.c | 4 ++-- gcc/doc/tm.texi | 2 +- gcc/expmed.c | 17 ++++++++++------- gcc/target.def | 2 +- gcc/targhooks.c | 4 ++-- gcc/targhooks.h | 2 +- 7 files changed, 30 insertions(+), 14 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 37e7b70d202..fb5ddf548f7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,16 @@ +2017-08-30 Richard Sandiford + Alan Hayward + David Sherwood + + * target.def (cstore_mode): Return a scalar_int_mode. + * doc/tm.texi: Regenerate. + * config/sparc/sparc.c (sparc_cstore_mode): Return a scalar_int_mode. + * targhooks.h (default_cstore_mode): Likewise. + * targhooks.c (default_cstore_mode): Likewise, using a forced + conversion. + * expmed.c (emit_cstore): Expect the target of the cstore to be + a scalar_int_mode. + 2017-08-30 Richard Sandiford Alan Hayward David Sherwood diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c index a3e7e46a514..54adb465768 100644 --- a/gcc/config/sparc/sparc.c +++ b/gcc/config/sparc/sparc.c @@ -671,7 +671,7 @@ static void sparc_print_operand_address (FILE *, machine_mode, rtx); static reg_class_t sparc_secondary_reload (bool, rtx, reg_class_t, machine_mode, secondary_reload_info *); -static machine_mode sparc_cstore_mode (enum insn_code icode); +static scalar_int_mode sparc_cstore_mode (enum insn_code icode); static void sparc_atomic_assign_expand_fenv (tree *, tree *, tree *); static bool sparc_fixed_condition_code_regs (unsigned int *, unsigned int *); static unsigned int sparc_min_arithmetic_precision (void); @@ -13170,7 +13170,7 @@ sparc_modes_tieable_p (machine_mode mode1, machine_mode mode2) /* Implement TARGET_CSTORE_MODE. */ -static machine_mode +static scalar_int_mode sparc_cstore_mode (enum insn_code icode ATTRIBUTE_UNUSED) { return (TARGET_ARCH64 ? DImode : SImode); diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi index dd27db75658..59c26677457 100644 --- a/gcc/doc/tm.texi +++ b/gcc/doc/tm.texi @@ -2902,7 +2902,7 @@ This hook defines a class of registers which could be used for spilling pseudos This hook should return @code{true} if given class of registers should be an allocno class in any way. Usually RA uses only one register class from all classes containing the same register set. In some complicated cases, you need to have two or more such classes as allocno ones for RA correct work. Not defining this hook is equivalent to returning @code{false} for all inputs. @end deftypefn -@deftypefn {Target Hook} machine_mode TARGET_CSTORE_MODE (enum insn_code @var{icode}) +@deftypefn {Target Hook} scalar_int_mode TARGET_CSTORE_MODE (enum insn_code @var{icode}) This hook defines the machine mode to use for the boolean result of conditional store patterns. The ICODE argument is the instruction code for the cstore being performed. Not definiting this hook is the same as accepting the mode encoded into operand 0 of the cstore expander patterns. @end deftypefn diff --git a/gcc/expmed.c b/gcc/expmed.c index 80df42f2ae3..8292d40b4e5 100644 --- a/gcc/expmed.c +++ b/gcc/expmed.c @@ -5291,7 +5291,8 @@ emit_cstore (rtx target, enum insn_code icode, enum rtx_code code, struct expand_operand ops[4]; rtx op0, comparison, subtarget; rtx_insn *last; - machine_mode result_mode = targetm.cstore_mode (icode); + scalar_int_mode result_mode = targetm.cstore_mode (icode); + scalar_int_mode int_target_mode; last = get_last_insn (); x = prepare_operand (icode, x, 2, mode, compare_mode, unsignedp); @@ -5303,9 +5304,11 @@ emit_cstore (rtx target, enum insn_code icode, enum rtx_code code, } if (target_mode == VOIDmode) - target_mode = result_mode; + int_target_mode = result_mode; + else + int_target_mode = as_a (target_mode); if (!target) - target = gen_reg_rtx (target_mode); + target = gen_reg_rtx (int_target_mode); comparison = gen_rtx_fmt_ee (code, result_mode, x, y); @@ -5321,20 +5324,20 @@ emit_cstore (rtx target, enum insn_code icode, enum rtx_code code, subtarget = ops[0].value; /* If we are converting to a wider mode, first convert to - TARGET_MODE, then normalize. This produces better combining + INT_TARGET_MODE, then normalize. This produces better combining opportunities on machines that have a SIGN_EXTRACT when we are testing a single bit. This mostly benefits the 68k. If STORE_FLAG_VALUE does not have the sign bit set when interpreted in MODE, we can do this conversion as unsigned, which is usually more efficient. */ - if (GET_MODE_SIZE (target_mode) > GET_MODE_SIZE (result_mode)) + if (GET_MODE_SIZE (int_target_mode) > GET_MODE_SIZE (result_mode)) { convert_move (target, subtarget, val_signbit_known_clear_p (result_mode, STORE_FLAG_VALUE)); op0 = target; - result_mode = target_mode; + result_mode = int_target_mode; } else op0 = subtarget; @@ -5370,7 +5373,7 @@ emit_cstore (rtx target, enum insn_code icode, enum rtx_code code, } /* If we were converting to a smaller mode, do the conversion now. */ - if (target_mode != result_mode) + if (int_target_mode != result_mode) { convert_move (target, op0, 0); return target; diff --git a/gcc/target.def b/gcc/target.def index 1e7c8deb526..ba8b8a27693 100644 --- a/gcc/target.def +++ b/gcc/target.def @@ -5093,7 +5093,7 @@ DEFHOOK for the cstore being performed. Not definiting this hook is the same\ as accepting the mode encoded into operand 0 of the cstore expander\ patterns.", - machine_mode, (enum insn_code icode), + scalar_int_mode, (enum insn_code icode), default_cstore_mode) /* This target hook allows the backend to compute the register pressure diff --git a/gcc/targhooks.c b/gcc/targhooks.c index 72e199f44ff..ebc2e9cda2b 100644 --- a/gcc/targhooks.c +++ b/gcc/targhooks.c @@ -1870,10 +1870,10 @@ default_pch_valid_p (const void *data_p, size_t len) /* Default version of cstore_mode. */ -machine_mode +scalar_int_mode default_cstore_mode (enum insn_code icode) { - return insn_data[(int) icode].operand[0].mode; + return as_a (insn_data[(int) icode].operand[0].mode); } /* Default version of member_type_forces_blk. */ diff --git a/gcc/targhooks.h b/gcc/targhooks.h index 2ab7eec348f..7c7e7488155 100644 --- a/gcc/targhooks.h +++ b/gcc/targhooks.h @@ -232,7 +232,7 @@ extern const char *default_pch_valid_p (const void *, size_t); extern void default_asm_output_ident_directive (const char*); -extern machine_mode default_cstore_mode (enum insn_code); +extern scalar_int_mode default_cstore_mode (enum insn_code); extern bool default_member_type_forces_blk (const_tree, machine_mode); extern void default_atomic_assign_expand_fenv (tree *, tree *, tree *); extern tree build_va_arg_indirect_ref (tree); -- 2.30.2