[committed] Fix description of 'GOMP_MAP_FIRSTPRIVATE' (was: [OpenACC] declare directive)

Message ID 87sgs6fr8o.fsf@euler.schwinge.homeip.net
State New
Headers show
Series
  • [committed] Fix description of 'GOMP_MAP_FIRSTPRIVATE' (was: [OpenACC] declare directive)
Related show

Commit Message

Thomas Schwinge June 18, 2019, 10:44 p.m.
Hi!

On Mon, 23 Nov 2015 13:37:20 +0100, I wrote:
> Hi Jim!

> 

> A few things I noticed when working on merging your trunk r230275 into

> gomp-4_0-branch.  Please fix these (on trunk).


> | --- include/gomp-constants.h

> | +++ include/gomp-constants.h

> | @@ -72,6 +72,11 @@ enum gomp_map_kind

> |         POINTER_SIZE_UNITS.  */

> |      GOMP_MAP_FORCE_DEVICEPTR =		(GOMP_MAP_FLAG_SPECIAL_1 | 0),

> |      /* Do not map, copy bits for firstprivate instead.  */

> | +    /* OpenACC device_resident.  */

> | +    GOMP_MAP_DEVICE_RESIDENT =		(GOMP_MAP_FLAG_SPECIAL_1 | 1),

> | +    /* OpenACC link.  */

> | +    GOMP_MAP_LINK =			(GOMP_MAP_FLAG_SPECIAL_1 | 2),

> | +    /* Allocate.  */

> |      GOMP_MAP_FIRSTPRIVATE =		(GOMP_MAP_FLAG_SPECIAL | 0),

> |      /* Similarly, but store the value in the pointer rather than

> |         pointed by the pointer.  */

> 

> I suspect the "Do not map, copy bits for firstprivate instead" comment

> still applies to GOMP_MAP_FIRSTPRIVATE only, which here (unintended?) got

> an "Allocate" comment added?


As obvious, now fixed on trunk in r272450 "Fix description of
'GOMP_MAP_FIRSTPRIVATE'", see attached.


Grüße
 Thomas

Patch

From 2a0899eaf3a9aabe64cb0649fd7a7fa263ebfcaa Mon Sep 17 00:00:00 2001
From: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 18 Jun 2019 22:14:52 +0000
Subject: [PATCH] Fix description of 'GOMP_MAP_FIRSTPRIVATE'

..., which got garbled in r230275.

	include/
	* gomp-constants.h (enum gomp_map_kind): Fix description of
	'GOMP_MAP_FIRSTPRIVATE'.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@272450 138bc75d-0d04-0410-961f-82ee72b054a4
---
 include/ChangeLog        | 5 +++++
 include/gomp-constants.h | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/ChangeLog b/include/ChangeLog
index 28f4664aa557..6d09a8d6e07b 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@ 
+2019-06-18  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* gomp-constants.h (enum gomp_map_kind): Fix description of
+	'GOMP_MAP_FIRSTPRIVATE'.
+
 2019-06-10  Martin Liska  <mliska@suse.cz>
 
 	* ansidecl.h (ATTRIBUTE_WARN_UNUSED_RESULT): New macro.
diff --git a/include/gomp-constants.h b/include/gomp-constants.h
index 8b93634f1b8b..82e9094c9342 100644
--- a/include/gomp-constants.h
+++ b/include/gomp-constants.h
@@ -71,12 +71,11 @@  enum gomp_map_kind
     /* Is a device pointer.  OMP_CLAUSE_SIZE for these is unused; is implicitly
        POINTER_SIZE_UNITS.  */
     GOMP_MAP_FORCE_DEVICEPTR =		(GOMP_MAP_FLAG_SPECIAL_1 | 0),
-    /* Do not map, copy bits for firstprivate instead.  */
     /* OpenACC device_resident.  */
     GOMP_MAP_DEVICE_RESIDENT =		(GOMP_MAP_FLAG_SPECIAL_1 | 1),
     /* OpenACC link.  */
     GOMP_MAP_LINK =			(GOMP_MAP_FLAG_SPECIAL_1 | 2),
-    /* Allocate.  */
+    /* Do not map, copy bits for firstprivate instead.  */
     GOMP_MAP_FIRSTPRIVATE =		(GOMP_MAP_FLAG_SPECIAL | 0),
     /* Similarly, but store the value in the pointer rather than
        pointed by the pointer.  */
-- 
2.20.1