UCP/CORE: Remove device range logic

Author: guy-ealey-morag

src/ucp/core/ucp_context.c

@@ -993,52 +993,6 @@ static uint64_t ucp_str_array_search(const char **array, unsigned array_len,
     return result;
 }
 
-/* Search str in the ranges that are specified in the array. 
- * Ranges are a prefix followed by a [range_start-range_end] suffix. (ex: mlx5_[0-2])
- * @return bitmap of indexes in which the string appears in the array.
- */
-static uint64_t ucp_str_array_search_in_ranges(const char **array,
-                                               unsigned array_len,
-                                               const char *str)
-{
-    unsigned long range_start, range_end, str_id;
-    size_t prefix_len;
-    uint64_t result;
-    const char *p;
-    char *endptr;
-    unsigned i;
-    int n;
-
-    result = 0;
-    for (i = 0; i < array_len; ++i) {
-        p = strchr(array[i], '[');
-        if (p == NULL) {
-            continue; /* Not a range */
-        }
-
-        prefix_len = (size_t)(p - array[i]);
-        if (strncmp(array[i], str, prefix_len)) {
-            continue; /* Prefix does not match */
-        }
-
-        n = 0;
-        if ((sscanf(p, "[%lu-%lu]%n", &range_start, &range_end, &n) != 2) ||
-            (n == 0) || (p[n] != '\0') || (range_start > range_end)) {
-            continue; /* Invalid range */
-        }
-
-        str_id = strtoul(str + prefix_len, &endptr, 10);
-        if ((endptr == str + prefix_len) || (*endptr != '\0') ||
-            (str_id < range_start) || (str_id > range_end)) {
-            continue; /* Mismatch */
-        }
-
-        result |= UCS_BIT(i);
-    }
-
-    return result;
-}
-
 static unsigned ucp_tl_alias_count(ucp_tl_alias_t *alias)
 {
     unsigned count;
@@ -1108,9 +1062,6 @@ static int ucp_is_resource_in_device_list(const uct_tl_resource_desc_t *resource
     mask = ucp_str_array_search((const char**)devices[dev_type].names,
                                 devices[dev_type].count, resource->dev_name,
                                 NULL);
-    mask |= ucp_str_array_search_in_ranges((const char**)devices[dev_type].names,
-                                           devices[dev_type].count,
-                                           resource->dev_name);
 
     /* for network devices, also search for the base name (before the delimiter) */
     if (dev_type == UCT_DEVICE_TYPE_NET) {
@@ -1119,9 +1070,6 @@ static int ucp_is_resource_in_device_list(const uct_tl_resource_desc_t *resource
             mask |= ucp_str_array_search((const char**)devices[dev_type].names,
                                          devices[dev_type].count, dev_basename,
                                          NULL);
-            mask |= ucp_str_array_search_in_ranges(
-                    (const char**)devices[dev_type].names,
-                    devices[dev_type].count, dev_basename);
         }
     }
 

test/gtest/ucp/test_ucp_context.cc

@@ -193,7 +193,8 @@ class test_ucp_net_devices_config : public ucp_test {
     }
 
     /* Test that a device config triggers duplicate device warning */
-    void test_duplicate_device_warning(const std::string &devices_config,
+    void test_duplicate_device_warning(const std::string &required_dev_name,
+                                       const std::string &devices_config,
                                        const std::string &duplicate_dev_name)
     {
         entity *e = create_entity();
@@ -203,8 +204,8 @@ class test_ucp_net_devices_config : public ucp_test {
             UCS_TEST_SKIP_R("No mlx5 network device available");
         }
 
-        if (!has_device(mlx5_devices, duplicate_dev_name)) {
-            UCS_TEST_SKIP_R(duplicate_dev_name + " device not available");
+        if (!has_device(mlx5_devices, required_dev_name)) {
+            UCS_TEST_SKIP_R(required_dev_name + " device not available");
         }
 
         m_entities.clear();
@@ -221,14 +222,9 @@ class test_ucp_net_devices_config : public ucp_test {
         EXPECT_EQ(m_warnings.size() - warn_count, 1)
                 << "Expected exactly one warning";
 
-        // print all warnings
-        for (const std::string &warn : m_warnings) {
-            std::cout << warn << std::endl;
-        }
-
         /* Check that a warning about duplicate device was printed */
         std::string expected_warn = "device '" + duplicate_dev_name +
-                                    "' was selected multiple times";
+                                    "' is specified multiple times";
         bool found_warning        = false;
         for (size_t i = warn_count; i < m_warnings.size(); ++i) {
             if (m_warnings[i].find(expected_warn) != std::string::npos) {
@@ -311,100 +307,22 @@ UCS_TEST_P(test_ucp_net_devices_config, explicit_port_suffix)
         << "Device '" << test_dev_name << "' should be selected";
 }
 
-/*
- * Test that device name range specification works with base names.
- * E.g., "mlx5_[0-1]" should match mlx5_0:1 and mlx5_1:1
- */
-UCS_TEST_P(test_ucp_net_devices_config, range_with_base_names)
-{
-    entity *e = create_entity();
-
-    std::set<std::string> mlx5_devices = get_mlx5_device_names(*e);
-    if (mlx5_devices.empty()) {
-        UCS_TEST_SKIP_R("No mlx5 network device available");
-    }
-
-    size_t num_mlx5_devices = mlx5_devices.size();
-    if (num_mlx5_devices < 2) {
-        UCS_TEST_SKIP_R("Need at least 2 mlx5 devices for range test");
-    }
-
-    m_entities.clear();
-
-    /* Use a range that should match all mlx devices */
-    modify_config("NET_DEVICES", "mlx5_[0-99]");
-    e = create_entity();
-
-    /* Verify that mlx5 devices were selected */
-    std::set<std::string> selected_devices = get_mlx5_device_names(*e);
-    EXPECT_EQ(selected_devices.size(), num_mlx5_devices)
-            << "Expected " << num_mlx5_devices
-            << " mlx5 devices to be selected with range";
-}
-
-/*
- * Test that a range not covering all devices only selects matching devices.
- * E.g., "mlx5_[1-2]" should match mlx5_1 and mlx5_2, but not mlx5_0.
- */
-UCS_TEST_P(test_ucp_net_devices_config, partial_range_selection)
-{
-    entity *e = create_entity();
-
-    std::set<std::string> mlx5_devices = get_mlx5_device_names(*e);
-    if (mlx5_devices.empty()) {
-        UCS_TEST_SKIP_R("No mlx5 network device available");
-    }
-
-    std::set<std::string> base_names = get_mlx5_base_names(mlx5_devices);
-
-    if (!has_device(base_names, "mlx5_0") ||
-        !has_device(base_names, "mlx5_1") ||
-        !has_device(base_names, "mlx5_2")) {
-        UCS_TEST_SKIP_R(
-                "Need mlx5_0, mlx5_1, and mlx5_2 devices for this test");
-    }
-
-    m_entities.clear();
-
-    modify_config("NET_DEVICES", "mlx5_[1-2]");
-    e = create_entity();
-
-    std::set<std::string> selected_devices = get_mlx5_device_names(*e);
-
-    std::set<std::string> selected_base_names = get_mlx5_base_names(
-            selected_devices);
-
-    std::set<std::string> expected_base_names = {"mlx5_1", "mlx5_2"};
-    EXPECT_EQ(selected_base_names, expected_base_names);
-}
-
 /*
  * Test that specifying a device multiple times produces a warning
  */
 UCS_TEST_P(test_ucp_net_devices_config, duplicate_device_warning_simple)
 {
-    test_duplicate_device_warning("mlx5_0:1,mlx5_0:1", "mlx5_0:1");
+    test_duplicate_device_warning("mlx5_0:1", "mlx5_0:1,mlx5_0:1", "mlx5_0:1");
 }
 
 UCS_TEST_P(test_ucp_net_devices_config, duplicate_device_warning_base_name)
 {
-    test_duplicate_device_warning("mlx5_0:1,mlx5_0", "mlx5_0:1");
+    test_duplicate_device_warning("mlx5_0:1", "mlx5_0:1,mlx5_0", "mlx5_0");
 }
 
 UCS_TEST_P(test_ucp_net_devices_config, duplicate_device_warning_two_base_name)
 {
-    test_duplicate_device_warning("mlx5_0,mlx5_0", "mlx5_0:1");
-}
-
-UCS_TEST_P(test_ucp_net_devices_config, duplicate_device_warning_range)
-{
-    test_duplicate_device_warning("mlx5_[0-99],mlx5_0", "mlx5_0:1");
-}
-
-UCS_TEST_P(test_ucp_net_devices_config, duplicate_device_warning_two_ranges)
-{
-    test_duplicate_device_warning("mlx5_[0-1],mlx5_[1-2]", "mlx5_1:1");
+    test_duplicate_device_warning("mlx5_0:1", "mlx5_0,mlx5_0", "mlx5_0");
 }
 
-
 UCP_INSTANTIATE_TEST_CASE_TLS(test_ucp_net_devices_config, ib, "ib")