Adding custom match source.

Signed-off-by: Nathan Hjelm <hjelmn@lanl.gov>

Author: mdosanjh

ompi/mca/pml/ob1/custommatch/arrays.h

@@ -18,6 +18,8 @@
  *                         reserved.
  * Copyright (c) 2012      Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2015      FUJITSU LIMITED.  All rights reserved.
+ * Copyright (c) 2018      Sandia National Laboratories
+ *                         All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -244,7 +246,11 @@ int mca_pml_ob1_add_comm(ompi_communicator_t* comm)
         pml_proc = mca_pml_ob1_peer_lookup(comm, hdr->hdr_src);
 
         if (OMPI_COMM_CHECK_ASSERT_ALLOW_OVERTAKE(comm)) {
+#if !MCA_PML_OB1_CUSTOM_MATCH
             opal_list_append( &pml_proc->unexpected_frags, (opal_list_item_t*)frag );
+#else
+            custom_match_umq_append(pml_comm->umq, hdr->hdr_tag, hdr->hdr_src, frag);
+#endif
             PERUSE_TRACE_MSG_EVENT(PERUSE_COMM_MSG_INSERT_IN_UNEX_Q, comm,
                                    hdr->hdr_src, hdr->hdr_tag, PERUSE_RECV);
             continue;
@@ -587,10 +593,20 @@ int mca_pml_ob1_dump(struct ompi_communicator_t* comm, int verbose)
     opal_output(0, "Communicator %s [%p](%d) rank %d recv_seq %d num_procs %lu last_probed %lu\n",
                 comm->c_name, (void*) comm, comm->c_contextid, comm->c_my_rank,
                 pml_comm->recv_sequence, pml_comm->num_procs, pml_comm->last_probed);
+
+#if !MCA_PML_OB1_CUSTOM_MATCH
     if( opal_list_get_size(&pml_comm->wild_receives) ) {
         opal_output(0, "expected MPI_ANY_SOURCE fragments\n");
         mca_pml_ob1_dump_frag_list(&pml_comm->wild_receives, true);
     }
+#endif
+
+#if MCA_PML_OB1_CUSTOM_MATCH
+     opal_output(0, "expected receives\n");
+     custom_match_prq_dump(pml_comm->pro);
+     opal_output(0, "unexpected frag\n");
+     custom_match_umq_dump(pml_comm->umq);
+#endif
 
     /* iterate through all procs on communicator */
     for( i = 0; i < (int)pml_comm->num_procs; i++ ) {
@@ -608,18 +624,22 @@ int mca_pml_ob1_dump(struct ompi_communicator_t* comm, int verbose)
                     proc->send_sequence);
 
         /* dump all receive queues */
-        if( opal_list_get_size(&proc->specific_receives) ) {
+#if !MCA_PML_OB1_CUSTOM_MATCH
+       if( opal_list_get_size(&proc->specific_receives) ) {
             opal_output(0, "expected specific receives\n");
             mca_pml_ob1_dump_frag_list(&proc->specific_receives, true);
         }
+#endif
         if( NULL != proc->frags_cant_match ) {
             opal_output(0, "out of sequence\n");
             mca_pml_ob1_dump_cant_match(proc->frags_cant_match);
         }
+#if !MCA_PML_OB1_CUSTOM_MATCH
         if( opal_list_get_size(&proc->unexpected_frags) ) {
             opal_output(0, "unexpected frag\n");
             mca_pml_ob1_dump_frag_list(&proc->unexpected_frags, false);
         }
+#endif
         /* dump all btls used for eager messages */
         for( n = 0; n < ep->btl_eager.arr_size; n++ ) {
             mca_bml_base_btl_t* bml_btl = &ep->btl_eager.bml_btls[n];

ompi/mca/pml/ob1/custommatch/fuzzy512-byte.h

@@ -9,6 +9,9 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
+ *
+ * Copyright (c) 2018      Sandia National Laboratories
+ * 			   All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -30,16 +33,20 @@ static void mca_pml_ob1_comm_proc_construct(mca_pml_ob1_comm_proc_t* proc)
     proc->expected_sequence = 1;
     proc->send_sequence = 0;
     proc->frags_cant_match = NULL;
+#if !MCA_PML_OB1_CUSTOM_MATCH
     OBJ_CONSTRUCT(&proc->specific_receives, opal_list_t);
     OBJ_CONSTRUCT(&proc->unexpected_frags, opal_list_t);
+#endif
 }
 
 
 static void mca_pml_ob1_comm_proc_destruct(mca_pml_ob1_comm_proc_t* proc)
 {
     assert(NULL == proc->frags_cant_match);
+#if !MCA_PML_OB1_CUSTOM_MATCH
     OBJ_DESTRUCT(&proc->specific_receives);
     OBJ_DESTRUCT(&proc->unexpected_frags);
+#endif
     if (proc->ompi_proc) {
         OBJ_RELEASE(proc->ompi_proc);
     }
@@ -53,7 +60,12 @@ OBJ_CLASS_INSTANCE(mca_pml_ob1_comm_proc_t, opal_object_t,
 
 static void mca_pml_ob1_comm_construct(mca_pml_ob1_comm_t* comm)
 {
+#if !MCA_PML_OB1_CUSTOM_MATCH
     OBJ_CONSTRUCT(&comm->wild_receives, opal_list_t);
+#else
+    comm->prq = custom_match_prq_init();
+    comm->umq = custom_match_umq_init();
+#endif
     OBJ_CONSTRUCT(&comm->matching_lock, opal_mutex_t);
     OBJ_CONSTRUCT(&comm->proc_lock, opal_mutex_t);
     comm->recv_sequence = 0;
@@ -75,7 +87,12 @@ static void mca_pml_ob1_comm_destruct(mca_pml_ob1_comm_t* comm)
         free(comm->procs);
     }
 
+#if !MCA_PML_OB1_CUSTOM_MATCH
     OBJ_DESTRUCT(&comm->wild_receives);
+#else
+    custom_match_prq_destroy(comm->prq);
+    custom_match_umq_destroy(comm->umq);
+#endif
     OBJ_DESTRUCT(&comm->matching_lock);
     OBJ_DESTRUCT(&comm->proc_lock);
 }

ompi/mca/pml/ob1/custommatch/fuzzy512-short.h

@@ -12,6 +12,8 @@
  *                         All rights reserved.
  * Copyright (c) 2015      Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2018      Sandia National Laboratories
+ *                         All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -28,6 +30,32 @@
 #include "opal/class/opal_list.h"
 #include "ompi/proc/proc.h"
 #include "ompi/communicator/communicator.h"
+
+#define MCA_PML_OB1_CUSTOM_MATCH 1/** TODO: move this to config parameter */
+#define MCA_PML_OB1_CUSTOM_MATCH_ARRAYS 0
+#define MCA_PML_OB1_CUSTOM_MATCH_FUZZY_BYTE 0
+#define MCA_PML_OB1_CUSTOM_MATCH_FUZZY_SHORT 0
+#define MCA_PML_OB1_CUSTOM_MATCH_FUZZY_WORD 0
+#define MCA_PML_OB1_CUSTOM_MATCH_VECTOR 0
+
+#if MCA_PML_OB1_CUSTOM_MATCH
+
+#if MCA_PML_OB1_CUSTOM_MATCH_ARRAYS
+#include "ompi/mca/pml/ob1/custommatch/arrays.h"
+#elif MCA_PML_OB1_CUSTOM_MATCH_FUZZY_BYTE
+#include "ompi/mca/pml/ob1/custommatch/fuzzy512-byte.h"
+#elif MCA_PML_OB1_CUSTOM_MATCH_FUZZY_SHORT
+#include "ompi/mca/pml/ob1/custommatch/fuzzy512-short.h"
+#elif MCA_PML_OB1_CUSTOM_MATCH_FUZZY_WORD
+#include "ompi/mca/pml/ob1/custommatch/fuzzy512-word.h"
+#elif MCA_PML_OB1_CUSTOM_MATCH_VECTOR
+#include "ompi/mca/pml/ob1/custommatch/vectors.h"
+#else
+#include "ompi/mca/pml/ob1/custommatch/linkedlist.h" //Default Custom Match is single linked list
+#endif
+
+#endif
+
 BEGIN_C_DECLS
 
 
@@ -41,8 +69,10 @@ struct mca_pml_ob1_comm_proc_t {
     int32_t send_sequence; /**< send side sequence number */
 #endif
     struct mca_pml_ob1_recv_frag_t* frags_cant_match;  /**< out-of-order fragment queues */
+#if !MCA_PML_OB1_CUSTOM_MATCH
     opal_list_t specific_receives; /**< queues of unmatched specific receives */
     opal_list_t unexpected_frags;  /**< unexpected fragment queues */
+#endif
 };
 typedef struct mca_pml_ob1_comm_proc_t mca_pml_ob1_comm_proc_t;
 
@@ -56,11 +86,17 @@ struct mca_pml_comm_t {
     opal_object_t super;
     volatile uint32_t recv_sequence;  /**< recv request sequence number - receiver side */
     opal_mutex_t matching_lock;   /**< matching lock */
+#if !MCA_PML_OB1_CUSTOM_MATCH
     opal_list_t wild_receives;    /**< queue of unmatched wild (source process not specified) receives */
+#endif
     opal_mutex_t proc_lock;
     mca_pml_ob1_comm_proc_t **procs;
     size_t num_procs;
     size_t last_probed;
+#if MCA_PML_OB1_CUSTOM_MATCH
+    custom_match_prq* prq;
+    custom_match_umq* umq;
+#endif
 };
 typedef struct mca_pml_comm_t mca_pml_ob1_comm_t;
 

ompi/mca/pml/ob1/custommatch/fuzzy512-word.h

@@ -14,6 +14,8 @@
  * Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved
  * Copyright (c) 2013-2017 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2018      Sandia National Laboratories
+ *                         All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -147,7 +149,12 @@ static int mca_pml_ob1_get_unex_msgq_size (const struct mca_base_pvar_t *pvar, v
     for (i = 0 ; i < comm_size ; ++i) {
         pml_proc = pml_comm->procs[i];
         if (pml_proc) {
+#if MCA_PML_OB1_CUSTOM_MATCH
+            values[i] = custom_match_umq_size(pml_comm->umq); // TODO: given the structure of custom match this does not make sense,
+                                                     //       as we only have one set of queues.
+#else
             values[i] = opal_list_get_size (&pml_proc->unexpected_frags);
+#endif
         } else {
             values[i] = 0;
         }
@@ -169,7 +176,12 @@ static int mca_pml_ob1_get_posted_recvq_size (const struct mca_base_pvar_t *pvar
         pml_proc = pml_comm->procs[i];
 
         if (pml_proc) {
+#if MCA_PML_OB1_CUSTOM_MATCH
+            values[i] = custom_match_prq_size(pml_comm->prq); // TODO: given the structure of custom match this does not make sense,
+                                                     //       as we only have one set of queues.
+#else
             values[i] = opal_list_get_size (&pml_proc->specific_receives);
+#endif
         } else {
             values[i] = 0;
         }