UCP: Remove single net dev filtering for single proto (#10919)

Author: brminich

src/ucp/proto/proto_common.c

@@ -152,37 +152,6 @@ ucp_proto_common_get_sys_dev(const ucp_proto_init_params_t *params,
     return params->worker->context->tl_rscs[rsc_index].tl_rsc.sys_device;
 }
 
-int ucp_proto_common_add_unique_sys_dev(ucs_sys_device_t sys_dev,
-                                        ucs_sys_device_t *sys_devs,
-                                        ucp_lane_index_t *num_sys_devs,
-                                        ucp_lane_index_t max_sys_devs)
-{
-    ucp_lane_index_t i;
-
-    for (i = 0; i < *num_sys_devs; ++i) {
-        if (sys_dev == sys_devs[i]) {
-            return 0; /* Already exists */
-        }
-    }
-
-    if (*num_sys_devs < max_sys_devs) {
-        sys_devs[(*num_sys_devs)++] = sys_dev;
-        return 1; /* Added */
-    }
-
-    return 0; /* No space */
-}
-
-ucp_lane_index_t
-ucp_proto_common_select_sys_dev_by_node_id(const ucp_proto_init_params_t *params,
-                                           ucp_lane_index_t num_sys_devs)
-{
-    if (num_sys_devs == 0) {
-        return 0;
-    }
-    return params->worker->context->config.node_local_id % num_sys_devs;
-}
-
 /* Pack/unpack local distance to make it equal to the remote one */
 static void
 ucp_proto_common_fp8_pack_unpack_distance(ucs_sys_dev_distance_t *distance)

src/ucp/proto/proto_common.h

@@ -255,15 +255,6 @@ ucs_sys_device_t
 ucp_proto_common_get_sys_dev(const ucp_proto_init_params_t *params,
                              ucp_lane_index_t lane);
 
-int ucp_proto_common_add_unique_sys_dev(ucs_sys_device_t sys_dev,
-                                        ucs_sys_device_t *sys_devs,
-                                        ucp_lane_index_t *num_sys_devs,
-                                        ucp_lane_index_t max_sys_devs);
-
-ucp_lane_index_t
-ucp_proto_common_select_sys_dev_by_node_id(const ucp_proto_init_params_t *params,
-                                           ucp_lane_index_t num_sys_devs);
-
 
 void ucp_proto_common_get_lane_distance(const ucp_proto_init_params_t *params,
                                         ucp_lane_index_t lane,

src/ucp/proto/proto_multi.c

@@ -181,16 +181,22 @@ static ucp_lane_index_t ucp_proto_multi_filter_net_devices(
         }
 
         sys_dev = ucp_proto_common_get_sys_dev(params, lane);
-        ucp_proto_common_add_unique_sys_dev(sys_dev, sys_devs, &num_max_bw_devs,
-                                            UCP_PROTO_MAX_LANES);
+        for (i = 0; i < num_max_bw_devs; ++i) {
+            if (sys_dev == sys_devs[i]) {
+                break;
+            }
+        }
+
+        if (i == num_max_bw_devs) {
+            sys_devs[num_max_bw_devs++] = sys_dev;
+        }
     }
 
     if (num_max_bw_devs == 0) {
         return num_lanes;
     }
 
-    seed = ucp_proto_common_select_sys_dev_by_node_id(params, num_max_bw_devs);
-
+    seed = params->worker->context->config.node_local_id % num_max_bw_devs;
     for (i = !!fixed_first_lane, num_filtered_lanes = i; i < num_lanes; ++i) {
         lane   = lanes[i];
         tl_rsc = ucp_proto_common_get_tl_rsc(params, lane);

src/ucp/proto/proto_single.c

@@ -10,87 +10,13 @@
 
 #include "proto_single.h"
 #include "proto_common.h"
-#include "proto_common.inl"
 #include "proto_init.h"
 #include "proto_debug.h"
 
 #include <ucs/debug/assert.h>
 #include <ucs/debug/log.h>
 #include <ucs/sys/math.h>
 
-static double
-ucp_proto_single_get_bandwidth(const ucp_proto_common_init_params_t *params,
-                               ucp_lane_index_t lane)
-{
-    ucp_proto_common_tl_perf_t tl_perf;
-    ucp_proto_perf_node_t *perf_node;
-    ucs_status_t status;
-
-    status = ucp_proto_common_get_lane_perf(params, lane, &tl_perf, &perf_node);
-    if (status != UCS_OK) {
-        return 0;
-    }
-
-    ucp_proto_perf_node_deref(&perf_node);
-    return tl_perf.bandwidth;
-}
-
-static void
-ucp_proto_single_update_lane(const ucp_proto_single_init_params_t *params,
-                             ucp_lane_index_t *lane_p)
-{
-    const ucp_proto_common_init_params_t *common_params = &params->super;
-    const ucp_proto_init_params_t *init_params = &common_params->super;
-    const ucp_context_h context                = init_params->worker->context;
-    double bandwidth;
-    ucp_lane_index_t lanes[UCP_PROTO_MAX_LANES];
-    ucs_sys_device_t sys_devs[UCP_PROTO_MAX_LANES];
-    ucp_lane_index_t num_lanes, num_same_bw_devs, i, lane;
-    ucs_sys_device_t sys_dev;
-
-    if (!context->config.ext.proto_use_single_net_device ||
-        /* skip lane update for node_local_id 0 since the original lane would be
-         * selected anyway */
-        (context->config.node_local_id == 0)) {
-        return;
-    }
-
-    if (!ucp_proto_common_is_net_dev(init_params, *lane_p)) {
-        return;
-    }
-
-    bandwidth   = ucp_proto_single_get_bandwidth(common_params, *lane_p);
-    lanes[0]    = *lane_p;
-    sys_devs[0] = ucp_proto_common_get_sys_dev(init_params, lanes[0]);
-
-    num_lanes = ucp_proto_common_find_lanes(
-            init_params, common_params->flags, params->lane_type,
-            params->tl_cap_flags, UCP_PROTO_MAX_LANES - 1,
-            (common_params->exclude_map | UCS_BIT(lanes[0])),
-            ucp_proto_common_filter_min_frag, lanes + 1);
-
-    for (num_same_bw_devs = 1, i = 1; i < num_lanes; ++i) {
-        lane = lanes[i];
-        if (!ucp_proto_common_is_net_dev(init_params, lane)) {
-            continue;
-        }
-
-        if (!ucp_proto_common_bandwidth_equal(
-                ucp_proto_single_get_bandwidth(common_params, lane), bandwidth)) {
-            continue;
-        }
-
-        sys_dev = ucp_proto_common_get_sys_dev(init_params, lane);
-        if (ucp_proto_common_add_unique_sys_dev(sys_dev, sys_devs,
-                                                &num_same_bw_devs,
-                                                UCP_PROTO_MAX_LANES)) {
-            lanes[num_same_bw_devs - 1] = lane;
-        }
-    }
-
-    *lane_p = lanes[ucp_proto_common_select_sys_dev_by_node_id(init_params,
-                                                               num_same_bw_devs)];
-}
 
 ucs_status_t ucp_proto_single_init(const ucp_proto_single_init_params_t *params,
                                    ucp_proto_perf_t **perf_p,
@@ -121,8 +47,6 @@ ucs_status_t ucp_proto_single_init(const ucp_proto_single_init_params_t *params,
 
     ucs_assert(num_lanes == 1);
 
-    ucp_proto_single_update_lane(params, &lane);
-
     reg_md_map = ucp_proto_common_reg_md_map(&params->super, UCS_BIT(lane));
     if (reg_md_map == 0) {
         spriv->reg_md = UCP_NULL_RESOURCE;