Commit a5d0bc12 by Thomas Schwinge

[OpenACC] Set 'acc_device_current = -1'

There's no point in using value '-3', and even though not directly related,
value '-1' does match 'GOMP_DEVICE_ICV'.

	libgomp/
	* config/accel/openacc.f90 (acc_device_current): Set to '-1'.
	* openacc.f90 (acc_device_current): Likewise.
	* openacc.h (acc_device_current): Likewise.
	* openacc_lib.h (acc_device_current): Likewise.
parent d20219b5
2020-04-29 Thomas Schwinge <thomas@codesourcery.com> 2020-04-29 Thomas Schwinge <thomas@codesourcery.com>
* config/accel/openacc.f90 (acc_device_current): Set to '-1'.
* openacc.f90 (acc_device_current): Likewise.
* openacc.h (acc_device_current): Likewise.
* openacc_lib.h (acc_device_current): Likewise.
PR target/94282 PR target/94282
* testsuite/libgomp.c-c++-common/function-not-offloaded.c: Remove * testsuite/libgomp.c-c++-common/function-not-offloaded.c: Remove
'dg-allow-blank-lines-in-output'. 'dg-allow-blank-lines-in-output'.
......
...@@ -44,7 +44,7 @@ module openacc_kinds ...@@ -44,7 +44,7 @@ module openacc_kinds
integer, parameter :: acc_device_kind = int32 integer, parameter :: acc_device_kind = int32
! Keep in sync with include/gomp-constants.h. ! Keep in sync with include/gomp-constants.h.
integer (acc_device_kind), parameter :: acc_device_current = -3 integer (acc_device_kind), parameter :: acc_device_current = -1
integer (acc_device_kind), parameter :: acc_device_none = 0 integer (acc_device_kind), parameter :: acc_device_none = 0
integer (acc_device_kind), parameter :: acc_device_default = 1 integer (acc_device_kind), parameter :: acc_device_default = 1
integer (acc_device_kind), parameter :: acc_device_host = 2 integer (acc_device_kind), parameter :: acc_device_host = 2
......
...@@ -41,7 +41,7 @@ module openacc_kinds ...@@ -41,7 +41,7 @@ module openacc_kinds
integer, parameter :: acc_device_kind = int32 integer, parameter :: acc_device_kind = int32
! Keep in sync with include/gomp-constants.h. ! Keep in sync with include/gomp-constants.h.
integer (acc_device_kind), parameter :: acc_device_current = -3 integer (acc_device_kind), parameter :: acc_device_current = -1
integer (acc_device_kind), parameter :: acc_device_none = 0 integer (acc_device_kind), parameter :: acc_device_none = 0
integer (acc_device_kind), parameter :: acc_device_default = 1 integer (acc_device_kind), parameter :: acc_device_default = 1
integer (acc_device_kind), parameter :: acc_device_host = 2 integer (acc_device_kind), parameter :: acc_device_host = 2
......
...@@ -49,7 +49,7 @@ extern "C" { ...@@ -49,7 +49,7 @@ extern "C" {
/* Types */ /* Types */
typedef enum acc_device_t { typedef enum acc_device_t {
/* Keep in sync with include/gomp-constants.h. */ /* Keep in sync with include/gomp-constants.h. */
acc_device_current = -3, acc_device_current = -1,
acc_device_none = 0, acc_device_none = 0,
acc_device_default = 1, acc_device_default = 1,
acc_device_host = 2, acc_device_host = 2,
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
integer, parameter :: acc_device_kind = 4 integer, parameter :: acc_device_kind = 4
! Keep in sync with include/gomp-constants.h. ! Keep in sync with include/gomp-constants.h.
integer (acc_device_kind), parameter :: acc_device_current = -3 integer (acc_device_kind), parameter :: acc_device_current = -1
integer (acc_device_kind), parameter :: acc_device_none = 0 integer (acc_device_kind), parameter :: acc_device_none = 0
integer (acc_device_kind), parameter :: acc_device_default = 1 integer (acc_device_kind), parameter :: acc_device_default = 1
integer (acc_device_kind), parameter :: acc_device_host = 2 integer (acc_device_kind), parameter :: acc_device_host = 2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment