diff options
Diffstat (limited to 'host/lib/rfnoc/graph_impl.cpp')
| -rw-r--r-- | host/lib/rfnoc/graph_impl.cpp | 174 |
1 files changed, 74 insertions, 100 deletions
diff --git a/host/lib/rfnoc/graph_impl.cpp b/host/lib/rfnoc/graph_impl.cpp index 0d90150c1..989bcb0c4 100644 --- a/host/lib/rfnoc/graph_impl.cpp +++ b/host/lib/rfnoc/graph_impl.cpp @@ -5,8 +5,8 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#include <uhd/rfnoc/source_block_ctrl_base.hpp> #include <uhd/rfnoc/sink_block_ctrl_base.hpp> +#include <uhd/rfnoc/source_block_ctrl_base.hpp> #include <uhd/utils/log.hpp> #include <uhdlib/rfnoc/graph_impl.hpp> @@ -15,13 +15,10 @@ using namespace uhd::rfnoc; /**************************************************************************** * Structors ***************************************************************************/ -graph_impl::graph_impl( - const std::string &name, - boost::weak_ptr<uhd::device3> device_ptr, - async_msg_handler::sptr msg_handler -) : _name(name) - , _device_ptr(device_ptr) - , _msg_handler(msg_handler) +graph_impl::graph_impl(const std::string& name, + boost::weak_ptr<uhd::device3> device_ptr, + async_msg_handler::sptr msg_handler) + : _name(name), _device_ptr(device_ptr), _msg_handler(msg_handler) { UHD_LOG_TRACE("RFNOC", "Instantiating RFNoC graph " << _name); } @@ -29,13 +26,12 @@ graph_impl::graph_impl( /**************************************************************************** * Connection API ***************************************************************************/ -void graph_impl::connect( - const block_id_t &src_block, - size_t src_block_port, - const block_id_t &dst_block, - size_t dst_block_port, - const size_t pkt_size_ -) { +void graph_impl::connect(const block_id_t& src_block, + size_t src_block_port, + const block_id_t& dst_block, + size_t dst_block_port, + const size_t pkt_size_) +{ device3::sptr device_ptr = _device_ptr.lock(); if (not device_ptr) { throw uhd::runtime_error("Invalid device"); @@ -45,62 +41,51 @@ void graph_impl::connect( device_ptr->get_block_ctrl<rfnoc::source_block_ctrl_base>(src_block); uhd::rfnoc::sink_block_ctrl_base::sptr dst = device_ptr->get_block_ctrl<rfnoc::sink_block_ctrl_base>(dst_block); - UHD_LOGGER_TRACE("RFNOC") - << "[" << _name << "] Attempting to connect " - << src_block << ":" << src_block_port << " --> " - << dst_block << ":" << dst_block_port - ; + UHD_LOGGER_TRACE("RFNOC") << "[" << _name << "] Attempting to connect " << src_block + << ":" << src_block_port << " --> " << dst_block << ":" + << dst_block_port; /******************************************************************** * 1. Draw the edges (logically connect the nodes) ********************************************************************/ size_t actual_src_block_port = src->connect_downstream( - boost::dynamic_pointer_cast<uhd::rfnoc::node_ctrl_base>(dst), - src_block_port - ); + boost::dynamic_pointer_cast<uhd::rfnoc::node_ctrl_base>(dst), src_block_port); if (src_block_port == uhd::rfnoc::ANY_PORT) { src_block_port = actual_src_block_port; } else if (src_block_port != actual_src_block_port) { - throw uhd::runtime_error(str( - boost::format("Can't connect to port %d on block %s.") - % src_block_port % src->unique_id() - )); + throw uhd::runtime_error( + str(boost::format("Can't connect to port %d on block %s.") % src_block_port + % src->unique_id())); } size_t actual_dst_block_port = dst->connect_upstream( - boost::dynamic_pointer_cast<uhd::rfnoc::node_ctrl_base>(src), - dst_block_port - ); + boost::dynamic_pointer_cast<uhd::rfnoc::node_ctrl_base>(src), dst_block_port); if (dst_block_port == uhd::rfnoc::ANY_PORT) { dst_block_port = actual_dst_block_port; } else if (dst_block_port != actual_dst_block_port) { - throw uhd::runtime_error(str( - boost::format("Can't connect to port %d on block %s.") - % dst_block_port % dst->unique_id() - )); + throw uhd::runtime_error( + str(boost::format("Can't connect to port %d on block %s.") % dst_block_port + % dst->unique_id())); } src->set_downstream_port(actual_src_block_port, actual_dst_block_port); dst->set_upstream_port(actual_dst_block_port, actual_src_block_port); // At this point, ports are locked and no one else can simply connect // into them. - UHD_LOGGER_TRACE("RFNOC") - << "[" << _name << "] Connecting " - << src_block << ":" << actual_src_block_port << " --> " - << dst_block << ":" << actual_dst_block_port - ; + UHD_LOGGER_TRACE("RFNOC") << "[" << _name << "] Connecting " << src_block << ":" + << actual_src_block_port << " --> " << dst_block << ":" + << actual_dst_block_port; /******************************************************************** * 2. Check IO signatures match ********************************************************************/ if (not rfnoc::stream_sig_t::is_compatible( - src->get_output_signature(actual_src_block_port), - dst->get_input_signature(actual_dst_block_port) - )) { - throw uhd::runtime_error(str( - boost::format("Can't connect block %s to %s: IO signature mismatch\n(%s is incompatible with %s).") - % src->get_block_id().get() % dst->get_block_id().get() - % src->get_output_signature(actual_src_block_port) - % dst->get_input_signature(actual_dst_block_port) - )); + src->get_output_signature(actual_src_block_port), + dst->get_input_signature(actual_dst_block_port))) { + throw uhd::runtime_error( + str(boost::format("Can't connect block %s to %s: IO signature mismatch\n(%s " + "is incompatible with %s).") + % src->get_block_id().get() % dst->get_block_id().get() + % src->get_output_signature(actual_src_block_port) + % dst->get_input_signature(actual_dst_block_port))); } UHD_LOG_TRACE("RFNOC", "IO signatures match."); @@ -117,38 +102,37 @@ void graph_impl::connect( /******************************************************************** * 4. Configure flow control ********************************************************************/ - size_t pkt_size = (pkt_size_ != 0) ? pkt_size_ : src->get_output_signature(src_block_port).packet_size; + size_t pkt_size = (pkt_size_ != 0) + ? pkt_size_ + : src->get_output_signature(src_block_port).packet_size; if (pkt_size == 0) { // Unspecified packet rate. Assume max packet size. - UHD_LOGGER_WARNING("RFNOC") << "Assuming max packet size for " << src->get_block_id() ; + UHD_LOGGER_WARNING("RFNOC") + << "Assuming max packet size for " << src->get_block_id(); pkt_size = uhd::rfnoc::MAX_PACKET_SIZE; } // FC window (in bytes) depends on FIFO size. size_t buf_size_bytes = dst->get_fifo_size(dst_block_port); if (buf_size_bytes < pkt_size) { - throw uhd::runtime_error(str( - boost::format("Input FIFO for block %s is too small (%d kiB) for packets of size %d kiB\n" - "coming from block %s.") - % dst->get_block_id().get() % (dst->get_fifo_size(dst_block_port) / 1024) - % (pkt_size / 1024) % src->get_block_id().get() - )); + throw uhd::runtime_error( + str(boost::format("Input FIFO for block %s is too small (%d kiB) for packets " + "of size %d kiB\n" + "coming from block %s.") + % dst->get_block_id().get() % (dst->get_fifo_size(dst_block_port) / 1024) + % (pkt_size / 1024) % src->get_block_id().get())); } - src->configure_flow_control_out( - true, /* enable output */ - buf_size_bytes, - 0, /* no packet limit. We need to revisit this at some point. */ - src_block_port - ); + src->configure_flow_control_out(true, /* enable output */ + buf_size_bytes, + 0, /* no packet limit. We need to revisit this at some point. */ + src_block_port); // On the same crossbar, use lots of FC packets - size_t bytes_per_response = buf_size_bytes / uhd::rfnoc::DEFAULT_FC_XBAR_RESPONSE_FREQ; + size_t bytes_per_response = + buf_size_bytes / uhd::rfnoc::DEFAULT_FC_XBAR_RESPONSE_FREQ; // Over the network, use less or we'd flood the transport if (sid.get_src_addr() != sid.get_dst_addr()) { bytes_per_response = buf_size_bytes / uhd::rfnoc::DEFAULT_FC_TX_RESPONSE_FREQ; } UHD_ASSERT_THROW(bytes_per_response != 0); - dst->configure_flow_control_in( - bytes_per_response, - dst_block_port - ); + dst->configure_flow_control_in(bytes_per_response, dst_block_port); /******************************************************************** * 5. Configure error policy @@ -158,33 +142,30 @@ void graph_impl::connect( /******************************************************************** * 6. Set async message handling ********************************************************************/ - src->sr_write(uhd::rfnoc::SR_RESP_OUT_DST_SID, _msg_handler->get_local_addr(), src_block_port); - dst->sr_write(uhd::rfnoc::SR_RESP_IN_DST_SID, _msg_handler->get_local_addr(), dst_block_port); + src->sr_write( + uhd::rfnoc::SR_RESP_OUT_DST_SID, _msg_handler->get_local_addr(), src_block_port); + dst->sr_write( + uhd::rfnoc::SR_RESP_IN_DST_SID, _msg_handler->get_local_addr(), dst_block_port); } -void graph_impl::connect( - const block_id_t &src_block, - const block_id_t &dst_block -) { +void graph_impl::connect(const block_id_t& src_block, const block_id_t& dst_block) +{ connect(src_block, ANY_PORT, dst_block, ANY_PORT); } -void graph_impl::connect_src( - const block_id_t &src_block, +void graph_impl::connect_src(const block_id_t& src_block, const size_t src_block_port, const uhd::sid_t dst_sid, const size_t buf_size_dst_bytes, - const size_t pkt_size_ -) { + const size_t pkt_size_) +{ device3::sptr device_ptr = _device_ptr.lock(); if (not device_ptr) { throw uhd::runtime_error("Invalid device"); } - UHD_LOGGER_DEBUG("RFNOC") - << "[" << _name << "] Connecting " - << src_block << ":" << src_block_port << " --> " - << dst_sid.to_pp_string_hex(); + UHD_LOGGER_DEBUG("RFNOC") << "[" << _name << "] Connecting " << src_block << ":" + << src_block_port << " --> " << dst_sid.to_pp_string_hex(); uhd::rfnoc::source_block_ctrl_base::sptr src = device_ptr->get_block_ctrl<rfnoc::source_block_ctrl_base>(src_block); @@ -192,8 +173,8 @@ void graph_impl::connect_src( src->set_destination(dst_sid.get(), src_block_port); size_t pkt_size = (pkt_size_ != 0) - ? pkt_size_ - : src->get_output_signature(src_block_port).packet_size; + ? pkt_size_ + : src->get_output_signature(src_block_port).packet_size; if (pkt_size == 0) { // Unspecified packet rate. Assume max packet size. UHD_LOGGER_WARNING("RFNOC") << "Assuming max packet size for " << src->get_block_id(); @@ -201,32 +182,26 @@ void graph_impl::connect_src( } size_t buf_size_pkts = buf_size_dst_bytes / pkt_size; if (buf_size_pkts == 0) { - throw uhd::runtime_error(str( - boost::format("Input FIFO for unknown destination is too small " - "(%d kiB) for packets of size %d kiB\n coming from " - "block %s.") - % (buf_size_dst_bytes / 1024) - % (pkt_size / 1024) - % src->get_block_id().get() - )); + throw uhd::runtime_error( + str(boost::format("Input FIFO for unknown destination is too small " + "(%d kiB) for packets of size %d kiB\n coming from " + "block %s.") + % (buf_size_dst_bytes / 1024) % (pkt_size / 1024) + % src->get_block_id().get())); } src->configure_flow_control_out(buf_size_pkts, src_block_port); - } void graph_impl::connect_sink( - const block_id_t &sink_block, - const size_t dst_block_port, - const size_t bytes_per_ack -) { + const block_id_t& sink_block, const size_t dst_block_port, const size_t bytes_per_ack) +{ device3::sptr device_ptr = _device_ptr.lock(); if (not device_ptr) { throw uhd::runtime_error("Invalid device"); } - UHD_LOGGER_DEBUG("RFNOC") - << "[" << _name << "] Connecting unknown source to" - << sink_block << ":" << dst_block_port; + UHD_LOGGER_DEBUG("RFNOC") << "[" << _name << "] Connecting unknown source to" + << sink_block << ":" << dst_block_port; uhd::rfnoc::sink_block_ctrl_base::sptr dst = device_ptr->get_block_ctrl<rfnoc::sink_block_ctrl_base>(sink_block); @@ -237,4 +212,3 @@ void graph_impl::connect_sink( ********************************************************************/ dst->set_error_policy("next_burst"); } - |