Patchwork RFA: patch to fix PR48633.

login
register
mail settings
Submitter Vladimir Makarov
Date May 13, 2011, 5:13 p.m.
Message ID <4DCD66BA.6040704@redhat.com>
Download mbox | patch
Permalink /patch/95495/
State New
Headers show

Comments

Vladimir Makarov - May 13, 2011, 5:13 p.m.
The patch fixes PR48633 described on 
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48633.

The patch was successfully bootstrapped on x86-64.

Ok to commit?

2011-05-13  Vladimir Makarov <vmakarov@redhat.com>

         PR rtl-optimization/48633
         * ira-build.c (loop_with_eh_edge_p): New function.
         (mark_loops_for_removal): Use it.

2011-05-13  Michael Matz <matz@gcc.gnu.org>

         PR rtl-optimization/48633
         * g++.dg/pr48633.C: New test.
Jeff Law - May 23, 2011, 3:27 p.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 05/13/11 11:13, Vladimir Makarov wrote:
> The patch fixes PR48633 described on
> http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48633.
> 
> The patch was successfully bootstrapped on x86-64.
> 
> Ok to commit?
> 
> 2011-05-13  Vladimir Makarov <vmakarov@redhat.com>
> 
>         PR rtl-optimization/48633
>         * ira-build.c (loop_with_eh_edge_p): New function.
>         (mark_loops_for_removal): Use it.
> 
> 2011-05-13  Michael Matz <matz@gcc.gnu.org>
> 
>         PR rtl-optimization/48633
>         * g++.dg/pr48633.C: New test.
OK.

Can you check if this also fixes 48757?  According to Uros, it looks
like the same bug.

Jeff
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJN2nzyAAoJEBRtltQi2kC70BwH/3hBSlChl6SQ6k4i3OYCmNRx
FCNLOYEn6fiWzZjAEUc2Jp/3/zb3i2byQ4qFmhd4QSeUamyDzt86WS03VlEg8Rcp
C0SJKZB529U5ijSjby5r4F4ZLw1YPOQhRtKd1y7Pb8w6tPppLqy/6Uw0d5u4S9M6
gZ2B94xEXRrXNqxCgbOLPwaFUSKGVfbjWzuw2pn+7HUfatYM276jKTO6nOLSHQPR
wYQrBv+kGfW5+vQCN3jCwohk3wkLF1oz8TsFSUlZcK7v40KD8MVpEXqjhdjQ8Q+Y
3Dg+d/IhelgLgnYi8OKj4hiYKEaHSJ58Ib4OKAKIfSp2s66ebcq1dBHOKMuIWk0=
=ioWL
-----END PGP SIGNATURE-----

Patch

Index: testsuite/g++.dg/pr48633.C
===================================================================
--- testsuite/g++.dg/pr48633.C	(revision 0)
+++ testsuite/g++.dg/pr48633.C	(revision 0)
@@ -0,0 +1,28 @@ 
+/* { dg-do compile} */
+/* { dg-options "-O2 -fira-region=all -fnon-call-exceptions" } */
+extern long double getme (void);
+extern void useme (long double);
+struct Frame {
+    long double tmp;
+};
+void bugme (int n, long double ld1, long double ld2, long double ld3,
+            long double ld4, long double ld5)
+{
+  Frame f;
+  int i;
+  f.tmp = getme();
+  try {
+    for (i = 0; i < n; i++)
+      {
+        f.tmp += 1.0;
+      }
+  } catch (...) {
+    f.tmp += 1.0;
+  }
+  ld1++;
+  ld2++;
+  ld3++;
+  ld4++;
+  ld5++;
+  useme (f.tmp);
+}
Index: ira-build.c
===================================================================
--- ira-build.c	(revision 173623)
+++ ira-build.c	(working copy)
@@ -1806,6 +1806,25 @@  low_pressure_loop_node_p (ira_loop_tree_
   return true;
 }
 
+/* Return TRUE if LOOP has a EH enter or exit edge.  */
+static bool
+loop_with_eh_edge_p (struct loop *loop)
+{
+  int i;
+  edge_iterator ei;
+  edge e;
+  VEC (edge, heap) *edges;
+
+  FOR_EACH_EDGE (e, ei, loop->header->preds)
+    if (e->flags & EDGE_EH)
+      return true;
+  edges = get_loop_exit_edges (loop);
+  FOR_EACH_VEC_ELT (edge, edges, i, e)
+    if (e->flags & EDGE_EH)
+      return true;
+  return false;
+}
+
 /* Sort loops for marking them for removal.  We put already marked
    loops first, then less frequent loops next, and then outer loops
    next.  */
@@ -1829,14 +1848,18 @@  loop_compare_func (const void *v1p, cons
   return l1->loop->num - l2->loop->num;
 }
 
-
 /* Mark loops which should be removed from regional allocation.  We
    remove a loop with low register pressure inside another loop with
    register pressure.  In this case a separate allocation of the loop
    hardly helps (for irregular register file architecture it could
    help by choosing a better hard register in the loop but we prefer
    faster allocation even in this case).  We also remove cheap loops
-   if there are more than IRA_MAX_LOOPS_NUM of them.  */
+   if there are more than IRA_MAX_LOOPS_NUM of them.  Loop with EH
+   exit or enter edges are removed too because the allocation might
+   require put pseudo moves on the EH edges (we could still do this
+   for pseudos with caller saved hard registers in some cases but it
+   is impossible to say here or during top-down allocation pass what
+   hard register the pseudos get finally).  */
 static void
 mark_loops_for_removal (void)
 {
@@ -1859,8 +1882,9 @@  mark_loops_for_removal (void)
 	  }
 	sorted_loops[n++] = &ira_loop_nodes[i];
 	ira_loop_nodes[i].to_remove_p
-	  = (low_pressure_loop_node_p (ira_loop_nodes[i].parent)
-	     && low_pressure_loop_node_p (&ira_loop_nodes[i]));
+	  = ((low_pressure_loop_node_p (ira_loop_nodes[i].parent)
+	      && low_pressure_loop_node_p (&ira_loop_nodes[i]))
+	     || loop_with_eh_edge_p (ira_loop_nodes[i].loop));
       }
   qsort (sorted_loops, n, sizeof (ira_loop_tree_node_t), loop_compare_func);
   for (i = 0; n - i + 1 > IRA_MAX_LOOPS_NUM; i++)