Merge pull request #491 from sourceryinstitute/descriptor-surgery

Adjust for the Fortran 2018 descriptors

Author: Damian Rouson

src/libcaf-gfortran-descriptor.h

@@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  */
 #ifndef LIBCAF_GFORTRAN_DESCRIPTOR_H
 #define LIBCAF_GFORTRAN_DESCRIPTOR_H
 
+#include "libcaf-version-def.h"
+
 #include <stdint.h>	/* For int32_t.  */
 
 /* GNU Fortran's array descriptor.  Keep in sync with libgfortran.h.  To be
@@ -47,34 +49,64 @@ typedef struct descriptor_dimension
 }
 descriptor_dimension;
 
+#ifdef GCC_GE_8
+  typedef struct dtype_type
+  {
+    size_t elem_len;
+    int version;
+    signed char rank;
+    signed char type;
+    signed short attribute;
+  }
+  dtype_type;
+#endif
+
 typedef struct gfc_descriptor_t {
   void *base_addr;
   size_t offset;
-  ptrdiff_t dtype;
 #ifdef GCC_GE_8
+  dtype_type dtype;
   ptrdiff_t span;
+#else
+  ptrdiff_t dtype;
 #endif
   descriptor_dimension dim[];
 } gfc_descriptor_t;
 
+#ifdef GCC_GE_8
 
-#define GFC_MAX_DIMENSIONS 7
+#define GFC_MAX_DIMENSIONS 15
+#define GFC_DTYPE_RANK_MASK 0x0F
+#define GFC_DTYPE_TYPE_SHIFT 4
+#define GFC_DTYPE_TYPE_MASK 0x70
+#define GFC_DTYPE_SIZE_SHIFT 7
+
+#define GFC_DESCRIPTOR_RANK(desc) (desc)->dtype.rank
+#define GFC_DESCRIPTOR_TYPE(desc) (desc)->dtype.type
+#define GFC_DESCRIPTOR_SIZE(desc) (desc)->dtype.elem_len
+#define GFC_DTYPE_TYPE_SIZE(desc) (( ((desc)->dtype.type << GFC_DTYPE_TYPE_SHIFT) \
+    | ((desc)->dtype.elem_len << GFC_DTYPE_SIZE_SHIFT) ) & GFC_DTYPE_TYPE_SIZE_MASK)
 
+#else
+
+#define GFC_MAX_DIMENSIONS 7
 #define GFC_DTYPE_RANK_MASK 0x07
 #define GFC_DTYPE_TYPE_SHIFT 3
 #define GFC_DTYPE_TYPE_MASK 0x38
 #define GFC_DTYPE_SIZE_SHIFT 6
+
 #define GFC_DESCRIPTOR_RANK(desc) ((desc)->dtype & GFC_DTYPE_RANK_MASK)
 #define GFC_DESCRIPTOR_TYPE(desc) (((desc)->dtype & GFC_DTYPE_TYPE_MASK) \
                                    >> GFC_DTYPE_TYPE_SHIFT)
 #define GFC_DESCRIPTOR_SIZE(desc) ((desc)->dtype >> GFC_DTYPE_SIZE_SHIFT)
+#define GFC_DTYPE_TYPE_SIZE(desc) ((desc)->dtype & GFC_DTYPE_TYPE_SIZE_MASK)
+
+#endif
 
 #define GFC_DTYPE_SIZE_MASK \
   ((~((ptrdiff_t) 0) >> GFC_DTYPE_SIZE_SHIFT) << GFC_DTYPE_SIZE_SHIFT)
 #define GFC_DTYPE_TYPE_SIZE_MASK (GFC_DTYPE_SIZE_MASK | GFC_DTYPE_TYPE_MASK)
 
-#define GFC_DTYPE_TYPE_SIZE(desc) ((desc)->dtype & GFC_DTYPE_TYPE_SIZE_MASK)
-
 #define GFC_DTYPE_INTEGER_1 ((BT_INTEGER << GFC_DTYPE_TYPE_SHIFT) \
    | (sizeof(int8_t) << GFC_DTYPE_SIZE_SHIFT))
 #define GFC_DTYPE_INTEGER_2 ((BT_INTEGER << GFC_DTYPE_TYPE_SHIFT) \
@@ -136,11 +168,14 @@ typedef struct gfc_descriptor_t {
     receives in the dtype component its gf_descriptor_t argument for character(kind=c_char)
     and logical(kind=c_bool) data:
 */
-#define GFC_DTYPE_CHARACTER 48
 
-#if 0
+#ifdef GCC_GE_8
+
 #define GFC_DTYPE_CHARACTER ((BT_CHARACTER << GFC_DTYPE_TYPE_SHIFT) \
    | (sizeof(char) << GFC_DTYPE_SIZE_SHIFT))
+
+#else
+#define GFC_DTYPE_CHARACTER 48
 #endif
 
 

src/libcaf-version-def.h

