[gomp4] Merge gomp-4_1-branch r224607 (2015-06-18) into gomp-4_0-branch

[gomp4] Merge gomp-4_1-branch r224607 (2015-06-18) into gomp-4_0-branch

[Thomas Schwinge]

[-- Attachment #1: Type: text/plain, Size: 1052 bytes --]

Hi!

I have recently merged trunk r228776 (2015-10-13) into gomp-4_0-branch,
which is the trunk revision before Jakub's big "Merge from
gomp-4_1-branch to trunk",
<http://news.gmane.org/find-root.php?message_id=%3C20151013191214.GL478%40tucnak.redhat.com%3E>.
Instead of attempting to merge that one in one go -- that is, to avoid
having to deal with a ton of merge conflicts at once, and to allow for
easier understanding of individual changes/regressions -- in the
following I'll gradually merge individual "blocks" of all the
gomp-4_1-branch changes into gomp-4_0-branch.  Committed to
gomp-4_0-branch in r228972:

commit 3931662876141de5c18d0c5e02c156eef5286bee
Merge: fdc2c87 2b9f218
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Mon Oct 19 15:38:31 2015 +0000

    svn merge -r 222404:224607 svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_1-branch
    
    
    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@228972 138bc75d-0d04-0410-961f-82ee72b054a4


Grüße,
 Thomas

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 472 bytes --]

[gomp4] Merge gomp-4_1-branch r225300 (2015-07-02) into gomp-4_0-branch

[Thomas Schwinge]

[-- Attachment #1: Type: text/plain, Size: 1752 bytes --]

Hi!

On Mon, 19 Oct 2015 17:54:46 +0200, I wrote:
> I have recently merged trunk r228776 (2015-10-13) into gomp-4_0-branch,
> which is the trunk revision before Jakub's big "Merge from
> gomp-4_1-branch to trunk",
> <http://news.gmane.org/find-root.php?message_id=%3C20151013191214.GL478%40tucnak.redhat.com%3E>.
> Instead of attempting to merge that one in one go -- that is, to avoid
> having to deal with a ton of merge conflicts at once, and to allow for
> easier understanding of individual changes/regressions -- in the
> following I'll gradually merge individual "blocks" of all the
> gomp-4_1-branch changes into gomp-4_0-branch.  Committed to
> gomp-4_0-branch in r228972:
> 
> commit 3931662876141de5c18d0c5e02c156eef5286bee
> Merge: fdc2c87 2b9f218
> Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
> Date:   Mon Oct 19 15:38:31 2015 +0000
> 
>     svn merge -r 222404:224607 svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_1-branch
>     
>     
>     git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@228972 138bc75d-0d04-0410-961f-82ee72b054a4


Yesterday, I merged gomp-4_1-branch r224838 in gomp-4_0-branch r229178,
<http://news.gmane.org/find-root.php?message_id=%3C87io5y7o7y.fsf%40schwinge.name%3E>.


Now committed to gomp-4_0-branch in r229214:

commit ae006d29a544a280a4ab4eb32f431c5ec7527823
Merge: cbef8ef 85aa63a
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Fri Oct 23 07:48:08 2015 +0000

    svn merge -r 224838:225300 svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_1-branch
    
    
    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@229214 138bc75d-0d04-0410-961f-82ee72b054a4


Grüße
 Thomas

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 472 bytes --]

[gomp4] Merge gomp-4_1-branch r226438 (2015-07-31) into gomp-4_0-branch

[Thomas Schwinge]

