829c6349e9
gcc/c-family/
* c-pragma.h (enum pragma_omp_clause): Add
PRAGMA_OACC_CLAUSE_{FINALIZE,IF_PRESENT}. Remove
PRAGMA_OACC_CLAUSE_PRESENT_OR_{COPY,COPYIN,COPYOUT,CREATE}.
gcc/c/
* c-parser.c (c_parser_omp_clause_name): Add support for finalize
and if_present. Make present_or_{copy,copyin,copyout,create} aliases
to their non-present_or_* counterparts. Make 'self' an alias to
PRAGMA_OACC_CLAUSE_HOST.
(c_parser_oacc_data_clause): Update GOMP mappings for
PRAGMA_OACC_CLAUSE_{COPY,COPYIN,COPYOUT,CREATE,DELETE}. Remove
PRAGMA_OACC_CLAUSE_{SELF,PRESENT_OR_*}.
(c_parser_oacc_all_clauses): Handle finalize and if_present clauses.
Remove support for present_or_* clauses.
(OACC_KERNELS_CLAUSE_MASK): Remove PRESENT_OR_* clauses.
(OACC_PARALLEL_CLAUSE_MASK): Likewise.
(OACC_DECLARE_CLAUSE_MASK): Likewise.
(OACC_DATA_CLAUSE_MASK): Likewise.
(OACC_ENTER_DATA_CLAUSE_MASK): Remove PRESENT_OR_* clauses.
(OACC_EXIT_DATA_CLAUSE_MASK): Add FINALIZE clause.
(OACC_UPDATE_CLAUSE_MASK): Remove SELF, add IF_PRESENT.
(c_parser_oacc_declare): Remove PRESENT_OR_* clauses.
* c-typeck.c (c_finish_omp_clauses): Handle IF_PRESENT and FINALIZE.
gcc/cp/
* parser.c (cp_parser_omp_clause_name): Add support for finalize
and if_present. Make present_or_{copy,copyin,copyout,create} aliases
to their non-present_or_* counterparts. Make 'self' an alias to
PRAGMA_OACC_CLAUSE_HOST.
(cp_parser_oacc_data_clause): Update GOMP mappings for
PRAGMA_OACC_CLAUSE_{COPY,COPYIN,COPYOUT,CREATE,DELETE}. Remove
PRAGMA_OACC_CLAUSE_{SELF,PRESENT_OR_*}.
(cp_parser_oacc_all_clauses): Handle finalize and if_present clauses.
Remove support for present_or_* clauses.
(OACC_KERNELS_CLAUSE_MASK): Remove PRESENT_OR_* clauses.
(OACC_PARALLEL_CLAUSE_MASK): Likewise.
(OACC_DECLARE_CLAUSE_MASK): Likewise.
(OACC_DATA_CLAUSE_MASK): Likewise.
(OACC_ENTER_DATA_CLAUSE_MASK): Remove PRESENT_OR_* clauses.
(OACC_EXIT_DATA_CLAUSE_MASK): Add FINALIZE clause.
(OACC_UPDATE_CLAUSE_MASK): Remove SELF, add IF_PRESENT.
(cp_parser_oacc_declare): Remove PRESENT_OR_* clauses.
* pt.c (tsubst_omp_clauses): Handle IF_PRESENT and FINALIZE.
* semantics.c (finish_omp_clauses): Handle IF_PRESENT and FINALIZE.
gcc/fortran/
* gfortran.h (gfc_omp_clauses): Add unsigned if_present, finalize
bitfields.
* openmp.c (enum omp_mask2): Remove OMP_CLAUSE_PRESENT_OR_*. Add
OMP_CLAUSE_{IF_PRESENT,FINALIZE}.
(gfc_match_omp_clauses): Update handling of copy, copyin, copyout,
create, deviceptr, present_of_*. Add support for finalize and
if_present.
(OACC_PARALLEL_CLAUSES): Remove PRESENT_OR_* clauses.
(OACC_KERNELS_CLAUSES): Likewise.
(OACC_DATA_CLAUSES): Likewise.
(OACC_DECLARE_CLAUSES): Likewise.
(OACC_UPDATE_CLAUSES): Add IF_PRESENT clause.
(OACC_ENTER_DATA_CLAUSES): Remove PRESENT_OR_* clauses.
(OACC_EXIT_DATA_CLAUSES): Add FINALIZE clause.
(gfc_match_oacc_declare): Update to OpenACC 2.5 semantics.
* trans-openmp.c (gfc_trans_omp_clauses): Add support for IF_PRESENT
and FINALIZE.
gcc/
* gimplify.c (gimplify_scan_omp_clauses): Add support for
OMP_CLAUSE_{IF_PRESENT,FINALIZE}.
(gimplify_adjust_omp_clauses): Likewise.
(gimplify_oacc_declare_1): Add support for GOMP_MAP_RELEASE, remove
support for GOMP_MAP_FORCE_{ALLOC,TO,FROM,TOFROM}.
(gimplify_omp_target_update): Update handling of acc update and
enter/exit data.
* omp-low.c (install_var_field): Remove unused parameter
base_pointers_restrict.
(scan_sharing_clauses): Remove base_pointers_restrict parameter.
Update call to install_var_field. Handle OMP_CLAUSE_{IF_PRESENT,
FINALIZE}
(omp_target_base_pointers_restrict_p): Delete.
(scan_omp_target): Update call to scan_sharing_clauses.
* tree-core.h (enum omp_clause_code): Add OMP_CLAUSE_{IF_PRESENT,
FINALIZE}.
* tree-nested.c (convert_nonlocal_omp_clauses): Handle
OMP_CLAUSE_{IF_PRESENT,FINALIZE}.
(convert_local_omp_clauses): Likewise.
* tree-pretty-print.c (dump_omp_clause): Likewise.
* tree.c (omp_clause_num_ops): Add entries for OMP_CLAUSE_{IF_PRESENT,
FINALIZE}.
(omp_clause_code_name): Likewise.
gcc/testsuite/
* c-c++-common/goacc/declare-1.c: Update test case to utilize OpenACC
2.5 data clause semantics.
* c-c++-common/goacc/declare-2.c: Likewise.
* c-c++-common/goacc/default-4.c: Likewise.
* c-c++-common/goacc/finalize-1.c: New test.
* c-c++-common/goacc/kernels-alias-2.c: Update test case to utilize
OpenACC 2.5 data clause semantics.
* c-c++-common/goacc/kernels-alias.c: Likewise.
* c-c++-common/goacc/routine-5.c: Likewise.
* c-c++-common/goacc/update-if_present-1.c: New test.
* c-c++-common/goacc/update-if_present-2.c: New test.
* g++.dg/goacc/template.C: Update test case to utilize OpenACC
2.5 data clause semantics.
* gfortran.dg/goacc/combined-directives.f90: Likewise.
* gfortran.dg/goacc/data-tree.f95: Likewise.
* gfortran.dg/goacc/declare-2.f95: Likewise.
* gfortran.dg/goacc/default-4.f: Likewise.
* gfortran.dg/goacc/enter-exit-data.f95: Likewise.
* gfortran.dg/goacc/finalize-1.f: New test.
* gfortran.dg/goacc/kernels-alias-2.f95: Update test case to utilize
OpenACC 2.5 data clause semantics.
* gfortran.dg/goacc/kernels-alias.f95: Likewise.
* gfortran.dg/goacc/kernels-tree.f95: Likewise.
* gfortran.dg/goacc/nested-function-1.f90: Likewise.
* gfortran.dg/goacc/parallel-tree.f95: Likewise.
* gfortran.dg/goacc/reduction-promotions.f90: Likewise.
* gfortran.dg/goacc/update-if_present-1.f90: New test.
* gfortran.dg/goacc/update-if_present-2.f90: New test.
libgomp/
* libgomp.h (struct splay_tree_key_s): Add dynamic_refcount member.
(gomp_acc_remove_pointer): Update declaration.
(gomp_acc_declare_allocate): Declare.
(gomp_remove_var): Declare.
* libgomp.map (OACC_2.5): Define.
* oacc-mem.c (acc_map_data): Update refcount.
(acc_unmap_data): Likewise.
(present_create_copy): Likewise.
(acc_create): Add FLAG_PRESENT when calling present_create_copy.
(acc_copyin): Likewise.
(FLAG_FINALIZE): Define.
(delete_copyout): Update dynamic refcounts, add support for FINALIZE.
(acc_delete_finalize): New function.
(acc_delete_finalize_async): New function.
(acc_copyout_finalize): New function.
(acc_copyout_finalize_async): New function.
(gomp_acc_insert_pointer): Update refcounts.
(gomp_acc_remove_pointer): Return if data is not present on the
accelerator.
* oacc-parallel.c (find_pset): Rename to find_pointer.
(find_pointer): Add support for GOMP_MAP_POINTER.
(handle_ftn_pointers): New function.
(GOACC_parallel_keyed): Update refcounts of variables.
(GOACC_enter_exit_data): Add support for finalized data mappings.
Add support for GOMP_MAP_{TO,ALLOC,RELESE,FROM}. Update handling
of fortran arrays.
(GOACC_update): Add support for GOMP_MAP_{ALWAYS_POINTER,TO,FROM}.
(GOACC_declare): Add support for GOMP_MAP_RELEASE, remove support
for GOMP_MAP_FORCE_FROM.
* openacc.f90 (module openacc_internal): Add
acc_copyout_finalize_{32_h,64_h,array_h,_l}, and
acc_delete_finalize_{32_h,64_h,array_h,_l}. Add interfaces for
acc_copyout_finalize and acc_delete_finalize.
(acc_copyout_finalize_32_h): New subroutine.
(acc_copyout_finalize_64_h): New subroutine.
(acc_copyout_finalize_array_h): New subroutine.
(acc_delete_finalize_32_h): New subroutine.
(acc_delete_finalize_64_h): New subroutine.
(acc_delete_finalize_array_h): New subroutine.
* openacc.h (acc_copyout_finalize): Declare.
(acc_copyout_finalize_async): Declare.
(acc_delete_finalize): Declare.
(acc_delete_finalize_async): Declare.
* openacc_lib.h (acc_copyout_finalize): New interface.
(acc_delete_finalize): New interface.
* target.c (gomp_map_vars): Update dynamic_refcount.
(gomp_remove_var): New function.
(gomp_unmap_vars): Use it.
(gomp_unload_image_from_device): Likewise.
* testsuite/libgomp.oacc-c-c++-common/data-already-1.c: Update test
case to utilize OpenACC 2.5 data clause semantics.
* testsuite/libgomp.oacc-c-c++-common/data-already-2.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/data-already-3.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/data-already-4.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/data-already-5.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/data-already-6.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/data-already-7.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/data-already-8.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/lib-16.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/lib-25.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/lib-32.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/lib-83.c: Likewise.
* testsuite/libgomp.oacc-fortran/data-5.f90: New test.
* testsuite/libgomp.oacc-fortran/data-already-1.f: Update test case to
utilize OpenACC 2.5 data clause semantics.
* testsuite/libgomp.oacc-fortran/data-already-2.f: Likewise.
* testsuite/libgomp.oacc-fortran/data-already-3.f: Likewise.
* testsuite/libgomp.oacc-fortran/data-already-4.f: Likewise.
* testsuite/libgomp.oacc-fortran/data-already-5.f: Likewise.
* testsuite/libgomp.oacc-fortran/data-already-6.f: Likewise.
* testsuite/libgomp.oacc-fortran/data-already-7.f: Likewise.
* testsuite/libgomp.oacc-fortran/data-already-8.f: Likewise.
* testsuite/libgomp.oacc-fortran/lib-32-1.f: Likewise.
* testsuite/libgomp.oacc-fortran/lib-32-2.f: Likewise.
Co-Authored-By: Cesar Philippidis <cesar@codesourcery.com>
Co-Authored-By: Thomas Schwinge <thomas@codesourcery.com>
From-SVN: r261813
137 lines
4.9 KiB
C++
137 lines
4.9 KiB
C++
/* OpenACC Runtime Library User-facing Declarations
|
|
|
|
Copyright (C) 2013-2018 Free Software Foundation, Inc.
|
|
|
|
Contributed by Mentor Embedded.
|
|
|
|
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/>. */
|
|
|
|
#ifndef _OPENACC_H
|
|
#define _OPENACC_H 1
|
|
|
|
/* The OpenACC standard is silent on whether or not including <openacc.h>
|
|
might or must not include other header files. We chose to include
|
|
some. */
|
|
#include <stddef.h>
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#if __cplusplus >= 201103
|
|
# define __GOACC_NOTHROW noexcept
|
|
#elif __cplusplus
|
|
# define __GOACC_NOTHROW throw ()
|
|
#else /* Not C++ */
|
|
# define __GOACC_NOTHROW __attribute__ ((__nothrow__))
|
|
#endif
|
|
|
|
/* Types */
|
|
typedef enum acc_device_t {
|
|
/* Keep in sync with include/gomp-constants.h. */
|
|
acc_device_none = 0,
|
|
acc_device_default = 1,
|
|
acc_device_host = 2,
|
|
/* acc_device_host_nonshm = 3 removed. */
|
|
acc_device_not_host = 4,
|
|
acc_device_nvidia = 5,
|
|
_ACC_device_hwm,
|
|
/* Ensure enumeration is layout compatible with int. */
|
|
_ACC_highest = __INT_MAX__,
|
|
_ACC_neg = -1
|
|
} acc_device_t;
|
|
|
|
typedef enum acc_async_t {
|
|
/* Keep in sync with include/gomp-constants.h. */
|
|
acc_async_noval = -1,
|
|
acc_async_sync = -2
|
|
} acc_async_t;
|
|
|
|
int acc_get_num_devices (acc_device_t) __GOACC_NOTHROW;
|
|
void acc_set_device_type (acc_device_t) __GOACC_NOTHROW;
|
|
acc_device_t acc_get_device_type (void) __GOACC_NOTHROW;
|
|
void acc_set_device_num (int, acc_device_t) __GOACC_NOTHROW;
|
|
int acc_get_device_num (acc_device_t) __GOACC_NOTHROW;
|
|
int acc_async_test (int) __GOACC_NOTHROW;
|
|
int acc_async_test_all (void) __GOACC_NOTHROW;
|
|
void acc_wait (int) __GOACC_NOTHROW;
|
|
void acc_async_wait (int) __GOACC_NOTHROW;
|
|
void acc_wait_async (int, int) __GOACC_NOTHROW;
|
|
void acc_wait_all (void) __GOACC_NOTHROW;
|
|
void acc_async_wait_all (void) __GOACC_NOTHROW;
|
|
void acc_wait_all_async (int) __GOACC_NOTHROW;
|
|
void acc_init (acc_device_t) __GOACC_NOTHROW;
|
|
void acc_shutdown (acc_device_t) __GOACC_NOTHROW;
|
|
#ifdef __cplusplus
|
|
int acc_on_device (int __arg) __GOACC_NOTHROW;
|
|
#else
|
|
int acc_on_device (acc_device_t __arg) __GOACC_NOTHROW;
|
|
#endif
|
|
void *acc_malloc (size_t) __GOACC_NOTHROW;
|
|
void acc_free (void *) __GOACC_NOTHROW;
|
|
/* Some of these would be more correct with const qualifiers, but
|
|
the standard specifies otherwise. */
|
|
void *acc_copyin (void *, size_t) __GOACC_NOTHROW;
|
|
void *acc_present_or_copyin (void *, size_t) __GOACC_NOTHROW;
|
|
void *acc_pcopyin (void *, size_t) __GOACC_NOTHROW;
|
|
void *acc_create (void *, size_t) __GOACC_NOTHROW;
|
|
void *acc_present_or_create (void *, size_t) __GOACC_NOTHROW;
|
|
void *acc_pcreate (void *, size_t) __GOACC_NOTHROW;
|
|
void acc_copyout (void *, size_t) __GOACC_NOTHROW;
|
|
void acc_delete (void *, size_t) __GOACC_NOTHROW;
|
|
void acc_update_device (void *, size_t) __GOACC_NOTHROW;
|
|
void acc_update_self (void *, size_t) __GOACC_NOTHROW;
|
|
void acc_map_data (void *, void *, size_t) __GOACC_NOTHROW;
|
|
void acc_unmap_data (void *) __GOACC_NOTHROW;
|
|
void *acc_deviceptr (void *) __GOACC_NOTHROW;
|
|
void *acc_hostptr (void *) __GOACC_NOTHROW;
|
|
int acc_is_present (void *, size_t) __GOACC_NOTHROW;
|
|
void acc_memcpy_to_device (void *, void *, size_t) __GOACC_NOTHROW;
|
|
void acc_memcpy_from_device (void *, void *, size_t) __GOACC_NOTHROW;
|
|
|
|
/* Finalize versions of copyout/delete functions, specified in OpenACC 2.5. */
|
|
void acc_copyout_finalize (void *, size_t) __GOACC_NOTHROW;
|
|
void acc_copyout_finalize_async (void *, size_t, int) __GOACC_NOTHROW;
|
|
void acc_delete_finalize (void *, size_t) __GOACC_NOTHROW;
|
|
void acc_delete_finalize_async (void *, size_t, int) __GOACC_NOTHROW;
|
|
|
|
/* CUDA-specific routines. */
|
|
void *acc_get_current_cuda_device (void) __GOACC_NOTHROW;
|
|
void *acc_get_current_cuda_context (void) __GOACC_NOTHROW;
|
|
void *acc_get_cuda_stream (int) __GOACC_NOTHROW;
|
|
int acc_set_cuda_stream (int, void *) __GOACC_NOTHROW;
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
|
|
/* Forwarding function with correctly typed arg. */
|
|
|
|
#pragma acc routine seq
|
|
inline int acc_on_device (acc_device_t __arg) __GOACC_NOTHROW
|
|
{
|
|
return acc_on_device ((int) __arg);
|
|
}
|
|
#endif
|
|
|
|
#endif /* _OPENACC_H */
|