Re: [PING*2][PATCH] Extend mode-switching to support toggle (1/2)
On 06/12/14 08:34, Christian Bruel wrote: On 06/11/2014 02:00 PM, Christian Bruel wrote: >On 06/11/2014 06:17 AM, Joern Rennecke wrote: Joern, is this new target macro interface OK with you ? >>Yes, this interface should allow me to do switches between rounding >>and truncating >>floating-point modes with an add/subtract immediate. >> >>However, the implentation, as posted, doesn't work - it causes memory >>corruption. >> >>It appears to work with the attached amendment patch. >> >Indeed, thanks for pointing out the bad reusing of the aux field >between multiple entities. > >In fact rereading this part of the implementation, I find the allocation >of aux*n_entities awkward. A simpler setting in the entity loop to carry >the mode directly into eg->aux is possible without array allocation >(which also fixes a memory leak by the way). > Here is the revised version fixing the aforementioned issue found by Joern on Epiphany. It also simplifies the allocation of the aux edges field to carry the modes. Now that everyone agrees on the interface, is this OK for trunk ? bootstrapped/regtested for X86 and SH4a. thanks, Christian toggle.patch 2014-06-12 Christian Bruel * mode-switching.c (struct bb_info): Add mode_out, mode_in caches. (make_preds_opaque): Delete. (clear_mode_bit, mode_bit_p, set_mode_bit): New macros. (commit_mode_sets): New function. (optimize_mode_switching): Handle current_mode to mode_switching_emit. Process all modes at once. * basic-block.h (pre_edge_lcm_avs): Declare. * lcm.c (pre_edge_lcm_avs): Renamed from pre_edge_lcm. Call clear_aux_for_edges. Fix comments. (pre_edge_lcm): New wrapper function to call pre_edge_lcm_avs. (pre_edge_rev_lcm): Idem. * config/epiphany/epiphany.c (emit_set_fp_mode): Add prev_mode parameter. * config/epiphany/epiphany-protos.h (emit_set_fp_mode): Idem. * config/epiphany/resolve-sw-modes.c (pass_resolve_sw_modes::execute): Idem. * config/i386/i386.c (x96_emit_mode_set): Idem. * config/sh/sh.c (sh_emit_mode_set): Likewise. Handle PR toggle. * config/sh/sh.md (toggle_pr): Defined if TARGET_FPU_SINGLE. (fpscr_toggle) Disallow from delay slot. * target.def (emit_mode_set): Add prev_mode parameter. * doc/tm.texi: Regenerate. 2014-06-12 Christian Bruel * gcc.target/sh/fpchg.c: New test. This is fine for the trunk. Thanks for your patience, Jeff
Re: [PING*2][PATCH] Extend mode-switching to support toggle (1/2)
On 06/11/2014 02:00 PM, Christian Bruel wrote:
> On 06/11/2014 06:17 AM, Joern Rennecke wrote:
Joern, is this new target macro interface OK with you ?
>> Yes, this interface should allow me to do switches between rounding
>> and truncating
>> floating-point modes with an add/subtract immediate.
>>
>> However, the implentation, as posted, doesn't work - it causes memory
>> corruption.
>>
>> It appears to work with the attached amendment patch.
>>
> Indeed, thanks for pointing out the bad reusing of the aux field
> between multiple entities.
>
> In fact rereading this part of the implementation, I find the allocation
> of aux*n_entities awkward. A simpler setting in the entity loop to carry
> the mode directly into eg->aux is possible without array allocation
> (which also fixes a memory leak by the way).
>
Here is the revised version fixing the aforementioned issue found by
Joern on Epiphany. It also simplifies the allocation of the aux edges
field to carry the modes.
Now that everyone agrees on the interface, is this OK for trunk ?
bootstrapped/regtested for X86 and SH4a.
thanks,
Christian
2014-06-12 Christian Bruel
* mode-switching.c (struct bb_info): Add mode_out, mode_in caches.
(make_preds_opaque): Delete.
(clear_mode_bit, mode_bit_p, set_mode_bit): New macros.
(commit_mode_sets): New function.
(optimize_mode_switching): Handle current_mode to mode_switching_emit.
Process all modes at once.
* basic-block.h (pre_edge_lcm_avs): Declare.
* lcm.c (pre_edge_lcm_avs): Renamed from pre_edge_lcm.
Call clear_aux_for_edges. Fix comments.
(pre_edge_lcm): New wrapper function to call pre_edge_lcm_avs.
(pre_edge_rev_lcm): Idem.
* config/epiphany/epiphany.c (emit_set_fp_mode): Add prev_mode parameter.
* config/epiphany/epiphany-protos.h (emit_set_fp_mode): Idem.
* config/epiphany/resolve-sw-modes.c (pass_resolve_sw_modes::execute): Idem.
* config/i386/i386.c (x96_emit_mode_set): Idem.
* config/sh/sh.c (sh_emit_mode_set): Likewise. Handle PR toggle.
* config/sh/sh.md (toggle_pr): Defined if TARGET_FPU_SINGLE.
(fpscr_toggle) Disallow from delay slot.
* target.def (emit_mode_set): Add prev_mode parameter.
* doc/tm.texi: Regenerate.
2014-06-12 Christian Bruel
* gcc.target/sh/fpchg.c: New test.
Index: gcc/basic-block.h
===
--- gcc/basic-block.h (revision 211436)
+++ gcc/basic-block.h (working copy)
@@ -711,6 +711,9 @@ extern void bitmap_union_of_preds (sbitmap, sbitma
extern struct edge_list *pre_edge_lcm (int, sbitmap *, sbitmap *,
sbitmap *, sbitmap *, sbitmap **,
sbitmap **);
+extern struct edge_list *pre_edge_lcm_avs (int, sbitmap *, sbitmap *,
+ sbitmap *, sbitmap *, sbitmap *,
+ sbitmap *, sbitmap **, sbitmap **);
extern struct edge_list *pre_edge_rev_lcm (int, sbitmap *,
sbitmap *, sbitmap *,
sbitmap *, sbitmap **,
Index: gcc/config/epiphany/epiphany-protos.h
===
--- gcc/config/epiphany/epiphany-protos.h (revision 211436)
+++ gcc/config/epiphany/epiphany-protos.h (working copy)
@@ -40,7 +40,8 @@ extern int epiphany_initial_elimination_offset (in
extern void epiphany_init_expanders (void);
extern int hard_regno_mode_ok (int regno, enum machine_mode mode);
#ifdef HARD_CONST
-extern void emit_set_fp_mode (int entity, int mode, HARD_REG_SET regs_live);
+extern void emit_set_fp_mode (int entity, int mode, int prev_mode,
+ HARD_REG_SET regs_live);
#endif
extern void epiphany_insert_mode_switch_use (rtx insn, int, int);
extern void epiphany_expand_set_fp_mode (rtx *operands);
Index: gcc/config/epiphany/epiphany.c
===
--- gcc/config/epiphany/epiphany.c (revision 211436)
+++ gcc/config/epiphany/epiphany.c (working copy)
@@ -2543,7 +2543,8 @@ epiphany_mode_exit (int entity)
}
void
-emit_set_fp_mode (int entity, int mode, HARD_REG_SET regs_live ATTRIBUTE_UNUSED)
+emit_set_fp_mode (int entity, int mode, int prev_mode ATTRIBUTE_UNUSED,
+ HARD_REG_SET regs_live ATTRIBUTE_UNUSED)
{
rtx save_cc, cc_reg, mask, src, src2;
enum attr_fp_mode fp_mode;
Index: gcc/config/epiphany/resolve-sw-modes.c
===
--- gcc/config/epiphany/resolve-sw-modes.c (revision 211436)
+++ gcc/config/epiphany/resolve-sw-modes.c (working copy)
@@ -170,7 +170,7 @@ pass_resolve_sw_modes::execute (function *fun)
}
start_sequence ();
emit_set_fp_mode (EPIPHANY_MSW_ENTITY_ROUND_UNKNOWN,
- jilted_mode, NULL);
+ jilted_mode, FP_MODE_NONE, NULL);
seq = get_insns ();
end_sequence ();
need_commit = true;
Index: gcc/config/i386/i386.c
===
--- gcc/config/i386/i386.c (revision 211436)
+++ gcc/config/i386/i386.c (working copy)
@@ -16447,7 +16447,8 @@ ix86_avx_emit_vzeroupper (HARD_REG_SET re
Re: [PING*2][PATCH] Extend mode-switching to support toggle (1/2)
On 11 Jun 2014, at 14:40, Christian Bruel wrote: > > On 06/10/2014 04:03 PM, Joern Rennecke wrote: >> On 13 May 2014 22:41, Oleg Endo wrote: >> >>> Right. I was thinking to add FPSCR.SZ mode switching to SH, in order to >>> do float vector moves. For that SZ and PR need to be switched both at >>> the same time (only SH4A has both, fpchg and fschg). So basically I'd >>> add another mode entity, which would emit SZ mode changes in addition to >>> the PR mode changes. But then adjacent FPSCR-changing insns could be >>> combined ... any idea/suggestion how to accomplish that? >> If they are sufficiently adjacent, you can use a peephole2 pattern for this. >> >> I see Cristian's patch addresses this in a different way - keeping size and >> precision in the same entity, and emitting toggles as appropriate. > > yes, I was only interested to optimize the SH4a case when PR=1 with a > good enough implementation. To cover all the other possibilities a new > entity would be better. But then as you say recombining them might be > difficult. An alternate hackish way could be to have a singe entity > with 4 modes covering all PR*SZ combinations). > > but I'm not sure that covering the case where PR=0 SZ=1 worth it, maybe > code size only, ? as the 64 move would be implemented as 2*32 moves anyway, I was thinking of using PR=0,SZ=1 mode (i.e. fmov.d) for float vector loads/stores. But at the moment that's a pie in the sky. Cheers, Oleg
Re: [PING*2][PATCH] Extend mode-switching to support toggle (1/2)
On 06/10/2014 04:03 PM, Joern Rennecke wrote: > On 13 May 2014 22:41, Oleg Endo wrote: > >> Right. I was thinking to add FPSCR.SZ mode switching to SH, in order to >> do float vector moves. For that SZ and PR need to be switched both at >> the same time (only SH4A has both, fpchg and fschg). So basically I'd >> add another mode entity, which would emit SZ mode changes in addition to >> the PR mode changes. But then adjacent FPSCR-changing insns could be >> combined ... any idea/suggestion how to accomplish that? > If they are sufficiently adjacent, you can use a peephole2 pattern for this. > > I see Cristian's patch addresses this in a different way - keeping size and > precision in the same entity, and emitting toggles as appropriate. yes, I was only interested to optimize the SH4a case when PR=1 with a good enough implementation. To cover all the other possibilities a new entity would be better. But then as you say recombining them might be difficult. An alternate hackish way could be to have a singe entity with 4 modes covering all PR*SZ combinations). but I'm not sure that covering the case where PR=0 SZ=1 worth it, maybe code size only, ? as the 64 move would be implemented as 2*32 moves anyway, > > The problem get's a bit more interesting if you have some instruction patterns > that care about one setting but not the other. > Describing this exactly allows lazy code motion to be a bit more lazy, but > OTOH > it can make it harder to combine mode switching instructions if you > still want to > do that.
Re: [PING*2][PATCH] Extend mode-switching to support toggle (1/2)
On 06/11/2014 06:17 AM, Joern Rennecke wrote: > >>> Joern, is this new target macro interface OK with you ? > Yes, this interface should allow me to do switches between rounding > and truncating > floating-point modes with an add/subtract immediate. > > However, the implentation, as posted, doesn't work - it causes memory > corruption. > > It appears to work with the attached amendment patch. > Indeed, thanks for pointing out the bad reusing of the aux field between multiple entities. In fact rereading this part of the implementation, I find the allocation of aux*n_entities awkward. A simpler setting in the entity loop to carry the mode directly into eg->aux is possible without array allocation (which also fixes a memory leak by the way). cheers, Christian
Re: [PING*2][PATCH] Extend mode-switching to support toggle (1/2)
On 2 June 2014 13:34, Christian Bruel wrote: > Hello, > > Any feedback for this ? I'd like to commit only when OK for Epiphany. >> Joern, is this new target macro interface OK with you ? Yes, this interface should allow me to do switches between rounding and truncating floating-point modes with an add/subtract immediate. However, the implentation, as posted, doesn't work - it causes memory corruption. It appears to work with the attached amendment patch. === gcc Summary === # of expected passes82184 # of unexpected failures41 # of unexpected successes 1 # of expected failures 90 # of unresolved testcases 2 # of unsupported tests 1585 /ssd/adapteva/bld-epiphany/gcc/xgcc version 4.10.0 20140608 (experimental) (Epiphany toolchain (built 20140610)) This is the same as before applying the patch(es). tmp Description: Binary data
Re: [PING*2][PATCH] Extend mode-switching to support toggle (1/2)
On 13 May 2014 22:41, Oleg Endo wrote: > Right. I was thinking to add FPSCR.SZ mode switching to SH, in order to > do float vector moves. For that SZ and PR need to be switched both at > the same time (only SH4A has both, fpchg and fschg). So basically I'd > add another mode entity, which would emit SZ mode changes in addition to > the PR mode changes. But then adjacent FPSCR-changing insns could be > combined ... any idea/suggestion how to accomplish that? If they are sufficiently adjacent, you can use a peephole2 pattern for this. I see Cristian's patch addresses this in a different way - keeping size and precision in the same entity, and emitting toggles as appropriate. The problem get's a bit more interesting if you have some instruction patterns that care about one setting but not the other. Describing this exactly allows lazy code motion to be a bit more lazy, but OTOH it can make it harder to combine mode switching instructions if you still want to do that.
Re: [PING*2][PATCH] Extend mode-switching to support toggle (1/2)
Hello, Any feedback for this ? I'd like to commit only when OK for Epiphany. many thanks, Christian On 05/26/2014 05:32 PM, Christian Bruel wrote: >> On 04/28/2014 10:08 AM, Christian Bruel wrote: >> Hello, >> >> I'd like to ping the following patches >> >> [Hookize mode-switching] >> http://gcc.gnu.org/ml/gcc-patches/2014-04/msg01003.html >> >> [Add new hooks to support toggle and SH4A fpchg instruction] >> http://gcc.gnu.org/ml/gcc-patches/2014-04/msg01005.html >>> Sorry, I only saw the first part and thought I' d need to wait till I >>> see the second part - and I somehow missed that. >>> >>> I think the previous known mode should be passed to the >>> TARGET_MODE_EMIT hook - no need to have extra hooks >>> for toggling, and, as I mentioned earlier, fixating on the toggle is >>> actually an SH artifact - other ports have multi-way >>> modes settings that can benefit from knowing the previous mode. >> OK I'll change the bool toggle parameter by the previous mode in >> TARGET_MODE_EMIT and remove the bool XOR hooks in the SH description. >> > Hello, > > This is the interface for targets that could use the previous mode for > switching. TARGET_MODE_EMIT now takes a new prev_mode parameter. If the > previous mode cannot be determined, MODE_NONE (value depends on the > entity) is used. > > The implementation is less trivial than just supporting a boolean toggle > bit, as the previous modes information have to be carried along the > edges. For this I recycle the auxiliary edge field that is made > unnecessary by the removal of make_pred_opaque and a change in the > implementation to call LCM for every modes from every identity > simultaneously. This idea was suggested by Joern in PR29349. Another > speed improvement is that we process the modes to no_mode instead of > max_num_modes for each entity. > Thanks to all this, the only additional data to support prev_mode is > that for each BB, the avin/avout lcm computation are cached inside the > bb_info mode_in/mode_out fields, the xor toggle bit handling could > have been removed. > > bootstrapped/regtested for x86 and sh4, sh4a, sh4a-single, > epiphany build is OK. testsuite not ran. > > Joern, is this new target macro interface OK with you ? Jeff, (or other > RTL maintainer) since this is a new implementation for > optimize_mode_switching I suppose your previous approval doesn't held > anymore... is this new one OK for trunk as well ? > No change for x86/sh4/2a interfaces. > > Many thanks > > Christian > >
Re: [PING*2][PATCH] Extend mode-switching to support toggle (1/2)
> On 04/28/2014 10:08 AM, Christian Bruel wrote:
> Hello,
>
> I'd like to ping the following patches
>
> [Hookize mode-switching]
> http://gcc.gnu.org/ml/gcc-patches/2014-04/msg01003.html
>
> [Add new hooks to support toggle and SH4A fpchg instruction]
> http://gcc.gnu.org/ml/gcc-patches/2014-04/msg01005.html
>> Sorry, I only saw the first part and thought I' d need to wait till I
>> see the second part - and I somehow missed that.
>>
>> I think the previous known mode should be passed to the
>> TARGET_MODE_EMIT hook - no need to have extra hooks
>> for toggling, and, as I mentioned earlier, fixating on the toggle is
>> actually an SH artifact - other ports have multi-way
>> modes settings that can benefit from knowing the previous mode.
> OK I'll change the bool toggle parameter by the previous mode in
> TARGET_MODE_EMIT and remove the bool XOR hooks in the SH description.
>
Hello,
This is the interface for targets that could use the previous mode for
switching. TARGET_MODE_EMIT now takes a new prev_mode parameter. If the
previous mode cannot be determined, MODE_NONE (value depends on the
entity) is used.
The implementation is less trivial than just supporting a boolean toggle
bit, as the previous modes information have to be carried along the
edges. For this I recycle the auxiliary edge field that is made
unnecessary by the removal of make_pred_opaque and a change in the
implementation to call LCM for every modes from every identity
simultaneously. This idea was suggested by Joern in PR29349. Another
speed improvement is that we process the modes to no_mode instead of
max_num_modes for each entity.
Thanks to all this, the only additional data to support prev_mode is
that for each BB, the avin/avout lcm computation are cached inside the
bb_info mode_in/mode_out fields, the xor toggle bit handling could
have been removed.
bootstrapped/regtested for x86 and sh4, sh4a, sh4a-single,
epiphany build is OK. testsuite not ran.
Joern, is this new target macro interface OK with you ? Jeff, (or other
RTL maintainer) since this is a new implementation for
optimize_mode_switching I suppose your previous approval doesn't held
anymore... is this new one OK for trunk as well ?
No change for x86/sh4/2a interfaces.
Many thanks
Christian
2014-05-23 Christian Bruel
* mode-switching.c (struct bb_info): Add mode_out, mode_in caches.
(make_preds_opaque): Delete function.
(clear_mode_bit, mode_bit_p, set_mode_bit): New macros.
(add_mode_set, get_mode_set, alloc_mode_aux, free_modes_edges): New functions.
(commit_mode_sets): New function.
(optimize_mode_switching): Handle current_mode to mode_switching_emit.
Process all modes at once.
* basic-block.h (pre_edge_lcm_avs): Declare.
* lcm.c (pre_edge_lcm_avs): Renamed from pre_edge_lcm.
Call clear_aux_for_edges. Fix comments.
(pre_edge_lcm): New wrapper function to call pre_edge_lcm_avs.
(pre_edge_rev_lcm): Idem.
* config/epiphany/epiphany.c (emit_set_fp_mode): Add prev_mode parameter.
* config/epiphany/epiphany-protos.h (emit_set_fp_mode): Idem.
* config/epiphany/resolve-sw-modes.c (pass_resolve_sw_modes::execute): Idem.
* config/i386/i386.c (x96_emit_mode_set): Idem.
* config/sh/sh.c (sh_emit_mode_set): Likewise. Handle PR toggle.
* config/sh/sh.md (toggle_pr): Defined if TARGET_FPU_SINGLE.
(fpscr_toggle) Disallow from delay slot.
* target.def (emit_mode_set): Add prev_mode parameter.
* doc/tm.texi: Regenerate.
2014-05-19 Christian Bruel
* gcc.target/sh/fpchg.c: New test.
Index: gcc/basic-block.h
===
--- gcc/basic-block.h (revision 210845)
+++ gcc/basic-block.h (working copy)
@@ -711,6 +711,9 @@ extern void bitmap_union_of_preds (sbitmap, sbitma
extern struct edge_list *pre_edge_lcm (int, sbitmap *, sbitmap *,
sbitmap *, sbitmap *, sbitmap **,
sbitmap **);
+extern struct edge_list *pre_edge_lcm_avs (int, sbitmap *, sbitmap *,
+ sbitmap *, sbitmap *, sbitmap *,
+ sbitmap *, sbitmap **, sbitmap **);
extern struct edge_list *pre_edge_rev_lcm (int, sbitmap *,
sbitmap *, sbitmap *,
sbitmap *, sbitmap **,
Index: gcc/config/epiphany/epiphany-protos.h
===
--- gcc/config/epiphany/epiphany-protos.h (revision 210845)
+++ gcc/config/epiphany/epiphany-protos.h (working copy)
@@ -40,7 +40,8 @@ extern int epiphany_initial_elimination_offset (in
extern void epiphany_init_expanders (void);
extern int hard_regno_mode_ok (int regno, enum machine_mode mode);
#ifdef HARD_CONST
-extern void emit_set_fp_mode (int entity, int mode, HARD_REG_SET regs_live);
+extern void emit_set_fp_mode (int entity, int mode, int prev_mode,
+ HARD_REG_SET regs_live);
#endif
extern void epiphany_insert_mode_switch_use (rtx insn, int, int);
extern void epiphany_expand_set_fp_mode (rtx *operands);
Index: gcc/config/epiphany/epiphany.c
=
Re: [PING*2][PATCH] Extend mode-switching to support toggle (1/2)
On Tue, 2014-05-13 at 09:10 +0100, Joern Rennecke wrote: > On 12 May 2014 23:39, Oleg Endo wrote: > > > This is the same as changing/setting the FP modes (PR, SZ) on SH while > > preserving the other FPSCR bits, or did I miss something? > > It's more like if you have to control multiple bits at once to get a > specific mode. > Say you have to turn SZ off and PR on. You you knew that only one bit needs > changing, you can do with one less arithmetic operation. Right. I was thinking to add FPSCR.SZ mode switching to SH, in order to do float vector moves. For that SZ and PR need to be switched both at the same time (only SH4A has both, fpchg and fschg). So basically I'd add another mode entity, which would emit SZ mode changes in addition to the PR mode changes. But then adjacent FPSCR-changing insns could be combined ... any idea/suggestion how to accomplish that? Cheers, Oleg
Re: [PING*2][PATCH] Extend mode-switching to support toggle (1/2)
On 12 May 2014 23:39, Oleg Endo wrote: > This is the same as changing/setting the FP modes (PR, SZ) on SH while > preserving the other FPSCR bits, or did I miss something? It's more like if you have to control multiple bits at once to get a specific mode. Say you have to turn SZ off and PR on. You you knew that only one bit needs changing, you can do with one less arithmetic operation.
Re: [PING*2][PATCH] Extend mode-switching to support toggle (1/2)
On Mon, 2014-05-12 at 13:51 +0100, Joern Rennecke wrote: > On 12 May 2014 13:16, Christian Bruel wrote: > > > Just for my curiosity, which other targets have multi-way toggling > > support ? > > The epiphany has, sort of: you read a control register, AND and/or OR > some mask(s) to the value, > and write it back. > If we knew the previous mode, we might elide and AND or an OR. > > I think this is actually quite a common issue. This is the same as changing/setting the FP modes (PR, SZ) on SH while preserving the other FPSCR bits, or did I miss something? Cheers, Oleg
Re: [PING*2][PATCH] Extend mode-switching to support toggle (1/2)
On Mon, 2014-05-12 at 19:32 +0900, Kaz Kojima wrote:
> [I'd like to add Oleg to CC list.]
>
> Christian Bruel wrote:
> > Just saw the Jeff's approval for the RTL part. Sorry for the crossed answers
> >
> > remains the target maintainers. Joern, Kaz ?
>
> SH specific part looks OK to me. Oleg, could you comment on
> the patch?
Looks OK to me with the 'previous mode vs. toggle' change mentioned by
Jörn here http://gcc.gnu.org/ml/gcc-patches/2014-05/msg00754.html
Except one naming thing (please rename, also the existing ones):
sh4_mode_exit -> sh_mode_exit
sh4_toggle_init -> sh_mode_toggle_init
sh4_toggle_destroy -> sh_mode_toggle_destroy
sh4_toggle_set -> sh_mode_toggle_set
sh4_toggle_test -> sh_mode_toggle_test
Other SH variants also have modes. E.g. SH2A FPU mode switching is also
done through the sh4_* functions, which is a bit confusing when reading.
A few cosmetic nits:
sh.c:
+static sbitmap *mode_in_flip; /* flip in mode status for each basic blocks.
*/
+static sbitmap *mode_out_flip; /* flip out mode status for each basic blocks.
*/
^
'basic block'
mode-switching.c:
+ if (mode != num_modes[e] &&
+ mode != targetm.mode_switching.exit (e))
The '&&' should go to the beginning of the 2nd line, AFAIK.
+ gcc_assert ((targetm.mode_switching.entry && targetm.mode_switching.exit) ||
+ (!targetm.mode_switching.entry && !targetm.mode_switching.exit));
Likewise.
tm.texi:
+@deftypefn {Target Hook} void TARGET_MODE_TOGGLE_SET (sbitmap *@var{avin},
sbitmap *@var{avout})
+Hook called by the mode switching pass to record the modes needed for each
entities in entry and exit of each basic block.
+@end deftypefn
'for each entity'
Re: [PING*2][PATCH] Extend mode-switching to support toggle (1/2)
On 12 May 2014 13:51, Joern Rennecke wrote: > On 12 May 2014 13:16, Christian Bruel wrote: > >> Just for my curiosity, which other targets have multi-way toggling >> support ? > > The epiphany has, sort of: you read a control register, AND and/or OR > some mask(s) to the value, > and write it back. > If we knew the previous mode, we might elide and AND or an OR. > > I think this is actually quite a common issue. P.S.: In some cases, multiple modes input could still be handled if we knew that certain other modes don't appear in the input, so a more powerful interface than providing the previous mode - if known, is to provide a set of potential predecessor modes. The case where we don't know anything then obviously is represented as the full base set. In the mode switching infrastructure, you can just calculate the union of the incoming (potential) mode(s) from each incoming edge.
Re: [PING*2][PATCH] Extend mode-switching to support toggle (1/2)
On 12 May 2014 13:16, Christian Bruel wrote: > Just for my curiosity, which other targets have multi-way toggling > support ? The epiphany has, sort of: you read a control register, AND and/or OR some mask(s) to the value, and write it back. If we knew the previous mode, we might elide and AND or an OR. I think this is actually quite a common issue.
Re: [PING*2][PATCH] Extend mode-switching to support toggle (1/2)
On 04/28/2014 10:08 AM, Christian Bruel wrote: Hello, I'd like to ping the following patches [Hookize mode-switching] http://gcc.gnu.org/ml/gcc-patches/2014-04/msg01003.html [Add new hooks to support toggle and SH4A fpchg instruction] http://gcc.gnu.org/ml/gcc-patches/2014-04/msg01005.html > Sorry, I only saw the first part and thought I' d need to wait till I > see the second part - and I somehow missed that. > > I think the previous known mode should be passed to the > TARGET_MODE_EMIT hook - no need to have extra hooks > for toggling, and, as I mentioned earlier, fixating on the toggle is > actually an SH artifact - other ports have multi-way > modes settings that can benefit from knowing the previous mode. OK I'll change the bool toggle parameter by the previous mode in TARGET_MODE_EMIT and remove the bool XOR hooks in the SH description. Just for my curiosity, which other targets have multi-way toggling support ? I'll commit the first patch as approved and re post the second one. Many thanks, Christian
Re: [PING*2][PATCH] Extend mode-switching to support toggle (1/2)
On 12 May 2014 10:06, Christian Bruel wrote: > Just saw the Jeff's approval for the RTL part. Sorry for the crossed answers > > remains the target maintainers. Joern, Kaz ? > > Many thanks. > > Christian > > On 05/12/2014 10:44 AM, Christian Bruel wrote: >> Hello, >> >> I'd still wish to ping for the following set of patches. Those changes >> does not impact other targets than SH4 but, as suggested by Joern, I >> have hooked the macros and moved the SH4A specific support to the target >> parts (so a different target can eventually implement other models than >> dual mode). >> >> Patch2 only does very little restructuring but if is not interesting >> enough for all targets, patch 1 should not be that intrusive. >> >> For RTL middle end and (X86, SH, Epiphany) target reviewers, >> >> Many thanks, >> >> Christian >> >> On 04/28/2014 10:08 AM, Christian Bruel wrote: >>> Hello, >>> >>> I'd like to ping the following patches >>> >>> [Hookize mode-switching] >>> http://gcc.gnu.org/ml/gcc-patches/2014-04/msg01003.html >>> >>> [Add new hooks to support toggle and SH4A fpchg instruction] >>> http://gcc.gnu.org/ml/gcc-patches/2014-04/msg01005.html Sorry, I only saw the first part and thought I' d need to wait till I see the second part - and I somehow missed that. I think the previous known mode should be passed to the TARGET_MODE_EMIT hook - no need to have extra hooks for toggling, and, as I mentioned earlier, fixating on the toggle is actually an SH artifact - other ports have multi-way modes settings that can benefit from knowing the previous mode.
Re: [PING*2][PATCH] Extend mode-switching to support toggle (1/2)
[I'd like to add Oleg to CC list.] Christian Bruel wrote: > Just saw the Jeff's approval for the RTL part. Sorry for the crossed answers > > remains the target maintainers. Joern, Kaz ? SH specific part looks OK to me. Oleg, could you comment on the patch? Regards, kaz
Re: [PING*2][PATCH] Extend mode-switching to support toggle (1/2)
Just saw the Jeff's approval for the RTL part. Sorry for the crossed answers remains the target maintainers. Joern, Kaz ? Many thanks. Christian On 05/12/2014 10:44 AM, Christian Bruel wrote: > Hello, > > I'd still wish to ping for the following set of patches. Those changes > does not impact other targets than SH4 but, as suggested by Joern, I > have hooked the macros and moved the SH4A specific support to the target > parts (so a different target can eventually implement other models than > dual mode). > > Patch2 only does very little restructuring but if is not interesting > enough for all targets, patch 1 should not be that intrusive. > > For RTL middle end and (X86, SH, Epiphany) target reviewers, > > Many thanks, > > Christian > > On 04/28/2014 10:08 AM, Christian Bruel wrote: >> Hello, >> >> I'd like to ping the following patches >> >> [Hookize mode-switching] >> http://gcc.gnu.org/ml/gcc-patches/2014-04/msg01003.html >> >> [Add new hooks to support toggle and SH4A fpchg instruction] >> http://gcc.gnu.org/ml/gcc-patches/2014-04/msg01005.html >> >> Many thanks >> >> >> >>
Re: [PING*2][PATCH] Extend mode-switching to support toggle (1/2)
Hello, I'd still wish to ping for the following set of patches. Those changes does not impact other targets than SH4 but, as suggested by Joern, I have hooked the macros and moved the SH4A specific support to the target parts (so a different target can eventually implement other models than dual mode). Patch2 only does very little restructuring but if is not interesting enough for all targets, patch 1 should not be that intrusive. For RTL middle end and (X86, SH, Epiphany) target reviewers, Many thanks, Christian On 04/28/2014 10:08 AM, Christian Bruel wrote: > Hello, > > I'd like to ping the following patches > > [Hookize mode-switching] > http://gcc.gnu.org/ml/gcc-patches/2014-04/msg01003.html > > [Add new hooks to support toggle and SH4A fpchg instruction] > http://gcc.gnu.org/ml/gcc-patches/2014-04/msg01005.html > > Many thanks > > > >
Re: [ PATCH] Extend mode-switching to support toggle (1/2)
On 04/17/14 07:58, Christian Bruel wrote: Hello, He is a new version of the patch. It hookizes the mode-setting and mode-toggling macros. Split in 2 parts. Successfully bootstrapped/regtested on ix86 and SH4/SH4a. I was able to do a limited build on Epiphany, if someone could give it a try on it that would be great. comments ? suggestions ? I can't really vouch for the sh & ephiphany bits, but those bits look reasonable. The rest looks good. OK for the trunk. Thanks, Jeff
[PING][PATCH] Extend mode-switching to support toggle (1/2)
Hello, I'd like to ping the following patches [Hookize mode-switching] http://gcc.gnu.org/ml/gcc-patches/2014-04/msg01003.html [Add new hooks to support toggle and SH4A fpchg instruction] http://gcc.gnu.org/ml/gcc-patches/2014-04/msg01005.html Many thanks
[ PATCH] Extend mode-switching to support toggle (2/2)
and the toggle-support hookized
many thanks,
Christian
2014-04-02 Christian Bruel
* target.def (mode_switching): New hook vector.
(toggle_init, toggle_destroy, toggle_set, toggle_test):
New mode toggle hooks.
* targhooks.h (default_toggle_test): Declare.
* basic-block.h (pre_edge_lcm_avs): Declare.
* lcm.c (pre_edge_lcm_avs): Renamed from pre_edge_lcm.
Call clear_aux_for_edges. Fix comments.
(pre_edge_lcm): New wrapper function to call pre_edge_lcm_avs.
(pre_edge_rev_lcm): Idem.
* mode-switching.c (init_modes_infos): New function.
(free_modes_infos): Likewise.
(add_mode_set): Likewise.
(get_mode): Likewise.
(commit_mode_sets): Likewise.
(merge_modes): Likewise.
(optimize_mode_switching): Support mode toggle.
(default_priority_to_mode, default_toggle_test): Define.
* doc/tm.texi.in (TARGET_MODE_TOGGLE_INIT, TARGET_MODE_TOGGLE_TEST)
(TARGET_MODE_TOGGLE_DESTROY, TARGET_MODE_TOGGLE_SET):
New target hooks.
* doc/tm.texi: Regenerate.
* config/sh/sh.c (sh4_toggle_init, sh4_toggle_destroy): Add hook and define.
(sh4_toggle_set, sh4_toggle_test): Likewise.
(mode_in_flip, mode_out_flip): Add bitmap to compute mode flipping.
(TARGET_MODE_EMIT): New toggle parameter.
* config/sh/sh.md (toggle_pr): Defined for TARGET_SH4_300 and TARGET_SH4A_FP.
(in_delay_slot): fpscr_toggle don't go in delay slot.
* config/i386/i386.c (ix86_emit_mode_set): Add bool unused parameter.
* config/epiphany/epiphany.c (emit_set_fp_mode): Add bool unused parameter.
--- gcc/basic-block.h 2014-01-07 10:30:59.0 +0100
+++ /work1/bruel/superh_elf/gnu_trunk.devs/gcc/gcc/basic-block.h 2014-04-15 16:17:53.0 +0200
@@ -711,6 +711,9 @@
extern struct edge_list *pre_edge_lcm (int, sbitmap *, sbitmap *,
sbitmap *, sbitmap *, sbitmap **,
sbitmap **);
+extern struct edge_list *pre_edge_lcm_avs (int, sbitmap *, sbitmap *,
+ sbitmap *, sbitmap *, sbitmap *,
+ sbitmap *, sbitmap **, sbitmap **);
extern struct edge_list *pre_edge_rev_lcm (int, sbitmap *,
sbitmap *, sbitmap *,
sbitmap *, sbitmap **,
--- gcc/config/epiphany/epiphany.c 2014-04-17 13:23:48.0 +0200
+++ /work1/bruel/superh_elf/gnu_trunk.devs/gcc/gcc/config/epiphany/epiphany.c 2014-04-17 13:25:54.0 +0200
@@ -2529,7 +2529,8 @@
}
void
-emit_set_fp_mode (int entity, int mode, HARD_REG_SET regs_live ATTRIBUTE_UNUSED)
+emit_set_fp_mode (int entity, int mode, bool toggle ATTRIBUTE_UNUSED,
+ HARD_REG_SET regs_live ATTRIBUTE_UNUSED)
{
rtx save_cc, cc_reg, mask, src, src2;
enum attr_fp_mode fp_mode;
--- gcc/config/epiphany/epiphany-protos.h 2014-04-17 11:10:36.0 +0200
+++ /work1/bruel/superh_elf/gnu_trunk.devs/gcc/gcc/config/epiphany/epiphany-protos.h 2014-04-17 11:22:02.0 +0200
@@ -40,7 +40,8 @@
extern void epiphany_init_expanders (void);
extern int hard_regno_mode_ok (int regno, enum machine_mode mode);
#ifdef HARD_CONST
-extern void emit_set_fp_mode (int entity, int mode, HARD_REG_SET regs_live);
+extern void emit_set_fp_mode (int entity, int mode,
+ bool toggle ATTRIBUTE_UNUSED, HARD_REG_SET regs_live);
#endif
extern void epiphany_insert_mode_switch_use (rtx insn, int, int);
extern void epiphany_expand_set_fp_mode (rtx *operands);
--- gcc/config/epiphany/resolve-sw-modes.c 2014-04-17 11:10:36.0 +0200
+++ /work1/bruel/superh_elf/gnu_trunk.devs/gcc/gcc/config/epiphany/resolve-sw-modes.c 2014-04-17 11:21:07.0 +0200
@@ -147,7 +147,7 @@
}
start_sequence ();
emit_set_fp_mode (EPIPHANY_MSW_ENTITY_ROUND_UNKNOWN,
- jilted_mode, NULL);
+ jilted_mode, false, NULL);
seq = get_insns ();
end_sequence ();
need_commit = true;
--- gcc/config/i386/i386.c 2014-04-17 13:02:49.0 +0200
+++ /work1/bruel/superh_elf/gnu_trunk.devs/gcc/gcc/config/i386/i386.c 2014-04-17 13:04:18.0 +0200
@@ -16409,7 +16409,8 @@
are to be inserted. */
static void
-ix86_emit_mode_set (int entity, int mode, HARD_REG_SET regs_live)
+ix86_emit_mode_set (int entity, int mode, bool toggle ATTRIBUTE_UNUSED,
+ HARD_REG_SET regs_live)
{
switch (entity)
{
--- gcc/config/sh/sh.c 2014-04-17 13:23:07.0 +0200
+++ /work1/bruel/superh_elf/gnu_trunk.devs/gcc/gcc/config/sh/sh.c 2014-04-17 13:25:27.0 +0200
@@ -202,7 +202,7 @@
static int calc_live_regs (HARD_REG_SET *);
static HOST_WIDE_INT rounded_frame_size (int);
static bool sh_frame_pointer_required (void);
-static void sh4_emit_mode_set (int, int, HARD_REG_SET);
+static void sh4_emit_mode_set (int, int, bool, HARD_REG_SET);
static int sh4_mode_needed (int, rtx);
static int sh4_mode_after (int, int, rtx);
static int sh4_mode_entry (int);
@@ -590,9 +590,21 @@
#undef TARGET_MODE_EXIT
#define TARGET_MODE_EXIT sh4_mode_exit
+#undef TARGET_MODE_TOGGLE_INIT
+#define TARGET_MODE_TOGGLE_INIT sh4_toggle_init
+
#undef TARGET_MODE_PRIORITY
#define TARGET_MODE_PRIORITY sh4_mode_priority
+#undef TARGET_MODE_TOGGLE_DESTROY
+#define TARGET
[ PATCH] Extend mode-switching to support toggle (1/2)
Hello,
He is a new version of the patch. It hookizes the mode-setting and
mode-toggling macros. Split in 2 parts.
Successfully bootstrapped/regtested on ix86 and SH4/SH4a.
I was able to do a limited build on Epiphany, if someone could give it a
try on it that would be great.
comments ? suggestions ?
many thanks,
Christian
2014-04-02 Christian Bruel
* target.def (mode_switching): New hook vector.
(mode_emit, mode_needed, mode_after, mode_entry): New hooks.
(mode_exit, modepriority_to_mode): Likewise.
* mode-switching.c (MODE_NEEDED, MODE_AFTER, MODE_ENTRY): Hookify.
(MODE_EXIT, MODE_PRIORITY_TO_MODE, EMIT_MODE_SET): Likewise.
(default_priority_to_mode): Define.
* targhooks.h (default_priority_to_mode): Declare.
* target.h: Include tm.h and hard-reg-set.h.
* doc/tm.texi.in (EMIT_MODE_SET, MODE_NEEDED, MODE_AFTER, MODE_ENTRY)
(MODE_EXIT, MODE_PRIORITY_TO_MODE): Delete and hookify.
* doc/tm.texi Regenerate.
* config/sh/sh.h (MODE_NEEDED, MODE_AFTER, MODE_ENTRY): Delete
(MODE_EXIT, MODE_PRIORITY_TO_MODE, EMIT_MODE_SET): Likewise.
* config/sh/sh.c (emit_fpu_toggle): New function.
(sh4_emit_mode_set, sh4_mode_needed): Hookify.
(sh4_mode_after, sh4_mode_entry, sh4_mode_exit): Likewise.
* config/i386/i386.h (MODE_NEEDED, MODE_AFTER, MODE_ENTRY): Delete
(MODE_EXIT, MODE_PRIORITY_TO_MODE, EMIT_MODE_SET): Likewise.
* config/i386/i386-protos.h (ix86_mode_needed, ix86_mode_after)
(ix86_mode_entrym, ix86_emit_mode_set): Remove external declaration.
* config/i386/i386.c (ix86_mode_needed, ix86_mode_after, ix86_mode_exit,
(ix86_mode_entry, ix86_mode_priority, ix86_emit_mode_set): Hookify.
* config/epiphany/epiphany.h (MODE_NEEDED, MODE_AFTER, MODE_ENTRY):
Delete
(MODE_EXIT, MODE_PRIORITY_TO_MODE, EMIT_MODE_SET): Likewise.
* config/sh/sh.h (MODE_NEEDED, MODE_AFTER, MODE_ENTRY): Delete
(MODE_EXIT, MODE_PRIORITY_TO_MODE, EMIT_MODE_SET): Likewise.
* config/sh/sh.c (sh4_emit_mode_set, sh4_mode_needed): Hookify.
(sh4_mode_after, sh4_mode_entry, sh4_mode_exit): Likewise.
* config/epiphany/epiphany-protos.h (epiphany_mode_needed)
(emit_set_fp_mode, epiphany_mode_entry_exit, epiphany_mode_after)
(epiphany_mode_priority_to_mode): Remove declaration.
* config/epiphany/epiphany.c (emit_set_fp_mode): Hookify.
(epiphany_mode_needed, epiphany_mode_priority_to_mode): Likewise.
(epiphany_mode_entry, epiphany_mode_exit, epiphany_mode_after):
Likewise.
(epiphany_mode_priority_to_mode): Change priority type. Hookify.
(epiphany_mode_needed, epiphany_mode_entry_exit): Hookify.
(epiphany_mode_after, epiphany_mode_entry, emit_set_fp_mode): Hookify.
--- gcc/config/epiphany/epiphany-protos.h (revision 209415)
+++ gcc/config/epiphany/epiphany-protos.h (working copy)
@@ -45,9 +45,7 @@ extern void emit_set_fp_mode (int entity, int mode
extern void epiphany_insert_mode_switch_use (rtx insn, int, int);
extern void epiphany_expand_set_fp_mode (rtx *operands);
extern int epiphany_mode_needed (int entity, rtx insn);
-extern int epiphany_mode_entry_exit (int entity, bool);
extern int epiphany_mode_after (int entity, int last_mode, rtx insn);
-extern int epiphany_mode_priority_to_mode (int entity, unsigned priority);
extern bool epiphany_epilogue_uses (int regno);
extern bool epiphany_optimize_mode_switching (int entity);
extern bool epiphany_is_interrupt_p (tree);
--- gcc/config/epiphany/epiphany.c (revision 209415)
+++ gcc/config/epiphany/epiphany.c (working copy)
@@ -152,6 +152,20 @@ static rtx frame_insn (rtx);
/* We further restrict the minimum to be a multiple of eight. */
#define TARGET_MIN_ANCHOR_OFFSET (optimize_size ? 0 : -2040)
+/* Mode switching hooks. */
+
+#define TARGET_MODE_EMIT emit_set_fp_mode
+
+#define TARGET_MODE_NEEDED epiphany_mode_needed
+
+#define TARGET_MODE_PRIORITY epiphany_mode_priority
+
+#define TARGET_MODE_ENTRY epiphany_mode_entry
+
+#define TARGET_MODE_EXIT epiphany_mode_exit
+
+#define TARGET_MODE_AFTER epiphany_mode_after
+
#include "target-def.h"
#undef TARGET_ASM_ALIGNED_HI_OP
@@ -2306,8 +2320,8 @@ epiphany_optimize_mode_switching (int entity)
gcc_unreachable ();
}
-int
-epiphany_mode_priority_to_mode (int entity, unsigned priority)
+static int
+epiphany_mode_priority (int entity, int priority)
{
if (entity == EPIPHANY_MSW_ENTITY_AND || entity == EPIPHANY_MSW_ENTITY_OR
|| entity== EPIPHANY_MSW_ENTITY_CONFIG)
@@ -2415,7 +2429,7 @@ epiphany_mode_needed (int entity, rtx insn)
}
}
-int
+static int
epiphany_mode_entry_exit (int entity, bool exit)
{
int normal_mode = epiphany_normal_fp_mode ;
@@ -2502,6 +2516,18 @@ epiphany_mode_after (int entity, int last_mode, rt
return last_mode;
}
+static int
+epiphany_mode_entry (int entity)
+{
+ return epiphany_mode_entry_exit (entity, false);
+}
+
+static int
+epiphany_mode_exit (int entity)
+{
+ return epiphany_mode_entry_exit (entity, true);
+}
+
void
emit_set_fp_mode (int entity, int mode, HARD_REG_SET regs_live ATTRIBUTE_UNUSED)
{
--- gcc/config/epiphany/epiphany.h (rev
Re: [PING PATCH] Extend mode-switching to support toggle
On 04/15/2014 01:13 PM, Joern Rennecke wrote: > On 15 April 2014 10:20, Christian Bruel wrote: >> Hello, >> >> I guess it's for RTL maintainers. Also interested by mode-switching.c >> last contributors (from past ChangeLog entries) comments, >> >> http://gcc.gnu.org/ml/gcc-patches/2014-04/msg00196.html > This only helps if there are exactly two modes for an entity. > An interface which extends EMIT_MODE_SET with a parameter for the known > mode would be more versatile. I.e. if you need to manipulate a control > register > with an AND and OR to set a specific mode with no knowledge of the previous > mode, having the known previous mode allows to use a single add or xor > to make the desired switch. An unknown mode could be represented by no_mode > or -1. yes, I didn't have a 3 state (or more) toggling in mind. My implementation only works for 2 states entities (flip on/off a bit). More than that would require not using a XOR and should expose the test/set_toggle_status machinery to a machine description part. This is a limitation of my proposal, If this will be a missing extension for a target, we will need to move the test/set toggle machinery out of the machine independent part. Maybe overkill as of today. I agree that extending the current EMIT_MODE_SET might be more flexible than a new EMIT_TOGGLE. I was balancing between the two interfaces... thanks for this point. > While you are at it, you should also hookize the thing. OK, > > FWIW, I have noted down some weaknesses/improvement opportunities of > the mode switching pass in: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29349 > . > This also touches the fpchg issue Thanks, I have also some example where this can be improved, hoping to resurrect this problem one day.
[PING PATCH] Extend mode-switching to support toggle
Hello, I guess it's for RTL maintainers. Also interested by mode-switching.c last contributors (from past ChangeLog entries) comments, http://gcc.gnu.org/ml/gcc-patches/2014-04/msg00196.html Many thanks Christian,
[PATCH] Extend mode-switching to support toggle
Respin of a long standing forgotten patch
(http://gcc.gnu.org/ml/gcc-patches/2006-12/msg01562.html).
This patch extends the mode-switching pass to toggle on/off a control
register status bit instead of setting the value. e.g on the SH4a to
support the FPCHG instruction used to switch FPU precision mode.
The idea is to use the AVOUT/AVIN information computed by LCM for each
mode on the CFG edges. When 2 modes for a given entity conflict, a
regular mode set is emitted. Elsewhere the same mode is set is for all
outgoing/incoming edges, a toggle is possible. The only important
general change is that we have to postpone the mode toggling (or
setting) after the modes have been computed for each edges.
bootstrapped/regtested for x86_64-unknown-linux-gnu and
sh-none-elf/sh-linux with for -m4a, and -m4
Comments appreciated. If OK go for trunk/stage1 ?
many thanks,
2014-04-02 Christian Bruel
* basic-block.h (pre_edge_lcm_avs): Declare.
* doc/tm.texi (EMIT_MODE_TOGGLE): Document.
* doc/tm.texi.in (EMIT_MODE_TOGGLE): Idem.
* config/sh/sh.h (EMIT_MODE_TOGGLE): Define.
* config/sh/sh-protos.h (emit_fpu_toggle): Declare
* config/sh/sh.c (emit_fpu_toggle): New function.
* config/sh/sh.md (toggle_pr): Defined for TARGET_SH4_300 and
TARGET_SH4A_FP.
(in_delay_slot): fpscr_toggle don't go in delay slot.
* lcm.c (pre_edge_lcm_avs): Renamed from pre_edge_lcm.
Call clear_aux_for_edges. Fix comments.
(pre_edge_lcm): New wrapper function to call pre_edge_lcm_avs.
(pre_edge_rev_lcm): Idem.
* mode-switching.c (init_modes_infos): New function.
(free_modes_infos): Idem.
(init_modes_infos): Idem
(add_mode_set): Idem.
(get_mode): Idem.
(commit_mode_sets): Idem.
(merge_modes): Idem.
(set_flip_status): Idem
(test_flip_status): Idem.
(optimize_mode_switching): Add support to toggle modes.
2014-04-02 Christian Bruel
* gcc.target/sh/fpchg1.c: New test.
Index: gcc/basic-block.h
===
--- gcc/basic-block.h (revision 208956)
+++ gcc/basic-block.h (working copy)
@@ -711,6 +711,9 @@ extern void bitmap_union_of_preds (sbitmap, sbitma
extern struct edge_list *pre_edge_lcm (int, sbitmap *, sbitmap *,
sbitmap *, sbitmap *, sbitmap **,
sbitmap **);
+extern struct edge_list *pre_edge_lcm_avs (int, sbitmap *, sbitmap *,
+ sbitmap *, sbitmap *, sbitmap *,
+ sbitmap *, sbitmap **, sbitmap **);
extern struct edge_list *pre_edge_rev_lcm (int, sbitmap *,
sbitmap *, sbitmap *,
sbitmap *, sbitmap **,
Index: gcc/config/sh/sh-protos.h
===
--- gcc/config/sh/sh-protos.h (revision 208956)
+++ gcc/config/sh/sh-protos.h (working copy)
@@ -210,6 +210,7 @@ extern bool check_use_sfunc_addr (rtx, rtx);
#ifdef HARD_CONST
extern void fpscr_set_from_mem (int, HARD_REG_SET);
#endif
+extern bool emit_fpu_toggle (int);
extern void sh_pr_interrupt (struct cpp_reader *);
extern void sh_pr_trapa (struct cpp_reader *);
Index: gcc/config/sh/sh.c
===
--- gcc/config/sh/sh.c (revision 208956)
+++ gcc/config/sh/sh.c (working copy)
@@ -10042,6 +10042,17 @@ get_free_reg (HARD_REG_SET regs_live)
return gen_rtx_REG (Pmode, 7);
}
+/* This function switches the fpscr. */
+bool
+emit_fpu_toggle (int e ATTRIBUTE_UNUSED)
+{
+ emit_insn (gen_toggle_pr ());
+ if (TARGET_FMOVD)
+emit_insn (gen_toggle_sz ());
+
+ return true;
+}
+
/* This function will set the fpscr from memory.
MODE is the mode we are setting it to. */
void
Index: gcc/config/sh/sh.h
===
--- gcc/config/sh/sh.h (revision 208956)
+++ gcc/config/sh/sh.h (working copy)
@@ -2259,6 +2259,9 @@ extern int current_function_interrupt;
#define MODE_PRIORITY_TO_MODE(ENTITY, N) \
((TARGET_FPU_SINGLE != 0) ^ (N) ? FP_MODE_SINGLE : FP_MODE_DOUBLE)
+#define EMIT_MODE_TOGGLE(ENTITY, MODE) \
+ ((TARGET_SH4A_FP || TARGET_SH4_300) ? emit_fpu_toggle (ENTITY) : false)
+
#define EMIT_MODE_SET(ENTITY, MODE, HARD_REGS_LIVE) \
fpscr_set_from_mem ((MODE), (HARD_REGS_LIVE))
Index: gcc/config/sh/sh.md
===
--- gcc/config/sh/sh.md (revision 208956)
+++ gcc/config/sh/sh.md (working copy)
@@ -504,6 +504,7 @@
(define_attr "in_delay_slot" "yes,no"
(cond [(eq_attr "type" "cbranch") (const_string "no")
(eq_attr "type" "pcload,pcload_si") (const_string "no")
+ (eq_attr "type" "fpscr_toggle") (const_string "no")
(eq_attr "needs_delay_slot" "yes") (const_string "no")
(eq_attr "length" "2") (const_string "yes")
] (const_string "no")))
@@ -12182,15 +12183,10 @@ label:
"fschg"
[(set_attr "type" "fpscr_toggle") (set_attr "fp_set" "unknown")])
-;; There's no way we can use it today, since optimize mode switching
-;; doesn't enable us to know from which mode we're switching to the
-;; mode it reque
