TEST/WIREUP: Consider distance when testing bw/latency

Author: yosefe

test/gtest/ucp/test_ucp_wireup.cc

@@ -1761,13 +1761,14 @@ class test_ucp_address_v2 : public test_ucp_wireup {
                                "tag,unified");
     }
 
-    void check_fp_values(double unpacked, double original)
+    void
+    check_fp_values(const std::string &name, double unpacked, double original)
     {
         double max_error = original / pow(2, _UCS_FP8_MANTISSA_BITS);
-        EXPECT_NEAR(original, unpacked, max_error);
+        EXPECT_NEAR(original, unpacked, max_error) << name;
     }
 
-    const uct_iface_attr_t *get_iface_attr(const ucp_address_entry_t *ae)
+    const ucp_worker_iface_t *get_wiface(const ucp_address_entry_t *ae)
     {
         ucp_worker_h worker   = sender().worker();
         ucp_context_h context = worker->context;
@@ -1789,7 +1790,7 @@ class test_ucp_address_v2 : public test_ucp_wireup {
                  ae->tl_name_csum) &&
                 uct_iface_is_reachable_v2(wiface->iface, &params)) {
                 EXPECT_EQ(ae->md_index, context->tl_rscs[rsc_index].md_index);
-                return &wiface->attr;
+                return wiface;
             }
         }
 
@@ -1825,20 +1826,22 @@ UCS_TEST_SKIP_COND_P(test_ucp_address_v2, pack_iface_attrs,
 
     const ucp_address_entry_t *ae;
     ucp_unpacked_address_for_each(ae, &unpacked_address) {
-        auto attr = get_iface_attr(ae);
-        ASSERT_NE(nullptr, attr);
+        auto wiface = get_wiface(ae);
+        ASSERT_NE(nullptr, wiface);
 
         // Segment size is packed as a multiplicator of
         // UCP_ADDRESS_IFACE_SEG_SIZE_FACTOR, thus the unpacked value may be
         // smaller than the original value by up to 64 bytes.
-        EXPECT_LT(ucp_address_iface_seg_size(attr) - ae->iface_attr.seg_size,
+        EXPECT_LT(ucp_address_iface_seg_size(&wiface->attr) -
+                          ae->iface_attr.seg_size,
                   UCP_ADDRESS_IFACE_SEG_SIZE_FACTOR);
-        check_fp_values(ae->iface_attr.overhead, attr->overhead);
-        check_fp_values(ae->iface_attr.lat_ovh,
-                        ucp_tl_iface_latency(worker->context, &attr->latency));
-        check_fp_values(
-                ae->iface_attr.bandwidth,
-                ucp_tl_iface_bandwidth(worker->context, &attr->bandwidth));
+
+        check_fp_values("overhead", ae->iface_attr.overhead,
+                        wiface->attr.overhead);
+        check_fp_values("latency", ae->iface_attr.lat_ovh,
+                        ucp_wireup_iface_lat_distance_v2(wiface, 0));
+        check_fp_values("bandwidth", ae->iface_attr.bandwidth,
+                        ucp_wireup_iface_bw_distance(wiface));
     }
 
     ucs_free(unpacked_address.address_list);