From: Richard Biener <richard.guenther@gmail.com>
To: Alexandre Oliva <aoliva@redhat.com>
Cc: "Uroš Bizjak" <ubizjak@gmail.com>,
"Alan Lawrence" <alan.lawrence@arm.com>,
"Jeff Law" <law@redhat.com>,
"James Greenhalgh" <James.Greenhalgh@arm.com>,
"H.J. Lu" <hjl.tools@gmail.com>,
"Segher Boessenkool" <segher@kernel.crashing.org>,
"GCC Patches" <gcc-patches@gcc.gnu.org>,
"Christophe Lyon" <christophe.lyon@linaro.org>,
"David Edelsohn" <dje.gcc@gmail.com>,
"Eric Botcazou" <ebotcazou@adacore.com>
Subject: Re: [PR67891] drop is_gimple_reg test from set_parm_rtl
Date: Wed, 14 Oct 2015 09:28:00 -0000 [thread overview]
Message-ID: <CAFiYyc1rZcnvOSkxVsSZu5gi1ozzzxNvLwA17YmM51DRj2KH=A@mail.gmail.com> (raw)
In-Reply-To: <or1tcy3zds.fsf@livre.home>
On Wed, Oct 14, 2015 at 5:25 AM, Alexandre Oliva <aoliva@redhat.com> wrote:
> On Oct 12, 2015, Richard Biener <richard.guenther@gmail.com> wrote:
>
>> On Sat, Oct 10, 2015 at 3:16 PM, Alexandre Oliva <aoliva@redhat.com> wrote:
>>> On Oct 9, 2015, Richard Biener <richard.guenther@gmail.com> wrote:
>>>
>>>> Ok. Note that I think emit_block_move shouldn't mess with the addressable flag.
>>>
>>> I have successfully tested a patch that stops it from doing so,
>>> reverting https://gcc.gnu.org/bugzilla/show_bug.cgi?id=49429#c11 but
>>> according to bugs 49429 and 49454, it looks like removing it would mess
>>> with escape analysis introduced in r175063 for bug 44194. The thread
>>> that introduces the mark_addressable calls suggests some discomfort with
>>> this solution, and even a suggestion that the markings should be
>>> deferred past the end of expand, but in the end there was agreement to
>>> go with it. https://gcc.gnu.org/ml/gcc-patches/2011-06/msg01746.html
>
>> Aww, indeed. Of course the issue is that we don't track pointers to the
>> stack introduced during RTL properly.
>
>> Thanks for checking. Might want to add a comment before that
>> addressable setting now that you've done the archeology.
>
> I decided to give the following approach a try instead. The following
> patch was regstrapped on x86_64-linux-gnu and i686-linux-gnu.
> Ok to install?
It looks ok to me but lacks a comment in mark_addressable_1 why we
do this queueing when currently expanding to RTL.
Richard.
> Would anyone with access to hpux (pa and ia64 are both affected) give it
> a spin?
>
>
> defer mark_addressable calls during expand till the end of expand
>
> From: Alexandre Oliva <aoliva@redhat.com>
>
> for gcc/ChangeLog
>
> * gimple-expr.c: Include hash-set.h and rtl.h.
> (mark_addressable_queue): New var.
> (mark_addressable): Factor actual marking into...
> (mark_addressable_1): ... this. Queue it up during expand.
> (mark_addressable_2): New.
> (flush_mark_addressable_queue): New.
> * gimple-expr.h (flush_mark_addressable_queue): Declare.
> * cfgexpand.c: Include gimple-expr.h.
> (pass_expand::execute): Flush mark_addressable queue.
> ---
> gcc/cfgexpand.c | 3 +++
> gcc/gimple-expr.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
> gcc/gimple-expr.h | 1 +
> 3 files changed, 52 insertions(+), 2 deletions(-)
>
> diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
> index eaad859..a362e17 100644
> --- a/gcc/cfgexpand.c
> +++ b/gcc/cfgexpand.c
> @@ -51,6 +51,7 @@ along with GCC; see the file COPYING3. If not see
> #include "internal-fn.h"
> #include "tree-eh.h"
> #include "gimple-iterator.h"
> +#include "gimple-expr.h"
> #include "gimple-walk.h"
> #include "cgraph.h"
> #include "tree-cfg.h"
> @@ -6373,6 +6374,8 @@ pass_expand::execute (function *fun)
> /* We're done expanding trees to RTL. */
> currently_expanding_to_rtl = 0;
>
> + flush_mark_addressable_queue ();
> +
> FOR_BB_BETWEEN (bb, ENTRY_BLOCK_PTR_FOR_FN (fun)->next_bb,
> EXIT_BLOCK_PTR_FOR_FN (fun), next_bb)
> {
> diff --git a/gcc/gimple-expr.c b/gcc/gimple-expr.c
> index 2a6ba1a..db249a3 100644
> --- a/gcc/gimple-expr.c
> +++ b/gcc/gimple-expr.c
> @@ -35,6 +35,8 @@ along with GCC; see the file COPYING3. If not see
> #include "gimplify.h"
> #include "stor-layout.h"
> #include "demangle.h"
> +#include "hash-set.h"
> +#include "rtl.h"
>
> /* ----- Type related ----- */
>
> @@ -823,6 +825,50 @@ is_gimple_mem_ref_addr (tree t)
> || decl_address_invariant_p (TREE_OPERAND (t, 0)))));
> }
>
> +/* Hold trees marked addressable during expand. */
> +
> +static hash_set<tree> *mark_addressable_queue;
> +
> +/* Mark X as addressable or queue it up if called during expand. */
> +
> +static void
> +mark_addressable_1 (tree x)
> +{
> + if (!currently_expanding_to_rtl)
> + {
> + TREE_ADDRESSABLE (x) = 1;
> + return;
> + }
> +
> + if (!mark_addressable_queue)
> + mark_addressable_queue = new hash_set<tree>();
> + mark_addressable_queue->add (x);
> +}
> +
> +/* Adaptor for mark_addressable_1 for use in hash_set traversal. */
> +
> +bool
> +mark_addressable_2 (tree const &x, void * ATTRIBUTE_UNUSED = NULL)
> +{
> + mark_addressable_1 (x);
> + return false;
> +}
> +
> +/* Mark all queued trees as addressable, and empty the queue. To be
> + called right after clearing CURRENTLY_EXPANDING_TO_RTL. */
> +
> +void
> +flush_mark_addressable_queue ()
> +{
> + gcc_assert (!currently_expanding_to_rtl);
> + if (mark_addressable_queue)
> + {
> + mark_addressable_queue->traverse<void*, mark_addressable_2> (NULL);
> + delete mark_addressable_queue;
> + mark_addressable_queue = NULL;
> + }
> +}
> +
> /* Mark X addressable. Unlike the langhook we expect X to be in gimple
> form and we don't do any syntax checking. */
>
> @@ -838,7 +884,7 @@ mark_addressable (tree x)
> && TREE_CODE (x) != PARM_DECL
> && TREE_CODE (x) != RESULT_DECL)
> return;
> - TREE_ADDRESSABLE (x) = 1;
> + mark_addressable_1 (x);
>
> /* Also mark the artificial SSA_NAME that points to the partition of X. */
> if (TREE_CODE (x) == VAR_DECL
> @@ -849,7 +895,7 @@ mark_addressable (tree x)
> {
> tree *namep = cfun->gimple_df->decls_to_pointers->get (x);
> if (namep)
> - TREE_ADDRESSABLE (*namep) = 1;
> + mark_addressable_1 (*namep);
> }
> }
>
> diff --git a/gcc/gimple-expr.h b/gcc/gimple-expr.h
> index 3d1c89f..2917d2752c 100644
> --- a/gcc/gimple-expr.h
> +++ b/gcc/gimple-expr.h
> @@ -52,6 +52,7 @@ extern bool is_gimple_asm_val (tree);
> extern bool is_gimple_min_lval (tree);
> extern bool is_gimple_call_addr (tree);
> extern bool is_gimple_mem_ref_addr (tree);
> +extern void flush_mark_addressable_queue (void);
> extern void mark_addressable (tree);
> extern bool is_gimple_reg_rhs (tree);
>
>
>
> --
> Alexandre Oliva, freedom fighter http://FSFLA.org/~lxoliva/
> You must be the change you wish to see in the world. -- Gandhi
> Be Free! -- http://FSFLA.org/ FSF Latin America board member
> Free Software Evangelist|Red Hat Brasil GNU Toolchain Engineer
next prev parent reply other threads:[~2015-10-14 9:28 UTC|newest]
Thread overview: 121+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-27 18:04 [PR64164] drop copyrename, integrate into expand Alexandre Oliva
2015-03-27 18:11 ` Alexandre Oliva
2015-03-28 19:22 ` Alexandre Oliva
2015-03-31 5:11 ` Jeff Law
2015-04-03 13:17 ` Alexandre Oliva
2015-04-06 16:08 ` Jeff Law
2015-04-24 1:56 ` Alexandre Oliva
2015-04-27 11:39 ` Richard Biener
2015-06-06 5:12 ` Alexandre Oliva
2015-06-08 8:16 ` Richard Biener
2015-06-09 8:58 ` Christophe Lyon
2015-06-10 0:28 ` Alexandre Oliva
2015-06-10 13:36 ` Richard Biener
2015-07-16 7:58 ` Alexandre Oliva
2015-07-16 8:50 ` Richard Biener
2015-07-16 21:33 ` Alexandre Oliva
2015-07-18 8:26 ` Alexandre Oliva
2015-07-21 13:25 ` Richard Biener
2015-07-22 17:13 ` Alexandre Oliva
2015-07-22 17:43 ` Alexandre Oliva
2015-07-23 11:04 ` Richard Biener
2015-07-23 15:42 ` Alexandre Oliva
2015-07-23 20:35 ` Segher Boessenkool
2015-07-23 21:24 ` H.J. Lu
2015-07-23 22:11 ` H.J. Lu
2015-07-24 1:31 ` David Edelsohn
2015-07-24 5:08 ` H.J. Lu
2015-07-24 9:26 ` Richard Biener
2015-07-24 12:50 ` H.J. Lu
2015-07-24 20:20 ` Alexandre Oliva
2015-07-25 2:37 ` David Edelsohn
2015-07-27 22:16 ` Alexandre Oliva
2015-07-27 22:31 ` H.J. Lu
2015-07-24 18:51 ` Alexandre Oliva
2015-07-24 19:12 ` H.J. Lu
2015-07-24 19:31 ` David Edelsohn
2015-07-24 20:43 ` Alexandre Oliva
2015-07-24 20:47 ` Alexandre Oliva
2015-07-24 21:53 ` H.J. Lu
2015-07-25 7:17 ` Richard Biener
2015-07-29 20:52 ` Alexandre Oliva
2015-07-29 21:06 ` H.J. Lu
2015-07-30 17:47 ` H.J. Lu
2015-08-03 23:46 ` Alexandre Oliva
2015-08-04 9:48 ` Richard Biener
2015-08-05 0:39 ` Alexandre Oliva
2015-08-05 9:14 ` Richard Biener
2015-08-05 23:03 ` Alexandre Oliva
2015-08-10 8:24 ` James Greenhalgh
2015-08-10 15:14 ` Jeff Law
2015-08-11 4:53 ` Patrick Marlier
2015-08-14 19:03 ` Alexandre Oliva
2015-08-15 8:57 ` Andreas Schwab
2015-08-16 13:00 ` Alexandre Oliva
[not found] ` <m2k2sv8s21.fsf@linux-m68k.org>
2015-08-17 5:05 ` Alexandre Oliva
2015-08-17 9:29 ` Kyrill Tkachov
2015-08-17 16:23 ` Andrew Pinski
2015-08-18 16:18 ` Kyrill Tkachov
2015-08-16 16:42 ` Andreas Schwab
2015-08-17 2:57 ` Alexandre Oliva
2015-08-17 8:23 ` Andreas Schwab
2015-08-17 9:21 ` Andreas Schwab
2015-08-17 11:58 ` Alexandre Oliva
2015-08-17 7:48 ` Christophe Lyon
2015-08-17 12:43 ` Alexandre Oliva
2015-08-17 13:39 ` Christophe Lyon
2015-08-18 6:53 ` Alexandre Oliva
2015-08-19 6:50 ` Alexandre Oliva
2015-08-19 10:17 ` Richard Biener
2015-08-19 13:35 ` Andreas Schwab
2015-08-19 13:45 ` Andreas Schwab
2015-08-19 17:48 ` Alexandre Oliva
2015-08-20 1:44 ` Alexandre Oliva
2015-08-20 17:03 ` Jeff Law
2015-08-21 7:57 ` Alexandre Oliva
2015-08-21 8:38 ` Richard Biener
2015-08-21 12:17 ` Andreas Schwab
2015-08-21 8:11 ` Alexandre Oliva
2015-08-21 8:37 ` Richard Biener
2015-09-02 17:09 ` Alan Lawrence
2015-09-02 22:34 ` Alexandre Oliva
2015-09-03 10:58 ` Alan Lawrence
2015-09-18 15:49 ` Alan Lawrence
2015-09-23 20:44 ` Alexandre Oliva
2015-09-25 11:39 ` Richard Biener
2015-10-09 5:26 ` [PR67828] don't unswitch loops on undefined SSA values (was: Re: [PR64164] drop copyrename, integrate into expand) Alexandre Oliva
2015-10-09 9:35 ` Richard Biener
2015-10-09 5:36 ` [PR67766] reorder return value copying from PARALLELs and CONCATs " Alexandre Oliva
2015-10-09 7:33 ` [PR67891] drop is_gimple_reg test from set_parm_rtl (was: [PR67766] reorder return value copying from PARALLELs and CONCATs) Alexandre Oliva
2015-10-09 9:40 ` Richard Biener
2015-10-10 13:20 ` [PR67891] drop is_gimple_reg test from set_parm_rtl Alexandre Oliva
2015-10-12 10:22 ` Richard Biener
2015-10-14 3:25 ` Alexandre Oliva
2015-10-14 9:28 ` Richard Biener [this message]
2015-11-03 1:11 ` Alexandre Oliva
2015-11-03 3:14 ` Jeff Law
2015-11-03 4:29 ` Alexandre Oliva
2022-10-17 12:08 ` Tag 'gcc/gimple-expr.cc:mark_addressable_2' as 'static' (was: [PR67891] drop is_gimple_reg test from set_parm_rtl) Thomas Schwinge
2015-10-09 9:36 ` [PR67766] reorder return value copying from PARALLELs and CONCATs (was: Re: [PR64164] drop copyrename, integrate into expand) Richard Biener
2015-09-29 11:31 ` [PR64164] drop copyrename, integrate into expand Szabolcs Nagy
2015-10-07 22:37 ` Alexandre Oliva
2015-10-08 10:00 ` Richard Biener
2015-10-09 21:10 ` Jeff Law
2015-11-05 5:09 ` Alexandre Oliva
2015-11-05 13:44 ` Richard Biener
2015-11-10 15:31 ` Alan Lawrence
2015-11-10 22:59 ` Alexandre Oliva
2015-11-10 23:43 ` Jeff Law
2015-11-11 18:10 ` Alexandre Oliva
2015-11-13 6:33 ` Jeff Law
2015-11-17 0:07 ` Alexandre Oliva
2015-11-24 5:41 ` Jeff Law
2015-07-24 18:21 ` Alexandre Oliva
2015-07-29 20:32 ` Alexandre Oliva
2015-04-29 3:51 ` Jeff Law
2015-03-31 6:55 ` Steven Bosscher
2015-03-31 13:30 ` Richard Biener
2015-03-31 14:06 ` Richard Biener
2015-04-03 13:30 ` Alexandre Oliva
2015-04-06 15:57 ` Jeff Law
2015-12-04 12:45 ` Dominik Vogt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAFiYyc1rZcnvOSkxVsSZu5gi1ozzzxNvLwA17YmM51DRj2KH=A@mail.gmail.com' \
--to=richard.guenther@gmail.com \
--cc=James.Greenhalgh@arm.com \
--cc=alan.lawrence@arm.com \
--cc=aoliva@redhat.com \
--cc=christophe.lyon@linaro.org \
--cc=dje.gcc@gmail.com \
--cc=ebotcazou@adacore.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=hjl.tools@gmail.com \
--cc=law@redhat.com \
--cc=segher@kernel.crashing.org \
--cc=ubizjak@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).