WIP: initial descriptor edits

Author: Damian Rouson

src/libcaf-gfortran-descriptor.h

@@ -47,28 +47,57 @@ 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)
+
+#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)
 
+#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)

src/libcaf.h

@@ -45,6 +45,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  */
 #define unlikely(x)     __builtin_expect(!!(x), 0)
 #endif
 
+#if __GNUC__ >= 8
+#define GCC_GE_8 1
+#endif
+
 #if __GNUC__ >= 7
 #define GCC_GE_7 1
 #endif

src/make.inc

@@ -37,7 +37,7 @@ compiler=gnu
 
 ifeq ($(compiler),gnu)
   FC=gfortran
-  CC=gcc
+  CC=mpicc
   MPFC = mpifort
   MPICC = mpicc
   OSHCC = oshcc

src/mpi/mpi_caf.c

@@ -7560,8 +7560,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 +7617,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;