OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
53d5b59cb3
gcc/libgomp/omp_lib.h.in
Tobias Burnus 432de08498 OpenMP 5.1: Add proc-bind 'primary' support 
In OpenMP 5.1 "master thread" was changed to "primary thread" and
the proc_bind clause and the OMP_PROC_BIND environment variable
now take 'primary' as argument as alias for 'master', while the
latter is deprecated.
This commit accepts 'primary' and adds the named constant
omp_proc_bind_primary and changes 'master thread' in the
documentation; however, given that not even OpenMP 5.0 is
fully supported, omp_display_env and the dumps currently
still output 'master' and there is no deprecation warning
when using the 'master' in the proc_bind clause.

gcc/c/ChangeLog:

	* c-parser.c (c_parser_omp_clause_proc_bind): Accept
	'primary' as alias for 'master'.

gcc/cp/ChangeLog:

	* parser.c (cp_parser_omp_clause_proc_bind): Accept
	'primary' as alias for 'master'.

gcc/fortran/ChangeLog:

	* gfortran.h (gfc_omp_proc_bind_kind): Add OMP_PROC_BIND_PRIMARY.
	* dump-parse-tree.c (show_omp_clauses): Add TODO comment to
	change 'master' to 'primary' in proc_bind for OpenMP 5.1.
	* intrinsic.texi (OMP_LIB): Mention OpenMP 5.1; add
	omp_proc_bind_primary.
	* openmp.c (gfc_match_omp_clauses): Accept
	'primary' as alias for 'master'.
	* trans-openmp.c (gfc_trans_omp_clauses): Handle
	OMP_PROC_BIND_PRIMARY.

gcc/ChangeLog:

	* tree-core.h (omp_clause_proc_bind_kind): Add
	OMP_CLAUSE_PROC_BIND_PRIMARY.
	* tree-pretty-print.c (dump_omp_clause): Add TODO comment to
	change 'master' to 'primary' in proc_bind for OpenMP 5.1.

libgomp/ChangeLog:

	* env.c (parse_bind_var): Accept 'primary' as alias for
	'master'.
	(omp_display_env): Add TODO comment to
	change 'master' to 'primary' in proc_bind for OpenMP 5.1.
	* libgomp.texi: Change 'master thread' to 'primary thread'
	in line with OpenMP 5.1.
	(omp_get_proc_bind): Add omp_proc_bind_primary and note that
	omp_proc_bind_master is an alias of it.
	(OMP_PROC_BIND): Mention 'PRIMARY'.
	* omp.h.in (__GOMP_DEPRECATED_5_1): Define.
	(omp_proc_bind_primary): Add.
	(omp_proc_bind_master): Deprecate for OpenMP 5.1.
	* omp_lib.f90.in (omp_proc_bind_primary): Add.
	(omp_proc_bind_master): Deprecate for OpenMP 5.1.
	* omp_lib.h.in (omp_proc_bind_primary): Add.
	* testsuite/libgomp.c/affinity-1.c: Check that
	'primary' works and is identical to 'master'.

gcc/testsuite/ChangeLog:

	* c-c++-common/gomp/pr61486-2.c: Duplicate one proc_bind(master)
	testcase and test proc_bind(primary) instead.
	* gfortran.dg/gomp/affinity-1.f90: Likewise.
2021-08-12 15:49:49 +02:00

274 lines
12 KiB
C
Raw Blame History

