1a021b8f2d
allgather. The new collectives provide a signifigant performance increase over tuned for small and medium messages. We are initially setting the priority lower than tuned until this has had some time to soak in the trunk. Please set coll_ml_priority to 90 for MTT runs. Credit for this work goes to Manjunath Gorentla Venkata (ORNL), Pavel Shamis (ORNL), and Nathan Hjelm (LANL). Commit details (for reference): Import ORNL's collectives for MPI_Allreduce, MPI_Reduce, and MPI_Allgather. We need to take the basesmuma header into account when calculating the ptpcoll small message thresholds. Add a define to bcol.h indicating the maximum header size so we can take the header into account while not making ptpcoll dependent on information from basesmuma. This resolves an issue with allreduce where ptpcoll overwrites the header of the next buffer in the basesmuma bank. Fix reduce and make a sequential collective launcher in coll_ml_inlines.h The root calculation for reduce was wrong for any root != 0. There are four possibilities for the root: - The root is not the current process but is in the current hierarchy. In this case the root is the index of the global root as specified in the root vector. - The root is not the current process and is not in the next level of the hierarchy. In this case 0 must be the local root since this process will never communicate with the real root. - The root is not the current process but will be in next level of the hierarchy. In this case the current process must be the root. - I am the root. The root is my index. Tested with IMB which rotates the root on every call to MPI_Reduce. Consider IMB the reproducer for the issue this commit solves. Make the bcast algorithm decision an enumerated variable Resolve various asset failures when destructing coll ml requests. Two issues: - Always reset the request to be invalid before returning it to the free list. This will avoid an asset in ompi_request_t's destructor. OMPI_REQUEST_FINI does this (and also releases the fortran handle index). - Never explicitly construct or destruct the superclass of an opal object. This screws up the class function tables and will cause either an assert failure or a segmentation fault when destructing coll ml requests. Cleanup allgather. I removed the duplicate non-blocking and blocking functions and modeled the cleanup after what I found in allreduce. Also cleaned up the code somewhat. Don't bother copying from the send to the recieve buffer in bcol_basesmuma_allreduce_intra_fanin_fanout if the pointers are the same. The eliminates a warning about memcpy and aliasing and avoids an unnecessary call to memcpy. Alwasy call CHECK_AND_RELEASE on memsync collectives. There was a call to OBJ_RELEASE on the collective communicator but because CHECK_AND_RECYLCE was never called there was not matching call to OBJ_RELEASE. This caused coll ml to leak communicators. Make allreduce use the sequential collective launcher in coll_ml_inlines.h Just launch the next collective in the component progress. I am a little unsure about this patch. There appears to be some sort of race between collectives that causes buffer exhaustion in some cases (IMB Allreduce is a reproducer). Changing progress to only launch the next bcol seems to resolve the issue but might not be the best fix. Note that I see little-no performance penalty for this change. Fix allreduce when there are extra sources. There was an issue with the buffer offset calculation when there are extra sources. In the case of extra sources == 1 the offset was set to buffer_size (just past the header of the next buffer). I adjusted the buffer size to take into accoun the maximum header size (see the earlier commit that added this) and simplified the offset calculation. Make reduce/allreduce non-blocking. This is required for MPI_Comm_idup to work correctly. This has been tested with various layouts using the ibm testsuite and imb and appears to have the same performance as the old blocking version. Fix allgather for non-contiguous layouts and simplify parsing the topology. Some things in this patch: - There were several comments to the effect that level 0 of the hierarchy MUST contain all of the ranks. At least one function made this assumption but it was not true. I changed the sbgp components and the coll ml initization code to enforce this requirement. - Ensure that hierarchy level 0 has the ranks in the correct scatter gather order. This removes the need for a separate sort list and fixes the offset calculation for allgather. - There were several passes over the hierarchy to determine properties of the hierarchy. I eliminated these extra passes and the memory allocation associated with them and calculate the tree properties on the fly. The same DFS recursion also handles the re-order of level 0. All these changes have been verified with MPI_Allreduce, MPI_Reduce, and MPI_Allgather. All functions now pass all IBM/Open MPI, and IMB tests. coll/ml: correct pointer usage for MPI_BOTTOM Since contiguous datatypes are copied via memcpy (bypassing the convertor) we need to adjust for the lb of the datatype. This corrects problems found testing code that uses MPI_BOTTOM (NULL) as the send pointer. Add fallback collectives for allreduce and reduce. cmr=v1.7.5:reviewer=pasha This commit was SVN r30363.
343 строки
11 KiB
C
343 строки
11 KiB
C
/*
|
|
* Code for selecting a collective function. The selection is based on
|
|
* comm-time attributes and invoke-time attributes.
|
|
*
|
|
* comm-time attributes: Attributes, which can used to filter available
|
|
* collective functions at communicator init time. Example attributes include
|
|
* comm size and msg size supported by bcols.
|
|
*
|
|
* invoke-time attributes: Attributes, which can be used to select function
|
|
* for given collective when a collective is invoked.
|
|
*
|
|
*/
|
|
|
|
#include "coll_ml_select.h"
|
|
|
|
static int msg_to_range(size_t msg_len)
|
|
{
|
|
int range;
|
|
|
|
if (msg_len < MSG_RANGE_INITIAL) {
|
|
return 1;
|
|
}
|
|
|
|
range = (int) log10((double)((msg_len / MSG_RANGE_INITIAL)));
|
|
|
|
if (range > NUM_MSG_RANGES)
|
|
return NUM_MSG_RANGES;
|
|
|
|
return range;
|
|
}
|
|
|
|
static int cmp_comm_attribs(struct mca_bcol_base_coll_fn_comm_attributes_t *attrib_var,
|
|
struct mca_bcol_base_coll_fn_comm_attributes_t *attrib_bcol){
|
|
|
|
|
|
if (!(attrib_var->comm_size_max <= attrib_bcol->comm_size_max)) {
|
|
return -1 ;
|
|
}
|
|
|
|
#if 0 /* Manju: pelase fix it*/
|
|
if (attrib_var->data_src != attrib_bcol->data_src) {
|
|
return -1;
|
|
}
|
|
|
|
if (attrib_var->waiting_semantics !=
|
|
attrib_bcol->waiting_semantics) {
|
|
return -1;
|
|
}
|
|
#endif
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Table that holds function names
|
|
*/
|
|
static int init_invoke_table(mca_coll_ml_module_t *ml_module)
|
|
{
|
|
int i=0,j=0,k=0, index_topo;
|
|
int bcoll_type;
|
|
struct mca_bcol_base_module_t *bcol_module = NULL;
|
|
int j_bcol_module=0;
|
|
int i_hier=0;
|
|
mca_coll_ml_topology_t *topo;
|
|
|
|
for (index_topo = 0; index_topo < COLL_ML_TOPO_MAX; index_topo++) {
|
|
topo = &ml_module->topo_list[index_topo];
|
|
if (COLL_ML_TOPO_DISABLED == topo->status) {
|
|
/* skip the topology */
|
|
continue;
|
|
}
|
|
for (i_hier = 0; i_hier < topo->n_levels; i_hier++) {
|
|
|
|
for (j_bcol_module = 0;
|
|
j_bcol_module < topo->component_pairs[i_hier].num_bcol_modules;
|
|
++j_bcol_module) {
|
|
|
|
bcol_module = topo->component_pairs[i_hier].bcol_modules[j_bcol_module];
|
|
|
|
for (bcoll_type = 0; bcoll_type < BCOL_NUM_OF_FUNCTIONS ; bcoll_type++){
|
|
for (i=0; i<NUM_MSG_RANGES; i++) {
|
|
for (j=0; j<OMPI_OP_NUM_OF_TYPES; j++) {
|
|
for (k=0; k<OMPI_DATATYPE_MAX_PREDEFINED; k++) {
|
|
bcol_module->filtered_fns_table[DATA_SRC_UNKNOWN][BLOCKING][bcoll_type][i][j][k]
|
|
= NULL;
|
|
|
|
bcol_module->filtered_fns_table[DATA_SRC_KNOWN][BLOCKING][bcoll_type][i][j][k]
|
|
= NULL;
|
|
|
|
bcol_module->filtered_fns_table[DATA_SRC_UNKNOWN][NON_BLOCKING][bcoll_type][i][j][k]
|
|
= NULL;
|
|
|
|
bcol_module->filtered_fns_table[DATA_SRC_KNOWN][NON_BLOCKING][bcoll_type][i][j][k]
|
|
= NULL;
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int add_to_invoke_table(mca_bcol_base_module_t *bcol_module,
|
|
mca_bcol_base_coll_fn_desc_t *fn_filtered,
|
|
mca_coll_ml_module_t *ml_module)
|
|
{
|
|
struct mca_bcol_base_coll_fn_invoke_attributes_t *inv_attribs = NULL;
|
|
int bcoll_type, data_src_type, waiting_semantic;
|
|
int range_min,range_max;
|
|
int i=0,j=0,k=0,mask=1;
|
|
|
|
|
|
|
|
if((NULL == fn_filtered->inv_attr)||(NULL == fn_filtered->comm_attr)) {
|
|
return OMPI_ERROR;
|
|
}
|
|
|
|
ML_VERBOSE(10, ("Calling add_to_invoke_table %p",fn_filtered->coll_fn));
|
|
|
|
inv_attribs = fn_filtered->inv_attr;
|
|
bcoll_type = fn_filtered->comm_attr->bcoll_type;
|
|
data_src_type = fn_filtered->comm_attr->data_src;
|
|
waiting_semantic = fn_filtered->comm_attr->waiting_semantics;
|
|
|
|
range_min = msg_to_range(inv_attribs->bcol_msg_min);
|
|
range_max = msg_to_range(inv_attribs->bcol_msg_max);
|
|
|
|
for (j=0; j<OMPI_OP_NUM_OF_TYPES; j++) {
|
|
for (k=0; k<OMPI_DATATYPE_MAX_PREDEFINED; k++) {
|
|
|
|
if ((inv_attribs->datatype_bitmap & (mask << k)) && (inv_attribs->op_types_bitmap & (mask << j))){
|
|
|
|
for (i=range_min; i<=range_max; i++) {
|
|
bcol_module->filtered_fns_table[data_src_type][waiting_semantic][bcoll_type][i][j][k]
|
|
= fn_filtered;
|
|
ML_VERBOSE(21, ("Putting functions %d %d %d %d %p", bcoll_type, i, j, k, fn_filtered));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
/*
|
|
* Maps count to msg range that is used for
|
|
* function table
|
|
* RANGE 0 is for small messages (say small msg =10k)
|
|
* MSG RANGE 1 - 10K - 100K
|
|
* RANGE 2 - 100K -1M
|
|
* RANGE 3 - 1M - 10M
|
|
*
|
|
* This is valid only when MSG_RANGE_INC is 10.
|
|
* For other values the function should replace log10 to log with
|
|
* base=MSG_RANGE_INC
|
|
*/
|
|
static int count_to_msg_range(int count,struct ompi_datatype_t *dtype)
|
|
{
|
|
size_t msg_len =0,dt_size;
|
|
int range = 0 ;
|
|
|
|
ompi_datatype_type_size(dtype, &dt_size);
|
|
msg_len = count*dt_size;
|
|
|
|
if (msg_len < MSG_RANGE_INITIAL) {
|
|
return 1;
|
|
}
|
|
|
|
range = (int) log10((double)((msg_len/MSG_RANGE_INITIAL)));
|
|
|
|
if (range > NUM_MSG_RANGES)
|
|
return NUM_MSG_RANGES;
|
|
|
|
return range;
|
|
|
|
}
|
|
|
|
/* Based on the attributes filled in comm_select_attributes
|
|
select functions for invoke time filtering */
|
|
|
|
|
|
static int build_algorithms_table(mca_coll_ml_module_t *ml_module,struct
|
|
mca_bcol_base_coll_fn_comm_attributes_t *my_comm_attrib)
|
|
{
|
|
int i_hier, j_bcol_module, k_bcol_fn, index_topo;
|
|
struct mca_bcol_base_module_t *bcol_module = NULL;
|
|
opal_list_t *fn_filtered_list;
|
|
opal_list_item_t *item;
|
|
mca_coll_ml_topology_t *topo;
|
|
|
|
/*
|
|
* Go through each hierarchy and for each
|
|
* bcol module in the hierarchy, select the alogrithms.
|
|
*/
|
|
for (index_topo = 0; index_topo < COLL_ML_TOPO_MAX; index_topo++) {
|
|
topo = &ml_module->topo_list[index_topo];
|
|
for (i_hier = 0; i_hier < topo->n_levels; i_hier++) {
|
|
my_comm_attrib->comm_size_max =
|
|
topo->component_pairs[i_hier].subgroup_module->group_size;
|
|
|
|
for (j_bcol_module = 0;
|
|
j_bcol_module < topo->component_pairs[i_hier].num_bcol_modules;
|
|
++j_bcol_module) {
|
|
|
|
bcol_module = topo->component_pairs[i_hier].bcol_modules[j_bcol_module];
|
|
|
|
/* Go through all bcols and available bcol functions */
|
|
for (k_bcol_fn = 0; k_bcol_fn < BCOL_NUM_OF_FUNCTIONS; k_bcol_fn++) {
|
|
struct mca_bcol_base_coll_fn_desc_t *fn_filtered = NULL;
|
|
|
|
/* Query the function attributes */
|
|
fn_filtered_list =
|
|
&(bcol_module->bcol_fns_table[k_bcol_fn]);
|
|
|
|
|
|
if (0 == opal_list_get_size(fn_filtered_list)) {
|
|
continue;
|
|
}
|
|
/* All definitions of a collective type is stored in the list
|
|
* Each item in the list is checked for compatability in the
|
|
* attributes and stored in the filtered list */
|
|
for (item = opal_list_get_first(fn_filtered_list);
|
|
item != opal_list_get_end(fn_filtered_list);
|
|
item = opal_list_get_next(item)){
|
|
|
|
fn_filtered = (struct mca_bcol_base_coll_fn_desc_t *)item;
|
|
if (cmp_comm_attribs(my_comm_attrib, fn_filtered->comm_attr) < 0) {
|
|
/* Criteria not satisfied continue to next bcol function */
|
|
continue;
|
|
}
|
|
|
|
/*
|
|
* Add bcol function to be available for invoke time selection
|
|
*/
|
|
add_to_invoke_table(bcol_module, fn_filtered, ml_module);
|
|
}
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
int mca_coll_ml_build_filtered_fn_table(mca_coll_ml_module_t *ml_module)
|
|
{
|
|
|
|
struct mca_bcol_base_coll_fn_comm_attributes_t *my_comm_attrib = NULL;
|
|
|
|
|
|
/* Init table storing all filtered functions */
|
|
init_invoke_table(ml_module);
|
|
|
|
my_comm_attrib = malloc(sizeof(struct mca_bcol_base_coll_fn_comm_attributes_t));
|
|
|
|
if (!my_comm_attrib) {
|
|
return OMPI_ERR_OUT_OF_RESOURCE;
|
|
}
|
|
|
|
my_comm_attrib->comm_size_min = 0;
|
|
|
|
/*
|
|
* This values should be passed using (maybe) mca parameters
|
|
*/
|
|
#if 0 /* Manju: pelase fix it*/
|
|
my_comm_attrib->data_src = DATA_SRC_KNOWN;
|
|
my_comm_attrib->waiting_semantics = BLOCKING;
|
|
#endif
|
|
|
|
if (build_algorithms_table(ml_module,my_comm_attrib)) {
|
|
return OMPI_ERROR;
|
|
}
|
|
|
|
return OMPI_SUCCESS;
|
|
|
|
}
|
|
|
|
#if 0
|
|
static struct mca_bcol_base_coll_fn_invoke_attributes_t *mca_construct_invoke_attributes(
|
|
struct ompi_datatype_t *dtype, int count,
|
|
struct ompi_op_t op_type)
|
|
{
|
|
size_t dt_size, msg_size;
|
|
struct mca_bcol_base_coll_fn_invoke_attributes_t *inv_attribs = NULL;
|
|
|
|
ompi_datatype_type_size(dtype, &dt_size);
|
|
msg_size = count*dt_size;
|
|
|
|
|
|
inv_attribs = malloc(sizeof(struct mca_bcol_base_coll_fn_invoke_attributes_t));
|
|
|
|
/* Fix : We might need to have range for msg size - For now selection will
|
|
* be based on maximum value
|
|
*/
|
|
inv_attribs->bcol_msg_min = 0;
|
|
inv_attribs->bcol_msg_max = msg_size;
|
|
|
|
return inv_attribs;
|
|
}
|
|
#endif
|
|
|
|
int mca_select_bcol_function(mca_bcol_base_module_t *bcol_module,
|
|
int bcoll_type,
|
|
bcol_function_args_t *bcol_fn_arguments,
|
|
coll_ml_function_t *ml_fn_arguments )
|
|
{
|
|
|
|
struct mca_bcol_base_coll_fn_desc_t *fn_filtered = NULL;
|
|
int msg_range=0;
|
|
int ret;
|
|
int data_src_type = DATA_SRC_KNOWN, waiting_type = BLOCKING;
|
|
|
|
msg_range =
|
|
count_to_msg_range(bcol_fn_arguments->count,
|
|
bcol_fn_arguments->dtype);
|
|
if ((BCOL_ALLREDUCE == bcoll_type) || (BCOL_REDUCE == bcoll_type)) {
|
|
/* needs to be resolved, the op structure has changed, there is no field called "op_type" */
|
|
fn_filtered =
|
|
bcol_module->filtered_fns_table[data_src_type][waiting_type][bcoll_type][msg_range][bcol_fn_arguments->dtype->id][bcol_fn_arguments->op->op_type];
|
|
}
|
|
else {
|
|
fn_filtered =
|
|
bcol_module->filtered_fns_table[data_src_type][waiting_type][bcoll_type][msg_range][bcol_fn_arguments->dtype->id][0];
|
|
|
|
}
|
|
|
|
if (NULL == fn_filtered) {
|
|
return OMPI_ERROR;
|
|
}
|
|
|
|
ret = (fn_filtered->coll_fn)(bcol_fn_arguments,ml_fn_arguments);
|
|
return ret;
|
|
}
|
|
|