Merge pull request open-mpi#784 from francois-wellenreiter/trig_mtl_rdv

MTL portals4 : improve the rendez-vous protocol using PtlTriggeredGet…

Author: hppritcha

ompi/mca/mtl/portals4/mtl_portals4.c

@@ -178,6 +178,7 @@ portals4_init_interface(void)
     me.ignore_bits = MTL_PORTALS4_CONTEXT_MASK |
         MTL_PORTALS4_SOURCE_MASK |
         MTL_PORTALS4_TAG_MASK;
+
     ret = PtlMEAppend(ompi_mtl_portals4.ni_h,
                       ompi_mtl_portals4.recv_idx,
                       &me,

ompi/mca/mtl/portals4/mtl_portals4.h

@@ -202,18 +202,26 @@ extern mca_mtl_portals4_module_t ompi_mtl_portals4;
     ((int)((match_bits & MTL_PORTALS4_SOURCE_MASK) >> 24))
 
 
+/* hda_data bit manipulation
+ *
+ * 0 1234567 01234567 01234567 0123 4567 01234567 01234567 01234567 01234567
+ *  |                              |             |
+ * ^|                              | context id  |        message tag
+ * ||                              |             |
+ * +---- is_sync
+ */
+
 #define MTL_PORTALS4_SYNC_MSG       0x8000000000000000ULL
 
-#define MTL_PORTALS4_SET_HDR_DATA(hdr_data, opcount, length, sync)   \
+#define MTL_PORTALS4_SET_HDR_DATA(hdr_data, tag, contextid, sync)    \
     {                                                                \
         hdr_data = (sync) ? 1 : 0;                                   \
-        hdr_data = (hdr_data << 15);                                 \
-        hdr_data |= opcount & 0x7FFFULL;                             \
-        hdr_data = (hdr_data << 48);                                 \
-        hdr_data |= (length & 0xFFFFFFFFFFFFULL);                    \
+        hdr_data = (hdr_data << 39);                                 \
+        hdr_data |= contextid;                                       \
+        hdr_data = (hdr_data << 24);                                 \
+        hdr_data |= (MTL_PORTALS4_TAG_MASK & tag);                   \
     }
 
-#define MTL_PORTALS4_GET_LENGTH(hdr_data) ((size_t)(hdr_data & 0xFFFFFFFFFFFFULL))
 #define MTL_PORTALS4_IS_SYNC_MSG(hdr_data)            \
     (0 != (MTL_PORTALS4_SYNC_MSG & hdr_data))
 

ompi/mca/mtl/portals4/mtl_portals4_probe.c

@@ -41,7 +41,7 @@ completion_fn(ptl_event_t *ev, ompi_mtl_portals4_base_request_t *ptl_base_reques
         ptl_request->status.MPI_SOURCE = MTL_PORTALS4_GET_SOURCE(ev->match_bits);
         ptl_request->status.MPI_TAG = MTL_PORTALS4_GET_TAG(ev->match_bits);
         ptl_request->status.MPI_ERROR = MPI_SUCCESS;
-        ptl_request->status._ucount = MTL_PORTALS4_GET_LENGTH(ev->hdr_data);
+        ptl_request->status._ucount += ev->mlength;
         if (ev->type != PTL_EVENT_SEARCH) {
             ptl_request->message = ompi_mtl_portals4_message_alloc(ev);
         }