[-- Attachment #1: Type: text/plain, Size: 1691 bytes --]

Hi!

On Fri, 23 Oct 2015 10:07:49 +0200, Thomas Schwinge <thomas@codesourcery.com> wrote:
> On Mon, 19 Oct 2015 17:54:46 +0200, I wrote:
> > [...] Jakub's big "Merge from
> > gomp-4_1-branch to trunk",
> > <http://news.gmane.org/find-root.php?message_id=%3C20151013191214.GL478%40tucnak.redhat.com%3E>.
> > Instead of attempting to merge that one in one go -- that is, to avoid
> > having to deal with a ton of merge conflicts at once, and to allow for
> > easier understanding of individual changes/regressions -- in the
> > following I'll gradually merge individual "blocks" of all the
> > gomp-4_1-branch changes into gomp-4_0-branch.

Amongst other things, the next batch includes support for several new
OMP_CLAUSE_* and GOMP_MAP_* to support "private", "firstprivate",
"defaultmap", "use_device_ptr", "is_device_ptr" clauses for OpenMP
"target", "link" clause for OpenMP "declare target", C++ "this" allowed
in OpenMP "declare simd", refcount changes in libgomp,
GOMP_OFFLOAD_dev2dev (same-device memcpy).

I have not yet assessed to which extent it's possible to merge these
with/use these instead of what we had implemented on gomp-4_0-branch
already, to support related OpenACC functionality.

Committed to gomp-4_0-branch in r229223:

commit a2959cca36b92018b5f8e9ec0971c5de4a07effc
Merge: ae006d2 9c23418
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Fri Oct 23 10:29:09 2015 +0000

    svn merge -r 225300:226438 svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_1-branch
    
    
    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@229223 138bc75d-0d04-0410-961f-82ee72b054a4


Grüße
 Thomas

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 472 bytes --]

[gomp4] Merge gomp-4_1-branch r228761 (2015-10-13) into gomp-4_0-branch

[Thomas Schwinge]

[-- Attachment #1: Type: text/plain, Size: 1380 bytes --]

Hi!

On Fri, 23 Oct 2015 12:48:23 +0200, I wrote:
> On Fri, 23 Oct 2015 10:07:49 +0200, I wrote:
> > On Mon, 19 Oct 2015 17:54:46 +0200, I wrote:
> > > [...] Jakub's big "Merge from
> > > gomp-4_1-branch to trunk",
> > > <http://news.gmane.org/find-root.php?message_id=%3C20151013191214.GL478%40tucnak.redhat.com%3E>.
> > > Instead of attempting to merge that one in one go -- that is, to avoid
> > > having to deal with a ton of merge conflicts at once, and to allow for
> > > easier understanding of individual changes/regressions -- in the
> > > following I'll gradually merge individual "blocks" of all the
> > > gomp-4_1-branch changes into gomp-4_0-branch.

Amongst other things, the last batch includes support for struct elements
in OpenMP "map", "to", "from" clauses.  Again, I have not yet assessed to
which extent this will be useful to support related (future) OpenACC
functionality.

Committed to gomp-4_0-branch in r229255:

commit 17f04b7a665d9313047ea9f8e71909a633b59c05
Merge: a2959cc 0254f5c
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Fri Oct 23 13:26:35 2015 +0000

    svn merge -r 226438:228761 svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_1-branch
    
    
    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@229255 138bc75d-0d04-0410-961f-82ee72b054a4


Grüße
 Thomas

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 472 bytes --]

[gomp4] Merge trunk r228777 (2015-10-13) into gomp-4_0-branch

[Thomas Schwinge]

[-- Attachment #1: Type: text/plain, Size: 1415 bytes --]

Hi!

On Fri, 23 Oct 2015 15:38:31 +0200, I wrote:
> On Fri, 23 Oct 2015 12:48:23 +0200, I wrote:
> > On Fri, 23 Oct 2015 10:07:49 +0200, I wrote:
> > > On Mon, 19 Oct 2015 17:54:46 +0200, I wrote:
> > > > [...] Jakub's big "Merge from
> > > > gomp-4_1-branch to trunk",
> > > > <http://news.gmane.org/find-root.php?message_id=%3C20151013191214.GL478%40tucnak.redhat.com%3E>.
> > > > Instead of attempting to merge that one in one go -- that is, to avoid
> > > > having to deal with a ton of merge conflicts at once, and to allow for
> > > > easier understanding of individual changes/regressions -- in the
> > > > following I'll gradually merge individual "blocks" of all the
> > > > gomp-4_1-branch changes into gomp-4_0-branch.
> 
> [the last batch]

On top of that, it then was trivially easy to merge into gomp-4_0-branch
the real trunk commit of Jakub's big "Merge from gomp-4_1-branch to
trunk" -- only ChangeLog files remained to be updated.  Committed to
gomp-4_0-branch in r229257:

commit 1bc39c0125a72e54eee9a366a655f4c8e4509d50
Merge: 17f04b7 43895be
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Fri Oct 23 13:43:20 2015 +0000

    svn merge -r 228776:228777 svn+ssh://gcc.gnu.org/svn/gcc/trunk
    
    
    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@229257 138bc75d-0d04-0410-961f-82ee72b054a4


Grüße
 Thomas

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 472 bytes --]

