aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--host/include/uhd/rfnoc/defaults.hpp6
-rw-r--r--host/include/uhd/rfnoc_graph.hpp37
-rw-r--r--host/lib/include/uhdlib/rfnoc/graph_stream_manager.hpp36
-rw-r--r--host/lib/include/uhdlib/rfnoc/link_stream_manager.hpp14
-rw-r--r--host/lib/include/uhdlib/rfnoc/mb_iface.hpp11
-rw-r--r--host/lib/include/uhdlib/rfnoc/rfnoc_common.hpp4
-rw-r--r--host/lib/rfnoc/graph_stream_manager.cpp117
-rw-r--r--host/lib/rfnoc/link_stream_manager.cpp29
-rw-r--r--host/lib/rfnoc/rfnoc_graph.cpp35
9 files changed, 164 insertions, 125 deletions
diff --git a/host/include/uhd/rfnoc/defaults.hpp b/host/include/uhd/rfnoc/defaults.hpp
index 6af67144a..9a3ce252f 100644
--- a/host/include/uhd/rfnoc/defaults.hpp
+++ b/host/include/uhd/rfnoc/defaults.hpp
@@ -49,11 +49,6 @@ static const int DEFAULT_SPP = 1996;
using noc_id_t = uint32_t;
/*** Device Identifiers ******************************************************/
-//! Device ID
-using device_id_t = uint16_t;
-//! NULL/unassigned device ID
-static const device_id_t NULL_DEVICE_ID = 0;
-
//! Device Type
using device_type_t = uint16_t;
// first nibble for device family (E = E, N = 1, X = A), remaining three nibbles
@@ -81,4 +76,3 @@ static const noc_id_t DDC_BLOCK = 0xDDC00000;
}} // namespace uhd::rfnoc
#endif /* INCLUDED_LIBUHD_RFNOC_DEFAULTS_HPP */
-
diff --git a/host/include/uhd/rfnoc_graph.hpp b/host/include/uhd/rfnoc_graph.hpp
index 556a298dc..8a56d1c80 100644
--- a/host/include/uhd/rfnoc_graph.hpp
+++ b/host/include/uhd/rfnoc_graph.hpp
@@ -12,6 +12,7 @@
#include <uhd/rfnoc/graph_edge.hpp>
#include <uhd/rfnoc/noc_block_base.hpp>
#include <uhd/stream.hpp>
+#include <uhd/transport/adapter_id.hpp>
#include <uhd/types/device_addr.hpp>
#include <uhd/utils/noncopyable.hpp>
#include <boost/units/detail/utility.hpp> // for demangle
@@ -196,7 +197,7 @@ public:
* \param strm_port The port of the streamer to connect.
* \param dst_blk The block ID of the destination block to connect to.
* \param dst_port The port of the destination block to connect to.
- * \param via_device The local device ID (transport) to use for this connection.
+ * \param adapter_id The local device ID (transport) to use for this connection.
*
* \throws connect_disallowed_on_dst
* if the destination port is statically connected to a *different* block
@@ -205,7 +206,7 @@ public:
size_t strm_port,
const block_id_t& dst_blk,
size_t dst_port,
- device_id_t via_device = NULL_DEVICE_ID) = 0;
+ uhd::transport::adapter_id_t adapter_id = uhd::transport::NULL_ADAPTER_ID) = 0;
/*! Connect RX streamer to an output of an NoC block
*
@@ -213,7 +214,7 @@ public:
* \param src_port The port of the source block to connect.
* \param streamer The streamer to connect.
* \param strm_port The port of the streamer to connect.
- * \param via_device The local device ID (transport) to use for this connection.
+ * \param adapter_id The local device ID (transport) to use for this connection.
*
* \throws connect_disallowed_on_src
* if the source port is statically connected to a *different* block
@@ -222,31 +223,31 @@ public:
size_t src_port,
uhd::rx_streamer::sptr streamer,
size_t strm_port,
- device_id_t via_device = NULL_DEVICE_ID) = 0;
+ uhd::transport::adapter_id_t adapter_id = uhd::transport::NULL_ADAPTER_ID) = 0;
- /*! Enumerate all the possible via devices that can be used to receive
- * from the specified block
+ /*! Enumerate all the possible host transport adapters that can be used to
+ * receive from the specified block
*
- * If addr and second_addr were specified in device_args, the device_id_t
+ * If addr and second_addr were specified in device_args, the adapter_id_t
* associated with addr will come first in the vector, then second_addr.
*
* \param src_blk The block ID of the source block to connect to.
* \param src_port The port of the source block to connect to.
*/
- virtual std::vector<device_id_t> enumerate_dst_via_devices(const block_id_t& src_blk,
- size_t src_port) = 0;
+ virtual std::vector<uhd::transport::adapter_id_t> enumerate_adapters_from_src(
+ const block_id_t& src_blk, size_t src_port) = 0;
- /*! Enumerate all the possible via devices that can be used to send to the
- * specified block
+ /*! Enumerate all the possible host transport adapters that can be used to
+ * send to the specified block
*
- * If addr and second_addr were specified in device_args, the device_id_t
+ * If addr and second_addr were specified in device_args, the adapter_id_t
* associated with addr will come first in the vector, then second_addr.
*
* \param dst_blk The block ID of the destination block to connect to.
* \param dst_port The port of the destination block to connect to.
*/
- virtual std::vector<device_id_t> enumerate_src_via_devices(const block_id_t& dst_blk,
- size_t dst_port) = 0;
+ virtual std::vector<uhd::transport::adapter_id_t> enumerate_adapters_to_dst(
+ const block_id_t& dst_blk, size_t dst_port) = 0;
/*! Enumerate all the possible static connections in the graph
*
@@ -290,8 +291,8 @@ public:
* \param args Arguments to aid the construction of the streamer
* \return a shared pointer to a new streamer
*/
- virtual rx_streamer::sptr create_rx_streamer(const size_t num_ports,
- const stream_args_t& args) = 0;
+ virtual rx_streamer::sptr create_rx_streamer(
+ const size_t num_ports, const stream_args_t& args) = 0;
/*! Create a new transmit streamer from the streamer arguments
* The created streamer is still not connected to anything yet.
@@ -303,8 +304,8 @@ public:
* \param args Arguments to aid the construction of the streamer
* \return a shared pointer to a new streamer
*/
- virtual tx_streamer::sptr create_tx_streamer(const size_t num_ports,
- const stream_args_t& args) = 0;
+ virtual tx_streamer::sptr create_tx_streamer(
+ const size_t num_ports, const stream_args_t& args) = 0;
/**************************************************************************
* Hardware Control
diff --git a/host/lib/include/uhdlib/rfnoc/graph_stream_manager.hpp b/host/lib/include/uhdlib/rfnoc/graph_stream_manager.hpp
index 2227a7ad3..8a721ea26 100644
--- a/host/lib/include/uhdlib/rfnoc/graph_stream_manager.hpp
+++ b/host/lib/include/uhdlib/rfnoc/graph_stream_manager.hpp
@@ -8,13 +8,14 @@
#define INCLUDED_LIBUHD_RFNOC_GRAPH_STREAM_MANAGER_HPP
#include <uhd/stream.hpp>
+#include <uhd/transport/adapter_id.hpp>
#include <uhdlib/rfnoc/chdr_packet.hpp>
+#include <uhdlib/rfnoc/chdr_rx_data_xport.hpp>
+#include <uhdlib/rfnoc/chdr_tx_data_xport.hpp>
#include <uhdlib/rfnoc/client_zero.hpp>
#include <uhdlib/rfnoc/ctrlport_endpoint.hpp>
#include <uhdlib/rfnoc/epid_allocator.hpp>
#include <uhdlib/rfnoc/mb_iface.hpp>
-#include <uhdlib/rfnoc/chdr_rx_data_xport.hpp>
-#include <uhdlib/rfnoc/chdr_tx_data_xport.hpp>
#include <functional>
#include <memory>
#include <set>
@@ -48,11 +49,11 @@ public:
/*! \brief Connect the host to the specified destination and create a control stream
*
* \param dst_addr The physical address of the destination endpoint
- * \param via_device The preference for the device to take to get to the destination
+ * \param adapter The preference for the adapter to use to get to the destination
* \return A pair (source, destination) endpoint IDs for the control stream
*/
- virtual sep_id_pair_t connect_host_to_device(
- sep_addr_t dst_addr, device_id_t host_device = NULL_DEVICE_ID) = 0;
+ virtual sep_id_pair_t connect_host_to_device(sep_addr_t dst_addr,
+ uhd::transport::adapter_id_t adapter = uhd::transport::NULL_ADAPTER_ID) = 0;
/*! \brief Connect two remote endpoints to each other
*
@@ -69,23 +70,23 @@ public:
* \param block_index The index of the block in the device
* \param client_clk The clock that is driving the ctrlport slave
* \param timebase_clk The clock that is driving the timebase
- * \param via_device The preference for the device to take to get to the destination
+ * \param adapter The preference for the adapter to use to get to the destination
* \return An interface to the ctrlport endpoint
*/
virtual ctrlport_endpoint::sptr get_block_register_iface(sep_addr_t dst_addr,
uint16_t block_index,
const clock_iface& client_clk,
const clock_iface& timebase_clk,
- device_id_t via_device = NULL_DEVICE_ID) = 0;
+ uhd::transport::adapter_id_t adapter = uhd::transport::NULL_ADAPTER_ID) = 0;
/*! \brief Get a pointer to the client zero instance for the specified EPID
*
* \param dst_epid The endpoint ID of the destination
- * \param via_device The preference for the device to take to get to the destination
+ * \param adapter The preference for the adapter to use to get to the destination
* \return An interface to the client zero instance
*/
- virtual detail::client_zero::sptr get_client_zero(
- sep_addr_t dst_addr, device_id_t via_device = NULL_DEVICE_ID) const = 0;
+ virtual detail::client_zero::sptr get_client_zero(sep_addr_t dst_addr,
+ uhd::transport::adapter_id_t adapter = uhd::transport::NULL_ADAPTER_ID) const = 0;
/*! Configure a flow controlled data stream from the endpoint with ID src_epid to the
@@ -111,7 +112,7 @@ public:
* \param dst_addr The address of the destination stream endpoint
* \param pyld_buff_fmt Datatype of SW buffer that holds the data payload
* \param mdata_buff_fmt Datatype of SW buffer that holds the data metadata
- * \param via_device The preference for the device to take to get to the destination
+ * \param adapter The preference for the adapter to use to get to the destination
* \param xport_args The transport arguments
* \return An transport instance
*/
@@ -119,7 +120,7 @@ public:
sep_addr_t dst_addr,
const sw_buff_t pyld_buff_fmt,
const sw_buff_t mdata_buff_fmt,
- const device_id_t via_device,
+ const uhd::transport::adapter_id_t adapter,
const device_addr_t& xport_args) = 0;
/*! \brief Create a data stream going from the host to the device
@@ -127,7 +128,7 @@ public:
* \param dst_addr The address of the destination stream endpoint
* \param pyld_buff_fmt Datatype of SW buffer that holds the data payload
* \param mdata_buff_fmt Datatype of SW buffer that holds the data metadata
- * \param via_device The preference for the device to take to get to the destination
+ * \param adapter The preference for the adapter to use to get to the destination
* \param xport_args The transport arguments
* \return An transport instance
*/
@@ -135,15 +136,16 @@ public:
sep_addr_t dst_addr,
const sw_buff_t pyld_buff_fmt,
const sw_buff_t mdata_buff_fmt,
- const device_id_t via_device,
+ const uhd::transport::adapter_id_t adapter,
const device_addr_t& xport_args) = 0;
- /*! \brief Get all the via_devices that can reach the specified endpoint
+ /*! \brief Get all the adapters that can reach the specified endpoint
*
* \param addr The address of the stream endpoint
- * \return A vector of all the via_devices
+ * \return A vector of adapter IDs
*/
- virtual std::vector<device_id_t> get_via_devices(sep_addr_t addr) const = 0;
+ virtual std::vector<uhd::transport::adapter_id_t> get_adapters(
+ sep_addr_t addr) const = 0;
/*!
* \brief Create a graph_stream_manager and return a unique_ptr to it
diff --git a/host/lib/include/uhdlib/rfnoc/link_stream_manager.hpp b/host/lib/include/uhdlib/rfnoc/link_stream_manager.hpp
index 72f1cf1c7..b1a934891 100644
--- a/host/lib/include/uhdlib/rfnoc/link_stream_manager.hpp
+++ b/host/lib/include/uhdlib/rfnoc/link_stream_manager.hpp
@@ -7,11 +7,12 @@
#ifndef INCLUDED_LIBUHD_RFNOC_LINK_STREAM_MANAGER_HPP
#define INCLUDED_LIBUHD_RFNOC_LINK_STREAM_MANAGER_HPP
+#include <uhd/transport/adapter_id.hpp>
+#include <uhdlib/rfnoc/chdr_rx_data_xport.hpp>
#include <uhdlib/rfnoc/client_zero.hpp>
#include <uhdlib/rfnoc/ctrlport_endpoint.hpp>
#include <uhdlib/rfnoc/epid_allocator.hpp>
#include <uhdlib/rfnoc/mb_iface.hpp>
-#include <uhdlib/rfnoc/chdr_rx_data_xport.hpp>
#include <functional>
#include <memory>
#include <set>
@@ -26,6 +27,9 @@ namespace uhd { namespace rfnoc {
* and thus, the host's device_id_t uniquely identifies the host-side transport adapter
* to use for packet transmission/reception.
*
+ * For convenience, the link_stream_manager also provides a method to get the
+ * host's transport adapter ID directly.
+ *
* There must be one instance of this class per logical link.
*/
class link_stream_manager
@@ -37,10 +41,16 @@ public:
/*! \brief Get the software device ID associated with this instance
*
- * \return A vector of addresses for all reachable endpoints
+ * \return The software device ID associated with this instance
*/
virtual device_id_t get_self_device_id() const = 0;
+ /*! \brief Get the transport adapter ID associated with this instance
+ *
+ * \return The adapter ID associated with this instance
+ */
+ virtual uhd::transport::adapter_id_t get_adapter_id() const = 0;
+
/*! \brief Get all the endpoints reachable from this link
*
* \return A vector of addresses for all reachable endpoints
diff --git a/host/lib/include/uhdlib/rfnoc/mb_iface.hpp b/host/lib/include/uhdlib/rfnoc/mb_iface.hpp
index 1a06d44e2..abfc9d1c4 100644
--- a/host/lib/include/uhdlib/rfnoc/mb_iface.hpp
+++ b/host/lib/include/uhdlib/rfnoc/mb_iface.hpp
@@ -7,6 +7,7 @@
#ifndef INCLUDED_LIBUHD_MB_IFACE_HPP
#define INCLUDED_LIBUHD_MB_IFACE_HPP
+#include <uhd/transport/adapter_id.hpp>
#include <uhd/types/endianness.hpp>
#include <uhdlib/rfnoc/chdr_ctrl_xport.hpp>
#include <uhdlib/rfnoc/chdr_rx_data_xport.hpp>
@@ -66,6 +67,16 @@ public:
*/
virtual std::vector<device_id_t> get_local_device_ids() = 0;
+ /*! Return the uhd::transport::adapter_id for the link associated with
+ * \p local_device_id
+ *
+ * A transport must be created on the adapter before this will be valid.
+ * Since link_stream_managers always create a chdr_ctrl_xport on
+ * construction, the requirement is satisfied.
+ */
+ virtual uhd::transport::adapter_id_t get_adapter_id(
+ const device_id_t local_device_id) = 0;
+
/*! Reset the device
*/
virtual void reset_network() = 0;
diff --git a/host/lib/include/uhdlib/rfnoc/rfnoc_common.hpp b/host/lib/include/uhdlib/rfnoc/rfnoc_common.hpp
index 4785949e7..c2ec4e0e3 100644
--- a/host/lib/include/uhdlib/rfnoc/rfnoc_common.hpp
+++ b/host/lib/include/uhdlib/rfnoc/rfnoc_common.hpp
@@ -36,6 +36,8 @@ constexpr size_t chdr_w_to_bits(chdr_w_t chdr_w)
}
}
+//! Device ID Type
+using device_id_t = uint16_t;
//! Stream Endpoint Instance Number Type
using sep_inst_t = uint16_t;
//! Stream Endpoint Physical Address Type
@@ -49,6 +51,8 @@ using sep_id_pair_t = std::pair<sep_id_t, sep_id_t>;
//! Stream Endpoint Virtual Channel Type
using sep_vc_t = uint8_t;
+//! NULL/unassigned device ID
+static constexpr device_id_t NULL_DEVICE_ID = 0;
//! NULL/unassigned device address
static constexpr sep_addr_t NULL_DEVICE_ADDR{NULL_DEVICE_ID, 0};
//! NULL/unassigned stream endpoint ID
diff --git a/host/lib/rfnoc/graph_stream_manager.cpp b/host/lib/rfnoc/graph_stream_manager.cpp
index f3c42c87f..dcfa88f32 100644
--- a/host/lib/rfnoc/graph_stream_manager.cpp
+++ b/host/lib/rfnoc/graph_stream_manager.cpp
@@ -18,9 +18,6 @@ using namespace uhd;
using namespace uhd::rfnoc;
using namespace uhd::rfnoc::chdr;
-namespace uhd { namespace rfnoc { namespace detail {
-}}} // uhd::rfnoc::detail
-
graph_stream_manager::~graph_stream_manager() = default;
class graph_stream_manager_impl : public graph_stream_manager
@@ -36,8 +33,9 @@ public:
_link_mgrs.emplace(lnk.first,
std::move(link_stream_manager::make(
pkt_factory, *lnk.second, epid_alloc, lnk.first)));
- if (_alloc_map.count(lnk.first) == 0) {
- _alloc_map[lnk.first] = allocation_info{0, 0};
+ auto adapter = _link_mgrs.at(lnk.first)->get_adapter_id();
+ if (_alloc_map.count(adapter) == 0) {
+ _alloc_map[adapter] = allocation_info{0, 0};
}
}
for (const auto& mgr_pair : _link_mgrs) {
@@ -69,18 +67,18 @@ public:
return retval;
}
- virtual sep_id_pair_t connect_host_to_device(
- sep_addr_t dst_addr, device_id_t host_device = NULL_DEVICE_ID)
+ virtual sep_id_pair_t connect_host_to_device(sep_addr_t dst_addr,
+ uhd::transport::adapter_id_t adapter = uhd::transport::NULL_ADAPTER_ID)
{
UHD_LOGGER_DEBUG("RFNOC::GRAPH")
- << boost::format("Connecting the Host to Endpoint %d:%d through Device "
+ << boost::format("Connecting the Host to Endpoint %d:%d through Adapter "
"%d (0 = no preference)... ")
- % dst_addr.first % dst_addr.second % host_device;
+ % dst_addr.first % dst_addr.second % adapter;
// When we connect, we setup a route and fire up a control stream between
// the endpoints
- device_id_t gateway = _check_dst_and_find_src(dst_addr, host_device,
- uhd::transport::link_type_t::CTRL);
+ device_id_t gateway =
+ _check_dst_and_find_src(dst_addr, adapter, uhd::transport::link_type_t::CTRL);
sep_id_pair_t epid_pair =
_link_mgrs.at(gateway)->connect_host_to_device(dst_addr);
UHD_LOGGER_DEBUG("RFNOC::GRAPH")
@@ -125,23 +123,23 @@ public:
uint16_t block_index,
const clock_iface& client_clk,
const clock_iface& timebase_clk,
- device_id_t via_device = NULL_DEVICE_ID)
+ uhd::transport::adapter_id_t adapter = uhd::transport::NULL_ADAPTER_ID)
{
// We must be connected to dst_addr before getting a register iface
sep_id_t dst_epid = _epid_alloc->get_epid(dst_addr);
- auto dev = _check_dst_and_find_src(dst_addr, via_device,
- uhd::transport::link_type_t::CTRL);
- return _link_mgrs.at(dev)->get_block_register_iface(dst_epid, block_index,
- client_clk, timebase_clk);
+ auto dev =
+ _check_dst_and_find_src(dst_addr, adapter, uhd::transport::link_type_t::CTRL);
+ return _link_mgrs.at(dev)->get_block_register_iface(
+ dst_epid, block_index, client_clk, timebase_clk);
}
- virtual detail::client_zero::sptr get_client_zero(
- sep_addr_t dst_addr, device_id_t via_device = NULL_DEVICE_ID) const
+ virtual detail::client_zero::sptr get_client_zero(sep_addr_t dst_addr,
+ uhd::transport::adapter_id_t adapter = uhd::transport::NULL_ADAPTER_ID) const
{
// We must be connected to dst_addr before getting a client zero
sep_id_t dst_epid = _epid_alloc->get_epid(dst_addr);
- auto dev = _check_dst_and_find_src(dst_addr, via_device,
- uhd::transport::link_type_t::CTRL);
+ auto dev =
+ _check_dst_and_find_src(dst_addr, adapter, uhd::transport::link_type_t::CTRL);
return _link_mgrs.at(dev)->get_client_zero(dst_epid);
}
@@ -187,73 +185,82 @@ public:
"specified source endpoint");
}
- chdr_rx_data_xport::uptr create_device_to_host_data_stream(
- const sep_addr_t src_addr,
+ chdr_rx_data_xport::uptr create_device_to_host_data_stream(const sep_addr_t src_addr,
const sw_buff_t pyld_buff_fmt,
const sw_buff_t mdata_buff_fmt,
- const device_id_t via_device,
+ const uhd::transport::adapter_id_t adapter,
const device_addr_t& xport_args)
{
- auto dev = _check_dst_and_find_src(src_addr, via_device,
- uhd::transport::link_type_t::RX_DATA);
- auto allocs = _alloc_map.at(dev);
+ device_id_t dev = _check_dst_and_find_src(
+ src_addr, adapter, uhd::transport::link_type_t::RX_DATA);
+ uhd::transport::adapter_id_t chosen = _link_mgrs.at(dev)->get_adapter_id();
+ auto allocs = _alloc_map.at(chosen);
allocs.rx++;
- _alloc_map[dev] = allocs;
- return _link_mgrs.at(dev)->create_device_to_host_data_stream(src_addr,
- pyld_buff_fmt,
- mdata_buff_fmt,
- xport_args);
+ _alloc_map[chosen] = allocs;
+ return _link_mgrs.at(dev)->create_device_to_host_data_stream(
+ src_addr, pyld_buff_fmt, mdata_buff_fmt, xport_args);
}
virtual chdr_tx_data_xport::uptr create_host_to_device_data_stream(
sep_addr_t dst_addr,
const sw_buff_t pyld_buff_fmt,
const sw_buff_t mdata_buff_fmt,
- const device_id_t via_device,
+ const uhd::transport::adapter_id_t adapter,
const device_addr_t& xport_args)
{
- auto dev = _check_dst_and_find_src(dst_addr, via_device,
- uhd::transport::link_type_t::TX_DATA);
- auto allocs = _alloc_map.at(dev);
+ device_id_t dev = _check_dst_and_find_src(
+ dst_addr, adapter, uhd::transport::link_type_t::TX_DATA);
+ uhd::transport::adapter_id_t chosen = _link_mgrs.at(dev)->get_adapter_id();
+ auto allocs = _alloc_map.at(chosen);
allocs.tx++;
- _alloc_map[dev] = allocs;
- return _link_mgrs.at(dev)->create_host_to_device_data_stream(dst_addr,
- pyld_buff_fmt,
- mdata_buff_fmt,
- xport_args);
+ _alloc_map[chosen] = allocs;
+ return _link_mgrs.at(dev)->create_host_to_device_data_stream(
+ dst_addr, pyld_buff_fmt, mdata_buff_fmt, xport_args);
}
- std::vector<device_id_t> get_via_devices(sep_addr_t addr) const
+ std::vector<uhd::transport::adapter_id_t> get_adapters(sep_addr_t addr) const
{
+ auto adapters = std::vector<uhd::transport::adapter_id_t>();
if (_src_map.count(addr) > 0) {
- return _src_map.at(addr);
+ const auto& src_devs = _src_map.at(addr);
+ for (auto src : src_devs) {
+ // Returns in order specified in device args
+ // Assumption: the device_id_t will be incremented sequentially
+ // and the std::map will then provide the link_stream_managers
+ // in the same order as the adapters were specified
+ adapters.push_back(_link_mgrs.at(src)->get_adapter_id());
+ }
+ return adapters;
} else {
throw uhd::rfnoc_error("Specified address is unreachable. No via_devices.");
}
}
+
private:
- device_id_t _check_dst_and_find_src(sep_addr_t dst_addr, device_id_t via_device,
+ device_id_t _check_dst_and_find_src(sep_addr_t dst_addr,
+ uhd::transport::adapter_id_t adapter,
uhd::transport::link_type_t link_type) const
{
if (_src_map.count(dst_addr) > 0) {
const auto& src_devs = _src_map.at(dst_addr);
- if (via_device == NULL_DEVICE_ID) {
+ if (adapter == uhd::transport::NULL_ADAPTER_ID) {
// TODO: Maybe we can come up with a better heuristic for when the user
// gives no preference
- auto dev = src_devs[0];
- auto dev_alloc = _alloc_map.at(dev);
+ auto dev = src_devs[0];
+ auto dev_alloc = _alloc_map.at(_link_mgrs.at(dev)->get_adapter_id());
for (auto candidate : src_devs) {
- auto candidate_alloc = _alloc_map.at(candidate);
+ auto candidate_alloc =
+ _alloc_map.at(_link_mgrs.at(candidate)->get_adapter_id());
switch (link_type) {
case uhd::transport::link_type_t::TX_DATA:
if (candidate_alloc.tx < dev_alloc.tx) {
- dev = candidate;
+ dev = candidate;
dev_alloc = candidate_alloc;
}
break;
case uhd::transport::link_type_t::RX_DATA:
if (candidate_alloc.rx < dev_alloc.rx) {
- dev = candidate;
+ dev = candidate;
dev_alloc = candidate_alloc;
}
break;
@@ -265,7 +272,7 @@ private:
return dev;
} else {
for (const auto& src : src_devs) {
- if (src == via_device) {
+ if (_link_mgrs.at(src)->get_adapter_id() == adapter) {
return src;
}
}
@@ -287,16 +294,14 @@ private:
std::map<sep_addr_t, std::vector<device_id_t>> _src_map;
// Data used for heuristic to determine which link to use
- struct allocation_info {
+ struct allocation_info
+ {
size_t rx;
size_t tx;
};
- // A map of allocations for each local_device
- // NOTE: Multiple local device IDs can refer to the same local xport adapter.
- // The scheme does not account for a NIC that is used to connect to multiple
- // remote devices, for example.
- std::map<device_id_t, allocation_info> _alloc_map;
+ // A map of allocations for each host transport adapter
+ std::map<uhd::transport::adapter_id_t, allocation_info> _alloc_map;
};
graph_stream_manager::uptr graph_stream_manager::make(
diff --git a/host/lib/rfnoc/link_stream_manager.cpp b/host/lib/rfnoc/link_stream_manager.cpp
index 1c3ad407d..c0d79c519 100644
--- a/host/lib/rfnoc/link_stream_manager.cpp
+++ b/host/lib/rfnoc/link_stream_manager.cpp
@@ -65,6 +65,8 @@ public:
// TODO: This needs to be cleaned up. A muxed_zero_copy_if is excessive here
_ctrl_xport = _mb_iface.make_ctrl_transport(_my_device_id, _my_mgmt_ctrl_epid);
+ _my_adapter_id = _mb_iface.get_adapter_id(_my_device_id);
+
// Create management portal using one of the child transports
_mgmt_portal = mgmt_portal::make(
*_ctrl_xport, _pkt_factory, sep_addr_t(_my_device_id, SEP_INST_MGMT_CTRL));
@@ -82,6 +84,11 @@ public:
return _my_device_id;
}
+ virtual uhd::transport::adapter_id_t get_adapter_id() const
+ {
+ return _my_adapter_id;
+ }
+
virtual const std::set<sep_addr_t>& get_reachable_endpoints() const
{
return _mgmt_portal->get_reachable_endpoints();
@@ -98,8 +105,8 @@ public:
_ensure_ep_is_reachable(dst_addr);
// Allocate EPIDs
- sep_id_t dst_epid = _epid_alloc->allocate_epid(dst_addr, *_mgmt_portal,
- *_ctrl_xport);
+ sep_id_t dst_epid =
+ _epid_alloc->allocate_epid(dst_addr, *_mgmt_portal, *_ctrl_xport);
// Make sure that the software side of the endpoint is initialized and reachable
if (_ctrl_ep == nullptr) {
@@ -130,10 +137,10 @@ public:
_ensure_ep_is_reachable(src_addr);
// Allocate EPIDs and initialize endpoints
- sep_id_t dst_epid = _epid_alloc->allocate_epid(dst_addr, *_mgmt_portal,
- *_ctrl_xport);
- sep_id_t src_epid = _epid_alloc->allocate_epid(src_addr, *_mgmt_portal,
- *_ctrl_xport);
+ sep_id_t dst_epid =
+ _epid_alloc->allocate_epid(dst_addr, *_mgmt_portal, *_ctrl_xport);
+ sep_id_t src_epid =
+ _epid_alloc->allocate_epid(src_addr, *_mgmt_portal, *_ctrl_xport);
// Set up routes
_mgmt_portal->setup_remote_route(*_ctrl_xport, dst_epid, src_epid);
@@ -220,8 +227,8 @@ public:
_ensure_ep_is_reachable(dst_addr);
// Generate a new destination (device) EPID instance
- sep_id_t dst_epid = _epid_alloc->allocate_epid(dst_addr, *_mgmt_portal,
- *_ctrl_xport);
+ sep_id_t dst_epid =
+ _epid_alloc->allocate_epid(dst_addr, *_mgmt_portal, *_ctrl_xport);
if (!_mgmt_portal->get_endpoint_info(dst_epid).has_data) {
throw uhd::rfnoc_error("Downstream endpoint does not support data traffic");
@@ -249,8 +256,8 @@ public:
_ensure_ep_is_reachable(src_addr);
// Generate a new source (device) EPID instance
- sep_id_t src_epid = _epid_alloc->allocate_epid(src_addr, *_mgmt_portal,
- *_ctrl_xport);
+ sep_id_t src_epid =
+ _epid_alloc->allocate_epid(src_addr, *_mgmt_portal, *_ctrl_xport);
if (!_mgmt_portal->get_endpoint_info(src_epid).has_data) {
throw uhd::rfnoc_error("Downstream endpoint does not support data traffic");
@@ -290,6 +297,8 @@ private:
const chdr::chdr_packet_factory& _pkt_factory;
// The device address of this software endpoint
const device_id_t _my_device_id;
+ // The host adapter ID associated with this software endpoint
+ adapter_id_t _my_adapter_id;
// Motherboard interface
mb_iface& _mb_iface;
diff --git a/host/lib/rfnoc/rfnoc_graph.cpp b/host/lib/rfnoc/rfnoc_graph.cpp
index 036c4611e..12f1cb2c4 100644
--- a/host/lib/rfnoc/rfnoc_graph.cpp
+++ b/host/lib/rfnoc/rfnoc_graph.cpp
@@ -35,9 +35,8 @@ public:
/**************************************************************************
* Structors
*************************************************************************/
- rfnoc_graph_impl(
- detail::rfnoc_device::sptr dev, const uhd::device_addr_t& dev_addr) try
- : _device(dev),
+ rfnoc_graph_impl(detail::rfnoc_device::sptr dev, const uhd::device_addr_t& dev_addr)
+ try : _device(dev),
_tree(_device->get_tree()),
_num_mboards(_tree->list("/mboards").size()),
_block_registry(std::make_unique<detail::block_container_t>()),
@@ -200,7 +199,7 @@ public:
size_t strm_port,
const block_id_t& dst_blk,
size_t dst_port,
- device_id_t via_device)
+ uhd::transport::adapter_id_t adapter_id)
{
// Verify the streamer was created by us
auto rfnoc_streamer = boost::dynamic_pointer_cast<rfnoc_tx_streamer>(streamer);
@@ -238,8 +237,10 @@ public:
bits_to_sw_buff(rfnoc_streamer->get_otw_item_comp_bit_width());
const sw_buff_t mdata_fmt = BUFF_U64;
- auto xport = _gsm->create_host_to_device_data_stream(
- sep_addr, pyld_fmt, mdata_fmt, via_device,
+ auto xport = _gsm->create_host_to_device_data_stream(sep_addr,
+ pyld_fmt,
+ mdata_fmt,
+ adapter_id,
rfnoc_streamer->get_stream_args().args);
rfnoc_streamer->connect_channel(strm_port, std::move(xport));
@@ -254,7 +255,7 @@ public:
size_t src_port,
uhd::rx_streamer::sptr streamer,
size_t strm_port,
- device_id_t via_device)
+ uhd::transport::adapter_id_t adapter_id)
{
// Verify the streamer was created by us
auto rfnoc_streamer = boost::dynamic_pointer_cast<rfnoc_rx_streamer>(streamer);
@@ -292,8 +293,10 @@ public:
bits_to_sw_buff(rfnoc_streamer->get_otw_item_comp_bit_width());
const sw_buff_t mdata_fmt = BUFF_U64;
- auto xport = _gsm->create_device_to_host_data_stream(
- sep_addr, pyld_fmt, mdata_fmt, via_device,
+ auto xport = _gsm->create_device_to_host_data_stream(sep_addr,
+ pyld_fmt,
+ mdata_fmt,
+ adapter_id,
rfnoc_streamer->get_stream_args().args);
rfnoc_streamer->connect_channel(strm_port, std::move(xport));
@@ -332,8 +335,8 @@ public:
return _num_mboards;
}
- std::vector<device_id_t> enumerate_src_via_devices(const block_id_t& dst_blk,
- size_t dst_port)
+ std::vector<uhd::transport::adapter_id_t> enumerate_adapters_to_dst(
+ const block_id_t& dst_blk, size_t dst_port)
{
// Verify dst_blk even exists in this graph
if (!has_block(dst_blk)) {
@@ -362,11 +365,11 @@ public:
const sep_addr_t sep_addr = _sep_map.at(sep_block_id);
// Find links that can reach the SEP
- return _gsm->get_via_devices(sep_addr);
+ return _gsm->get_adapters(sep_addr);
}
- std::vector<device_id_t> enumerate_dst_via_devices(const block_id_t& src_blk,
- size_t src_port)
+ std::vector<uhd::transport::adapter_id_t> enumerate_adapters_from_src(
+ const block_id_t& src_blk, size_t src_port)
{
// Verify src_blk even exists in this graph
if (!has_block(src_blk)) {
@@ -395,7 +398,7 @@ public:
const sep_addr_t sep_addr = _sep_map.at(sep_block_id);
// Find links that can reach the SEP
- return _gsm->get_via_devices(sep_addr);
+ return _gsm->get_adapters(sep_addr);
}
std::vector<graph_edge_t> enumerate_active_connections()
@@ -446,7 +449,7 @@ private:
+ std::to_string(chdr_w_to_bits(chdr_w)) + " but device "
+ std::to_string(mb_idx) + " has CHDR width of "
+ std::to_string(
- chdr_w_to_bits(_device->get_mb_iface(mb_idx).get_chdr_w()))
+ chdr_w_to_bits(_device->get_mb_iface(mb_idx).get_chdr_w()))
+ " bits!");
}
if (_device->get_mb_iface(mb_idx).get_endianness() != endianness) {
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-30 20:08:13 +0000