From: Tom de Vries <Tom_deVries@mentor.com>
To: Richard Biener <rguenther@suse.de>
Cc: "gcc-patches@gnu.org" <gcc-patches@gnu.org>,
Jakub Jelinek <jakub@redhat.com>
Subject: [PATCH] Improve verification of loop->latch in verify_loop_structure
Date: Tue, 24 Nov 2015 15:19:00 -0000 [thread overview]
Message-ID: <56547D49.5040609@mentor.com> (raw)
In-Reply-To: <alpine.LSU.2.11.1511231122000.4884@t29.fhfr.qr>
[-- Attachment #1: Type: text/plain, Size: 1016 bytes --]
[ was: Re: [PATCH] Check NULL loop->latch in verify_loop_structure ]
On 23/11/15 11:28, Richard Biener wrote:
> On Mon, 23 Nov 2015, Tom de Vries wrote:
>
>> Hi,
>>
>> In verify_loop_structure, we stop checking the latch once we find that it's
>> NULL.
>>
>> This patch tries a bit harder:
>> - if !LOOPS_MAY_HAVE_MULTIPLE_LATCHES, we don't allow a NULL latch
>> - if LOOPS_MAY_HAVE_MULTIPLE_LATCHES, we check that indeed there's no
>> single loop latch.
>>
>> As a consequence of adding this check, I needed to fix expand_omp_for_generic,
>> which missed an initialization of a loop latch.
>>
>> Bootstrapped and reg-tested on x86_64.
>>
>> OK for stage3 trunk?
>
> You miss to catch the case where loop->latch is non-NULL but there
> are multiple latches, so I think the patch can be improved.
> That case is more important for correctness (passes
> seeing ->latch non-NULL assume a single latch).
>
Updated according to comment.
Bootstrapped and reg-tested on x86_64.
OK for stage3 trunk?
Thanks,
- Tom
[-- Attachment #2: 0001-Improve-verification-of-loop-latch-in-verify_loop_structure.patch --]
[-- Type: text/x-patch, Size: 3847 bytes --]
Improve verification of loop->latch in verify_loop_structure
2015-11-22 Tom de Vries <tom@codesourcery.com>
* cfgloop.c (find_single_latch): New function, factored out of ...
(flow_loops_find): ... here.
(verify_loop_structure): Improve verification of loop->latch.
* cfgloop.h (find_single_latch): Declare.
* omp-low.c (expand_omp_for_generic): Initialize latch of orig_loop.
---
gcc/cfgloop.c | 70 ++++++++++++++++++++++++++++++++++++++++++-----------------
gcc/cfgloop.h | 1 +
gcc/omp-low.c | 1 +
3 files changed, 52 insertions(+), 20 deletions(-)
diff --git a/gcc/cfgloop.c b/gcc/cfgloop.c
index bf00e0e..a6850e3 100644
--- a/gcc/cfgloop.c
+++ b/gcc/cfgloop.c
@@ -388,6 +388,33 @@ bb_loop_header_p (basic_block header)
return false;
}
+/* Return the latch block for this header block, if it has just a single one.
+ Otherwise, return NULL. */
+
+basic_block
+find_single_latch (struct loop* loop)
+{
+ basic_block header = loop->header;
+ edge_iterator ei;
+ edge e;
+ basic_block latch = NULL;
+
+ FOR_EACH_EDGE (e, ei, header->preds)
+ {
+ basic_block cand = e->src;
+ if (!flow_bb_inside_loop_p (loop, cand))
+ continue;
+
+ if (latch != NULL)
+ /* More than one latch edge. */
+ return NULL;
+
+ latch = cand;
+ }
+
+ return latch;
+}
+
/* Find all the natural loops in the function and save in LOOPS structure and
recalculate loop_father information in basic block structures.
If LOOPS is non-NULL then the loop structures for already recorded loops
@@ -482,29 +509,10 @@ flow_loops_find (struct loops *loops)
{
struct loop *loop = larray[i];
basic_block header = loop->header;
- edge_iterator ei;
- edge e;
flow_loop_tree_node_add (header->loop_father, loop);
loop->num_nodes = flow_loop_nodes_find (loop->header, loop);
-
- /* Look for the latch for this header block, if it has just a
- single one. */
- FOR_EACH_EDGE (e, ei, header->preds)
- {
- basic_block latch = e->src;
-
- if (flow_bb_inside_loop_p (loop, latch))
- {
- if (loop->latch != NULL)
- {
- /* More than one latch edge. */
- loop->latch = NULL;
- break;
- }
- loop->latch = latch;
- }
- }
+ loop->latch = find_single_latch (loop);
}
return loops;
@@ -1439,6 +1447,28 @@ verify_loop_structure (void)
error ("loop %d%'s latch is not dominated by its header", i);
err = 1;
}
+ if (find_single_latch (loop) == NULL)
+ {
+ error ("loop %d%'s latch is is not the only latch", i);
+ err = 1;
+ }
+ }
+ else
+ {
+ if (loops_state_satisfies_p (LOOPS_MAY_HAVE_MULTIPLE_LATCHES))
+ {
+ if (find_single_latch (loop) != NULL)
+ {
+ error ("loop %d%'s latch is missing", i);
+ err = 1;
+ }
+ }
+ else
+ {
+ error ("loop %d%'s latch is missing, and loops may not have"
+ " multiple latches", i);
+ err = 1;
+ }
}
if (loops_state_satisfies_p (LOOPS_HAVE_SIMPLE_LATCHES))
{
diff --git a/gcc/cfgloop.h b/gcc/cfgloop.h
index ee73bf9..7faf591 100644
--- a/gcc/cfgloop.h
+++ b/gcc/cfgloop.h
@@ -270,6 +270,7 @@ bool mark_irreducible_loops (void);
void release_recorded_exits (function *);
void record_loop_exits (void);
void rescan_loop_exit (edge, bool, bool);
+basic_block find_single_latch (struct loop*);
/* Loop data structure manipulation/querying. */
extern void flow_loop_tree_node_add (struct loop *, struct loop *);
diff --git a/gcc/omp-low.c b/gcc/omp-low.c
index 0d4c6e5..2d782eb 100644
--- a/gcc/omp-low.c
+++ b/gcc/omp-low.c
@@ -8903,6 +8903,7 @@ expand_omp_for_generic (struct omp_region *region,
orig_loop->header = l1_bb;
/* The loop may have multiple latches. */
add_loop (orig_loop, new_loop);
+ orig_loop->latch = find_single_latch (orig_loop);
}
}
}
next prev parent reply other threads:[~2015-11-24 15:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-22 23:29 [PATCH] Check NULL " Tom de Vries
2015-11-23 10:29 ` Richard Biener
2015-11-24 15:19 ` Tom de Vries [this message]
2015-11-25 10:44 ` [PATCH] Improve verification of " Richard Biener
2015-11-26 11:46 ` Alan Lawrence
2015-11-26 11:57 ` Alan Lawrence
2015-11-26 12:16 ` Richard Biener
2015-11-26 14:44 ` Tom de Vries
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=56547D49.5040609@mentor.com \
--to=tom_devries@mentor.com \
--cc=gcc-patches@gnu.org \
--cc=jakub@redhat.com \
--cc=rguenther@suse.de \
/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).