From: Tom de Vries <Tom_deVries@mentor.com>
To: Jakub Jelinek <jakub@redhat.com>
Cc: GCC Patches <gcc-patches@gcc.gnu.org>
Subject: [PATCH][2/5] Handle simple latch bb in expand_omp_for_static_chunk
Date: Mon, 31 Aug 2015 11:55:00 -0000 [thread overview]
Message-ID: <55E43F92.6060105@mentor.com> (raw)
In-Reply-To: <55E43D5D.5020300@mentor.com>
[-- Attachment #1: Type: text/plain, Size: 2044 bytes --]
On 31/08/15 13:41, Tom de Vries wrote:
> On 15/04/15 15:10, Tom de Vries wrote:
>> Hi,
>>
>> This patch series fixes PR65637.
>>
>> Currently, ssa-handling code in expand_omp_for_static_chunk is dead and
>> not exercised by testing.
>>
>> Ssa-handling code in omp-low.c is only triggered by
>> pass_parallelize_loops, and that pass doesn't specify a chunk size on
>> the GIMPLE_OMP_FOR it constructs, so that only exercises the
>> expand_omp_for_static_nochunk path.
>>
>> Using the attached trigger patch, we excercise the ssa-handling code in
>> expand_omp_for_static_chunk.
> >
> > 1. Fix gcc_assert in expand_omp_for_static_chunk
> > 2. Fix inner loop phi in expand_omp_for_static_chunk
> > 3. Handle 2 preds for fin_bb in expand_omp_for_static_chunk
>
> I'm posting an updated series.
>
> 1. Add param parloops-chunk-size
> 2. Handle simple latch bb in expand_omp_for_static_chunk
> 3. Fix gcc_assert in expand_omp_for_static_chunk
> 4. Fix inner loop phi in expand_omp_for_static_chunk
> 5. Handle 2 preds for fin_bb in expand_omp_for_static_chunk
>
> There are two new patches, (1) and (2) in the new numbering.
>
> The first patch adds a param parloops-chunk-size, which means the
> ssa-handling code in expand_omp_for_static_chunk is no longer dead.
>
> The second patch handles simple latches in expand_omp_for_static_chunk,
> similar to the fix for PR66846 in expand_omp_for_static_nochunk.
>
> The rest of the patches are now updated to include the testcases (and
> patch number 4 has been updated to handle simple latches).
>
> The patch series has been bootstrapped and reg-tested on x86_64.
>
> I'll post the patches from the patch series individually. The first two
> in response to this email, the latter three in response to the earlier
> submissions.
>
Hi,
this patch handles simple latches in expand_omp_for_static_chunk,
similar to how it's done for expand_omp_for_static_nochunk in the fix
for PR66846 (
https://gcc.gnu.org/viewcvs/gcc/trunk/gcc/omp-low.c?annotate=226427&pathrev=226427#l6539
).
Thanks,
- Tom
[-- Attachment #2: 0002-Handle-simple-latch-bb-in-expand_omp_for_static_chun.patch --]
[-- Type: text/x-patch, Size: 2003 bytes --]
Handle simple latch bb in expand_omp_for_static_chunk
2015-08-31 Tom de Vries <tom@codesourcery.com>
* omp-low.c (expand_omp_for_static_chunk): Handle simple latch bb.
---
gcc/omp-low.c | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/gcc/omp-low.c b/gcc/omp-low.c
index aa2a598..c3dfc51 100644
--- a/gcc/omp-low.c
+++ b/gcc/omp-low.c
@@ -6960,7 +6960,8 @@ expand_omp_for_static_chunk (struct omp_region *region,
body_bb = single_succ (seq_start_bb);
if (!broken_loop)
{
- gcc_assert (BRANCH_EDGE (cont_bb)->dest == body_bb);
+ gcc_assert (BRANCH_EDGE (cont_bb)->dest == body_bb
+ || single_succ (BRANCH_EDGE (cont_bb)->dest) == body_bb);
gcc_assert (EDGE_COUNT (cont_bb->succs) == 2);
trip_update_bb = split_edge (FALLTHRU_EDGE (cont_bb));
}
@@ -7261,6 +7262,11 @@ expand_omp_for_static_chunk (struct omp_region *region,
if (!broken_loop)
{
se = find_edge (cont_bb, body_bb);
+ if (se == NULL)
+ {
+ se = BRANCH_EDGE (cont_bb);
+ gcc_assert (single_succ (se->dest) == body_bb);
+ }
if (gimple_omp_for_combined_p (fd->for_stmt))
{
remove_edge (se);
@@ -7351,14 +7357,25 @@ expand_omp_for_static_chunk (struct omp_region *region,
if (!broken_loop)
{
+ struct loop *loop = body_bb->loop_father;
struct loop *trip_loop = alloc_loop ();
trip_loop->header = iter_part_bb;
trip_loop->latch = trip_update_bb;
add_loop (trip_loop, iter_part_bb->loop_father);
+ if (loop != entry_bb->loop_father)
+ {
+ gcc_assert (loop->header == body_bb);
+ gcc_assert (broken_loop
+ || loop->latch == region->cont
+ || single_pred (loop->latch) == region->cont);
+ trip_loop->inner = loop;
+ return;
+ }
+
if (!gimple_omp_for_combined_p (fd->for_stmt))
{
- struct loop *loop = alloc_loop ();
+ loop = alloc_loop ();
loop->header = body_bb;
if (collapse_bb == NULL)
loop->latch = cont_bb;
--
1.9.1
next prev parent reply other threads:[~2015-08-31 11:51 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-15 13:10 [PR65637] Fix ssa-handling code " Tom de Vries
2015-04-15 13:15 ` [PR65637][PATCH][1/3] Fix gcc_assert " Tom de Vries
2015-08-31 12:00 ` [PR65637][PATCH][3/5] " Tom de Vries
2015-09-03 9:16 ` Jakub Jelinek
2015-04-15 13:17 ` [PR65637][PATCH][2/3] Fix inner loop phi " Tom de Vries
2015-08-31 12:03 ` [PR65637][PATCH][4/5] " Tom de Vries
2015-09-03 9:20 ` Jakub Jelinek
2015-04-15 13:23 ` [PR65637][PATCH][3/3] Handle 2 preds for fin_bb " Tom de Vries
2015-08-31 12:26 ` [PR65637][PATCH][5/5] " Tom de Vries
2015-09-03 9:40 ` Jakub Jelinek
2015-05-18 13:13 ` [PING][PR65637] Fix ssa-handling code " Tom de Vries
2015-05-18 14:19 ` Tom de Vries
2015-06-08 12:34 ` [PING^2][PR65637] " Tom de Vries
2015-08-31 11:44 ` [PR65637] " Tom de Vries
2015-08-31 11:51 ` [PATCH][1/5] Add param parloops-chunk-size Tom de Vries
2015-09-03 8:57 ` Jakub Jelinek
2015-08-31 11:55 ` Tom de Vries [this message]
2015-09-03 9:02 ` [PATCH][2/5] Handle simple latch bb in expand_omp_for_static_chunk Jakub Jelinek
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=55E43F92.6060105@mentor.com \
--to=tom_devries@mentor.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=jakub@redhat.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).