Tree profilng merge 1 - allow inserting onto edge to EXIT_BLOCK

Tree profilng merge 1 - allow inserting onto edge to EXIT_BLOCK

[Jan Hubicka]

Hi,
for bootstrap with tree profiling we must be able to split edges to
EXIT_BLOCK.  This has been discussed with RTH on irc in the past

Honza

Bootstrapped/regtested i686-pc-gnu-linux without libjava, of course will
re-test with libjava if approved.  OK?

2004-05-28  Jan Hubicka  <jh@suse.cz>
	* gimple-low.c (tree_find_edge_insert_loc):  Allow inserting before
	return_stmt.
Index: gimple-low.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/gimple-low.c,v
retrieving revision 2.2
retrieving revision 1.1.4.17.2.7
diff -c -3 -p -r2.2 -r1.1.4.17.2.7
*************** tree_find_edge_insert_loc (edge e, block
*** 2834,2839 ****
--- 2858,2879 ----
        tmp = bsi_stmt (*bsi);
        if (!stmt_ends_bb_p (tmp))
  	return true;
+ 
+       /* Insert code just before returning the value.  We may need to decompose
+          the return in the case it contains non-trivial operand.  */
+       if (TREE_CODE (tmp) == RETURN_EXPR)
+         {
+ 	  tree op = TREE_OPERAND (tmp, 0);
+ 	  if (!is_gimple_val (op))
+ 	    {
+ 	      if (TREE_CODE (op) != MODIFY_EXPR)
+ 		abort ();
+ 	      bsi_insert_before (bsi, op, BSI_NEW_STMT);
+ 	      TREE_OPERAND (tmp, 0) = TREE_OPERAND (op, 0);
+ 	    }
+ 	  bsi_prev (bsi);
+ 	  return true;
+         }
      }
  
    /* Otherwise, create a new basic block, and split this edge.  */

Re: Tree profilng merge 1 - allow inserting onto edge to EXIT_BLOCK

[Jeffrey A Law]

On Fri, 2004-05-28 at 04:52, Jan Hubicka wrote:
> Hi,
> for bootstrap with tree profiling we must be able to split edges to
> EXIT_BLOCK.  This has been discussed with RTH on irc in the past
> 
> Honza
> 
> Bootstrapped/regtested i686-pc-gnu-linux without libjava, of course will
> re-test with libjava if approved.  OK?
> 
> 2004-05-28  Jan Hubicka  <jh@suse.cz>
> 	* gimple-low.c (tree_find_edge_insert_loc):  Allow inserting before
> 	return_stmt.
This is fine.  Please install this patch.

jeff

Re: Tree profilng merge 1 - allow inserting onto edge to EXIT_BLOCK

[Richard Henderson]

On Fri, May 28, 2004 at 12:52:45PM +0200, Jan Hubicka wrote:
> 	* gimple-low.c (tree_find_edge_insert_loc):  Allow inserting before
> 	return_stmt.

Wait on this.  Jason and I talked about redefining things such that
we only ever have one RETURN_EXPR in a function, and that it always
only contains just the result_decl.

I have the solution prototyped; we'll see what kind of uglies I run
into.


r~

Re: Tree profilng merge 1 - allow inserting onto edge to EXIT_BLOCK

[Jeffrey A Law]

On Sun, 2004-06-06 at 17:45, Richard Henderson wrote:
> On Fri, May 28, 2004 at 12:52:45PM +0200, Jan Hubicka wrote:
> > 	* gimple-low.c (tree_find_edge_insert_loc):  Allow inserting before
> > 	return_stmt.
> 
> Wait on this.  Jason and I talked about redefining things such that
> we only ever have one RETURN_EXPR in a function, and that it always
> only contains just the result_decl.
> 
> I have the solution prototyped; we'll see what kind of uglies I run
> into.
Keep me informed -- how you do this has some implications for
Andrew's code (which I've taken review responsibility for) to
optimize stuff like

if (cond)
  return x;
else
  return y;

Jeff

Re: Tree profilng merge 1 - allow inserting onto edge to EXIT_BLOCK

[Paolo Bonzini]

Jeffrey A Law wrote:

> Keep me informed -- how you do this has some implications for
> Andrew's code (which I've taken review responsibility for) to
> optimize stuff like
 >
 > if (cond)
 >   return x;
 > else
 >   return y;

I planned to do this as part of a general rewrite of phiopt (see earlier 
message to the list in which I CCed you).  Is Andrew rewriting this to

  if (cond)
    T = x;
  else
    T = y;
   return T;

?

Paolo

Re: Tree profilng merge 1 - allow inserting onto edge to EXIT_BLOCK

[Richard Henderson]

On Mon, Jun 07, 2004 at 04:12:23PM +0200, Paolo Bonzini wrote:
> I planned to do this as part of a general rewrite of phiopt (see earlier 
> message to the list in which I CCed you).  Is Andrew rewriting this to
> 
>  if (cond)
>    T = x;
>  else
>    T = y;
>   return T;

My patch does this.  In the process of committing it now...


r~

Re: Tree profilng merge 1 - allow inserting onto edge to EXIT_BLOCK

[Jan Hubicka]

> On Fri, May 28, 2004 at 12:52:45PM +0200, Jan Hubicka wrote:
> > 	* gimple-low.c (tree_find_edge_insert_loc):  Allow inserting before
> > 	return_stmt.
> 
> Wait on this.  Jason and I talked about redefining things such that
> we only ever have one RETURN_EXPR in a function, and that it always
> only contains just the result_decl.

What are the major advantages of this (except for having easier job in
the RTL expansion)
> 
> I have the solution prototyped; we'll see what kind of uglies I run
> into.

The patch ahs been approved by Jeff so I think I already applied it, so
please just revert it if you have something better.

Honza
> 
> 
> r~

Re: Tree profilng merge 1 - allow inserting onto edge to EXIT_BLOCK

[Richard Kenner]

    Wait on this.  Jason and I talked about redefining things such that
    we only ever have one RETURN_EXPR in a function, and that it always
    only contains just the result_decl.

Would this be visible to front ends or done during gimplification?

Re: Tree profilng merge 1 - allow inserting onto edge to EXIT_BLOCK

[Richard Henderson]

On Sun, Jun 06, 2004 at 07:48:25PM -0400, Richard Kenner wrote:
>     Wait on this.  Jason and I talked about redefining things such that
>     we only ever have one RETURN_EXPR in a function, and that it always
>     only contains just the result_decl.
> 
> Would this be visible to front ends or done during gimplification?

During and after gimplification.


r~