Fix redefinition of template parameters, inline off to avoid `stream flows backward in dataflow region` issue

2022-10-11 11:23:49 +02:00 · 2022-10-11 11:23:49 +02:00 · 63ce79a402
parent 8559e6b893
commit 63ce79a402
5 changed files with 25 additions and 25 deletions
--- a/hw/services/network/hls/ib_transport_protocol/ib_transport_protocol.cpp
+++ b/hw/services/network/hls/ib_transport_protocol/ib_transport_protocol.cpp
@ -56,7 +56,7 @@ void rx_process_ibh(
 	ap_uint<32>&		regValidIbvCountRx
 ) {
 //
-// #pragma HLS inline off
+#pragma HLS inline off
 #pragma HLS pipeline II=1

 	static BaseTransportHeader<WIDTH> bth;
@ -106,7 +106,7 @@ void rx_process_exh(
 	stream<ExHeader<WIDTH> >& metaOut,
 	stream<net_axis<WIDTH> >& output
 ) {
-// #pragma HLS inline off
+#pragma HLS inline off
 #pragma HLS pipeline II=1

 	enum fsmStateType {META, ACK_HEADER, RETH_HEADER, NO_HEADER};
@ -263,7 +263,7 @@ void rx_ibh_fsm(
 #endif
 	ap_uint<32>&		regInvalidPsnDropCount
 ) {
-// #pragma HLS inline off
+#pragma HLS inline off
 #pragma HLS pipeline II=1

 	enum fsmStateType{LOAD, PROCESS};
@ -465,7 +465,7 @@ void rx_exh_fsm(
 	stream<pkgSplit>& rx_pkgSplitTypeFifo,
 	stream<pkgShift>& rx_pkgShiftTypeFifo
 ) {
-// #pragma HLS inline off
+#pragma HLS inline off
 #pragma HLS pipeline II=1

 	enum pe_fsmStateType {META, DMA_META, DATA};
@ -719,7 +719,7 @@ void drop_ooo_ibh(
 	stream<bool>& metaIn,
 	stream<net_axis<WIDTH> >& output
 ) {
-// #pragma HLS inline off
+#pragma HLS inline off
 #pragma HLS pipeline II=1

 	enum fsmType {META, FWD, DROP};
@ -782,7 +782,7 @@ void rx_exh_payload(
 #endif
 	stream<net_axis<WIDTH> >& rx_exhNoShiftFifo
 ) {
-// #pragma HLS inline off
+#pragma HLS inline off
 #pragma HLS pipeline II=1

 	enum fsmStateType {META, PKG};
@ -845,7 +845,7 @@ void handle_read_requests(
 	stream<memCmdInternal>&	memoryReadCmd,
 	stream<event>& readEventFifo
 ) {
-// #pragma HLS inline off
+#pragma HLS inline off
 #pragma HLS pipeline II=1

 	enum hrr_fsmStateType {META, GENERATE};
@ -909,7 +909,7 @@ void merge_rx_pkgs(
 	stream<net_axis<WIDTH> >& rx_NoSift2mergerFifo,
 	stream<net_axis<WIDTH> >& m_axis_mem_write_data
 ) {
-// #pragma HLS inline off
+#pragma HLS inline off
 #pragma HLS pipeline II=1

 	enum mrpStateType{IDLE, FWD_AETH, FWD_RETH, FWD_NONE};
@ -1000,7 +1000,7 @@ void local_req_handler(
 	stream<retransAddrLen>&		tx2retrans_insertAddrLen)
 #endif
 {
-// #pragma HLS inline off
+#pragma HLS inline off
 #pragma HLS pipeline II=1

 	//enum fsmStateType {META, GENERATE};
@ -1082,7 +1082,7 @@ void mem_cmd_merger(
 	stream<memCmd>& out,
 	stream<pkgInfo>& pkgInfoFifo
 ) {
-// #pragma HLS inline off
+#pragma HLS inline off
 #pragma HLS pipeline II=1

 	memCmdInternal cmd;
@ -1158,7 +1158,7 @@ void tx_pkg_arbiter(
 	stream<net_axis<WIDTH> >& rawPayFifo,
 	stream<ap_uint<512> >& tx_immedFifo
 ) {
-// #pragma HLS inline off
+#pragma HLS inline off
 #pragma HLS pipeline II=1

 	enum mrpStateType{IDLE, FWD_AETH, FWD_RETH, FWD_RAW, FWD_IMMED};
@ -1281,7 +1281,7 @@ void meta_merger(
 	stream<ibhMeta>&	tx_ibhMetaFifo,
 	stream<event>&		tx_exhMetaFifo
 ) {
-// #pragma HLS inline off
+#pragma HLS inline off
 #pragma HLS pipeline II=1

 	ackEvent aev;
@ -1353,7 +1353,7 @@ void generate_ibh(
 #endif
 	stream<BaseTransportHeader<WIDTH> >& tx_ibhHeaderFifo
 ) {
-// #pragma HLS inline off
+#pragma HLS inline off
 #pragma HLS pipeline II=1

 	enum fsmStateType {META, GET_PSN};
@ -1452,7 +1452,7 @@ void generate_exh(
 #endif
 	stream<net_axis<WIDTH> >& output
 ) {
-// #pragma HLS inline off
+#pragma HLS inline off
 #pragma HLS pipeline II=1

 	enum ge_fsmStateType {META, GET_MSN, PROCESS};
@ -1710,7 +1710,7 @@ void append_payload(
 	stream<net_axis<WIDTH> >&	tx_rawPayloadFifo,
 	stream<net_axis<WIDTH> >&	tx_packetFifo
 ) {
-// #pragma HLS inline off
+#pragma HLS inline off
 #pragma HLS pipeline II=1

 	enum fsmState {INFO, HEADER, AETH_PAYLOAD, RETH_PAYLOAD, RAW_PAYLOAD};
@ -1855,7 +1855,7 @@ void prepend_ibh_header(
 	stream<net_axis<WIDTH> >& tx_ibhPayloadFifo,
 	stream<net_axis<WIDTH> >& m_axis_tx_data
 ) {
-// #pragma HLS inline off
+#pragma HLS inline off
 #pragma HLS pipeline II=1

 	enum pihStatea {GET_HEADER, HEADER, PARTIAL_HEADER, BODY};
@ -1952,7 +1952,7 @@ void ipUdpMetaHandler(
 	stream<ap_uint<16> >&	exh_lengthFifo,
 	stream<ExHeader<WIDTH> >& exHeaderOutput
 ) {
-// #pragma HLS inline off
+#pragma HLS inline off
 #pragma HLS pipeline II=1

 	ipUdpMeta meta;
@ -1988,7 +1988,7 @@ void tx_ipUdpMetaMerger(
 	stream<ipUdpMeta>&		m_axis_tx_meta,
 	stream<ap_uint<24> >&	tx_dstQpFifo
 ) {
-// #pragma HLS inline off
+#pragma HLS inline off
 #pragma HLS pipeline II=1

 	connTableEntry connMeta;
@ -2018,7 +2018,7 @@ void qp_interface(
 	stream<ifStateReq>&			qpi2stateTable_upd_req,
 	stream<ifMsnReq>&			if2msnTable_init
 ) {
-// #pragma HLS inline off
+#pragma HLS inline off
 #pragma HLS pipeline II=1

 	enum fstStateType{GET_STATE, UPD_STATE};
@ -2055,7 +2055,7 @@ void qp_interface(
 void three_merger(
 	stream<event>& in0, stream<event>& in1, stream<event>& in2, stream<event>& out
 ) {
-// #pragma HLS inline off
+#pragma HLS inline off
 #pragma HLS pipeline II=1

 	if (!in0.empty())
@ -2077,7 +2077,7 @@ void merge_retrans_request(
 	stream<retransAddrLen>&		tx2retrans_insertAddrLen,
 	stream<retransEntry>&		tx2retrans_insertRequest
 ) {
-// #pragma HLS inline off
+#pragma HLS inline off
 #pragma HLS pipeline II=1

 	retransMeta meta;
--- a/hw/services/network/hls/ib_transport_protocol/msn_table.hpp
+++ b/hw/services/network/hls/ib_transport_protocol/msn_table.hpp
@ -79,7 +79,7 @@ struct dmaState
 };


-template <int INSTID = 0>
+template <int INSTID>
 void msn_table(hls::stream<rxMsnReq>& rxExh2msnTable_upd_req,
 					hls::stream<ap_uint<16> >& txExh2msnTable_req,
 					hls::stream<ifMsnReq>& if2msnTable_init,
--- a/hw/services/network/hls/ib_transport_protocol/read_req_table.hpp
+++ b/hw/services/network/hls/ib_transport_protocol/read_req_table.hpp
@ -69,7 +69,7 @@ struct readReqTableEntry
 	ap_uint<24> max_fwd_readreq;
 };

-template <int INSTID = 0>
+template <int INSTID>
 void read_req_table(stream<txReadReqUpdate>&	tx_readReqTable_upd,
 #if !RETRANS_EN
 					stream<rxReadReqUpdate>&	rx_readReqTable_upd_req);
--- a/hw/services/network/hls/ib_transport_protocol/state_table.hpp
+++ b/hw/services/network/hls/ib_transport_protocol/state_table.hpp
@ -106,7 +106,7 @@ struct txStateReq
 		:qpn(qpn), psn(psn), write(true) {}
 };

-template <int INSTID = 0>
+template <int INSTID>
 void state_table(	hls::stream<rxStateReq>& rxIbh2stateTable_upd_req,
 						hls::stream<txStateReq>& txIbh2stateTable_upd_req,
 						hls::stream<ifStateReq>& qpi2stateTable_upd_req,
--- a/hw/services/network/hls/ib_transport_protocol/transport_timer.hpp
+++ b/hw/services/network/hls/ib_transport_protocol/transport_timer.hpp
@ -79,7 +79,7 @@ struct rxTimerUpdate
 /**
 * page 352
 */
-template <int INSTID = 0>
+template <int INSTID>
 void transport_timer(	stream<rxTimerUpdate>&	rxClearTimer_req,
 						stream<ap_uint<24> >&	txSetTimer_req,
 						stream<retransmission>&	timer2retrans_req);