Skip to content
Snippets Groups Projects
  • Kwok Cheung Yeung's avatar
    a6d22fb2
    openmp: Add support for the OpenMP 5.0 task detach clause · a6d22fb2
    Kwok Cheung Yeung authored
    2021-01-16  Kwok Cheung Yeung  <kcy@codesourcery.com>
    
    	gcc/
    	* builtin-types.def
    	(BT_FN_VOID_OMPFN_PTR_OMPCPYFN_LONG_LONG_BOOL_UINT_PTR_INT): Rename
    	to...
    	(BT_FN_VOID_OMPFN_PTR_OMPCPYFN_LONG_LONG_BOOL_UINT_PTR_INT_PTR):
    	...this.  Add extra argument.
    	* gimplify.c (omp_default_clause): Ensure that event handle is
    	firstprivate in a task region.
    	(gimplify_scan_omp_clauses): Handle OMP_CLAUSE_DETACH.
    	(gimplify_adjust_omp_clauses): Likewise.
    	* omp-builtins.def (BUILT_IN_GOMP_TASK): Change function type to
    	BT_FN_VOID_OMPFN_PTR_OMPCPYFN_LONG_LONG_BOOL_UINT_PTR_INT_PTR.
    	* omp-expand.c (expand_task_call): Add GOMP_TASK_FLAG_DETACH to flags
    	if detach clause specified.  Add detach argument when generating
    	call to	GOMP_task.
    	* omp-low.c (scan_sharing_clauses): Setup data environment for detach
    	clause.
    	(finish_taskreg_scan): Move field for variable containing the event
    	handle to the front of the struct.
    	* tree-core.h (enum omp_clause_code): Add OMP_CLAUSE_DETACH.  Fix
    	ordering.
    	* tree-nested.c (convert_nonlocal_omp_clauses): Handle
    	OMP_CLAUSE_DETACH clause.
    	(convert_local_omp_clauses): Handle OMP_CLAUSE_DETACH clause.
    	* tree-pretty-print.c (dump_omp_clause): Handle OMP_CLAUSE_DETACH.
    	* tree.c (omp_clause_num_ops): Add entry for OMP_CLAUSE_DETACH.
    	Fix ordering.
    	(omp_clause_code_name): Add entry for OMP_CLAUSE_DETACH.  Fix
    	ordering.
    	(walk_tree_1): Handle OMP_CLAUSE_DETACH.
    
    	gcc/c-family/
    	* c-pragma.h (pragma_omp_clause): Add PRAGMA_OMP_CLAUSE_DETACH.
    	Redefine PRAGMA_OACC_CLAUSE_DETACH.
    
    	gcc/c/
    	* c-parser.c (c_parser_omp_clause_detach): New.
    	(c_parser_omp_all_clauses): Handle PRAGMA_OMP_CLAUSE_DETACH clause.
    	(OMP_TASK_CLAUSE_MASK): Add mask for PRAGMA_OMP_CLAUSE_DETACH.
    	* c-typeck.c (c_finish_omp_clauses): Handle PRAGMA_OMP_CLAUSE_DETACH
    	clause.  Prevent use of detach with mergeable and overriding the
    	data sharing mode of the event handle.
    
    	gcc/cp/
    	* parser.c (cp_parser_omp_clause_detach): New.
    	(cp_parser_omp_all_clauses): Handle PRAGMA_OMP_CLAUSE_DETACH.
    	(OMP_TASK_CLAUSE_MASK): Add mask for PRAGMA_OMP_CLAUSE_DETACH.
    	* pt.c (tsubst_omp_clauses): Handle OMP_CLAUSE_DETACH clause.
    	* semantics.c (finish_omp_clauses): Handle OMP_CLAUSE_DETACH clause.
    	Prevent use of detach with mergeable and overriding the	data sharing
    	mode of the event handle.
    
    	gcc/fortran/
    	* dump-parse-tree.c (show_omp_clauses): Handle detach clause.
    	* frontend-passes.c (gfc_code_walker): Walk detach expression.
    	* gfortran.h (struct gfc_omp_clauses): Add detach field.
    	(gfc_c_intptr_kind): New.
    	* openmp.c (gfc_free_omp_clauses): Free detach clause.
    	(gfc_match_omp_detach): New.
    	(enum omp_mask1): Add OMP_CLAUSE_DETACH.
    	(enum omp_mask2): Remove OMP_CLAUSE_DETACH.
    	(gfc_match_omp_clauses): Handle OMP_CLAUSE_DETACH for OpenMP.
    	(OMP_TASK_CLAUSES): Add OMP_CLAUSE_DETACH.
    	(resolve_omp_clauses): Prevent use of detach with mergeable and
    	overriding the data sharing mode of the event handle.
    	* trans-openmp.c (gfc_trans_omp_clauses): Handle detach clause.
    	* trans-types.c (gfc_c_intptr_kind): New.
    	(gfc_init_kinds): Initialize gfc_c_intptr_kind.
    	* types.def
    	(BT_FN_VOID_OMPFN_PTR_OMPCPYFN_LONG_LONG_BOOL_UINT_PTR_INT): Rename
    	to...
    	(BT_FN_VOID_OMPFN_PTR_OMPCPYFN_LONG_LONG_BOOL_UINT_PTR_INT_PTR):
    	...this.  Add extra argument.
    
    	gcc/testsuite/
    	* c-c++-common/gomp/task-detach-1.c: New.
    	* g++.dg/gomp/task-detach-1.C: New.
    	* gcc.dg/gomp/task-detach-1.c: New.
    	* gfortran.dg/gomp/task-detach-1.f90: New.
    
    	include/
    	* gomp-constants.h (GOMP_TASK_FLAG_DETACH): New.
    
    	libgomp/
    	* fortran.c (omp_fulfill_event_): New.
    	* libgomp.h (struct gomp_task): Add detach and completion_sem fields.
    	(struct gomp_team): Add task_detach_queue and task_detach_count
    	fields.
    	* libgomp.map (OMP_5.0.1): Add omp_fulfill_event and omp_fulfill_event_.
    	* libgomp_g.h (GOMP_task): Add extra argument.
    	* omp.h.in (enum omp_event_handle_t): New.
    	(omp_fulfill_event): New.
    	* omp_lib.f90.in (omp_event_handle_kind): New.
    	(omp_fulfill_event): New.
    	* omp_lib.h.in (omp_event_handle_kind): New.
    	(omp_fulfill_event): Declare.
    	* priority_queue.c (priority_tree_find): New.
    	(priority_list_find): New.
    	(priority_queue_find): New.
    	* priority_queue.h (priority_queue_predicate): New.
    	(priority_queue_find): New.
    	* task.c (gomp_init_task): Initialize detach field.
    	(task_fulfilled_p): New.
    	(GOMP_task): Add detach argument.  Ignore detach argument if
    	GOMP_TASK_FLAG_DETACH not set in flags.  Initialize completion_sem
    	field.	Copy address of completion_sem into detach argument and
    	into the start of the data record.  Wait for detach event if task
    	not deferred.
    	(gomp_barrier_handle_tasks): Queue tasks with unfulfilled events.
    	Remove completed tasks and requeue dependent tasks.
    	(omp_fulfill_event): New.
    	* team.c (gomp_new_team): Initialize task_detach_queue and
    	task_detach_count fields.
    	(free_team): Free task_detach_queue field.
    	* testsuite/libgomp.c-c++-common/task-detach-1.c: New testcase.
    	* testsuite/libgomp.c-c++-common/task-detach-2.c: New testcase.
    	* testsuite/libgomp.c-c++-common/task-detach-3.c: New testcase.
    	* testsuite/libgomp.c-c++-common/task-detach-4.c: New testcase.
    	* testsuite/libgomp.c-c++-common/task-detach-5.c: New testcase.
    	* testsuite/libgomp.c-c++-common/task-detach-6.c: New testcase.
    	* testsuite/libgomp.fortran/task-detach-1.f90: New testcase.
    	* testsuite/libgomp.fortran/task-detach-2.f90: New testcase.
    	* testsuite/libgomp.fortran/task-detach-3.f90: New testcase.
    	* testsuite/libgomp.fortran/task-detach-4.f90: New testcase.
    	* testsuite/libgomp.fortran/task-detach-5.f90: New testcase.
    	* testsuite/libgomp.fortran/task-detach-6.f90: New testcase.
    a6d22fb2
    History
    openmp: Add support for the OpenMP 5.0 task detach clause
    Kwok Cheung Yeung authored
    2021-01-16  Kwok Cheung Yeung  <kcy@codesourcery.com>
    
    	gcc/
    	* builtin-types.def
    	(BT_FN_VOID_OMPFN_PTR_OMPCPYFN_LONG_LONG_BOOL_UINT_PTR_INT): Rename
    	to...
    	(BT_FN_VOID_OMPFN_PTR_OMPCPYFN_LONG_LONG_BOOL_UINT_PTR_INT_PTR):
    	...this.  Add extra argument.
    	* gimplify.c (omp_default_clause): Ensure that event handle is
    	firstprivate in a task region.
    	(gimplify_scan_omp_clauses): Handle OMP_CLAUSE_DETACH.
    	(gimplify_adjust_omp_clauses): Likewise.
    	* omp-builtins.def (BUILT_IN_GOMP_TASK): Change function type to
    	BT_FN_VOID_OMPFN_PTR_OMPCPYFN_LONG_LONG_BOOL_UINT_PTR_INT_PTR.
    	* omp-expand.c (expand_task_call): Add GOMP_TASK_FLAG_DETACH to flags
    	if detach clause specified.  Add detach argument when generating
    	call to	GOMP_task.
    	* omp-low.c (scan_sharing_clauses): Setup data environment for detach
    	clause.
    	(finish_taskreg_scan): Move field for variable containing the event
    	handle to the front of the struct.
    	* tree-core.h (enum omp_clause_code): Add OMP_CLAUSE_DETACH.  Fix
    	ordering.
    	* tree-nested.c (convert_nonlocal_omp_clauses): Handle
    	OMP_CLAUSE_DETACH clause.
    	(convert_local_omp_clauses): Handle OMP_CLAUSE_DETACH clause.
    	* tree-pretty-print.c (dump_omp_clause): Handle OMP_CLAUSE_DETACH.
    	* tree.c (omp_clause_num_ops): Add entry for OMP_CLAUSE_DETACH.
    	Fix ordering.
    	(omp_clause_code_name): Add entry for OMP_CLAUSE_DETACH.  Fix
    	ordering.
    	(walk_tree_1): Handle OMP_CLAUSE_DETACH.
    
    	gcc/c-family/
    	* c-pragma.h (pragma_omp_clause): Add PRAGMA_OMP_CLAUSE_DETACH.
    	Redefine PRAGMA_OACC_CLAUSE_DETACH.
    
    	gcc/c/
    	* c-parser.c (c_parser_omp_clause_detach): New.
    	(c_parser_omp_all_clauses): Handle PRAGMA_OMP_CLAUSE_DETACH clause.
    	(OMP_TASK_CLAUSE_MASK): Add mask for PRAGMA_OMP_CLAUSE_DETACH.
    	* c-typeck.c (c_finish_omp_clauses): Handle PRAGMA_OMP_CLAUSE_DETACH
    	clause.  Prevent use of detach with mergeable and overriding the
    	data sharing mode of the event handle.
    
    	gcc/cp/
    	* parser.c (cp_parser_omp_clause_detach): New.
    	(cp_parser_omp_all_clauses): Handle PRAGMA_OMP_CLAUSE_DETACH.
    	(OMP_TASK_CLAUSE_MASK): Add mask for PRAGMA_OMP_CLAUSE_DETACH.
    	* pt.c (tsubst_omp_clauses): Handle OMP_CLAUSE_DETACH clause.
    	* semantics.c (finish_omp_clauses): Handle OMP_CLAUSE_DETACH clause.
    	Prevent use of detach with mergeable and overriding the	data sharing
    	mode of the event handle.
    
    	gcc/fortran/
    	* dump-parse-tree.c (show_omp_clauses): Handle detach clause.
    	* frontend-passes.c (gfc_code_walker): Walk detach expression.
    	* gfortran.h (struct gfc_omp_clauses): Add detach field.
    	(gfc_c_intptr_kind): New.
    	* openmp.c (gfc_free_omp_clauses): Free detach clause.
    	(gfc_match_omp_detach): New.
    	(enum omp_mask1): Add OMP_CLAUSE_DETACH.
    	(enum omp_mask2): Remove OMP_CLAUSE_DETACH.
    	(gfc_match_omp_clauses): Handle OMP_CLAUSE_DETACH for OpenMP.
    	(OMP_TASK_CLAUSES): Add OMP_CLAUSE_DETACH.
    	(resolve_omp_clauses): Prevent use of detach with mergeable and
    	overriding the data sharing mode of the event handle.
    	* trans-openmp.c (gfc_trans_omp_clauses): Handle detach clause.
    	* trans-types.c (gfc_c_intptr_kind): New.
    	(gfc_init_kinds): Initialize gfc_c_intptr_kind.
    	* types.def
    	(BT_FN_VOID_OMPFN_PTR_OMPCPYFN_LONG_LONG_BOOL_UINT_PTR_INT): Rename
    	to...
    	(BT_FN_VOID_OMPFN_PTR_OMPCPYFN_LONG_LONG_BOOL_UINT_PTR_INT_PTR):
    	...this.  Add extra argument.
    
    	gcc/testsuite/
    	* c-c++-common/gomp/task-detach-1.c: New.
    	* g++.dg/gomp/task-detach-1.C: New.
    	* gcc.dg/gomp/task-detach-1.c: New.
    	* gfortran.dg/gomp/task-detach-1.f90: New.
    
    	include/
    	* gomp-constants.h (GOMP_TASK_FLAG_DETACH): New.
    
    	libgomp/
    	* fortran.c (omp_fulfill_event_): New.
    	* libgomp.h (struct gomp_task): Add detach and completion_sem fields.
    	(struct gomp_team): Add task_detach_queue and task_detach_count
    	fields.
    	* libgomp.map (OMP_5.0.1): Add omp_fulfill_event and omp_fulfill_event_.
    	* libgomp_g.h (GOMP_task): Add extra argument.
    	* omp.h.in (enum omp_event_handle_t): New.
    	(omp_fulfill_event): New.
    	* omp_lib.f90.in (omp_event_handle_kind): New.
    	(omp_fulfill_event): New.
    	* omp_lib.h.in (omp_event_handle_kind): New.
    	(omp_fulfill_event): Declare.
    	* priority_queue.c (priority_tree_find): New.
    	(priority_list_find): New.
    	(priority_queue_find): New.
    	* priority_queue.h (priority_queue_predicate): New.
    	(priority_queue_find): New.
    	* task.c (gomp_init_task): Initialize detach field.
    	(task_fulfilled_p): New.
    	(GOMP_task): Add detach argument.  Ignore detach argument if
    	GOMP_TASK_FLAG_DETACH not set in flags.  Initialize completion_sem
    	field.	Copy address of completion_sem into detach argument and
    	into the start of the data record.  Wait for detach event if task
    	not deferred.
    	(gomp_barrier_handle_tasks): Queue tasks with unfulfilled events.
    	Remove completed tasks and requeue dependent tasks.
    	(omp_fulfill_event): New.
    	* team.c (gomp_new_team): Initialize task_detach_queue and
    	task_detach_count fields.
    	(free_team): Free task_detach_queue field.
    	* testsuite/libgomp.c-c++-common/task-detach-1.c: New testcase.
    	* testsuite/libgomp.c-c++-common/task-detach-2.c: New testcase.
    	* testsuite/libgomp.c-c++-common/task-detach-3.c: New testcase.
    	* testsuite/libgomp.c-c++-common/task-detach-4.c: New testcase.
    	* testsuite/libgomp.c-c++-common/task-detach-5.c: New testcase.
    	* testsuite/libgomp.c-c++-common/task-detach-6.c: New testcase.
    	* testsuite/libgomp.fortran/task-detach-1.f90: New testcase.
    	* testsuite/libgomp.fortran/task-detach-2.f90: New testcase.
    	* testsuite/libgomp.fortran/task-detach-3.f90: New testcase.
    	* testsuite/libgomp.fortran/task-detach-4.f90: New testcase.
    	* testsuite/libgomp.fortran/task-detach-5.f90: New testcase.
    	* testsuite/libgomp.fortran/task-detach-6.f90: New testcase.