Index: /trunk/modules/vci_synthetic_initator/caba/sources/include/vci_synthetic_initiator.h =================================================================== --- /trunk/modules/vci_synthetic_initator/caba/sources/include/vci_synthetic_initiator.h (revision 130) +++ /trunk/modules/vci_synthetic_initator/caba/sources/include/vci_synthetic_initiator.h (revision 131) @@ -4,5 +4,5 @@ * Copyright : UPMC / LIP6 * Authors : Christophe Choichillon - * Version : 2.0 + * Version : 2.1 * * SOCLIB_LGPL_HEADER_BEGIN @@ -26,4 +26,10 @@ * SOCLIB_LGPL_HEADER_END * + * Versions : + * - 1.0 Sending only one request at a time + * - 2.0 Sending multiple transactions and broadcast responses + * identified with pktid (deprecated) + * - 2.1 Broadcast responses identified with the value 0 of trdid + * * Maintainers: christophe.choichillon@lip6.fr */ @@ -32,4 +38,5 @@ #define SOCLIB_CABA_SYNTHETIC_INITIATOR_H +#include #include #include @@ -62,4 +69,5 @@ VCI_SINGLE_SEND, VCI_BC_SEND, + VCI_SINGLE_REGISTER }; @@ -140,6 +148,6 @@ // Broadcast FSM - sc_signal r_bc_fsm; // FSM state - sc_signal r_bc_date; // broadcast transaction requested date + //sc_signal r_bc_fsm; // FSM state + //sc_signal r_bc_date; // broadcast transaction requested date sc_signal r_bc_nrsp; // Expected number of responses for a broadcast command Index: /trunk/modules/vci_synthetic_initator/caba/sources/src/vci_synthetic_initiator.cpp =================================================================== --- /trunk/modules/vci_synthetic_initator/caba/sources/src/vci_synthetic_initiator.cpp (revision 130) +++ /trunk/modules/vci_synthetic_initator/caba/sources/src/vci_synthetic_initiator.cpp (revision 131) @@ -5,5 +5,5 @@ * Copyright : UPMC / LIP6 * Authors : Christophe Choichillon - * Version : 2.0 + * Version : 2.1 * * SOCLIB_LGPL_HEADER_BEGIN @@ -81,19 +81,24 @@ m_ymin(ymin), m_ymax(ymax), - r_date_fifo("r_date_fifo", depth), - r_type_fifo("r_type_fifo", depth), - r_cmd_fsm; ("r_count"), - r_bc_rsp_fsm("r_bc_rsp_fsm"), - r_index("r_index"), - r_broadcast_req("r_broadcast_req"), - r_broadcast_rsp("r_broadcast_rsp"), - r_bc_nrsp("r_bc_nrsp") - //r_req_id("r_req_id") + r_date_fifo("r_date_fifo", m_depth), + r_bc_fifo("r_bc_fifo", m_depth), + r_cmd_fsm("r_cmd_fsm"), + r_cmd_address("r_cmd_address"), + r_cmd_trdid("r_cmd_trdid"), + r_cmd_count("r_cmd_count"), + r_cmd_seed("r_cmd_seed"), + //r_bc_fsm("r_bc_fsm"), + //r_bc_date("r_bc_date"), + r_bc_nrsp("r_bc_nrsp"), + r_cpt_cycles("r_cpt_cycles"), + r_cpt_period("r_cpt_period"), + r_nb_single("r_nb_single"), + r_latency_single("r_latency_single"), + r_nb_bc("r_nb_bc"), + r_latency_bc("r_latency_bc") { - r_req_id = new sc_signal*[tab_size]; - for(int i = 0; i < tab_size ; i++){ - r_req_id[i] = new sc_signal[2]; - } + r_pending_fsm = new sc_signal[m_tab_size]; + r_pending_date = new sc_signal[m_tab_size]; SC_METHOD(transition); @@ -112,8 +117,6 @@ ///////////////////////////////// { - for(int i = 0; i < tab_size ; i++){ - delete r_req_id[i]; - } - delete r_req_id; + delete r_pending_fsm; + delete r_pending_date; } @@ -146,12 +149,12 @@ std::cout << "Vci_Synthetic_Initiator " << name() - << " : " << std::dec << m_cpt_cycles << " cycles " + << " : " << std::dec << r_cpt_cycles.read() << " cycles " << " : state_cmd_fsm = " << state_cmd_str[r_cmd_fsm] - << " : state_rsp_fsm = " << state_bc_rsp_str[r_bc_rsp_fsm] + << " : state_rsp_fsm = " << state_bc_rsp_str[r_pending_fsm[0].read()] << " Adresse to send : " << std::hex << r_cmd_address.read() << " Number of broadcast to receive : " << std::dec << r_bc_nrsp.read() - << " Number of packets sent : " << std::dec << r_nb_single.read() << " " << r_id_to_send.read() << std::endl; + << " Number of packets sent : " << std::dec << r_nb_single.read() << " " << r_cmd_trdid.read() << std::endl; for(int i = 0; i < (1< m_bc_period) && r_data_fifo.wok() ) - m_cpt_period = 0; + if ( m_bc_period && (r_cpt_period.read() > m_bc_period) && r_date_fifo.wok() ) + r_cpt_period = 0; else - m_cpt_period = m_cpt_period.read() + 1; + r_cpt_period = r_cpt_period.read() + 1; //////////////////////// // update fifos //////////////////////// - if (date_fifo_put){ - if (date_fifo_get){ + if (fifo_put){ + if (fifo_get){ r_date_fifo.put_and_get(r_cpt_cycles.read()); r_bc_fifo.put_and_get(fifo_bc); } else { - r_date_fifo.simple_put(m_cpt_cycles); + r_date_fifo.simple_put(r_cpt_cycles.read()); r_bc_fifo.simple_put(fifo_bc); } } else { - if (date_fifo_get){ + if (fifo_get){ r_date_fifo.simple_get(); r_bc_fifo.simple_get(); @@ -374,5 +390,4 @@ p_vci.be = 0xF; p_vci.srcid = m_srcid; - p_vci.pktid = 0; p_vci.cons = false; p_vci.wrap = false; @@ -393,4 +408,5 @@ p_vci.wdata = 0; p_vci.trdid = 0; + p_vci.pktid = 0; p_vci.eop = false; break; @@ -400,9 +416,10 @@ { p_vci.cmdval = true; - p_vci.address = (addr_t)(r_cmd_address.read() + (r_count.read()*4)); + p_vci.address = (addr_t)(r_cmd_address.read() + (r_cmd_count.read()*4)); p_vci.plen = m_length*4; p_vci.wdata = 0; - p_vci.trdid = r_id_to_send.read(); - if (r_count.read() == m_length - 1 ) { + p_vci.trdid = r_cmd_trdid.read(); + p_vci.pktid = 0; + if (r_cmd_count.read() == m_length - 1 ) { p_vci.eop = true; } else { @@ -418,9 +435,21 @@ p_vci.plen = 4; p_vci.wdata = 0; - p_vci.pktid = 1; p_vci.trdid = 0; + p_vci.pktid = 0; p_vci.eop = true; break; } + ////////////////// + case VCI_SINGLE_REGISTER: + { + p_vci.cmdval = false; + p_vci.address = 0; + p_vci.plen = 0; + p_vci.wdata = 0; + p_vci.trdid = 0; + p_vci.pktid = 0; + p_vci.eop = false; + break; + } } // end switch vci_cmd_fsm