Fixed a bug that would not display the user/mpi counters if one or the other was not turned on. Updated some MCA parameter names to be more accurate. Made sure bin counters were initialized even if they aren't turned on at the start.

Signed-off-by: David Eberius <deberius@vols.utk.edu>

Author: David Eberius

ompi/runtime/ompi_spc.c

@@ -303,15 +303,15 @@ int ompi_spc_register_params()
                                  &ompi_mpi_spc_p2p_message_boundary);
 
     ompi_mpi_spc_collective_message_boundary = 12288;
-    (void) mca_base_var_register("ompi", "mpi", NULL, "spc_message_boundary",
+    (void) mca_base_var_register("ompi", "mpi", NULL, "spc_collective_message_boundary",
                                  "An integer value for determining the boundary for whether a message is small/large for collective bin counters (<= this value is small).",
                                  MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
                                  OPAL_INFO_LVL_4,
                                  MCA_BASE_VAR_SCOPE_READONLY,
                                  &ompi_mpi_spc_collective_message_boundary);
 
     ompi_mpi_spc_collective_comm_boundary = 64;
-    (void) mca_base_var_register("ompi", "mpi", NULL, "spc_comm_boundary",
+    (void) mca_base_var_register("ompi", "mpi", NULL, "spc_collective_comm_boundary",
                                  "An integer value for determining the boundary for whether a communicator is small/large for collective bin counters (<= this value is small).",
                                  MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
                                  OPAL_INFO_LVL_4,
@@ -918,24 +918,26 @@ void ompi_spc_init(void)
      * ###################### Initialize Bin Counters Here ####################
      * ########################################################################
      */
+    /* NOTE: These should be initialized even if they aren't currently turned on.
+     *       This is just in case they are turned on mid-run through MPI_T.
+     */
+    /* STEP 3a: Regular bin counters initialized here. */
     int *rules = NULL;
     ompi_spc_value_t *bins = NULL;
 
-    if(IS_SPC_BIT_SET(ompi_spc_attached_event,OMPI_SPC_P2P_MESSAGE_SIZE)) {
-        rules = (int*)(ompi_spc_events+ompi_spc_offsets[OMPI_SPC_P2P_MESSAGE_SIZE].rules_offset);
-        bins = (ompi_spc_value_t*)(ompi_spc_events+ompi_spc_offsets[OMPI_SPC_P2P_MESSAGE_SIZE].bins_offset);
+    rules = (int*)(ompi_spc_events+ompi_spc_offsets[OMPI_SPC_P2P_MESSAGE_SIZE].rules_offset);
+    bins = (ompi_spc_value_t*)(ompi_spc_events+ompi_spc_offsets[OMPI_SPC_P2P_MESSAGE_SIZE].bins_offset);
 
-        bins[0] = bins[1] = 0;
+    bins[0] = bins[1] = 0;
 
-        rules[0] = 2; /* The number of bins */
-        rules[1] = ompi_mpi_spc_p2p_message_boundary; /* The number after which counters go in the second bin */
-    }
+    rules[0] = 2; /* The number of bins */
+    rules[1] = ompi_mpi_spc_p2p_message_boundary; /* The number after which counters go in the second bin */
 
     /* Initialize Collective Bin Counters Here */
     int num_bins = 4; /* This can be expanded to be more flexible */
 
     for(i = 0; i < OMPI_SPC_NUM_COUNTERS; i++) {
-        if(IS_SPC_BIT_SET(ompi_spc_attached_event, i) && IS_SPC_BIT_SET(ompi_spc_collective_bin_event,i)) {
+        if(IS_SPC_BIT_SET(ompi_spc_collective_bin_event,i)) {
             rules = (int*)(ompi_spc_events+ompi_spc_offsets[i].rules_offset);
             bins = (ompi_spc_value_t*)(ompi_spc_events+ompi_spc_offsets[i].bins_offset);
 

ompi/runtime/ompi_spc.h

@@ -107,6 +107,8 @@ OMPI_DECLSPEC extern int ompi_mpi_spc_collective_comm_boundary;
  *     bin, or collective bin add its enum name to the logic for
  *     specialized counters in the ompi_spc_init function in ompi_spc.c
  *     Search For: 'STEP 3'
+ *     NOTE: If this is a bin counter, and not a collective bin counter,
+ *           you will need to initialize it. Search for: 'STEP 3a'
  * 4.) If this counter is a watermark counter, additional logic is required
  *     for when this counter is read.  The standard behavior of watermark
  *     counters is to keep track of updates to another counter and increase
@@ -367,7 +369,7 @@ bool IS_SPC_BIT_SET(uint32_t* array, int32_t pos);
         ompi_spc_timer_stop(event_id, usec)
 
 #define SPC_USER_OR_MPI(tag, value, enum_if_user, enum_if_mpi) \
-    if( OPAL_UNLIKELY(IS_SPC_BIT_SET(ompi_spc_attached_event, enum_if_user) && IS_SPC_BIT_SET(ompi_spc_attached_event, enum_if_mpi)) ) \
+    if( OPAL_UNLIKELY(IS_SPC_BIT_SET(ompi_spc_attached_event, enum_if_user) || IS_SPC_BIT_SET(ompi_spc_attached_event, enum_if_mpi)) ) \
         ompi_spc_user_or_mpi(tag, value, enum_if_user, enum_if_mpi)
 
 #define SPC_CYCLES_TO_USECS(cycles) \