Index: branches/RWT/modules/vci_cc_vcache_wrapper/caba/metadata/vci_cc_vcache_wrapper.sd =================================================================== --- branches/RWT/modules/vci_cc_vcache_wrapper/caba/metadata/vci_cc_vcache_wrapper.sd (revision 767) +++ branches/RWT/modules/vci_cc_vcache_wrapper/caba/metadata/vci_cc_vcache_wrapper.sd (revision 771) @@ -3,24 +3,24 @@ Module('caba:vci_cc_vcache_wrapper', - classname = 'soclib::caba::VciCcVCacheWrapper', + classname = 'soclib::caba::VciCcVCacheWrapper', - tmpl_parameters = [ + tmpl_parameters = [ parameter.Module('vci_param', default = 'caba:vci_param'), parameter.Int('dspin_in_width'), parameter.Int('dspin_out_width'), - parameter.Module('iss_t') + parameter.Module('iss_t') ], - header_files = [ '../source/include/vci_cc_vcache_wrapper.h' ], + header_files = [ '../source/include/vci_cc_vcache_wrapper.h' ], - implementation_files = [ '../source/src/vci_cc_vcache_wrapper.cpp' ], + implementation_files = [ '../source/src/vci_cc_vcache_wrapper.cpp' ], - uses = [ + uses = [ Uses('caba:base_module'), Uses('common:mapping_table'), - Uses('common:iss2'), - Uses('caba:multi_write_buffer'), - Uses('caba:generic_fifo'), - Uses('caba:generic_cache_tsar', + Uses('common:iss2'), + Uses('caba:multi_write_buffer'), + Uses('caba:generic_fifo'), + Uses('caba:generic_cache_tsar_rwt', addr_t = parameter.StringExt('sc_dt::sc_uint<%d> ', parameter.Reference('addr_size'))), @@ -32,8 +32,8 @@ parameter.Reference('addr_size')) ), - Uses('caba:dspin_dhccp_param'), + Uses('caba:dspin_rwt_param'), ], - ports = [ + ports = [ Port('caba:vci_initiator', 'p_vci'), Port('caba:dspin_input', 'p_dspin_m2p', @@ -43,29 +43,29 @@ Port('caba:dspin_input', 'p_dspin_clack', dspin_data_size = parameter.Reference('dspin_in_width')), - Port('caba:bit_in','p_irq', parameter.Constant('n_irq')), - Port('caba:bit_in', 'p_resetn', auto = 'resetn'), - Port('caba:clock_in', 'p_clk', auto = 'clock') + Port('caba:bit_in','p_irq', parameter.Constant('n_irq')), + Port('caba:bit_in', 'p_resetn', auto = 'resetn'), + Port('caba:clock_in', 'p_clk', auto = 'clock') ], - instance_parameters = [ + instance_parameters = [ parameter.Int('proc_id'), - parameter.Module('mt', 'common:mapping_table'), - parameter.Module('mc', 'common:mapping_table'), - parameter.IntTab('initiator_rw_index'), - parameter.IntTab('initiator_c_index'), - parameter.IntTab('target_index'), - parameter.Int('itlb_ways'), - parameter.Int('itlb_sets'), - parameter.Int('dtlb_ways'), - parameter.Int('dtlb_sets'), - parameter.Int('icache_ways'), - parameter.Int('icache_sets'), - parameter.Int('icache_words'), - parameter.Int('dcache_ways'), - parameter.Int('dcache_sets'), - parameter.Int('dcache_words'), - parameter.Int('wbuf_nlines'), - parameter.Int('wbuf_nwords'), - parameter.Int('max_frozen_cycles') + parameter.Module('mt', 'common:mapping_table'), + parameter.Module('mc', 'common:mapping_table'), + parameter.IntTab('initiator_rw_index'), + parameter.IntTab('initiator_c_index'), + parameter.IntTab('target_index'), + parameter.Int('itlb_ways'), + parameter.Int('itlb_sets'), + parameter.Int('dtlb_ways'), + parameter.Int('dtlb_sets'), + parameter.Int('icache_ways'), + parameter.Int('icache_sets'), + parameter.Int('icache_words'), + parameter.Int('dcache_ways'), + parameter.Int('dcache_sets'), + parameter.Int('dcache_words'), + parameter.Int('wbuf_nlines'), + parameter.Int('wbuf_nwords'), + parameter.Int('max_frozen_cycles') ], ) Index: branches/RWT/modules/vci_cc_vcache_wrapper/caba/source/include/vci_cc_vcache_wrapper.h =================================================================== --- branches/RWT/modules/vci_cc_vcache_wrapper/caba/source/include/vci_cc_vcache_wrapper.h (revision 767) +++ branches/RWT/modules/vci_cc_vcache_wrapper/caba/source/include/vci_cc_vcache_wrapper.h (revision 771) @@ -35,4 +35,5 @@ #include #include + #include "caba_base_module.h" #include "multi_write_buffer.h" @@ -42,5 +43,5 @@ #include "vci_initiator.h" #include "dspin_interface.h" -#include "dspin_dhccp_param.h" +#include "dspin_rwt_param.h" #include "mapping_table.h" #include "static_assert.h" Index: branches/RWT/modules/vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp =================================================================== --- branches/RWT/modules/vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp (revision 767) +++ branches/RWT/modules/vci_cc_vcache_wrapper/caba/source/src/vci_cc_vcache_wrapper.cpp (revision 771) @@ -4289,6 +4289,6 @@ uint32_t rdata; - size_t way; - size_t set; + size_t way = 0; // To avoid gcc warning + size_t set = 0; // To avoid gcc warning size_t word; r_dcache.read_neutral(r_dcache_xtn_data_addr.read(), @@ -5379,6 +5379,6 @@ uint32_t rdata; - size_t way; - size_t set; + size_t way = 0; // to avoid gcc warning + size_t set = 0; // to avoid gcc warning size_t word; r_dcache.read_neutral(r_dcache_cc_inval_addr.read(), @@ -5399,7 +5399,7 @@ r_dcache_cc_inval_data_cpt = 0; r_dcache_fsm = r_dcache_fsm_cc_save.read(); - r_dcache.write_dir( way, - set, - CACHE_SLOT_STATE_ZOMBI ); + r_dcache.write_dir(way, + set, + CACHE_SLOT_STATE_ZOMBI ); } } @@ -6207,22 +6207,22 @@ uint64_t receive_data = p_dspin_m2p.data.read(); // initialize coherence packet type - uint64_t receive_type = DspinDhccpParam::dspin_get(receive_data, - DspinDhccpParam::M2P_TYPE); + uint64_t receive_type = DspinRwtParam::dspin_get(receive_data, + DspinRwtParam::M2P_TYPE); // test for a broadcast - if (DspinDhccpParam::dspin_get(receive_data,DspinDhccpParam::M2P_BC)) + if (DspinRwtParam::dspin_get(receive_data,DspinRwtParam::M2P_BC)) { r_cc_receive_fsm = CC_RECEIVE_BRDCAST_HEADER; } // test for a multi updt - else if (receive_type == DspinDhccpParam::TYPE_MULTI_UPDT_DATA) + else if (receive_type == DspinRwtParam::TYPE_MULTI_UPDT_DATA) { r_cc_receive_fsm = CC_RECEIVE_DATA_UPDT_HEADER; } - else if (receive_type == DspinDhccpParam::TYPE_MULTI_UPDT_INST) + else if (receive_type == DspinRwtParam::TYPE_MULTI_UPDT_INST) { r_cc_receive_fsm = CC_RECEIVE_INS_UPDT_HEADER; } // test for a multi inval - else if (receive_type == DspinDhccpParam::TYPE_MULTI_INVAL_DATA) + else if (receive_type == DspinRwtParam::TYPE_MULTI_INVAL_DATA) { r_cc_receive_fsm = CC_RECEIVE_DATA_INVAL_HEADER; @@ -6257,11 +6257,11 @@ // request dcache to handle the BROADCAST r_cc_receive_dcache_req = true; - r_cc_receive_dcache_nline = DspinDhccpParam::dspin_get(receive_data, - DspinDhccpParam::BROADCAST_NLINE); + r_cc_receive_dcache_nline = DspinRwtParam::dspin_get(receive_data, + DspinRwtParam::BROADCAST_NLINE); r_cc_receive_dcache_type = CC_TYPE_INVAL; // request icache to handle the BROADCAST r_cc_receive_icache_req = true; - r_cc_receive_icache_nline = DspinDhccpParam::dspin_get(receive_data, - DspinDhccpParam::BROADCAST_NLINE); + r_cc_receive_icache_nline = DspinRwtParam::dspin_get(receive_data, + DspinRwtParam::BROADCAST_NLINE); r_cc_receive_icache_type = CC_TYPE_INVAL; // get back to idle state @@ -6279,6 +6279,6 @@ // sample updt tab index in the HEADER, then skip to second flit r_cc_receive_fsm = CC_RECEIVE_DATA_INVAL_NLINE; - r_cc_receive_dcache_inval_is_config = DspinDhccpParam::dspin_get(receive_data, - DspinDhccpParam::MULTI_INVAL_IS_CONFIG); + r_cc_receive_dcache_inval_is_config = DspinRwtParam::dspin_get(receive_data, + DspinRwtParam::MULTI_INVAL_IS_CONFIG); break; } @@ -6301,5 +6301,5 @@ // request dcache to handle the INVAL r_cc_receive_dcache_req = true; - r_cc_receive_dcache_nline = DspinDhccpParam::dspin_get(receive_data,DspinDhccpParam::MULTI_INVAL_NLINE); + r_cc_receive_dcache_nline = DspinRwtParam::dspin_get(receive_data,DspinRwtParam::MULTI_INVAL_NLINE); r_cc_receive_dcache_type = CC_TYPE_INVAL; // get back to idle state @@ -6320,5 +6320,5 @@ // request icache to handle the INVAL r_cc_receive_icache_req = true; - r_cc_receive_icache_nline = DspinDhccpParam::dspin_get(receive_data,DspinDhccpParam::MULTI_INVAL_NLINE); + r_cc_receive_icache_nline = DspinRwtParam::dspin_get(receive_data,DspinRwtParam::MULTI_INVAL_NLINE); r_cc_receive_icache_type = CC_TYPE_INVAL; // get back to idle state @@ -6337,5 +6337,5 @@ if (not r_cc_receive_dcache_req.read()) { - r_cc_receive_dcache_updt_tab_idx = DspinDhccpParam::dspin_get(receive_data,DspinDhccpParam::MULTI_UPDT_UPDT_INDEX); + r_cc_receive_dcache_updt_tab_idx = DspinRwtParam::dspin_get(receive_data,DspinRwtParam::MULTI_UPDT_UPDT_INDEX); r_cc_receive_fsm = CC_RECEIVE_DATA_UPDT_NLINE; break; @@ -6352,5 +6352,5 @@ if (not r_cc_receive_icache_req.read()) { - r_cc_receive_icache_updt_tab_idx = DspinDhccpParam::dspin_get(receive_data,DspinDhccpParam::MULTI_UPDT_UPDT_INDEX); + r_cc_receive_icache_updt_tab_idx = DspinRwtParam::dspin_get(receive_data,DspinRwtParam::MULTI_UPDT_UPDT_INDEX); r_cc_receive_fsm = CC_RECEIVE_INS_UPDT_NLINE; break; @@ -6370,6 +6370,6 @@ { r_cc_receive_dcache_req = true; - r_cc_receive_dcache_nline = DspinDhccpParam::dspin_get(receive_data,DspinDhccpParam::MULTI_UPDT_NLINE); - r_cc_receive_word_idx = DspinDhccpParam::dspin_get(receive_data,DspinDhccpParam::MULTI_UPDT_WORD_INDEX); + r_cc_receive_dcache_nline = DspinRwtParam::dspin_get(receive_data,DspinRwtParam::MULTI_UPDT_NLINE); + r_cc_receive_word_idx = DspinRwtParam::dspin_get(receive_data,DspinRwtParam::MULTI_UPDT_WORD_INDEX); r_cc_receive_dcache_type = CC_TYPE_UPDT; // get back to idle state @@ -6390,6 +6390,6 @@ { r_cc_receive_icache_req = true; - r_cc_receive_icache_nline = DspinDhccpParam::dspin_get(receive_data,DspinDhccpParam::MULTI_UPDT_NLINE); - r_cc_receive_word_idx = DspinDhccpParam::dspin_get(receive_data,DspinDhccpParam::MULTI_UPDT_WORD_INDEX); + r_cc_receive_icache_nline = DspinRwtParam::dspin_get(receive_data,DspinRwtParam::MULTI_UPDT_NLINE); + r_cc_receive_word_idx = DspinRwtParam::dspin_get(receive_data,DspinRwtParam::MULTI_UPDT_WORD_INDEX); r_cc_receive_icache_type = CC_TYPE_UPDT; // get back to idle state @@ -6407,6 +6407,6 @@ uint64_t receive_data = p_dspin_m2p.data.read(); bool receive_eop = p_dspin_m2p.eop.read(); - cc_receive_updt_fifo_be = DspinDhccpParam::dspin_get(receive_data,DspinDhccpParam::MULTI_UPDT_BE); - cc_receive_updt_fifo_data = DspinDhccpParam::dspin_get(receive_data,DspinDhccpParam::MULTI_UPDT_DATA); + cc_receive_updt_fifo_be = DspinRwtParam::dspin_get(receive_data,DspinRwtParam::MULTI_UPDT_BE); + cc_receive_updt_fifo_data = DspinRwtParam::dspin_get(receive_data,DspinRwtParam::MULTI_UPDT_DATA); cc_receive_updt_fifo_eop = receive_eop; cc_receive_updt_fifo_put = true; @@ -6423,6 +6423,6 @@ uint64_t receive_data = p_dspin_m2p.data.read(); bool receive_eop = p_dspin_m2p.eop.read(); - cc_receive_updt_fifo_be = DspinDhccpParam::dspin_get(receive_data,DspinDhccpParam::MULTI_UPDT_BE); - cc_receive_updt_fifo_data = DspinDhccpParam::dspin_get(receive_data,DspinDhccpParam::MULTI_UPDT_DATA); + cc_receive_updt_fifo_be = DspinRwtParam::dspin_get(receive_data,DspinRwtParam::MULTI_UPDT_BE); + cc_receive_updt_fifo_data = DspinRwtParam::dspin_get(receive_data,DspinRwtParam::MULTI_UPDT_DATA); cc_receive_updt_fifo_eop = receive_eop; cc_receive_updt_fifo_put = true; @@ -6436,16 +6436,16 @@ ///////////////// DSPIN CLACK interface /////////////// - uint64_t clack_type = DspinDhccpParam::dspin_get(r_dspin_clack_flit.read(), - DspinDhccpParam::CLACK_TYPE); - - size_t clack_way = DspinDhccpParam::dspin_get(r_dspin_clack_flit.read(), - DspinDhccpParam::CLACK_WAY); - - size_t clack_set = DspinDhccpParam::dspin_get(r_dspin_clack_flit.read(), - DspinDhccpParam::CLACK_SET); + uint64_t clack_type = DspinRwtParam::dspin_get(r_dspin_clack_flit.read(), + DspinRwtParam::CLACK_TYPE); + + size_t clack_way = DspinRwtParam::dspin_get(r_dspin_clack_flit.read(), + DspinRwtParam::CLACK_WAY); + + size_t clack_set = DspinRwtParam::dspin_get(r_dspin_clack_flit.read(), + DspinRwtParam::CLACK_SET); bool dspin_clack_get = false; - bool dcache_clack_request = (clack_type == DspinDhccpParam::TYPE_CLACK_DATA); - bool icache_clack_request = (clack_type == DspinDhccpParam::TYPE_CLACK_INST); + bool dcache_clack_request = (clack_type == DspinRwtParam::TYPE_CLACK_DATA); + bool icache_clack_request = (clack_type == DspinRwtParam::TYPE_CLACK_INST); if (r_dspin_clack_req.read()) @@ -6701,10 +6701,10 @@ { // initialize dspin send data - DspinDhccpParam::dspin_set(dspin_send_data, + DspinRwtParam::dspin_set(dspin_send_data, m_cc_global_id, - DspinDhccpParam::CLEANUP_SRCID); - DspinDhccpParam::dspin_set(dspin_send_data, + DspinRwtParam::CLEANUP_SRCID); + DspinRwtParam::dspin_set(dspin_send_data, 0, - DspinDhccpParam::P2M_BC); + DspinRwtParam::P2M_BC); if(r_cc_send_last_client.read() == 0) // dcache active request @@ -6712,24 +6712,24 @@ uint64_t dest = (uint64_t) r_dcache_cc_send_nline.read() >> (m_nline_width - m_x_width - m_y_width) - << (DspinDhccpParam::GLOBALID_WIDTH - m_x_width - m_y_width); - DspinDhccpParam::dspin_set(dspin_send_data, + << (DspinRwtParam::GLOBALID_WIDTH - m_x_width - m_y_width); + DspinRwtParam::dspin_set(dspin_send_data, dest, - DspinDhccpParam::CLEANUP_DEST); - - DspinDhccpParam::dspin_set(dspin_send_data, + DspinRwtParam::CLEANUP_DEST); + + DspinRwtParam::dspin_set(dspin_send_data, (r_dcache_cc_send_nline.read() & 0x300000000ULL)>>32, - DspinDhccpParam::CLEANUP_NLINE_MSB); - - DspinDhccpParam::dspin_set(dspin_send_data, + DspinRwtParam::CLEANUP_NLINE_MSB); + + DspinRwtParam::dspin_set(dspin_send_data, r_dcache_cc_send_way.read(), - DspinDhccpParam::CLEANUP_WAY_INDEX); - - DspinDhccpParam::dspin_set(dspin_send_data, - DspinDhccpParam::TYPE_CLEANUP_DATA, - DspinDhccpParam::P2M_TYPE); - - DspinDhccpParam::dspin_set(dspin_send_data, + DspinRwtParam::CLEANUP_WAY_INDEX); + + DspinRwtParam::dspin_set(dspin_send_data, + DspinRwtParam::TYPE_CLEANUP_DATA, + DspinRwtParam::P2M_TYPE); + + DspinRwtParam::dspin_set(dspin_send_data, (r_dcache_cc_cleanup_line_ncc.read() and (r_cc_send_last_client.read() == 0)), - DspinDhccpParam::CLEANUP_NCC); + DspinRwtParam::CLEANUP_NCC); } else // icache active request @@ -6737,25 +6737,25 @@ uint64_t dest = (uint64_t) r_icache_cc_send_nline.read() >> (m_nline_width - m_x_width - m_y_width) - << (DspinDhccpParam::GLOBALID_WIDTH - m_x_width - m_y_width); - - DspinDhccpParam::dspin_set(dspin_send_data, + << (DspinRwtParam::GLOBALID_WIDTH - m_x_width - m_y_width); + + DspinRwtParam::dspin_set(dspin_send_data, dest, - DspinDhccpParam::CLEANUP_DEST); - - DspinDhccpParam::dspin_set(dspin_send_data, + DspinRwtParam::CLEANUP_DEST); + + DspinRwtParam::dspin_set(dspin_send_data, (r_icache_cc_send_nline.read() & 0x300000000ULL)>>32, - DspinDhccpParam::CLEANUP_NLINE_MSB); - - DspinDhccpParam::dspin_set(dspin_send_data, + DspinRwtParam::CLEANUP_NLINE_MSB); + + DspinRwtParam::dspin_set(dspin_send_data, r_icache_cc_send_way.read(), - DspinDhccpParam::CLEANUP_WAY_INDEX); - - DspinDhccpParam::dspin_set(dspin_send_data, - DspinDhccpParam::TYPE_CLEANUP_INST, - DspinDhccpParam::P2M_TYPE); - - DspinDhccpParam::dspin_set(dspin_send_data, + DspinRwtParam::CLEANUP_WAY_INDEX); + + DspinRwtParam::dspin_set(dspin_send_data, + DspinRwtParam::TYPE_CLEANUP_INST, + DspinRwtParam::P2M_TYPE); + + DspinRwtParam::dspin_set(dspin_send_data, 0, - DspinDhccpParam::CLEANUP_NCC); + DspinRwtParam::CLEANUP_NCC); @@ -6773,13 +6773,13 @@ if(r_cc_send_last_client.read() == 0) // dcache active request { - DspinDhccpParam::dspin_set(dspin_send_data, + DspinRwtParam::dspin_set(dspin_send_data, r_dcache_cc_send_nline.read() & 0xFFFFFFFFULL, - DspinDhccpParam::CLEANUP_NLINE_LSB); + DspinRwtParam::CLEANUP_NLINE_LSB); } else // icache active request { - DspinDhccpParam::dspin_set(dspin_send_data, + DspinRwtParam::dspin_set(dspin_send_data, r_icache_cc_send_nline.read() & 0xFFFFFFFFULL, - DspinDhccpParam::CLEANUP_NLINE_LSB); + DspinRwtParam::CLEANUP_NLINE_LSB); } // send flit @@ -6793,7 +6793,7 @@ { - DspinDhccpParam::dspin_set(dspin_send_data, + DspinRwtParam::dspin_set(dspin_send_data, r_cc_send_data_fifo.read(), - DspinDhccpParam::CLEANUP_DATA_UPDT); + DspinRwtParam::CLEANUP_DATA_UPDT); p_dspin_p2m.data = dspin_send_data; @@ -6806,10 +6806,10 @@ { // initialize dspin send data - DspinDhccpParam::dspin_set(dspin_send_data, + DspinRwtParam::dspin_set(dspin_send_data, 0, - DspinDhccpParam::P2M_BC); - DspinDhccpParam::dspin_set(dspin_send_data, - DspinDhccpParam::TYPE_MULTI_ACK, - DspinDhccpParam::P2M_TYPE); + DspinRwtParam::P2M_BC); + DspinRwtParam::dspin_set(dspin_send_data, + DspinRwtParam::TYPE_MULTI_ACK, + DspinRwtParam::P2M_TYPE); if(r_cc_send_last_client.read() == 0) // dcache active request @@ -6817,13 +6817,13 @@ uint64_t dest = (uint64_t) r_dcache_cc_send_nline.read() >> (m_nline_width - m_x_width - m_y_width) - << (DspinDhccpParam::GLOBALID_WIDTH - m_x_width - m_y_width); + << (DspinRwtParam::GLOBALID_WIDTH - m_x_width - m_y_width); - DspinDhccpParam::dspin_set(dspin_send_data, + DspinRwtParam::dspin_set(dspin_send_data, dest, - DspinDhccpParam::MULTI_ACK_DEST); - - DspinDhccpParam::dspin_set(dspin_send_data, + DspinRwtParam::MULTI_ACK_DEST); + + DspinRwtParam::dspin_set(dspin_send_data, r_dcache_cc_send_updt_tab_idx.read(), - DspinDhccpParam::MULTI_ACK_UPDT_INDEX); + DspinRwtParam::MULTI_ACK_UPDT_INDEX); } else // icache active request @@ -6831,14 +6831,14 @@ uint64_t dest = (uint64_t) r_icache_cc_send_nline.read() >> (m_nline_width - m_x_width - m_y_width) - << (DspinDhccpParam::GLOBALID_WIDTH - m_x_width - m_y_width); + << (DspinRwtParam::GLOBALID_WIDTH - m_x_width - m_y_width); - DspinDhccpParam::dspin_set(dspin_send_data, + DspinRwtParam::dspin_set(dspin_send_data, dest, - DspinDhccpParam::MULTI_ACK_DEST); - - DspinDhccpParam::dspin_set(dspin_send_data, + DspinRwtParam::MULTI_ACK_DEST); + + DspinRwtParam::dspin_set(dspin_send_data, r_icache_cc_send_updt_tab_idx.read(), - DspinDhccpParam::MULTI_ACK_UPDT_INDEX); + DspinRwtParam::MULTI_ACK_UPDT_INDEX); } // send flit @@ -6938,10 +6938,10 @@ - int clack_type = DspinDhccpParam::dspin_get(r_dspin_clack_flit.read(), - DspinDhccpParam::CLACK_TYPE); + int clack_type = DspinRwtParam::dspin_get(r_dspin_clack_flit.read(), + DspinRwtParam::CLACK_TYPE); bool dspin_clack_get = false; - bool dcache_clack_request = (clack_type == DspinDhccpParam::TYPE_CLACK_DATA); - bool icache_clack_request = (clack_type == DspinDhccpParam::TYPE_CLACK_INST); + bool dcache_clack_request = (clack_type == DspinRwtParam::TYPE_CLACK_DATA); + bool icache_clack_request = (clack_type == DspinRwtParam::TYPE_CLACK_INST); if (r_dspin_clack_req.read()) Index: branches/RWT/modules/vci_mem_cache/caba/metadata/vci_mem_cache.sd =================================================================== --- branches/RWT/modules/vci_mem_cache/caba/metadata/vci_mem_cache.sd (revision 767) +++ branches/RWT/modules/vci_mem_cache/caba/metadata/vci_mem_cache.sd (revision 771) @@ -40,5 +40,5 @@ Uses('caba:generic_fifo'), Uses('caba:generic_llsc_global_table'), - Uses('caba:dspin_dhccp_param') + Uses('caba:dspin_rwt_param') ], Index: branches/RWT/modules/vci_mem_cache/caba/source/include/vci_mem_cache.h =================================================================== --- branches/RWT/modules/vci_mem_cache/caba/source/include/vci_mem_cache.h (revision 767) +++ branches/RWT/modules/vci_mem_cache/caba/source/include/vci_mem_cache.h (revision 771) @@ -51,5 +51,5 @@ #include "update_tab.h" #include "dspin_interface.h" -#include "dspin_dhccp_param.h" +#include "dspin_rwt_param.h" #define TRT_ENTRIES 4 // Number of entries in TRT Index: branches/RWT/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp =================================================================== --- branches/RWT/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp (revision 767) +++ branches/RWT/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp (revision 771) @@ -2029,6 +2029,6 @@ { uint64_t flit = m_cc_receive_to_multi_ack_fifo.read(); - updt_index = DspinDhccpParam::dspin_get(flit, - DspinDhccpParam::MULTI_ACK_UPDT_INDEX); + updt_index = DspinRwtParam::dspin_get(flit, + DspinRwtParam::MULTI_ACK_UPDT_INDEX); cc_receive_to_multi_ack_fifo_get = true; @@ -5661,29 +5661,29 @@ uint32_t srcid = - DspinDhccpParam::dspin_get( + DspinRwtParam::dspin_get( flit, - DspinDhccpParam::CLEANUP_SRCID); + DspinRwtParam::CLEANUP_SRCID); uint8_t type = - DspinDhccpParam::dspin_get( + DspinRwtParam::dspin_get( flit, - DspinDhccpParam::P2M_TYPE); + DspinRwtParam::P2M_TYPE); r_cleanup_way_index = - DspinDhccpParam::dspin_get( + DspinRwtParam::dspin_get( flit, - DspinDhccpParam::CLEANUP_WAY_INDEX); + DspinRwtParam::CLEANUP_WAY_INDEX); r_cleanup_nline = - DspinDhccpParam::dspin_get( + DspinRwtParam::dspin_get( flit, - DspinDhccpParam::CLEANUP_NLINE_MSB) << 32; - - r_cleanup_inst = (type == DspinDhccpParam::TYPE_CLEANUP_INST); + DspinRwtParam::CLEANUP_NLINE_MSB) << 32; + + r_cleanup_inst = (type == DspinRwtParam::TYPE_CLEANUP_INST); r_cleanup_srcid = srcid; r_cleanup_ncc = - DspinDhccpParam::dspin_get( + DspinRwtParam::dspin_get( flit, - DspinDhccpParam::CLEANUP_NCC); + DspinRwtParam::CLEANUP_NCC); r_cleanup_contains_data = false; @@ -5710,8 +5710,8 @@ << " CLEANUP_IDLE> Cleanup request:" << std::hex << " / owner_id = " << srcid - << " / owner_ins = " << (type == DspinDhccpParam::TYPE_CLEANUP_INST) - << " / ncc = " << DspinDhccpParam::dspin_get( + << " / owner_ins = " << (type == DspinRwtParam::TYPE_CLEANUP_INST) + << " / ncc = " << DspinRwtParam::dspin_get( flit, - DspinDhccpParam::CLEANUP_NCC) + DspinRwtParam::CLEANUP_NCC) << std::endl; } @@ -5728,8 +5728,8 @@ addr_t nline = r_cleanup_nline.read() | - DspinDhccpParam::dspin_get(flit, DspinDhccpParam::CLEANUP_NLINE_LSB); + DspinRwtParam::dspin_get(flit, DspinRwtParam::CLEANUP_NLINE_LSB); bool eop = - DspinDhccpParam::dspin_get(flit, DspinDhccpParam::P2M_EOP) == 0x1; + DspinRwtParam::dspin_get(flit, DspinRwtParam::P2M_EOP) == 0x1; if (! eop) @@ -5768,5 +5768,5 @@ uint32_t data = - DspinDhccpParam::dspin_get (flit, DspinDhccpParam::CLEANUP_DATA_UPDT); + DspinRwtParam::dspin_get (flit, DspinRwtParam::CLEANUP_DATA_UPDT); r_cleanup_data[r_cleanup_data_index] = data; @@ -8170,10 +8170,10 @@ uint8_t type = - DspinDhccpParam::dspin_get( + DspinRwtParam::dspin_get( p_dspin_p2m.data.read(), - DspinDhccpParam::P2M_TYPE); - - if((type == DspinDhccpParam::TYPE_CLEANUP_DATA) or - (type == DspinDhccpParam::TYPE_CLEANUP_INST)) + DspinRwtParam::P2M_TYPE); + + if((type == DspinRwtParam::TYPE_CLEANUP_DATA) or + (type == DspinRwtParam::TYPE_CLEANUP_INST)) { r_cc_receive_fsm = CC_RECEIVE_CLEANUP; @@ -8181,5 +8181,5 @@ } - if(type == DspinDhccpParam::TYPE_MULTI_ACK) + if(type == DspinRwtParam::TYPE_MULTI_ACK) { r_cc_receive_fsm = CC_RECEIVE_MULTI_ACK; @@ -10261,31 +10261,31 @@ if(m_config_to_cc_send_inst_fifo.read()) { - multi_inval_type = DspinDhccpParam::TYPE_MULTI_INVAL_INST; + multi_inval_type = DspinRwtParam::TYPE_MULTI_INVAL_INST; } else { - multi_inval_type = DspinDhccpParam::TYPE_MULTI_INVAL_DATA; + multi_inval_type = DspinRwtParam::TYPE_MULTI_INVAL_DATA; } uint64_t flit = 0; uint64_t dest = m_config_to_cc_send_srcid_fifo.read() << - (DspinDhccpParam::SRCID_WIDTH - vci_param_int::S); - - DspinDhccpParam::dspin_set( flit, + (DspinRwtParam::SRCID_WIDTH - vci_param_int::S); + + DspinRwtParam::dspin_set( flit, dest, - DspinDhccpParam::MULTI_INVAL_DEST); + DspinRwtParam::MULTI_INVAL_DEST); // MODIFIED FOR CONFIG INVAL (solution 1 bit in flit multi_inval) - DspinDhccpParam::dspin_set( flit, + DspinRwtParam::dspin_set( flit, 1, - DspinDhccpParam::MULTI_INVAL_IS_CONFIG); - - DspinDhccpParam::dspin_set( flit, + DspinRwtParam::MULTI_INVAL_IS_CONFIG); + + DspinRwtParam::dspin_set( flit, r_config_to_cc_send_trdid.read(), - DspinDhccpParam::MULTI_INVAL_UPDT_INDEX); - - DspinDhccpParam::dspin_set( flit, + DspinRwtParam::MULTI_INVAL_UPDT_INDEX); + + DspinRwtParam::dspin_set( flit, multi_inval_type, - DspinDhccpParam::M2P_TYPE); + DspinRwtParam::M2P_TYPE); p_dspin_m2p.write = true; p_dspin_m2p.data = flit; @@ -10296,7 +10296,7 @@ { uint64_t flit = 0; - DspinDhccpParam::dspin_set( flit, + DspinRwtParam::dspin_set( flit, r_config_to_cc_send_nline.read(), - DspinDhccpParam::MULTI_INVAL_NLINE); + DspinRwtParam::MULTI_INVAL_NLINE); p_dspin_m2p.eop = true; p_dspin_m2p.write = true; @@ -10312,26 +10312,26 @@ if(m_xram_rsp_to_cc_send_inst_fifo.read()) { - multi_inval_type = DspinDhccpParam::TYPE_MULTI_INVAL_INST; + multi_inval_type = DspinRwtParam::TYPE_MULTI_INVAL_INST; } else { - multi_inval_type = DspinDhccpParam::TYPE_MULTI_INVAL_DATA; + multi_inval_type = DspinRwtParam::TYPE_MULTI_INVAL_DATA; } uint64_t flit = 0; uint64_t dest = m_xram_rsp_to_cc_send_srcid_fifo.read() << - (DspinDhccpParam::SRCID_WIDTH - vci_param_int::S); - - DspinDhccpParam::dspin_set( flit, + (DspinRwtParam::SRCID_WIDTH - vci_param_int::S); + + DspinRwtParam::dspin_set( flit, dest, - DspinDhccpParam::MULTI_INVAL_DEST); - - DspinDhccpParam::dspin_set( flit, + DspinRwtParam::MULTI_INVAL_DEST); + + DspinRwtParam::dspin_set( flit, r_xram_rsp_to_cc_send_trdid.read(), - DspinDhccpParam::MULTI_INVAL_UPDT_INDEX); - - DspinDhccpParam::dspin_set( flit, + DspinRwtParam::MULTI_INVAL_UPDT_INDEX); + + DspinRwtParam::dspin_set( flit, multi_inval_type, - DspinDhccpParam::M2P_TYPE); + DspinRwtParam::M2P_TYPE); p_dspin_m2p.write = true; p_dspin_m2p.data = flit; @@ -10344,7 +10344,7 @@ uint64_t flit = 0; - DspinDhccpParam::dspin_set( flit, + DspinRwtParam::dspin_set( flit, r_xram_rsp_to_cc_send_nline.read(), - DspinDhccpParam::MULTI_INVAL_NLINE); + DspinRwtParam::MULTI_INVAL_NLINE); p_dspin_m2p.eop = true; p_dspin_m2p.write = true; @@ -10358,15 +10358,15 @@ uint64_t flit = 0; - DspinDhccpParam::dspin_set( flit, + DspinRwtParam::dspin_set( flit, m_broadcast_boundaries, - DspinDhccpParam::BROADCAST_BOX); + DspinRwtParam::BROADCAST_BOX); - DspinDhccpParam::dspin_set( flit, + DspinRwtParam::dspin_set( flit, 1, - DspinDhccpParam::MULTI_INVAL_IS_CONFIG); - - DspinDhccpParam::dspin_set( flit, + DspinRwtParam::MULTI_INVAL_IS_CONFIG); + + DspinRwtParam::dspin_set( flit, 1ULL, - DspinDhccpParam::M2P_BC); + DspinRwtParam::M2P_BC); p_dspin_m2p.write = true; p_dspin_m2p.data = flit; @@ -10380,11 +10380,11 @@ uint64_t flit = 0; - DspinDhccpParam::dspin_set( flit, + DspinRwtParam::dspin_set( flit, m_broadcast_boundaries, - DspinDhccpParam::BROADCAST_BOX); - - DspinDhccpParam::dspin_set( flit, + DspinRwtParam::BROADCAST_BOX); + + DspinRwtParam::dspin_set( flit, 1ULL, - DspinDhccpParam::M2P_BC); + DspinRwtParam::M2P_BC); p_dspin_m2p.write = true; p_dspin_m2p.data = flit; @@ -10395,7 +10395,7 @@ { uint64_t flit = 0; - DspinDhccpParam::dspin_set( flit, + DspinRwtParam::dspin_set( flit, r_xram_rsp_to_cc_send_nline.read(), - DspinDhccpParam::BROADCAST_NLINE); + DspinRwtParam::BROADCAST_NLINE); p_dspin_m2p.write = true; p_dspin_m2p.eop = true; @@ -10407,7 +10407,7 @@ { uint64_t flit = 0; - DspinDhccpParam::dspin_set( flit, + DspinRwtParam::dspin_set( flit, r_config_to_cc_send_nline.read(), - DspinDhccpParam::BROADCAST_NLINE); + DspinRwtParam::BROADCAST_NLINE); p_dspin_m2p.write = true; p_dspin_m2p.eop = true; @@ -10421,23 +10421,23 @@ uint64_t flit = 0; - uint8_t multi_inval_type; - if (r_read_to_cc_send_inst.read()) - { - multi_inval_type = DspinDhccpParam::TYPE_MULTI_INVAL_INST; - } - else - { - multi_inval_type = DspinDhccpParam::TYPE_MULTI_INVAL_DATA; - } - - DspinDhccpParam::dspin_set( + //uint8_t multi_inval_type; + //if (r_read_to_cc_send_inst.read()) + //{ + // multi_inval_type = DspinRwtParam::TYPE_MULTI_INVAL_INST; + //} + //else + //{ + // multi_inval_type = DspinRwtParam::TYPE_MULTI_INVAL_DATA; + //} + + DspinRwtParam::dspin_set( flit, r_read_to_cc_send_dest.read(), - DspinDhccpParam::MULTI_INVAL_DEST); - - DspinDhccpParam::dspin_set( + DspinRwtParam::MULTI_INVAL_DEST); + + DspinRwtParam::dspin_set( flit, - DspinDhccpParam::TYPE_MULTI_INVAL_DATA, - DspinDhccpParam::M2P_TYPE); + DspinRwtParam::TYPE_MULTI_INVAL_DATA, + DspinRwtParam::M2P_TYPE); p_dspin_m2p.write = true; @@ -10453,8 +10453,8 @@ uint64_t flit = 0; - DspinDhccpParam::dspin_set( + DspinRwtParam::dspin_set( flit, r_read_to_cc_send_nline.read(), - DspinDhccpParam::MULTI_INVAL_NLINE); + DspinRwtParam::MULTI_INVAL_NLINE); @@ -10471,13 +10471,13 @@ uint64_t flit = 0; - DspinDhccpParam::dspin_set( + DspinRwtParam::dspin_set( flit, r_write_to_cc_send_dest.read(), - DspinDhccpParam::MULTI_INVAL_DEST); - - DspinDhccpParam::dspin_set( + DspinRwtParam::MULTI_INVAL_DEST); + + DspinRwtParam::dspin_set( flit, - DspinDhccpParam::TYPE_MULTI_INVAL_DATA, - DspinDhccpParam::M2P_TYPE); + DspinRwtParam::TYPE_MULTI_INVAL_DATA, + DspinRwtParam::M2P_TYPE); p_dspin_m2p.write = true; @@ -10492,8 +10492,8 @@ uint64_t flit = 0; - DspinDhccpParam::dspin_set( + DspinRwtParam::dspin_set( flit, r_write_to_cc_send_nline.read(), - DspinDhccpParam::MULTI_INVAL_NLINE); + DspinRwtParam::MULTI_INVAL_NLINE); @@ -10510,7 +10510,7 @@ { uint64_t flit = 0; - DspinDhccpParam::dspin_set( flit, + DspinRwtParam::dspin_set( flit, r_write_to_cc_send_nline.read(), - DspinDhccpParam::BROADCAST_NLINE); + DspinRwtParam::BROADCAST_NLINE); p_dspin_m2p.write = true; p_dspin_m2p.eop = true; @@ -10522,7 +10522,7 @@ { uint64_t flit = 0; - DspinDhccpParam::dspin_set( flit, + DspinRwtParam::dspin_set( flit, r_cas_to_cc_send_nline.read(), - DspinDhccpParam::BROADCAST_NLINE); + DspinRwtParam::BROADCAST_NLINE); p_dspin_m2p.write = true; p_dspin_m2p.eop = true; @@ -10538,9 +10538,9 @@ if(m_write_to_cc_send_inst_fifo.read()) { - multi_updt_type = DspinDhccpParam::TYPE_MULTI_UPDT_INST; + multi_updt_type = DspinRwtParam::TYPE_MULTI_UPDT_INST; } else { - multi_updt_type = DspinDhccpParam::TYPE_MULTI_UPDT_DATA; + multi_updt_type = DspinRwtParam::TYPE_MULTI_UPDT_DATA; } @@ -10548,20 +10548,20 @@ uint64_t dest = m_write_to_cc_send_srcid_fifo.read() << - (DspinDhccpParam::SRCID_WIDTH - vci_param_int::S); - - DspinDhccpParam::dspin_set( + (DspinRwtParam::SRCID_WIDTH - vci_param_int::S); + + DspinRwtParam::dspin_set( flit, dest, - DspinDhccpParam::MULTI_UPDT_DEST); - - DspinDhccpParam::dspin_set( + DspinRwtParam::MULTI_UPDT_DEST); + + DspinRwtParam::dspin_set( flit, r_write_to_cc_send_trdid.read(), - DspinDhccpParam::MULTI_UPDT_UPDT_INDEX); - - DspinDhccpParam::dspin_set( + DspinRwtParam::MULTI_UPDT_UPDT_INDEX); + + DspinRwtParam::dspin_set( flit, multi_updt_type, - DspinDhccpParam::M2P_TYPE); + DspinRwtParam::M2P_TYPE); p_dspin_m2p.write = true; @@ -10575,13 +10575,13 @@ uint64_t flit = 0; - DspinDhccpParam::dspin_set( + DspinRwtParam::dspin_set( flit, r_write_to_cc_send_index.read(), - DspinDhccpParam::MULTI_UPDT_WORD_INDEX); - - DspinDhccpParam::dspin_set( + DspinRwtParam::MULTI_UPDT_WORD_INDEX); + + DspinRwtParam::dspin_set( flit, r_write_to_cc_send_nline.read(), - DspinDhccpParam::MULTI_UPDT_NLINE); + DspinRwtParam::MULTI_UPDT_NLINE); p_dspin_m2p.write = true; @@ -10602,13 +10602,13 @@ uint64_t flit = 0; - DspinDhccpParam::dspin_set( + DspinRwtParam::dspin_set( flit, multi_updt_be, - DspinDhccpParam::MULTI_UPDT_BE); - - DspinDhccpParam::dspin_set( + DspinRwtParam::MULTI_UPDT_BE); + + DspinRwtParam::dspin_set( flit, multi_updt_data, - DspinDhccpParam::MULTI_UPDT_DATA); + DspinRwtParam::MULTI_UPDT_DATA); p_dspin_m2p.write = true; @@ -10626,9 +10626,9 @@ if(m_cas_to_cc_send_inst_fifo.read()) { - multi_updt_type = DspinDhccpParam::TYPE_MULTI_UPDT_INST; + multi_updt_type = DspinRwtParam::TYPE_MULTI_UPDT_INST; } else { - multi_updt_type = DspinDhccpParam::TYPE_MULTI_UPDT_DATA; + multi_updt_type = DspinRwtParam::TYPE_MULTI_UPDT_DATA; } @@ -10636,20 +10636,20 @@ uint64_t dest = m_cas_to_cc_send_srcid_fifo.read() << - (DspinDhccpParam::SRCID_WIDTH - vci_param_int::S); - - DspinDhccpParam::dspin_set( + (DspinRwtParam::SRCID_WIDTH - vci_param_int::S); + + DspinRwtParam::dspin_set( flit, dest, - DspinDhccpParam::MULTI_UPDT_DEST); - - DspinDhccpParam::dspin_set( + DspinRwtParam::MULTI_UPDT_DEST); + + DspinRwtParam::dspin_set( flit, r_cas_to_cc_send_trdid.read(), - DspinDhccpParam::MULTI_UPDT_UPDT_INDEX); - - DspinDhccpParam::dspin_set( + DspinRwtParam::MULTI_UPDT_UPDT_INDEX); + + DspinRwtParam::dspin_set( flit, multi_updt_type, - DspinDhccpParam::M2P_TYPE); + DspinRwtParam::M2P_TYPE); p_dspin_m2p.write = true; @@ -10663,13 +10663,13 @@ uint64_t flit = 0; - DspinDhccpParam::dspin_set( + DspinRwtParam::dspin_set( flit, r_cas_to_cc_send_index.read(), - DspinDhccpParam::MULTI_UPDT_WORD_INDEX); - - DspinDhccpParam::dspin_set( + DspinRwtParam::MULTI_UPDT_WORD_INDEX); + + DspinRwtParam::dspin_set( flit, r_cas_to_cc_send_nline.read(), - DspinDhccpParam::MULTI_UPDT_NLINE); + DspinRwtParam::MULTI_UPDT_NLINE); p_dspin_m2p.write = true; @@ -10683,13 +10683,13 @@ uint64_t flit = 0; - DspinDhccpParam::dspin_set( + DspinRwtParam::dspin_set( flit, 0xF, - DspinDhccpParam::MULTI_UPDT_BE); - - DspinDhccpParam::dspin_set( + DspinRwtParam::MULTI_UPDT_BE); + + DspinRwtParam::dspin_set( flit, r_cas_to_cc_send_wdata.read(), - DspinDhccpParam::MULTI_UPDT_DATA); + DspinRwtParam::MULTI_UPDT_DATA); p_dspin_m2p.write = true; @@ -10704,13 +10704,13 @@ uint64_t flit = 0; - DspinDhccpParam::dspin_set( + DspinRwtParam::dspin_set( flit, 0xF, - DspinDhccpParam::MULTI_UPDT_BE); - - DspinDhccpParam::dspin_set( + DspinRwtParam::MULTI_UPDT_BE); + + DspinRwtParam::dspin_set( flit, r_cas_to_cc_send_wdata_high.read(), - DspinDhccpParam::MULTI_UPDT_DATA); + DspinRwtParam::MULTI_UPDT_DATA); p_dspin_m2p.write = true; @@ -10731,34 +10731,34 @@ if(r_cleanup_inst.read()) { - cleanup_ack_type = DspinDhccpParam::TYPE_CLACK_INST; + cleanup_ack_type = DspinRwtParam::TYPE_CLACK_INST; } else { - cleanup_ack_type = DspinDhccpParam::TYPE_CLACK_DATA; + cleanup_ack_type = DspinRwtParam::TYPE_CLACK_DATA; } uint64_t flit = 0; uint64_t dest = r_cleanup_srcid.read() << - (DspinDhccpParam::SRCID_WIDTH - vci_param_int::S); - - DspinDhccpParam::dspin_set( + (DspinRwtParam::SRCID_WIDTH - vci_param_int::S); + + DspinRwtParam::dspin_set( flit, dest, - DspinDhccpParam::CLACK_DEST); - - DspinDhccpParam::dspin_set( + DspinRwtParam::CLACK_DEST); + + DspinRwtParam::dspin_set( flit, r_cleanup_nline.read() & 0xFFFF, - DspinDhccpParam::CLACK_SET); - - DspinDhccpParam::dspin_set( + DspinRwtParam::CLACK_SET); + + DspinRwtParam::dspin_set( flit, r_cleanup_way_index.read(), - DspinDhccpParam::CLACK_WAY); - - DspinDhccpParam::dspin_set( + DspinRwtParam::CLACK_WAY); + + DspinRwtParam::dspin_set( flit, cleanup_ack_type, - DspinDhccpParam::CLACK_TYPE); + DspinRwtParam::CLACK_TYPE); p_dspin_clack.eop = true;