diff options
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/ChangeLog | 6 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.fortran/use_device_ptr-optional-1.f90 | 22 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.fortran/use_device_ptr-optional-2.f90 | 33 |
3 files changed, 61 insertions, 0 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 1fc8c471b6f..2f60d606a88 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,9 @@ +2019-11-11 Tobias Burnus <tobias@codesourcery.com> + Kwok Cheung Yeung <kcy@codesourcery.com> + + * testsuite/libgomp.fortran/use_device_ptr-optional-1.f90: Extend. + * testsuite/libgomp.fortran/use_device_ptr-optional-2.f90: New. + 2019-11-11 Thomas Schwinge <thomas@codesourcery.com> * testsuite/libgomp.fortran/target9.f90: Specify 'dg-do run'. diff --git a/libgomp/testsuite/libgomp.fortran/use_device_ptr-optional-1.f90 b/libgomp/testsuite/libgomp.fortran/use_device_ptr-optional-1.f90 index ac69df559c9..e92ee8bf573 100644 --- a/libgomp/testsuite/libgomp.fortran/use_device_ptr-optional-1.f90 +++ b/libgomp/testsuite/libgomp.fortran/use_device_ptr-optional-1.f90 @@ -11,6 +11,9 @@ program test_it ptr_null => null() call bar(ptr_null) + + call foo_absent() + call bar_absent() contains subroutine foo(ii) integer, pointer, optional :: ii @@ -34,4 +37,23 @@ contains if (associated(jj)) stop 8 !$omp end target data end subroutine bar + + subroutine foo_absent(ii) + integer, pointer, optional :: ii + + if (present(ii)) STOP 31 + !$omp target data map(to:ixx) use_device_ptr(ii) + if (present(ii)) STOP 32 + !$omp end target data + end subroutine foo_absent + + ! For bar, it is assumed that a NULL ptr on the host maps to NULL on the device + subroutine bar_absent(jj) + integer, pointer, optional :: jj + + if (present(jj)) STOP 41 + !$omp target data map(to:ixx) use_device_ptr(jj) + if (present(jj)) STOP 42 + !$omp end target data + end subroutine bar_absent end program test_it diff --git a/libgomp/testsuite/libgomp.fortran/use_device_ptr-optional-2.f90 b/libgomp/testsuite/libgomp.fortran/use_device_ptr-optional-2.f90 new file mode 100644 index 00000000000..41abf17eede --- /dev/null +++ b/libgomp/testsuite/libgomp.fortran/use_device_ptr-optional-2.f90 @@ -0,0 +1,33 @@ +! Check whether absent optional arguments are properly +! handled with use_device_{addr,ptr}. +program main + implicit none (type, external) + call foo() +contains + subroutine foo(v, w, x, y, z) + integer, target, optional, value :: v + integer, target, optional :: w + integer, target, optional :: x(:) + integer, target, optional, allocatable :: y + integer, target, optional, allocatable :: z(:) + integer :: d + + !$omp target data map(d) use_device_addr(v, w, x, y, z) + if(present(v)) stop 1 + if(present(w)) stop 2 + if(present(x)) stop 3 + if(present(y)) stop 4 + if(present(z)) stop 5 + !$omp end target data + +! Using 'v' in use_device_ptr gives an ICE +! TODO: Find out what the OpenMP spec permits for use_device_ptr + + !$omp target data map(d) use_device_ptr(w, x, y, z) + if(present(w)) stop 6 + if(present(x)) stop 7 + if(present(y)) stop 8 + if(present(z)) stop 9 + !$omp end target data + end subroutine foo +end program main |