Re: [gomp4] Merge gomp-4_1-branch r228761 (2015-10-13) into gomp-4_0-branch

[Jakub Jelinek]

On Fri, Oct 23, 2015 at 03:38:31PM +0200, Thomas Schwinge wrote:
> Hi!
> 
> On Fri, 23 Oct 2015 12:48:23 +0200, I wrote:
> > On Fri, 23 Oct 2015 10:07:49 +0200, I wrote:
> > > On Mon, 19 Oct 2015 17:54:46 +0200, I wrote:
> > > > [...] Jakub's big "Merge from
> > > > gomp-4_1-branch to trunk",
> > > > <http://news.gmane.org/find-root.php?message_id=%3C20151013191214.GL478%40tucnak.redhat.com%3E>.
> > > > Instead of attempting to merge that one in one go -- that is, to avoid
> > > > having to deal with a ton of merge conflicts at once, and to allow for
> > > > easier understanding of individual changes/regressions -- in the
> > > > following I'll gradually merge individual "blocks" of all the
> > > > gomp-4_1-branch changes into gomp-4_0-branch.
> 
> Amongst other things, the last batch includes support for struct elements
> in OpenMP "map", "to", "from" clauses.  Again, I have not yet assessed to
> which extent this will be useful to support related (future) OpenACC
> functionality.

I bet that the OpenACC standard would need to say something about those
before you can start using them.
That said, I think more interesting to OpenACC might be the
firstprivatization of scalars on the target region (so that instead of
mapping the arguments that are newly mapped and only copied from the host to
device, you can use a cheaper firstprivatization).  If OpenACC requires all
user vars to be mapped, you could still consider that e.g. for artificial
variables created by the compiler.

	Jakub

Re: [gomp4] Merge gomp-4_1-branch r228761 (2015-10-13) into gomp-4_0-branch

[Thomas Schwinge]

[-- Attachment #1: Type: text/plain, Size: 1899 bytes --]

Hi Jakub!

On Fri, 23 Oct 2015 15:58:47 +0200, Jakub Jelinek <jakub@redhat.com> wrote:
> On Fri, Oct 23, 2015 at 03:38:31PM +0200, Thomas Schwinge wrote:
> > On Fri, 23 Oct 2015 12:48:23 +0200, I wrote:
> > > On Fri, 23 Oct 2015 10:07:49 +0200, I wrote:
> > > > On Mon, 19 Oct 2015 17:54:46 +0200, I wrote:
> > > > > [...] Jakub's big "Merge from
> > > > > gomp-4_1-branch to trunk",
> > > > > <http://news.gmane.org/find-root.php?message_id=%3C20151013191214.GL478%40tucnak.redhat.com%3E>.
> > > > > Instead of attempting to merge that one in one go -- that is, to avoid
> > > > > having to deal with a ton of merge conflicts at once, and to allow for
> > > > > easier understanding of individual changes/regressions -- in the
> > > > > following I'll gradually merge individual "blocks" of all the
> > > > > gomp-4_1-branch changes into gomp-4_0-branch.
> > 
> > Amongst other things, the last batch includes support for struct elements
> > in OpenMP "map", "to", "from" clauses.  Again, I have not yet assessed to
> > which extent this will be useful to support related (future) OpenACC
> > functionality.
> 
> I bet that the OpenACC standard would need to say something about those
> before you can start using them.

:-) That's why I here said *future* OpenACC functionality.

> That said, I think more interesting to OpenACC might be the
> firstprivatization of scalars on the target region (so that instead of
> mapping the arguments that are newly mapped and only copied from the host to
> device, you can use a cheaper firstprivatization).  If OpenACC requires all
> user vars to be mapped, you could still consider that e.g. for artificial
> variables created by the compiler.

Right, using that "firstprivate" functionality is one of the things that
I noted down while working through your changes; should be a nice
optimization.


Grüße
 Thomas

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 472 bytes --]