@@ -0,0 +1,7 @@
+#if __GNUC__ >= 8
+#define GCC_GE_8 1
+#endif
+
+#if __GNUC__ >= 7
+#define GCC_GE_7 1
+#endif

src/libcaf.h

@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  */
 #include <stddef.h>	/* For size_t.  */
 #include <stdbool.h>
 
+#include  "libcaf-version-def.h"
 #include "libcaf-gfortran-descriptor.h"
 
 #include <mpi.h>
@@ -45,10 +46,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  */
 #define unlikely(x)     __builtin_expect(!!(x), 0)
 #endif
 
-#if __GNUC__ >= 7
-#define GCC_GE_7 1
-#endif
-
 #ifdef PREFIX_NAME
 #define PREFIX3(X,Y) X ## Y
 #define PREFIX2(X,Y) PREFIX3(X,Y)

src/make.inc

@@ -37,12 +37,12 @@ compiler=gnu
 
 ifeq ($(compiler),gnu)
   FC=gfortran
-  CC=gcc
+  CC=mpicc
   MPFC = mpifort
   MPICC = mpicc
   OSHCC = oshcc
   FFLAGS_EXTRA = -fcoarray=lib
-  MPI_EXTRA_FLAGS = -Wall -Wextra -Wno-error=cpp -Wno-error=unused-parameter -DSTRIDED#-DNONBLOCKING_PUT -DCAF_MPI_LOCK_UNLOCK
+  MPI_EXTRA_FLAGS = -Wall -Wextra -Wno-error=cpp -Wno-error=unused-parameter -DSTRIDED -DUSE_FAILED_IMAGES  #-DNONBLOCKING_PUT -DCAF_MPI_LOCK_UNLOCK
   MPI_RUN = mpiexec -np 2
 else
   ifeq ($(compiler),cray)

src/mpi/mpi_caf.c

@@ -1151,7 +1151,10 @@ PREFIX (register) (size_t size, caf_register_t type, caf_token_t *token,
         MPI_Alloc_mem(actual_size, MPI_INFO_NULL, &mem);
         MPI_Win_create(mem, actual_size, 1, MPI_INFO_NULL, CAF_COMM_WORLD, p);
 #endif // MPI_VERSION
+
+#ifndef GCC_GE_8
         if (GFC_DESCRIPTOR_RANK (desc) != 0)
+#endif
           mpi_token->desc = desc;
 
         if(l_var)
@@ -6092,8 +6095,13 @@ PREFIX (sendget_by_ref) (caf_token_t dst_token, int dst_image_index,
   */
 
   dst_rank = size > 1 ? 1 : 0;
+#ifdef GCC_GE_8
+  temp_src_desc.base.dtype.elem_len = GFC_DTYPE_INTEGER_4;
+  temp_src_desc.base.dtype.rank = dst_rank;
+#else
   temp_src_desc.base.dtype = GFC_DTYPE_INTEGER_4 |
-                             dst_rank;
+			     dst_rank;
+#endif
   temp_src_desc.base.offset = 0;
   temp_src_desc.dim[0].lower_bound = 0;
   temp_src_desc.dim[0]._ubound = size - 1;
@@ -7560,8 +7568,14 @@ PREFIX (failed_images) (gfc_descriptor_t *array, int team __attribute__ ((unused
   array->dim[0]._ubound = -1;
   array->base_addr = NULL;
 #endif
+
+#ifdef GCC_GE_8
+  array->dtype.type = BT_INTEGER;
+  array->dtype.elem_len = local_kind;
+#else
   array->dtype = ((BT_INTEGER << GFC_DTYPE_TYPE_SHIFT)
 		  | (local_kind << GFC_DTYPE_SIZE_SHIFT));
+#endif
   array->dim[0].lower_bound = 0;
   array->dim[0]._stride = 1;
   array->offset = 0;
@@ -7611,8 +7625,14 @@ PREFIX (stopped_images) (gfc_descriptor_t *array, int team __attribute__ ((unuse
   array->dim[0]._ubound = -1;
   array->base_addr = NULL;
 #endif
+
+#ifdef GCC_GE_8
+  array->dtype.type = BT_INTEGER;
+  array->dtype.elem_len = local_kind;
+#else
   array->dtype = ((BT_INTEGER << GFC_DTYPE_TYPE_SHIFT)
 		  | (local_kind << GFC_DTYPE_SIZE_SHIFT));
+#endif
   array->dim[0].lower_bound = 0;
   array->dim[0]._stride = 1;
   array->offset = 0;

src/tests/integration/pde_solvers/coarrayHeatSimplified/Makefile

@@ -3,10 +3,7 @@ compiler=gnu
 executable=co_heat
 
 ifeq ($(compiler),gnu)
-  opencoarrays_dir=/opt/opencoarrays
-  opt=-L $(opencoarrays_dir)/lib
-  compile=mpifort -fcoarray=lib
-  lib=-lcaf_mpi
+  compile=caf
 else
   ifeq ($(compiler),intel)
     compile=ifort -coarray=shared -standard-semantics -O3 -coarray-num-images=2