public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
From: Jan Hubicka <hubicka@ucw.cz>
To: gcc-patches@gcc.gnu.org
Subject: PR bootstrap/50709 (bootstrap miscompare)
Date: Wed, 19 Oct 2011 17:15:00 -0000	[thread overview]
Message-ID: <20111019164149.GG18858@kam.mff.cuni.cz> (raw)

Hi,
the ENABLE_CHECKING code verifying consistency of inliner cache has effect on changing
order of querries to the fibheap that consequentely makes entries with same key come
in different orders.

Fixed by enabling the checking aways.  I also added extra check that the keys are conservatively
correct.

Bootstrapped/regtested x86_64-linux.


Index: ChangeLog
===================================================================
--- ChangeLog	(revision 180190)
+++ ChangeLog	(working copy)
@@ -1,3 +1,9 @@
+2011-10-19  Jan Hubicka  <jh@suse.cz>
+
+	PR bootstrap/50709
+	* ipa-inline.c (inline_small_functions): Fix checking code to not make
+	effect on fibheap stability.
+
 2011-10-19  Roland Stigge  <stigge@antcom.de>
 
 	PR translation/48638
Index: ipa-inline.c
===================================================================
--- ipa-inline.c	(revision 180190)
+++ ipa-inline.c	(working copy)
@@ -1384,6 +1384,7 @@ inline_small_functions (void)
       struct cgraph_node *where, *callee;
       int badness = fibheap_min_key (heap);
       int current_badness;
+      int cached_badness = -1;
       int growth;
 
       edge = (struct cgraph_edge *) fibheap_extract_min (heap);
@@ -1392,16 +1393,20 @@ inline_small_functions (void)
       if (!edge->inline_failed)
 	continue;
 
-      /* Be sure that caches are maintained consistent.  */
 #ifdef ENABLE_CHECKING
+      /* Be sure that caches are maintained conservatively consistent.
+	 This means that cached badness is allways smaller or equal
+	 to the real badness.  */
+      cached_badness = edge_badness (edge, false);
+#endif
       reset_edge_growth_cache (edge);
       reset_node_growth_cache (edge->callee);
-#endif
 
       /* When updating the edge costs, we only decrease badness in the keys.
 	 Increases of badness are handled lazilly; when we see key with out
 	 of date value on it, we re-insert it now.  */
       current_badness = edge_badness (edge, false);
+      gcc_assert (cached_badness == -1 || cached_badness <= current_badness);
       gcc_assert (current_badness >= badness);
       if (current_badness != badness)
 	{

             reply	other threads:[~2011-10-19 16:42 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-19 17:15 Jan Hubicka [this message]
2011-10-20 13:08 ` Jan Hubicka
2011-10-25 16:47   ` H.J. Lu

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=20111019164149.GG18858@kam.mff.cuni.cz \
    --to=hubicka@ucw.cz \
    --cc=gcc-patches@gcc.gnu.org \
    /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).