10508db867
2020-11-05 Ulrich Drepper <drepper@redhat.com> Kwok Cheung Yeung <kcy@codesourcery.com> libgomp/ * Makefile.am (%.mod): Add -cpp and -fopenmp to compile flags. * Makefile.in: Regenerate. * fortran.c: Wrap uses of omp_set_nested and omp_get_nested with pragmas to ignore -Wdeprecated-declarations warnings. * icv.c: Likewise. * omp.h.in (__GOMP_DEPRECATED_5_0): Define. Mark omp_lock_hint_* enum values, omp_lock_hint_t, omp_set_nested, and omp_get_nested with __GOMP_DEPRECATED_5_0. * omp_lib.f90.in: Mark omp_get_nested and omp_set_nested as deprecated. * testsuite/libgomp.c++/affinity-1.C: Add -Wno-deprecated-declarations to test options. * testsuite/libgomp.c/affinity-1.c: Likewise. * testsuite/libgomp.c/affinity-2.c: Likewise. * testsuite/libgomp.c/appendix-a/a.15.1.c: Likewise. * testsuite/libgomp.c/lib-1.c: Likewise. * testsuite/libgomp.c/nested-1.c: Likewise. * testsuite/libgomp.c/nested-2.c: Likewise. * testsuite/libgomp.c/nested-3.c: Likewise. * testsuite/libgomp.c/pr32362-1.c: Likewise. * testsuite/libgomp.c/pr32362-2.c: Likewise. * testsuite/libgomp.c/pr32362-3.c: Likewise. * testsuite/libgomp.c/pr35549.c: Likewise. * testsuite/libgomp.c/pr42942.c: Likewise. * testsuite/libgomp.c/pr61200.c: Likewise. * testsuite/libgomp.c/sort-1.c: Likewise. * testsuite/libgomp.c/target-5.c: Likewise. * testsuite/libgomp.c/target-6.c: Likewise. * testsuite/libgomp.c/teams-1.c: Likewise. * testsuite/libgomp.c/thread-limit-1.c: Likewise. * testsuite/libgomp.c/thread-limit-2.c: Likewise. * testsuite/libgomp.c/thread-limit-4.c: Likewise. * testsuite/libgomp.fortran/affinity1.f90: Likewise. * testsuite/libgomp.fortran/lib1.f90: Likewise. * testsuite/libgomp.fortran/lib2.f: Likewise. * testsuite/libgomp.fortran/nested1.f90: Likewise. * testsuite/libgomp.fortran/teams1.f90: Likewise.
51 lines
1.6 KiB
Fortran
51 lines
1.6 KiB
Fortran
! { dg-do run }
|
|
! { dg-skip-if "" { ! run_expensive_tests } { "*" } { "-O2" } }
|
|
! { dg-set-target-env-var OMP_PROC_BIND "spread,close" }
|
|
! { dg-set-target-env-var OMP_PLACES "{6,7}:4:-2,!{2,3}" }
|
|
! { dg-set-target-env-var OMP_NUM_THREADS "2" }
|
|
! { dg-additional-options "-Wno-deprecated-declarations" }
|
|
|
|
use omp_lib
|
|
integer :: num, i, nump
|
|
num = omp_get_num_places ()
|
|
print *, 'omp_get_num_places () == ', num
|
|
do i = 0, num - 1
|
|
nump = omp_get_place_num_procs (place_num = i)
|
|
if (nump .eq. 0) then
|
|
print *, 'place ', i, ' {}'
|
|
else
|
|
call print_place (i, nump)
|
|
end if
|
|
end do
|
|
call print_place_var
|
|
call omp_set_nested (nested = .true.)
|
|
!$omp parallel
|
|
if (omp_get_thread_num () == omp_get_num_threads () - 1) then
|
|
!$omp parallel
|
|
if (omp_get_thread_num () == omp_get_num_threads () - 1) &
|
|
call print_place_var
|
|
!$omp end parallel
|
|
end if
|
|
!$omp end parallel
|
|
contains
|
|
subroutine print_place (i, nump)
|
|
integer, intent (in) :: i, nump
|
|
integer :: ids(nump)
|
|
call omp_get_place_proc_ids (place_num = i, ids = ids)
|
|
print *, 'place ', i, ' {', ids, '}'
|
|
end subroutine
|
|
subroutine print_place_var
|
|
integer :: place, num_places
|
|
place = omp_get_place_num ()
|
|
num_places = omp_get_partition_num_places ()
|
|
print *, 'place ', place
|
|
if (num_places .gt. 0) call print_partition (num_places)
|
|
end subroutine
|
|
subroutine print_partition (num_places)
|
|
integer, intent (in) :: num_places
|
|
integer :: place_nums(num_places)
|
|
call omp_get_partition_place_nums (place_nums = place_nums)
|
|
print *, 'partition ', place_nums(1), '-', place_nums(num_places)
|
|
end subroutine
|
|
end
|