fortran/use-mpi-f08: add CFI support for isendrecv

and isendrecv_replace

Signed-off-by: Howard Pritchard <howardp@lanl.gov>

Author: hppritcha

ompi/mpi/fortran/use-mpi-f08/bindings/mpi-f-interfaces-bind.h.in

@@ -273,7 +273,7 @@ end subroutine ompi_isend_f
 
 subroutine ompi_isendrecv_f(sendbuf,sendcount,sendtype,dest,sendtag,recvbuf, &
                            recvcount,recvtype,source,recvtag,comm,request,ierror) &
-   BIND(C, name="ompi_isendrecv_f")
+   BIND(C, name="ompi_isendrecv_@OMPI_F08_BINDINGS_EXTENSION@")
    implicit none
    OMPI_F08_IGNORE_TKR_TYPE, INTENT(IN) :: sendbuf
    OMPI_F08_IGNORE_TKR_TYPE :: recvbuf
@@ -287,7 +287,7 @@ end subroutine ompi_isendrecv_f
 
 subroutine ompi_isendrecv_replace_f(buf,count,datatype,dest,sendtag,source, &
                                    recvtag,comm,request,ierror) &
-   BIND(C, name="ompi_isendrecv_replace_f")
+   BIND(C, name="ompi_isendrecv_replace_@OMPI_F08_BINDINGS_EXTENSION@")
    implicit none
    OMPI_F08_IGNORE_TKR_TYPE :: buf
    INTEGER, INTENT(IN) :: count, dest, sendtag, source, recvtag

ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-interfaces.h.in

@@ -155,7 +155,7 @@ end subroutine MPI_Isend_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
 end interface  MPI_Isend
 
 interface  MPI_Isendrecv
-subroutine MPI_Isendrecv_f08(sendbuf,sendcount,sendtype,dest,sendtag,recvbuf, &
+subroutine MPI_Isendrecv_f08@OMPI_F08_BINDINGS_TS_SUFFIX@(sendbuf,sendcount,sendtype,dest,sendtag,recvbuf, &
                             recvcount,recvtype,source,recvtag,comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
    implicit none
@@ -167,11 +167,11 @@ subroutine MPI_Isendrecv_f08(sendbuf,sendcount,sendtype,dest,sendtag,recvbuf, &
    TYPE(MPI_Comm), INTENT(IN) :: comm
    TYPE(MPI_Request), INTENT(OUT) :: request
    INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-end subroutine MPI_Isendrecv_f08
+end subroutine MPI_Isendrecv_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
 end interface  MPI_Isendrecv
 
 interface  MPI_Isendrecv_replace
-subroutine MPI_Isendrecv_replace_f08(buf,count,datatype,dest,sendtag,source,recvtag, &
+subroutine MPI_Isendrecv_replace_f08@OMPI_F08_BINDINGS_TS_SUFFIX@(buf,count,datatype,dest,sendtag,source,recvtag, &
                                     comm,request,ierror)
    use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Request
    implicit none
@@ -182,7 +182,7 @@ subroutine MPI_Isendrecv_replace_f08(buf,count,datatype,dest,sendtag,source,recv
    TYPE(MPI_Comm), INTENT(IN) :: comm
    TYPE(MPI_Request), INTENT(OUT) :: request
    INTEGER, OPTIONAL, INTENT(OUT) :: ierror
-end subroutine MPI_Isendrecv_replace_f08
+end subroutine MPI_Isendrecv_replace_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
 end interface  MPI_Isendrecv_replace
 
 interface  MPI_Issend

ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-rename.h.in

@@ -35,9 +35,11 @@
 #define MPI_Isend_f08 PMPI_Isend_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
 #define MPI_Isend_f08ts PMPI_Isend_f08ts
 #define MPI_Isendrecv PMPI_Isendrecv
-#define MPI_Isendrecv_f08 PMPI_Isendrecv_f08
+#define MPI_Isendrecv_f08 PMPI_Isendrecv_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
+#define MPI_Isendrecv_f08ts PMPI_Isendrecv_f08ts
 #define MPI_Isendrecv_replace PMPI_Isendrecv_replace
-#define MPI_Isendrecv_replace_f08 PMPI_Isendrecv_replace_f08
+#define MPI_Isendrecv_replace_f08 PMPI_Isendrecv_replace_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
+#define MPI_Isendrecv_replace_f08ts PMPI_Isendrecv_replace_f08ts
 #define MPI_Issend PMPI_Issend
 #define MPI_Issend_f08 PMPI_Issend_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
 #define MPI_Issend_f08ts PMPI_Issend_f08ts
@@ -916,6 +918,8 @@
 #define MPI_Irecv_f08 MPI_Irecv_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
 #define MPI_Irsend_f08 MPI_Irsend_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
 #define MPI_Isend_f08 MPI_Isend_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
+#define MPI_Isendrecv_f08 MPI_Isendrecv_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
+#define MPI_Isendrecv_replace_f08 MPI_Isendrecv_replace_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
 #define MPI_Issend_f08 MPI_Issend_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
 #define MPI_Recv_f08 MPI_Recv_f08@OMPI_F08_BINDINGS_TS_SUFFIX@
 #define MPI_Recv_init_f08 MPI_Recv_init_f08@OMPI_F08_BINDINGS_TS_SUFFIX@

ompi/mpi/fortran/use-mpi-f08/ts/Makefile.am

@@ -115,6 +115,8 @@ libusempif08_ts_la_SOURCES = \
         iscatter_ts.c \
         iscatterv_ts.c \
         isend_ts.c \
+        isendrecv_ts.c \
+        isendrecv_replace_ts.c \
         issend_ts.c \
         mrecv_ts.c \
         neighbor_allgather_ts.c \

ompi/mpi/fortran/use-mpi-f08/ts/bindings.h

@@ -43,6 +43,17 @@ void ompi_isend_ts(CFI_cdesc_t *x, MPI_Fint *count, MPI_Fint *datatype,
                    MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm,
                    MPI_Fint *request, MPI_Fint *ierr);
 
+void ompi_isendrecv_ts(CFI_cdesc_t* x1, MPI_Fint *sendcount, MPI_Fint *sendtype,
+                       MPI_Fint *dest, MPI_Fint *sendtag, CFI_cdesc_t* x2,
+                       MPI_Fint *recvcount, MPI_Fint *recvtype,
+                       MPI_Fint *source, MPI_Fint *recvtag, MPI_Fint *comm,
+                       MPI_Fint *request, MPI_Fint *ierr);
+
+void ompi_isendrecv_replace_ts(CFI_cdesc_t* x, MPI_Fint *count, MPI_Fint *datatype,
+                               MPI_Fint *dest, MPI_Fint *sendtag,
+                               MPI_Fint *source, MPI_Fint *recvtag,
+                               MPI_Fint *comm, MPI_Fint *request, MPI_Fint *ierr);
+
 void ompi_issend_ts(CFI_cdesc_t* x, MPI_Fint *count, MPI_Fint *datatype,
                     MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm,
                     MPI_Fint *request, MPI_Fint *ierr);