! Copyright (C) 2005-2021 Free Software Foundation, Inc.
! Contributed by Jakub Jelinek <jakub@redhat.com>.
! This file is part of the GNU Offloading and Multi Processing Library
! (libgomp).
! Libgomp is free software; you can redistribute it and/or modify it
! under the terms of the GNU General Public License as published by
! the Free Software Foundation; either version 3, or (at your option)
! any later version.
! Libgomp is distributed in the hope that it will be useful, but WITHOUT ANY
! WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
! FOR A PARTICULAR PURPOSE. See the GNU General Public License for
! more details.
! Under Section 7 of GPL version 3, you are granted additional
! permissions described in the GCC Runtime Library Exception, version
! 3.1, as published by the Free Software Foundation.
! You should have received a copy of the GNU General Public License and
! a copy of the GCC Runtime Library Exception along with this program;
! see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
! <http://www.gnu.org/licenses/>.
integer omp_lock_kind, omp_nest_lock_kind, openmp_version
parameter (omp_lock_kind = @OMP_LOCK_KIND@)
parameter (omp_nest_lock_kind = @OMP_NEST_LOCK_KIND@)
integer omp_depend_kind
parameter (omp_depend_kind = @OMP_DEPEND_KIND@)
integer omp_sched_kind
parameter (omp_sched_kind = 4)
integer (omp_sched_kind) omp_sched_static, omp_sched_dynamic
integer (omp_sched_kind) omp_sched_guided, omp_sched_auto
parameter (omp_sched_static = 1)
parameter (omp_sched_dynamic = 2)
parameter (omp_sched_guided = 3)
parameter (omp_sched_auto = 4)
integer omp_proc_bind_kind
parameter (omp_proc_bind_kind = 4)
integer (omp_proc_bind_kind) omp_proc_bind_false
integer (omp_proc_bind_kind) omp_proc_bind_true
integer (omp_proc_bind_kind) omp_proc_bind_primary
integer (omp_proc_bind_kind) omp_proc_bind_master
integer (omp_proc_bind_kind) omp_proc_bind_close
integer (omp_proc_bind_kind) omp_proc_bind_spread
parameter (omp_proc_bind_false = 0)
parameter (omp_proc_bind_true = 1)
parameter (omp_proc_bind_primary = 2)
parameter (omp_proc_bind_master = 2)
parameter (omp_proc_bind_close = 3)
parameter (omp_proc_bind_spread = 4)
integer omp_sync_hint_kind
integer omp_lock_hint_kind
parameter (omp_sync_hint_kind = 4)
parameter (omp_lock_hint_kind = omp_sync_hint_kind)
integer (omp_sync_hint_kind) omp_sync_hint_none
integer (omp_lock_hint_kind) omp_lock_hint_none
integer (omp_sync_hint_kind) omp_sync_hint_uncontended
integer (omp_lock_hint_kind) omp_lock_hint_uncontended
integer (omp_sync_hint_kind) omp_sync_hint_contended
integer (omp_sync_hint_kind) omp_lock_hint_contended
integer (omp_lock_hint_kind) omp_sync_hint_nonspeculative
integer (omp_lock_hint_kind) omp_lock_hint_nonspeculative
integer (omp_sync_hint_kind) omp_sync_hint_speculative
integer (omp_lock_hint_kind) omp_lock_hint_speculative
parameter (omp_sync_hint_none = 0)
parameter (omp_lock_hint_none = 0)
parameter (omp_sync_hint_uncontended = 1)
parameter (omp_lock_hint_uncontended = 1)
parameter (omp_sync_hint_contended = 2)
parameter (omp_lock_hint_contended = 2)
parameter (omp_sync_hint_nonspeculative = 4)
parameter (omp_lock_hint_nonspeculative = 4)
parameter (omp_sync_hint_speculative = 8)
parameter (omp_lock_hint_speculative = 8)
parameter (openmp_version = 201511)
integer omp_pause_resource_kind
parameter (omp_pause_resource_kind = 4)
integer (omp_pause_resource_kind) omp_pause_soft
integer (omp_pause_resource_kind) omp_pause_hard
parameter (omp_pause_soft = 1)
parameter (omp_pause_hard = 2)
integer omp_allocator_handle_kind, omp_alloctrait_key_kind
integer omp_alloctrait_val_kind, omp_memspace_handle_kind
integer omp_event_handle_kind
parameter (omp_allocator_handle_kind = @INTPTR_T_KIND@)
parameter (omp_alloctrait_key_kind = 4)
parameter (omp_alloctrait_val_kind = @INTPTR_T_KIND@)
parameter (omp_memspace_handle_kind = @INTPTR_T_KIND@)
parameter (omp_event_handle_kind = @INTPTR_T_KIND@)
integer (omp_alloctrait_key_kind) omp_atk_sync_hint
integer (omp_alloctrait_key_kind) omp_atk_alignment
integer (omp_alloctrait_key_kind) omp_atk_access
integer (omp_alloctrait_key_kind) omp_atk_pool_size
integer (omp_alloctrait_key_kind) omp_atk_fallback
integer (omp_alloctrait_key_kind) omp_atk_fb_data
integer (omp_alloctrait_key_kind) omp_atk_pinned
integer (omp_alloctrait_key_kind) omp_atk_partition
parameter (omp_atk_sync_hint = 1)
parameter (omp_atk_alignment = 2)
parameter (omp_atk_access = 3)
parameter (omp_atk_pool_size = 4)
parameter (omp_atk_fallback = 5)
parameter (omp_atk_fb_data = 6)
parameter (omp_atk_pinned = 7)
parameter (omp_atk_partition = 8)
integer (omp_alloctrait_val_kind) omp_atv_false
integer (omp_alloctrait_val_kind) omp_atv_true
integer (omp_alloctrait_val_kind) omp_atv_default
integer (omp_alloctrait_val_kind) omp_atv_contended
integer (omp_alloctrait_val_kind) omp_atv_uncontended
integer (omp_alloctrait_val_kind) omp_atv_serialized
integer (omp_alloctrait_val_kind) omp_atv_sequential
integer (omp_alloctrait_val_kind) omp_atv_private
integer (omp_alloctrait_val_kind) omp_atv_all
integer (omp_alloctrait_val_kind) omp_atv_thread
integer (omp_alloctrait_val_kind) omp_atv_pteam
integer (omp_alloctrait_val_kind) omp_atv_cgroup
integer (omp_alloctrait_val_kind) omp_atv_default_mem_fb
integer (omp_alloctrait_val_kind) omp_atv_null_fb
integer (omp_alloctrait_val_kind) omp_atv_abort_fb
integer (omp_alloctrait_val_kind) omp_atv_allocator_fb
integer (omp_alloctrait_val_kind) omp_atv_environment
integer (omp_alloctrait_val_kind) omp_atv_nearest
integer (omp_alloctrait_val_kind) omp_atv_blocked
integer (omp_alloctrait_val_kind) omp_atv_interleaved
parameter (omp_atv_default = -1)
parameter (omp_atv_false = 0)
parameter (omp_atv_true = 1)
parameter (omp_atv_contended = 3)
parameter (omp_atv_uncontended = 4)
parameter (omp_atv_serialized = 5)
parameter (omp_atv_sequential = omp_atv_serialized)
parameter (omp_atv_private = 6)
parameter (omp_atv_all = 7)
parameter (omp_atv_thread = 8)
parameter (omp_atv_pteam = 9)
parameter (omp_atv_cgroup = 10)
parameter (omp_atv_default_mem_fb = 11)
parameter (omp_atv_null_fb = 12)
parameter (omp_atv_abort_fb = 13)
parameter (omp_atv_allocator_fb = 14)
parameter (omp_atv_environment = 15)
parameter (omp_atv_nearest = 16)
parameter (omp_atv_blocked = 17)
parameter (omp_atv_interleaved = 18)
integer (omp_allocator_handle_kind) omp_null_allocator
integer (omp_allocator_handle_kind) omp_default_mem_alloc
integer (omp_allocator_handle_kind) omp_large_cap_mem_alloc
integer (omp_allocator_handle_kind) omp_const_mem_alloc
integer (omp_allocator_handle_kind) omp_high_bw_mem_alloc
integer (omp_allocator_handle_kind) omp_low_lat_mem_alloc
integer (omp_allocator_handle_kind) omp_cgroup_mem_alloc
integer (omp_allocator_handle_kind) omp_pteam_mem_alloc
integer (omp_allocator_handle_kind) omp_thread_mem_alloc
parameter (omp_null_allocator = 0)
parameter (omp_default_mem_alloc = 1)
parameter (omp_large_cap_mem_alloc = 2)
parameter (omp_const_mem_alloc = 3)
parameter (omp_high_bw_mem_alloc = 4)
parameter (omp_low_lat_mem_alloc = 5)
parameter (omp_cgroup_mem_alloc = 6)
parameter (omp_pteam_mem_alloc = 7)
parameter (omp_thread_mem_alloc = 8)
integer (omp_memspace_handle_kind) omp_default_mem_space
integer (omp_memspace_handle_kind) omp_large_cap_mem_space
integer (omp_memspace_handle_kind) omp_const_mem_space
integer (omp_memspace_handle_kind) omp_high_bw_mem_space
integer (omp_memspace_handle_kind) omp_low_lat_mem_space
parameter (omp_default_mem_space = 0)
parameter (omp_large_cap_mem_space = 1)
parameter (omp_const_mem_space = 2)
parameter (omp_high_bw_mem_space = 3)
parameter (omp_low_lat_mem_space = 4)
type omp_alloctrait
integer (omp_alloctrait_key_kind) key
integer (omp_alloctrait_val_kind) value
end type omp_alloctrait
external omp_init_lock, omp_init_nest_lock
external omp_init_lock_with_hint
external omp_init_nest_lock_with_hint
external omp_destroy_lock, omp_destroy_nest_lock
external omp_set_lock, omp_set_nest_lock
external omp_unset_lock, omp_unset_nest_lock
external omp_set_dynamic, omp_set_nested
external omp_set_num_threads
external omp_get_dynamic, omp_get_nested
logical(4) omp_get_dynamic, omp_get_nested
external omp_test_lock, omp_in_parallel
logical(4) omp_test_lock, omp_in_parallel
external omp_get_max_threads, omp_get_num_procs
integer(4) omp_get_max_threads, omp_get_num_procs
external omp_get_num_threads, omp_get_thread_num
integer(4) omp_get_num_threads, omp_get_thread_num
external omp_test_nest_lock
integer(4) omp_test_nest_lock
external omp_get_wtick, omp_get_wtime
double precision omp_get_wtick, omp_get_wtime
external omp_set_schedule, omp_get_schedule
external omp_get_thread_limit, omp_set_max_active_levels
external omp_get_max_active_levels, omp_get_level
external omp_get_ancestor_thread_num, omp_get_team_size
external omp_get_active_level
external omp_get_supported_active_levels
integer(4) omp_get_thread_limit, omp_get_max_active_levels
integer(4) omp_get_level, omp_get_ancestor_thread_num
integer(4) omp_get_team_size, omp_get_active_level
integer(4) omp_get_supported_active_levels
external omp_in_final
logical(4) omp_in_final
external omp_get_cancellation
logical(4) omp_get_cancellation
external omp_get_proc_bind
integer(omp_proc_bind_kind) omp_get_proc_bind
integer(4) omp_get_num_places
external omp_get_num_places
integer(4) omp_get_place_num_procs
external omp_get_place_num_procs
external omp_get_place_proc_ids
integer(4) omp_get_place_num
external omp_get_place_num
integer(4) omp_get_partition_num_places
external omp_get_partition_num_places
external omp_get_partition_place_nums
external omp_set_default_device, omp_get_default_device
external omp_get_num_devices, omp_get_num_teams
external omp_get_team_num
integer(4) omp_get_default_device, omp_get_num_devices
integer(4) omp_get_num_teams, omp_get_team_num
external omp_is_initial_device
logical(4) omp_is_initial_device
external omp_get_initial_device
integer(4) omp_get_initial_device
external omp_get_device_num
integer(4) omp_get_device_num
external omp_get_max_task_priority
integer(4) omp_get_max_task_priority
external omp_fulfill_event
external omp_set_affinity_format, omp_get_affinity_format
external omp_display_affinity, omp_capture_affinity
integer(4) omp_get_affinity_format
integer(4) omp_capture_affinity
external omp_pause_resource, omp_pause_resource_all
integer(4) omp_pause_resource
integer(4) omp_pause_resource_all
external omp_init_allocator
integer (omp_allocator_handle_kind) omp_init_allocator
external omp_destroy_allocator
external omp_set_default_allocator
external omp_get_default_allocator
integer (omp_allocator_handle_kind) omp_get_default_allocator
external omp_display_env
Reference in New Issue View Git Blame Copy Permalink