3c9f5092c6
libgfortran/ChangeLog: 2016-09-19 Andre Vehreschild <vehre@gcc.gnu.org> * caf/libcaf.h: Add caf_reference_type. * caf/mpi.c: Adapted signature of caf_register(). * caf/single.c (struct caf_single_token): Added to keep the pointer to the memory registered and array descriptor. (caf_internal_error): Added convenience interface. (_gfortran_caf_register): Adapted to work with caf_single_token and return memory in the array descriptor. (_gfortran_caf_deregister): Same. (assign_char1_from_char4): Fixed style. (convert_type): Fixed incorrect conversion. (_gfortran_caf_get): Adapted to work with caf_single_token. (_gfortran_caf_send): Same. (_gfortran_caf_sendget): Same. (copy_data): Added to stop repeating it in all _by_ref functions. (get_for_ref): Recursive getting of coarray data using a chain of references. (_gfortran_caf_get_by_ref): Driver for computing the memory needed for the get and checking properties of the operation. (send_by_ref): Same as get_for_ref but for sending data. (_gfortran_caf_send_by_ref): Same like caf_get_by_ref but for sending. (_gfortran_caf_sendget_by_ref): Uses get_by_ref and send_by_ref to implement sendget for reference chains. (_gfortran_caf_atomic_define): Adapted to work with caf_single_token. (_gfortran_caf_atomic_ref): Likewise. (_gfortran_caf_atomic_cas): Likewise. (_gfortran_caf_atomic_op): Likewise. (_gfortran_caf_event_post): Likewise. (_gfortran_caf_event_wait): Likewise. (_gfortran_caf_event_query): Likewise. (_gfortran_caf_lock): Likewise. (_gfortran_caf_unlock): Likewise. gcc/testsuite/ChangeLog: 2016-09-19 Andre Vehreschild <vehre@gcc.gnu.org> * gfortran.dg/coarray/alloc_comp_4.f90: New test. * gfortran.dg/coarray_38.f90: * gfortran.dg/coarray_alloc_comp_1.f08: New test. * gfortran.dg/coarray_alloc_comp_2.f08: New test. * gfortran.dg/coarray_allocate_7.f08: New test. * gfortran.dg/coarray_allocate_8.f08: New test. * gfortran.dg/coarray_allocate_9.f08: New test. * gfortran.dg/coarray_lib_alloc_1.f90: Adapted scan-tree-dumps to expect new caf_register. * gfortran.dg/coarray_lib_alloc_2.f90: Same. * gfortran.dg/coarray_lib_alloc_3.f90: Same. * gfortran.dg/coarray_lib_comm_1.f90: Adapted scan-tree-dumps to expect get_by_refs. * gfortran.dg/coarray_lib_token_3.f90: Same as for coarray_lib_alloc2. * gfortran.dg/coarray_lock_7.f90: Same. * gfortran.dg/coarray_poly_5.f90: Same. * gfortran.dg/coarray_poly_6.f90: Same. * gfortran.dg/coarray_poly_7.f90: Same. * gfortran.dg/coarray_poly_8.f90: Same. * gfortran.dg/coindexed_1.f90: Changed errors expected. gcc/fortran/ChangeLog: 2016-09-19 Andre Vehreschild <vehre@gcc.gnu.org> * expr.c (gfc_check_assign): Added flag to control whether datatype conversion is allowed. * gfortran.h: Added caf-token-tree to gfc_component. Changed prototypes mostly to add whether datatype conversion is allowed. * gfortran.texi: Added documentation for the caf_reference_t and the caf_*_by_ref function. * primary.c (caf_variable_attr): Similar to gfc_variable_attr but focused on the needs of coarrays. (gfc_caf_attr): Same. * resolve.c (resolve_ordinary_assign): Set the conversion allowed flag when not in a coarray. * trans-array.c (gfc_array_init_size): Moved setting of array descriptor's datatype before the alloc, because caf_register needs it. (gfc_array_allocate): Changed notion of whether an array is a coarray. (gfc_array_deallocate): Same. (gfc_alloc_allocatable_for_assignment): Added setting of coarray's array descriptor datatype before the register. And using deregister/ register to mimmick a realloc for coarrays. * trans-decl.c (gfc_build_builtin_function_decls): Corrected signatures of old caf-functions and added signature definitions of the _by_ref ones. (generate_coarray_sym_init): Adapted to new caf_register signature. * trans-expr.c (gfc_conv_scalar_to_descriptor): Make sure a constant is translated to an lvalue expression before use in an array descriptor. (gfc_get_ultimate_alloc_ptr_comps_caf_token): New function. Get the last allocatable component's coarray token. (gfc_get_tree_for_caf_expr): For top-level object get the coarray token and check for unsupported features. (gfc_get_caf_token_offset): Getting the offset might procude new statements, which now are stored in the pre and post of the current se. (gfc_caf_get_image_index): For this image return a call to caf_this_image. (expr_may_alias_variables): Check that the result is set for testing its properties. (alloc_scalar_allocatable_for_assignment): Added auto allocation of coarray components. (gfc_trans_assignment_1): Rewrite an assign to a coarray object to be a sendget. * trans-intrinsic.c (conv_caf_vector_subscript_elem): Corrected wrong comment. (compute_component_offset): Compute the correct offset a structure member. (conv_expr_ref_to_caf_ref): Convert to a chain of refs into caf_references. (gfc_conv_intrinsic_caf_get): Call caf_get_by_ref instead of caf_get. (conv_caf_send): Call caf_*_by_ref for coarrays that need reallocation. (gfc_conv_intrinsic_function): Adapted to new signuature of the caf drivers. (conv_intrinsic_atomic_op): Add pre and post statements correctly. (conv_intrinsic_atomic_ref): Same. (conv_intrinsic_atomic_cas): Same. (conv_intrinsic_event_query): Same. * trans-stmt.c (gfc_trans_lock_unlock): Same. (gfc_trans_event_post_wait): Same. (gfc_trans_allocate): Support allocation of allocatable coarrays. (gfc_trans_deallocate): And there deallocation. * trans-types.c (gfc_typenode_for_spec): Added flag to control whether a component is part of coarray. When so, then add space to store a coarray token. (gfc_build_array_type): Same. (gfc_get_array_descriptor_base): Same. (gfc_get_array_type_bounds): Same. (gfc_sym_type): Same. (gfc_get_derived_type): Same. (gfc_get_caf_reference_type): Declare the caf_reference_type. * trans-types.h: Prototype changes only. * trans.c (gfc_allocate_using_lib): Use the updated caf_register signature. (gfc_allocate_allocatable): Same. (gfc_deallocate_with_status): Same. * trans.h: Defined the runtime types for caf_reference_t and the enums. From-SVN: r240231
236 lines
8.6 KiB
C
236 lines
8.6 KiB
C
/* Common declarations for all of GNU Fortran libcaf implementations.
|
|
Copyright (C) 2011-2016 Free Software Foundation, Inc.
|
|
Contributed by Tobias Burnus <burnus@net-b.de>
|
|
|
|
This file is part of the GNU Fortran Coarray Runtime Library (libcaf).
|
|
|
|
Libcaf 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.
|
|
|
|
Libcaf 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 LIBCAF_H
|
|
#define LIBCAF_H
|
|
|
|
#include <stdbool.h>
|
|
#include <stddef.h> /* For size_t. */
|
|
#include <stdint.h> /* For int32_t. */
|
|
|
|
#include "libgfortran.h"
|
|
|
|
#if 0
|
|
#ifndef __GNUC__
|
|
#define __attribute__(x)
|
|
#define likely(x) (x)
|
|
#define unlikely(x) (x)
|
|
#else
|
|
#define likely(x) __builtin_expect(!!(x), 1)
|
|
#define unlikely(x) __builtin_expect(!!(x), 0)
|
|
#endif
|
|
|
|
/* Definitions of the Fortran 2008 standard; need to kept in sync with
|
|
ISO_FORTRAN_ENV, cf. libgfortran.h. */
|
|
#define STAT_UNLOCKED 0
|
|
#define STAT_LOCKED 1
|
|
#define STAT_LOCKED_OTHER_IMAGE 2
|
|
#define STAT_STOPPED_IMAGE 6000
|
|
#endif
|
|
|
|
/* Describes what type of array we are registerring. Keep in sync with
|
|
gcc/fortran/trans.h. */
|
|
typedef enum caf_register_t {
|
|
CAF_REGTYPE_COARRAY_STATIC,
|
|
CAF_REGTYPE_COARRAY_ALLOC,
|
|
CAF_REGTYPE_LOCK_STATIC,
|
|
CAF_REGTYPE_LOCK_ALLOC,
|
|
CAF_REGTYPE_CRITICAL,
|
|
CAF_REGTYPE_EVENT_STATIC,
|
|
CAF_REGTYPE_EVENT_ALLOC
|
|
}
|
|
caf_register_t;
|
|
|
|
typedef void* caf_token_t;
|
|
typedef gfc_array_void gfc_descriptor_t;
|
|
|
|
/* Linked list of static coarrays registered. */
|
|
typedef struct caf_static_t {
|
|
caf_token_t token;
|
|
struct caf_static_t *prev;
|
|
}
|
|
caf_static_t;
|
|
|
|
/* When there is a vector subscript in this dimension, nvec == 0, otherwise,
|
|
lower_bound, upper_bound, stride contains the bounds relative to the declared
|
|
bounds; kind denotes the integer kind of the elements of vector[]. */
|
|
typedef struct caf_vector_t {
|
|
size_t nvec;
|
|
union {
|
|
struct {
|
|
void *vector;
|
|
int kind;
|
|
} v;
|
|
struct {
|
|
ptrdiff_t lower_bound, upper_bound, stride;
|
|
} triplet;
|
|
} u;
|
|
}
|
|
caf_vector_t;
|
|
|
|
typedef enum caf_ref_type_t {
|
|
/* Reference a component of a derived type, either regular one or an
|
|
allocatable or pointer type. For regular ones idx in caf_reference_t is
|
|
set to -1. */
|
|
CAF_REF_COMPONENT,
|
|
/* Reference an allocatable array. */
|
|
CAF_REF_ARRAY,
|
|
/* Reference a non-allocatable/non-pointer array. */
|
|
CAF_REF_STATIC_ARRAY
|
|
} caf_ref_type_t;
|
|
|
|
typedef enum caf_array_ref_t {
|
|
/* No array ref. This terminates the array ref. */
|
|
CAF_ARR_REF_NONE = 0,
|
|
/* Reference array elements given by a vector. Only for this mode
|
|
caf_reference_t.u.a.dim[i].v is valid. */
|
|
CAF_ARR_REF_VECTOR,
|
|
/* A full array ref (:). */
|
|
CAF_ARR_REF_FULL,
|
|
/* Reference a range on elements given by start, end and stride. */
|
|
CAF_ARR_REF_RANGE,
|
|
/* Only a single item is referenced given in the start member. */
|
|
CAF_ARR_REF_SINGLE,
|
|
/* An array ref of the kind (i:), where i is an arbitrary valid index in the
|
|
array. The index i is given in the start member. */
|
|
CAF_ARR_REF_OPEN_END,
|
|
/* An array ref of the kind (:i), where the lower bound of the array ref
|
|
is given by the remote side. The index i is given in the end member. */
|
|
CAF_ARR_REF_OPEN_START
|
|
} caf_array_ref_t;
|
|
|
|
/* References to remote components of a derived type. */
|
|
typedef struct caf_reference_t {
|
|
/* A pointer to the next ref or NULL. */
|
|
struct caf_reference_t *next;
|
|
/* The type of the reference. */
|
|
/* caf_ref_type_t, replaced by int to allow specification in fortran FE. */
|
|
int type;
|
|
/* The size of an item referenced in bytes. I.e. in an array ref this is
|
|
the factor to advance the array pointer with to get to the next item.
|
|
For component refs this gives just the size of the element referenced. */
|
|
size_t item_size;
|
|
union {
|
|
struct {
|
|
/* The offset (in bytes) of the component in the derived type. */
|
|
ptrdiff_t offset;
|
|
/* The offset (in bytes) to the caf_token associated with this
|
|
component. NULL, when not allocatable/pointer ref. */
|
|
ptrdiff_t caf_token_offset;
|
|
} c;
|
|
struct {
|
|
/* The mode of the array ref. See CAF_ARR_REF_*. */
|
|
/* caf_array_ref_t, replaced by unsigend char to allow specification in
|
|
fortran FE. */
|
|
unsigned char mode[GFC_MAX_DIMENSIONS];
|
|
/* The type of a static array. Unset for array's with descriptors. */
|
|
int static_array_type;
|
|
/* Subscript refs (s) or vector refs (v). */
|
|
union {
|
|
struct {
|
|
/* The start and end boundary of the ref and the stride. */
|
|
index_type start, end, stride;
|
|
} s;
|
|
struct {
|
|
/* nvec entries of kind giving the elements to reference. */
|
|
void *vector;
|
|
/* The number of entries in vector. */
|
|
size_t nvec;
|
|
/* The integer kind used for the elements in vector. */
|
|
int kind;
|
|
} v;
|
|
} dim[GFC_MAX_DIMENSIONS];
|
|
} a;
|
|
} u;
|
|
} caf_reference_t;
|
|
|
|
void _gfortran_caf_init (int *, char ***);
|
|
void _gfortran_caf_finalize (void);
|
|
|
|
int _gfortran_caf_this_image (int);
|
|
int _gfortran_caf_num_images (int, int);
|
|
|
|
void _gfortran_caf_register (size_t, caf_register_t, caf_token_t *,
|
|
gfc_descriptor_t *, int *, char *, int);
|
|
void _gfortran_caf_deregister (caf_token_t *, int *, char *, int);
|
|
|
|
void _gfortran_caf_sync_all (int *, char *, int);
|
|
void _gfortran_caf_sync_memory (int *, char *, int);
|
|
void _gfortran_caf_sync_images (int, int[], int *, char *, int);
|
|
|
|
void _gfortran_caf_stop_numeric (int32_t)
|
|
__attribute__ ((noreturn));
|
|
void _gfortran_caf_stop_str (const char *, int32_t)
|
|
__attribute__ ((noreturn));
|
|
void _gfortran_caf_error_stop_str (const char *, int32_t)
|
|
__attribute__ ((noreturn));
|
|
void _gfortran_caf_error_stop (int32_t) __attribute__ ((noreturn));
|
|
|
|
void _gfortran_caf_co_broadcast (gfc_descriptor_t *, int, int *, char *, int);
|
|
void _gfortran_caf_co_sum (gfc_descriptor_t *, int, int *, char *, int);
|
|
void _gfortran_caf_co_min (gfc_descriptor_t *, int, int *, char *, int, int);
|
|
void _gfortran_caf_co_max (gfc_descriptor_t *, int, int *, char *, int, int);
|
|
void _gfortran_caf_co_reduce (gfc_descriptor_t *, void* (*) (void *, void*),
|
|
int, int, int *, char *, int, int);
|
|
|
|
void _gfortran_caf_get (caf_token_t, size_t, int, gfc_descriptor_t *,
|
|
caf_vector_t *, gfc_descriptor_t *, int, int, bool,
|
|
int *);
|
|
void _gfortran_caf_send (caf_token_t, size_t, int, gfc_descriptor_t *,
|
|
caf_vector_t *, gfc_descriptor_t *, int, int, bool,
|
|
int *);
|
|
void _gfortran_caf_sendget (caf_token_t, size_t, int, gfc_descriptor_t *,
|
|
caf_vector_t *, caf_token_t, size_t, int,
|
|
gfc_descriptor_t *, caf_vector_t *, int, int, bool);
|
|
|
|
void _gfortran_caf_get_by_ref (caf_token_t token, int image_idx,
|
|
gfc_descriptor_t *dst, caf_reference_t *refs, int dst_kind,
|
|
int src_kind, bool may_require_tmp, bool dst_reallocatable, int *stat);
|
|
void _gfortran_caf_send_by_ref (caf_token_t token, int image_index,
|
|
gfc_descriptor_t *src, caf_reference_t *refs, int dst_kind,
|
|
int src_kind, bool may_require_tmp, bool dst_reallocatable, int *stat);
|
|
void _gfortran_caf_sendget_by_ref (
|
|
caf_token_t dst_token, int dst_image_index, caf_reference_t *dst_refs,
|
|
caf_token_t src_token, int src_image_index, caf_reference_t *src_refs,
|
|
int dst_kind, int src_kind, bool may_require_tmp, int *dst_stat,
|
|
int *src_stat);
|
|
|
|
void _gfortran_caf_atomic_define (caf_token_t, size_t, int, void *, int *,
|
|
int, int);
|
|
void _gfortran_caf_atomic_ref (caf_token_t, size_t, int, void *, int *,
|
|
int, int);
|
|
void _gfortran_caf_atomic_cas (caf_token_t, size_t, int, void *, void *,
|
|
void *, int *, int, int);
|
|
void _gfortran_caf_atomic_op (int, caf_token_t, size_t, int, void *, void *,
|
|
int *, int, int);
|
|
|
|
void _gfortran_caf_lock (caf_token_t, size_t, int, int *, int *, char *, int);
|
|
void _gfortran_caf_unlock (caf_token_t, size_t, int, int *, char *, int);
|
|
void _gfortran_caf_event_post (caf_token_t, size_t, int, int *, char *, int);
|
|
void _gfortran_caf_event_wait (caf_token_t, size_t, int, int *, char *, int);
|
|
void _gfortran_caf_event_query (caf_token_t, size_t, int, int *, int *);
|
|
|
|
#endif /* LIBCAF_H */
|