Re: [gomp4] Avoiding predication for certain blocks

[Thomas Schwinge <thomas at schwinge dot name>]

Hi!

On Mon, 1 Jun 2015 12:10:12 +0200, Tom de Vries <Tom_deVries@mentor.com> wrote:
> On 29/05/15 18:23, Bernd Schmidt wrote:
> > When predicating the code for OpenACC, we should avoid the entry block
> > in an offloaded region, which contains setup code that should be run in
> > every thread. The following patch adds a new marker statement that is
> > used to identify this block. Currently, predication doesn't happen
> > anyway due to an oversight in the algorithm, but I'll be fixing that in
> > a followup patch.
> >
> > Committed on gomp-4_0-branch.

> this causes an ICE in kernels-eternal.c.

(Belatedly) confirmed:

    [-PASS:-]{+FAIL: c-c++-common/goacc/kernels-eternal.c (internal compiler error)+}
    {+FAIL:+} c-c++-common/goacc/kernels-eternal.c (test for excess errors)

    [-PASS:-]{+FAIL: c-c++-common/goacc/kernels-eternal.c  -std=c++11 (internal compiler error)+}
    {+FAIL:+} c-c++-common/goacc/kernels-eternal.c  -std=c++11 (test for excess errors)
    [-PASS:-]{+FAIL: c-c++-common/goacc/kernels-eternal.c  -std=c++14 (internal compiler error)+}
    {+FAIL:+} c-c++-common/goacc/kernels-eternal.c  -std=c++14 (test for excess errors)
    [-PASS:-]{+FAIL: c-c++-common/goacc/kernels-eternal.c  -std=c++98 (internal compiler error)+}
    {+FAIL:+} c-c++-common/goacc/kernels-eternal.c  -std=c++98 (test for excess errors)

> The GIMPLE_OMP_ENTRY_END is removed the first time (!ssa) we call 
> expand_omp_target. The second time we call expand_omp_target (ssa), it's 
> no longer there, and we call 'gimple_code (NULL)' here:
> ...
>    basic_block entry_succ_bb = single_succ (entry_bb);
>    gsi = gsi_last_bb (entry_succ_bb);
>    if (gimple_code (gsi_stmt (gsi)) == GIMPLE_OMP_ENTRY_END)
>      gsi_remove (&gsi, true);
> ...
> 
> This patch fixes that by not attempting to remove GIMPLE_OMP_ENTRY_END 
> when in ssa.
> 
> Committed to gomp-4_0-branch.

I also observed -- and still do observe -- ICEs as follows.  Tom, as
you've fixed (thanks!) this already for
c-c++-common/goacc/kernels-eternal.c, would you mind fixing it for these,
too:

    [-PASS:-]{+FAIL: c-c++-common/goacc-gomp/nesting-1.c (internal compiler error)+}
    {+FAIL:+} c-c++-common/goacc-gomp/nesting-1.c (test for excess errors)

    [-PASS:-]{+FAIL: c-c++-common/gomp/nesting-1.c (internal compiler error)+}
    {+FAIL:+} c-c++-common/gomp/nesting-1.c (test for excess errors)

    [-PASS:-]{+FAIL: c-c++-common/goacc-gomp/nesting-1.c  -std=c++11 (internal compiler error)+}
    {+FAIL:+} c-c++-common/goacc-gomp/nesting-1.c  -std=c++11 (test for excess errors)
    [-PASS:-]{+FAIL: c-c++-common/goacc-gomp/nesting-1.c  -std=c++14 (internal compiler error)+}
    {+FAIL:+} c-c++-common/goacc-gomp/nesting-1.c  -std=c++14 (test for excess errors)
    [-PASS:-]{+FAIL: c-c++-common/goacc-gomp/nesting-1.c  -std=c++98 (internal compiler error)+}
    {+FAIL:+} c-c++-common/goacc-gomp/nesting-1.c  -std=c++98 (test for excess errors)

    [-PASS:-]{+FAIL: c-c++-common/gomp/nesting-1.c  -std=c++11 (internal compiler error)+}
    {+FAIL:+} c-c++-common/gomp/nesting-1.c  -std=c++11 (test for excess errors)
    [-PASS:-]{+FAIL: c-c++-common/gomp/nesting-1.c  -std=c++14 (internal compiler error)+}
    {+FAIL:+} c-c++-common/gomp/nesting-1.c  -std=c++14 (test for excess errors)
    [-PASS:-]{+FAIL: c-c++-common/gomp/nesting-1.c  -std=c++98 (internal compiler error)+}
    {+FAIL:+} c-c++-common/gomp/nesting-1.c  -std=c++98 (test for excess errors)


GrÃÃe,
 Thomas

Attachment: signature.asc
Description: PGP signature