Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/SelfTest/src/test.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/SelfTest/src/test.cpp (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/SelfTest/src/test.cpp (revision 121) @@ -107,10 +107,10 @@ ALLOC2_SC_SIGNAL(out_RETIRE_STORE_QUEUE_PTR_WRITE ,"out_RETIRE_STORE_QUEUE_PTR_WRITE ",Tlsq_ptr_t ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); ALLOC2_SC_SIGNAL(out_RETIRE_LOAD_QUEUE_PTR_WRITE ,"out_RETIRE_LOAD_QUEUE_PTR_WRITE ",Tlsq_ptr_t ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); - ALLOC2_SC_SIGNAL(out_RETIRE_READ_RA ,"out_RETIRE_READ_RA ",Tcontrol_t ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); - ALLOC2_SC_SIGNAL(out_RETIRE_NUM_REG_RA_PHY ,"out_RETIRE_NUM_REG_RA_PHY ",Tgeneral_address_t,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); - ALLOC2_SC_SIGNAL(out_RETIRE_READ_RB ,"out_RETIRE_READ_RB ",Tcontrol_t ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); - ALLOC2_SC_SIGNAL(out_RETIRE_NUM_REG_RB_PHY ,"out_RETIRE_NUM_REG_RB_PHY ",Tgeneral_address_t,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); - ALLOC2_SC_SIGNAL(out_RETIRE_READ_RC ,"out_RETIRE_READ_RC ",Tcontrol_t ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); - ALLOC2_SC_SIGNAL(out_RETIRE_NUM_REG_RC_PHY ,"out_RETIRE_NUM_REG_RC_PHY ",Tspecial_address_t,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); +// ALLOC2_SC_SIGNAL(out_RETIRE_READ_RA ,"out_RETIRE_READ_RA ",Tcontrol_t ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); +// ALLOC2_SC_SIGNAL(out_RETIRE_NUM_REG_RA_PHY ,"out_RETIRE_NUM_REG_RA_PHY ",Tgeneral_address_t,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); +// ALLOC2_SC_SIGNAL(out_RETIRE_READ_RB ,"out_RETIRE_READ_RB ",Tcontrol_t ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); +// ALLOC2_SC_SIGNAL(out_RETIRE_NUM_REG_RB_PHY ,"out_RETIRE_NUM_REG_RB_PHY ",Tgeneral_address_t,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); +// ALLOC2_SC_SIGNAL(out_RETIRE_READ_RC ,"out_RETIRE_READ_RC ",Tcontrol_t ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); +// ALLOC2_SC_SIGNAL(out_RETIRE_NUM_REG_RC_PHY ,"out_RETIRE_NUM_REG_RC_PHY ",Tspecial_address_t,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); ALLOC2_SC_SIGNAL(out_RETIRE_WRITE_RD ,"out_RETIRE_WRITE_RD ",Tcontrol_t ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); ALLOC2_SC_SIGNAL(out_RETIRE_NUM_REG_RD_LOG ,"out_RETIRE_NUM_REG_RD_LOG ",Tgeneral_address_t,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); @@ -224,4 +224,5 @@ if (_param->_have_port_load_queue_ptr) INSTANCE2_SC_SIGNAL(_Commit_unit, in_INSERT_LOAD_QUEUE_PTR_WRITE ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]); +#ifdef DEBUG INSTANCE2_SC_SIGNAL(_Commit_unit, in_INSERT_READ_RA ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]); INSTANCE2_SC_SIGNAL(_Commit_unit, in_INSERT_NUM_REG_RA_LOG ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]); @@ -233,4 +234,5 @@ INSTANCE2_SC_SIGNAL(_Commit_unit, in_INSERT_NUM_REG_RC_LOG ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]); INSTANCE2_SC_SIGNAL(_Commit_unit, in_INSERT_NUM_REG_RC_PHY ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]); +#endif INSTANCE2_SC_SIGNAL(_Commit_unit, in_INSERT_WRITE_RD ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]); INSTANCE2_SC_SIGNAL(_Commit_unit, in_INSERT_NUM_REG_RD_LOG ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]); @@ -253,10 +255,10 @@ if (_param->_have_port_load_queue_ptr) INSTANCE2_SC_SIGNAL(_Commit_unit,out_RETIRE_LOAD_QUEUE_PTR_WRITE ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); - INSTANCE2_SC_SIGNAL(_Commit_unit,out_RETIRE_READ_RA ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); - INSTANCE2_SC_SIGNAL(_Commit_unit,out_RETIRE_NUM_REG_RA_PHY ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); - INSTANCE2_SC_SIGNAL(_Commit_unit,out_RETIRE_READ_RB ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); - INSTANCE2_SC_SIGNAL(_Commit_unit,out_RETIRE_NUM_REG_RB_PHY ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); - INSTANCE2_SC_SIGNAL(_Commit_unit,out_RETIRE_READ_RC ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); - INSTANCE2_SC_SIGNAL(_Commit_unit,out_RETIRE_NUM_REG_RC_PHY ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); +// INSTANCE2_SC_SIGNAL(_Commit_unit,out_RETIRE_READ_RA ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); +// INSTANCE2_SC_SIGNAL(_Commit_unit,out_RETIRE_NUM_REG_RA_PHY ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); +// INSTANCE2_SC_SIGNAL(_Commit_unit,out_RETIRE_READ_RB ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); +// INSTANCE2_SC_SIGNAL(_Commit_unit,out_RETIRE_NUM_REG_RB_PHY ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); +// INSTANCE2_SC_SIGNAL(_Commit_unit,out_RETIRE_READ_RC ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); +// INSTANCE2_SC_SIGNAL(_Commit_unit,out_RETIRE_NUM_REG_RC_PHY ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); INSTANCE2_SC_SIGNAL(_Commit_unit,out_RETIRE_WRITE_RD ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); INSTANCE2_SC_SIGNAL(_Commit_unit,out_RETIRE_NUM_REG_RD_LOG ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); @@ -664,10 +666,10 @@ DELETE2_SC_SIGNAL(out_RETIRE_STORE_QUEUE_PTR_WRITE ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); DELETE2_SC_SIGNAL(out_RETIRE_LOAD_QUEUE_PTR_WRITE ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); - DELETE2_SC_SIGNAL(out_RETIRE_READ_RA ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); - DELETE2_SC_SIGNAL(out_RETIRE_NUM_REG_RA_PHY ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); - DELETE2_SC_SIGNAL(out_RETIRE_READ_RB ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); - DELETE2_SC_SIGNAL(out_RETIRE_NUM_REG_RB_PHY ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); - DELETE2_SC_SIGNAL(out_RETIRE_READ_RC ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); - DELETE2_SC_SIGNAL(out_RETIRE_NUM_REG_RC_PHY ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); +// DELETE2_SC_SIGNAL(out_RETIRE_READ_RA ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); +// DELETE2_SC_SIGNAL(out_RETIRE_NUM_REG_RA_PHY ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); +// DELETE2_SC_SIGNAL(out_RETIRE_READ_RB ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); +// DELETE2_SC_SIGNAL(out_RETIRE_NUM_REG_RB_PHY ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); +// DELETE2_SC_SIGNAL(out_RETIRE_READ_RC ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); +// DELETE2_SC_SIGNAL(out_RETIRE_NUM_REG_RC_PHY ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); DELETE2_SC_SIGNAL(out_RETIRE_WRITE_RD ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); DELETE2_SC_SIGNAL(out_RETIRE_NUM_REG_RD_LOG ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/include/Commit_unit.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/include/Commit_unit.h (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/include/Commit_unit.h (revision 121) @@ -94,4 +94,5 @@ public : SC_IN (Tlsq_ptr_t ) *** in_INSERT_STORE_QUEUE_PTR_WRITE ;//[nb_rename_unit][nb_inst_insert] public : SC_IN (Tlsq_ptr_t ) *** in_INSERT_LOAD_QUEUE_PTR_WRITE ;//[nb_rename_unit][nb_inst_insert] +#ifdef DEBUG public : SC_IN (Tcontrol_t ) *** in_INSERT_READ_RA ;//[nb_rename_unit][nb_inst_insert] public : SC_IN (Tgeneral_address_t ) *** in_INSERT_NUM_REG_RA_LOG ;//[nb_rename_unit][nb_inst_insert] @@ -103,4 +104,5 @@ public : SC_IN (Tspecial_address_t ) *** in_INSERT_NUM_REG_RC_LOG ;//[nb_rename_unit][nb_inst_insert] public : SC_IN (Tspecial_address_t ) *** in_INSERT_NUM_REG_RC_PHY ;//[nb_rename_unit][nb_inst_insert] +#endif public : SC_IN (Tcontrol_t ) *** in_INSERT_WRITE_RD ;//[nb_rename_unit][nb_inst_insert] public : SC_IN (Tgeneral_address_t ) *** in_INSERT_NUM_REG_RD_LOG ;//[nb_rename_unit][nb_inst_insert] @@ -122,10 +124,10 @@ public : SC_OUT(Tlsq_ptr_t ) *** out_RETIRE_STORE_QUEUE_PTR_WRITE ;//[nb_rename_unit][nb_inst_retire] public : SC_OUT(Tlsq_ptr_t ) *** out_RETIRE_LOAD_QUEUE_PTR_WRITE ;//[nb_rename_unit][nb_inst_retire] - public : SC_OUT(Tcontrol_t ) *** out_RETIRE_READ_RA ;//[nb_rename_unit][nb_inst_retire] - public : SC_OUT(Tgeneral_address_t ) *** out_RETIRE_NUM_REG_RA_PHY ;//[nb_rename_unit][nb_inst_retire] - public : SC_OUT(Tcontrol_t ) *** out_RETIRE_READ_RB ;//[nb_rename_unit][nb_inst_retire] - public : SC_OUT(Tgeneral_address_t ) *** out_RETIRE_NUM_REG_RB_PHY ;//[nb_rename_unit][nb_inst_retire] - public : SC_OUT(Tcontrol_t ) *** out_RETIRE_READ_RC ;//[nb_rename_unit][nb_inst_retire] - public : SC_OUT(Tspecial_address_t ) *** out_RETIRE_NUM_REG_RC_PHY ;//[nb_rename_unit][nb_inst_retire] +//public : SC_OUT(Tcontrol_t ) *** out_RETIRE_READ_RA ;//[nb_rename_unit][nb_inst_retire] +//public : SC_OUT(Tgeneral_address_t ) *** out_RETIRE_NUM_REG_RA_PHY ;//[nb_rename_unit][nb_inst_retire] +//public : SC_OUT(Tcontrol_t ) *** out_RETIRE_READ_RB ;//[nb_rename_unit][nb_inst_retire] +//public : SC_OUT(Tgeneral_address_t ) *** out_RETIRE_NUM_REG_RB_PHY ;//[nb_rename_unit][nb_inst_retire] +//public : SC_OUT(Tcontrol_t ) *** out_RETIRE_READ_RC ;//[nb_rename_unit][nb_inst_retire] +//public : SC_OUT(Tspecial_address_t ) *** out_RETIRE_NUM_REG_RC_PHY ;//[nb_rename_unit][nb_inst_retire] public : SC_OUT(Tcontrol_t ) *** out_RETIRE_WRITE_RD ;//[nb_rename_unit][nb_inst_retire] public : SC_OUT(Tgeneral_address_t ) *** out_RETIRE_NUM_REG_RD_LOG ;//[nb_rename_unit][nb_inst_retire] Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/include/Types.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/include/Types.h (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/include/Types.h (revision 121) @@ -70,4 +70,5 @@ public : Tlsq_ptr_t store_queue_ptr_write ; public : Tlsq_ptr_t load_queue_ptr_write ; +#ifdef DEBUG public : Tcontrol_t read_ra ; public : Tgeneral_address_t num_reg_ra_log ; @@ -79,4 +80,5 @@ public : Tspecial_address_t num_reg_rc_log ; public : Tspecial_address_t num_reg_rc_phy ; +#endif public : Tcontrol_t write_rd ; public : Tgeneral_address_t num_reg_rd_log ; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit.cpp (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit.cpp (revision 121) @@ -161,10 +161,10 @@ if (_param->_have_port_load_queue_ptr) (*(out_RETIRE_LOAD_QUEUE_PTR_WRITE [i][j])) (*(in_RETIRE_ACK [x][y])); - (*(out_RETIRE_READ_RA [i][j])) (*(in_RETIRE_ACK [x][y])); - (*(out_RETIRE_NUM_REG_RA_PHY [i][j])) (*(in_RETIRE_ACK [x][y])); - (*(out_RETIRE_READ_RB [i][j])) (*(in_RETIRE_ACK [x][y])); - (*(out_RETIRE_NUM_REG_RB_PHY [i][j])) (*(in_RETIRE_ACK [x][y])); - (*(out_RETIRE_READ_RC [i][j])) (*(in_RETIRE_ACK [x][y])); - (*(out_RETIRE_NUM_REG_RC_PHY [i][j])) (*(in_RETIRE_ACK [x][y])); +// (*(out_RETIRE_READ_RA [i][j])) (*(in_RETIRE_ACK [x][y])); +// (*(out_RETIRE_NUM_REG_RA_PHY [i][j])) (*(in_RETIRE_ACK [x][y])); +// (*(out_RETIRE_READ_RB [i][j])) (*(in_RETIRE_ACK [x][y])); +// (*(out_RETIRE_NUM_REG_RB_PHY [i][j])) (*(in_RETIRE_ACK [x][y])); +// (*(out_RETIRE_READ_RC [i][j])) (*(in_RETIRE_ACK [x][y])); +// (*(out_RETIRE_NUM_REG_RC_PHY [i][j])) (*(in_RETIRE_ACK [x][y])); (*(out_RETIRE_WRITE_RD [i][j])) (*(in_RETIRE_ACK [x][y])); (*(out_RETIRE_NUM_REG_RD_LOG [i][j])) (*(in_RETIRE_ACK [x][y])); @@ -191,10 +191,10 @@ if (_param->_have_port_load_queue_ptr) (*(out_RETIRE_LOAD_QUEUE_PTR_WRITE [i][j])) (*(in_SPR_WRITE_ACK [x][y])); - (*(out_RETIRE_READ_RA [i][j])) (*(in_SPR_WRITE_ACK [x][y])); - (*(out_RETIRE_NUM_REG_RA_PHY [i][j])) (*(in_SPR_WRITE_ACK [x][y])); - (*(out_RETIRE_READ_RB [i][j])) (*(in_SPR_WRITE_ACK [x][y])); - (*(out_RETIRE_NUM_REG_RB_PHY [i][j])) (*(in_SPR_WRITE_ACK [x][y])); - (*(out_RETIRE_READ_RC [i][j])) (*(in_SPR_WRITE_ACK [x][y])); - (*(out_RETIRE_NUM_REG_RC_PHY [i][j])) (*(in_SPR_WRITE_ACK [x][y])); +// (*(out_RETIRE_READ_RA [i][j])) (*(in_SPR_WRITE_ACK [x][y])); +// (*(out_RETIRE_NUM_REG_RA_PHY [i][j])) (*(in_SPR_WRITE_ACK [x][y])); +// (*(out_RETIRE_READ_RB [i][j])) (*(in_SPR_WRITE_ACK [x][y])); +// (*(out_RETIRE_NUM_REG_RB_PHY [i][j])) (*(in_SPR_WRITE_ACK [x][y])); +// (*(out_RETIRE_READ_RC [i][j])) (*(in_SPR_WRITE_ACK [x][y])); +// (*(out_RETIRE_NUM_REG_RC_PHY [i][j])) (*(in_SPR_WRITE_ACK [x][y])); (*(out_RETIRE_WRITE_RD [i][j])) (*(in_SPR_WRITE_ACK [x][y])); (*(out_RETIRE_NUM_REG_RD_LOG [i][j])) (*(in_SPR_WRITE_ACK [x][y])); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_allocation.cpp (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_allocation.cpp (revision 121) @@ -80,4 +80,5 @@ _ALLOC2_SIGNAL_IN ( in_INSERT_STORE_QUEUE_PTR_WRITE ,"store_queue_ptr_write",Tlsq_ptr_t ,_param->_size_store_queue_ptr ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]); _ALLOC2_SIGNAL_IN ( in_INSERT_LOAD_QUEUE_PTR_WRITE ,"load_queue_ptr_write" ,Tlsq_ptr_t ,_param->_size_load_queue_ptr ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]); +#ifdef DEBUG _ALLOC2_SIGNAL_IN ( in_INSERT_READ_RA ,"read_ra" ,Tcontrol_t ,1 ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]); _ALLOC2_SIGNAL_IN ( in_INSERT_NUM_REG_RA_LOG ,"num_reg_ra_log" ,Tgeneral_address_t,_param->_size_general_register_logic,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]); @@ -89,4 +90,5 @@ _ALLOC2_SIGNAL_IN ( in_INSERT_NUM_REG_RC_LOG ,"num_reg_rc_log" ,Tspecial_address_t,_param->_size_special_register_logic,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]); _ALLOC2_SIGNAL_IN ( in_INSERT_NUM_REG_RC_PHY ,"num_reg_rc_phy" ,Tspecial_address_t,_param->_size_special_register ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]); +#endif _ALLOC2_SIGNAL_IN ( in_INSERT_WRITE_RD ,"write_rd" ,Tcontrol_t ,1 ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]); _ALLOC2_SIGNAL_IN ( in_INSERT_NUM_REG_RD_LOG ,"num_reg_rd_log" ,Tgeneral_address_t,_param->_size_general_register_logic,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]); @@ -114,10 +116,10 @@ _ALLOC2_SIGNAL_OUT(out_RETIRE_STORE_QUEUE_PTR_WRITE ,"store_queue_ptr_write",Tlsq_ptr_t ,_param->_size_store_queue_ptr ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); _ALLOC2_SIGNAL_OUT(out_RETIRE_LOAD_QUEUE_PTR_WRITE ,"load_queue_ptr_write" ,Tlsq_ptr_t ,_param->_size_load_queue_ptr ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); - _ALLOC2_SIGNAL_OUT(out_RETIRE_READ_RA ,"read_ra" ,Tcontrol_t ,1 ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); - _ALLOC2_SIGNAL_OUT(out_RETIRE_NUM_REG_RA_PHY ,"num_reg_ra_phy" ,Tgeneral_address_t,_param->_size_general_register ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); - _ALLOC2_SIGNAL_OUT(out_RETIRE_READ_RB ,"read_rb" ,Tcontrol_t ,1 ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); - _ALLOC2_SIGNAL_OUT(out_RETIRE_NUM_REG_RB_PHY ,"num_reg_rb_phy" ,Tgeneral_address_t,_param->_size_general_register ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); - _ALLOC2_SIGNAL_OUT(out_RETIRE_READ_RC ,"read_rc" ,Tcontrol_t ,1 ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); - _ALLOC2_SIGNAL_OUT(out_RETIRE_NUM_REG_RC_PHY ,"num_reg_rc_phy" ,Tspecial_address_t,_param->_size_special_register ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); +// _ALLOC2_SIGNAL_OUT(out_RETIRE_READ_RA ,"read_ra" ,Tcontrol_t ,1 ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); +// _ALLOC2_SIGNAL_OUT(out_RETIRE_NUM_REG_RA_PHY ,"num_reg_ra_phy" ,Tgeneral_address_t,_param->_size_general_register ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); +// _ALLOC2_SIGNAL_OUT(out_RETIRE_READ_RB ,"read_rb" ,Tcontrol_t ,1 ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); +// _ALLOC2_SIGNAL_OUT(out_RETIRE_NUM_REG_RB_PHY ,"num_reg_rb_phy" ,Tgeneral_address_t,_param->_size_general_register ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); +// _ALLOC2_SIGNAL_OUT(out_RETIRE_READ_RC ,"read_rc" ,Tcontrol_t ,1 ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); +// _ALLOC2_SIGNAL_OUT(out_RETIRE_NUM_REG_RC_PHY ,"num_reg_rc_phy" ,Tspecial_address_t,_param->_size_special_register ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); _ALLOC2_SIGNAL_OUT(out_RETIRE_WRITE_RD ,"write_rd" ,Tcontrol_t ,1 ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); _ALLOC2_SIGNAL_OUT(out_RETIRE_NUM_REG_RD_LOG ,"num_reg_rd_log" ,Tgeneral_address_t,_param->_size_general_register_logic,_param->_nb_rename_unit,_param->_nb_inst_retire[it1]); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_deallocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_deallocation.cpp (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_deallocation.cpp (revision 121) @@ -47,4 +47,5 @@ DELETE2_SIGNAL( in_INSERT_STORE_QUEUE_PTR_WRITE ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1],_param->_size_store_queue_ptr ); DELETE2_SIGNAL( in_INSERT_LOAD_QUEUE_PTR_WRITE ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1],_param->_size_load_queue_ptr ); +#ifdef DEBUG DELETE2_SIGNAL( in_INSERT_READ_RA ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1],1 ); DELETE2_SIGNAL( in_INSERT_NUM_REG_RA_LOG ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1],_param->_size_general_register_logic); @@ -56,4 +57,5 @@ DELETE2_SIGNAL( in_INSERT_NUM_REG_RC_LOG ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1],_param->_size_special_register_logic); DELETE2_SIGNAL( in_INSERT_NUM_REG_RC_PHY ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1],_param->_size_special_register ); +#endif DELETE2_SIGNAL( in_INSERT_WRITE_RD ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1],1 ); DELETE2_SIGNAL( in_INSERT_NUM_REG_RD_LOG ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1],_param->_size_general_register_logic); @@ -74,10 +76,10 @@ DELETE2_SIGNAL(out_RETIRE_STORE_QUEUE_PTR_WRITE ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1],_param->_size_store_queue_ptr ); DELETE2_SIGNAL(out_RETIRE_LOAD_QUEUE_PTR_WRITE ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1],_param->_size_load_queue_ptr ); - DELETE2_SIGNAL(out_RETIRE_READ_RA ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1],1 ); - DELETE2_SIGNAL(out_RETIRE_NUM_REG_RA_PHY ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1],_param->_size_general_register ); - DELETE2_SIGNAL(out_RETIRE_READ_RB ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1],1 ); - DELETE2_SIGNAL(out_RETIRE_NUM_REG_RB_PHY ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1],_param->_size_general_register ); - DELETE2_SIGNAL(out_RETIRE_READ_RC ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1],1 ); - DELETE2_SIGNAL(out_RETIRE_NUM_REG_RC_PHY ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1],_param->_size_special_register ); +// DELETE2_SIGNAL(out_RETIRE_READ_RA ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1],1 ); +// DELETE2_SIGNAL(out_RETIRE_NUM_REG_RA_PHY ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1],_param->_size_general_register ); +// DELETE2_SIGNAL(out_RETIRE_READ_RB ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1],1 ); +// DELETE2_SIGNAL(out_RETIRE_NUM_REG_RB_PHY ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1],_param->_size_general_register ); +// DELETE2_SIGNAL(out_RETIRE_READ_RC ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1],1 ); +// DELETE2_SIGNAL(out_RETIRE_NUM_REG_RC_PHY ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1],_param->_size_special_register ); DELETE2_SIGNAL(out_RETIRE_WRITE_RD ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1],1 ); DELETE2_SIGNAL(out_RETIRE_NUM_REG_RD_LOG ,_param->_nb_rename_unit,_param->_nb_inst_retire[it1],_param->_size_general_register_logic); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_genMealy_retire.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_genMealy_retire.cpp (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_genMealy_retire.cpp (revision 121) @@ -153,10 +153,10 @@ if (_param->_have_port_load_queue_ptr) PORT_WRITE(out_RETIRE_LOAD_QUEUE_PTR_WRITE [x][y], entry->load_queue_ptr_write ); - PORT_WRITE(out_RETIRE_READ_RA [x][y], entry->read_ra ); - PORT_WRITE(out_RETIRE_NUM_REG_RA_PHY [x][y], entry->num_reg_ra_phy ); - PORT_WRITE(out_RETIRE_READ_RB [x][y], entry->read_rb ); - PORT_WRITE(out_RETIRE_NUM_REG_RB_PHY [x][y], entry->num_reg_rb_phy ); - PORT_WRITE(out_RETIRE_READ_RC [x][y], entry->read_rc ); - PORT_WRITE(out_RETIRE_NUM_REG_RC_PHY [x][y], entry->num_reg_rc_phy ); +// PORT_WRITE(out_RETIRE_READ_RA [x][y], entry->read_ra ); +// PORT_WRITE(out_RETIRE_NUM_REG_RA_PHY [x][y], entry->num_reg_ra_phy ); +// PORT_WRITE(out_RETIRE_READ_RB [x][y], entry->read_rb ); +// PORT_WRITE(out_RETIRE_NUM_REG_RB_PHY [x][y], entry->num_reg_rb_phy ); +// PORT_WRITE(out_RETIRE_READ_RC [x][y], entry->read_rc ); +// PORT_WRITE(out_RETIRE_NUM_REG_RC_PHY [x][y], entry->num_reg_rc_phy ); PORT_WRITE(out_RETIRE_WRITE_RD [x][y], entry->write_rd ); PORT_WRITE(out_RETIRE_NUM_REG_RD_LOG [x][y], entry->num_reg_rd_log ); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_transition.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_transition.cpp (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_transition.cpp (revision 121) @@ -156,4 +156,5 @@ entry->store_queue_ptr_write = PORT_READ(in_INSERT_STORE_QUEUE_PTR_WRITE [x][y]); entry->load_queue_ptr_write = (_param->_have_port_load_queue_ptr)?PORT_READ(in_INSERT_LOAD_QUEUE_PTR_WRITE [x][y]):0; +#ifdef DEBUG entry->read_ra = PORT_READ(in_INSERT_READ_RA [x][y]); entry->num_reg_ra_log = PORT_READ(in_INSERT_NUM_REG_RA_LOG [x][y]); @@ -165,4 +166,5 @@ entry->num_reg_rc_log = PORT_READ(in_INSERT_NUM_REG_RC_LOG [x][y]); entry->num_reg_rc_phy = PORT_READ(in_INSERT_NUM_REG_RC_PHY [x][y]); +#endif entry->write_rd = PORT_READ(in_INSERT_WRITE_RD [x][y]); entry->num_reg_rd_log = PORT_READ(in_INSERT_NUM_REG_RD_LOG [x][y]); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/OOO_Engine_Glue/SelfTest/src/test.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/OOO_Engine_Glue/SelfTest/src/test.cpp (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/OOO_Engine_Glue/SelfTest/src/test.cpp (revision 121) @@ -227,4 +227,5 @@ if (_param->_have_port_load_queue_ptr) INSTANCE2_SC_SIGNAL(_OOO_Engine_Glue,out_INSERT_COMMIT_UNIT_LOAD_QUEUE_PTR_WRITE ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]); +#ifdef DEBUG INSTANCE2_SC_SIGNAL(_OOO_Engine_Glue,out_INSERT_COMMIT_UNIT_READ_RA ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]); INSTANCE2_SC_SIGNAL(_OOO_Engine_Glue,out_INSERT_COMMIT_UNIT_NUM_REG_RA_PHY ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]); @@ -233,4 +234,5 @@ INSTANCE2_SC_SIGNAL(_OOO_Engine_Glue,out_INSERT_COMMIT_UNIT_READ_RC ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]); INSTANCE2_SC_SIGNAL(_OOO_Engine_Glue,out_INSERT_COMMIT_UNIT_NUM_REG_RC_PHY ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]); +#endif INSTANCE2_SC_SIGNAL(_OOO_Engine_Glue,out_INSERT_COMMIT_UNIT_WRITE_RD ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]); INSTANCE2_SC_SIGNAL(_OOO_Engine_Glue,out_INSERT_COMMIT_UNIT_NUM_REG_RD_PHY_OLD ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/OOO_Engine_Glue/include/OOO_Engine_Glue.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/OOO_Engine_Glue/include/OOO_Engine_Glue.h (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/OOO_Engine_Glue/include/OOO_Engine_Glue.h (revision 121) @@ -114,4 +114,5 @@ public : SC_OUT(Tlsq_ptr_t ) *** out_INSERT_COMMIT_UNIT_STORE_QUEUE_PTR_WRITE ;//[nb_rename_unit][nb_inst_insert] public : SC_OUT(Tlsq_ptr_t ) *** out_INSERT_COMMIT_UNIT_LOAD_QUEUE_PTR_WRITE ;//[nb_rename_unit][nb_inst_insert] +#ifdef DEBUG public : SC_OUT(Tcontrol_t ) *** out_INSERT_COMMIT_UNIT_READ_RA ;//[nb_rename_unit][nb_inst_insert] public : SC_OUT(Tgeneral_address_t ) *** out_INSERT_COMMIT_UNIT_NUM_REG_RA_PHY ;//[nb_rename_unit][nb_inst_insert] @@ -120,4 +121,5 @@ public : SC_OUT(Tcontrol_t ) *** out_INSERT_COMMIT_UNIT_READ_RC ;//[nb_rename_unit][nb_inst_insert] public : SC_OUT(Tspecial_address_t ) *** out_INSERT_COMMIT_UNIT_NUM_REG_RC_PHY ;//[nb_rename_unit][nb_inst_insert] +#endif public : SC_OUT(Tcontrol_t ) *** out_INSERT_COMMIT_UNIT_WRITE_RD ;//[nb_rename_unit][nb_inst_insert] public : SC_OUT(Tgeneral_address_t ) *** out_INSERT_COMMIT_UNIT_NUM_REG_RD_PHY_OLD ;//[nb_rename_unit][nb_inst_insert] Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/OOO_Engine_Glue/src/OOO_Engine_Glue_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/OOO_Engine_Glue/src/OOO_Engine_Glue_allocation.cpp (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/OOO_Engine_Glue/src/OOO_Engine_Glue_allocation.cpp (revision 121) @@ -117,4 +117,5 @@ _ALLOC2_SIGNAL_OUT(out_INSERT_COMMIT_UNIT_STORE_QUEUE_PTR_WRITE ,"COMMIT_UNIT_STORE_QUEUE_PTR_WRITE" ,Tlsq_ptr_t ,_param->_size_store_queue_ptr ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]); _ALLOC2_SIGNAL_OUT(out_INSERT_COMMIT_UNIT_LOAD_QUEUE_PTR_WRITE ,"COMMIT_UNIT_LOAD_QUEUE_PTR_WRITE" ,Tlsq_ptr_t ,_param->_size_load_queue_ptr ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]); +#ifdef DEBUG _ALLOC2_SIGNAL_OUT(out_INSERT_COMMIT_UNIT_READ_RA ,"COMMIT_UNIT_READ_RA" ,Tcontrol_t ,1 ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]); _ALLOC2_SIGNAL_OUT(out_INSERT_COMMIT_UNIT_NUM_REG_RA_PHY ,"COMMIT_UNIT_NUM_REG_RA_PHY" ,Tgeneral_address_t ,_param->_size_general_register,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]); @@ -123,4 +124,5 @@ _ALLOC2_SIGNAL_OUT(out_INSERT_COMMIT_UNIT_READ_RC ,"COMMIT_UNIT_READ_RC" ,Tcontrol_t ,1 ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]); _ALLOC2_SIGNAL_OUT(out_INSERT_COMMIT_UNIT_NUM_REG_RC_PHY ,"COMMIT_UNIT_NUM_REG_RC_PHY" ,Tspecial_address_t ,_param->_size_special_register,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]); +#endif _ALLOC2_SIGNAL_OUT(out_INSERT_COMMIT_UNIT_WRITE_RD ,"COMMIT_UNIT_WRITE_RD" ,Tcontrol_t ,1 ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]); _ALLOC2_SIGNAL_OUT(out_INSERT_COMMIT_UNIT_NUM_REG_RD_PHY_OLD ,"COMMIT_UNIT_NUM_REG_RD_PHY_OLD" ,Tgeneral_address_t ,_param->_size_general_register,_param->_nb_rename_unit,_param->_nb_inst_insert[it1]); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/OOO_Engine_Glue/src/OOO_Engine_Glue_deallocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/OOO_Engine_Glue/src/OOO_Engine_Glue_deallocation.cpp (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/OOO_Engine_Glue/src/OOO_Engine_Glue_deallocation.cpp (revision 121) @@ -71,4 +71,5 @@ DELETE2_SIGNAL(out_INSERT_COMMIT_UNIT_STORE_QUEUE_PTR_WRITE ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1],_param->_size_store_queue_ptr ); DELETE2_SIGNAL(out_INSERT_COMMIT_UNIT_LOAD_QUEUE_PTR_WRITE ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1],_param->_size_load_queue_ptr ); +#ifdef DEBUG DELETE2_SIGNAL(out_INSERT_COMMIT_UNIT_READ_RA ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1],1 ); DELETE2_SIGNAL(out_INSERT_COMMIT_UNIT_NUM_REG_RA_PHY ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1],_param->_size_general_register); @@ -77,4 +78,5 @@ DELETE2_SIGNAL(out_INSERT_COMMIT_UNIT_READ_RC ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1],1 ); DELETE2_SIGNAL(out_INSERT_COMMIT_UNIT_NUM_REG_RC_PHY ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1],_param->_size_special_register); +#endif DELETE2_SIGNAL(out_INSERT_COMMIT_UNIT_WRITE_RD ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1],1 ); DELETE2_SIGNAL(out_INSERT_COMMIT_UNIT_NUM_REG_RD_PHY_OLD ,_param->_nb_rename_unit,_param->_nb_inst_insert[it1],_param->_size_general_register); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/OOO_Engine_Glue/src/OOO_Engine_Glue_genMealy_insert.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/OOO_Engine_Glue/src/OOO_Engine_Glue_genMealy_insert.cpp (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/OOO_Engine_Glue/src/OOO_Engine_Glue_genMealy_insert.cpp (revision 121) @@ -69,4 +69,5 @@ if (_param->_have_port_load_queue_ptr) PORT_WRITE(out_INSERT_COMMIT_UNIT_LOAD_QUEUE_PTR_WRITE [i][j],LOAD_QUEUE_PTR_WRITE ); +#ifdef DEBUG PORT_WRITE(out_INSERT_COMMIT_UNIT_READ_RA [i][j],READ_RA ); PORT_WRITE(out_INSERT_COMMIT_UNIT_NUM_REG_RA_PHY [i][j],NUM_REG_RA_PHY ); @@ -75,4 +76,5 @@ PORT_WRITE(out_INSERT_COMMIT_UNIT_READ_RC [i][j],READ_RC ); PORT_WRITE(out_INSERT_COMMIT_UNIT_NUM_REG_RC_PHY [i][j],NUM_REG_RC_PHY ); +#endif PORT_WRITE(out_INSERT_COMMIT_UNIT_WRITE_RD [i][j],WRITE_RD ); PORT_WRITE(out_INSERT_COMMIT_UNIT_NUM_REG_RD_PHY_OLD [i][j],NUM_REG_RD_PHY_OLD ); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Dependency_checking_unit/SelfTest/src/test.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Dependency_checking_unit/SelfTest/src/test.cpp (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Dependency_checking_unit/SelfTest/src/test.cpp (revision 121) @@ -135,11 +135,17 @@ INSTANCE1_SC_SIGNAL(_Dependency_checking_unit,out_RENAME_OUT_CONTEXT_ID ,_param->_nb_inst_insert); INSTANCE1_SC_SIGNAL(_Dependency_checking_unit,out_RENAME_OUT_READ_RA ,_param->_nb_inst_insert); +#ifdef DEBUG INSTANCE1_SC_SIGNAL(_Dependency_checking_unit,out_RENAME_OUT_NUM_REG_RA_LOG ,_param->_nb_inst_insert); +#endif INSTANCE1_SC_SIGNAL(_Dependency_checking_unit,out_RENAME_OUT_NUM_REG_RA_PHY ,_param->_nb_inst_insert); INSTANCE1_SC_SIGNAL(_Dependency_checking_unit,out_RENAME_OUT_READ_RB ,_param->_nb_inst_insert); +#ifdef DEBUG INSTANCE1_SC_SIGNAL(_Dependency_checking_unit,out_RENAME_OUT_NUM_REG_RB_LOG ,_param->_nb_inst_insert); +#endif INSTANCE1_SC_SIGNAL(_Dependency_checking_unit,out_RENAME_OUT_NUM_REG_RB_PHY ,_param->_nb_inst_insert); INSTANCE1_SC_SIGNAL(_Dependency_checking_unit,out_RENAME_OUT_READ_RC ,_param->_nb_inst_insert); +#ifdef DEBUG INSTANCE1_SC_SIGNAL(_Dependency_checking_unit,out_RENAME_OUT_NUM_REG_RC_LOG ,_param->_nb_inst_insert); +#endif INSTANCE1_SC_SIGNAL(_Dependency_checking_unit,out_RENAME_OUT_NUM_REG_RC_PHY ,_param->_nb_inst_insert); INSTANCE1_SC_SIGNAL(_Dependency_checking_unit,out_RENAME_OUT_WRITE_RD ,_param->_nb_inst_insert); @@ -324,13 +330,19 @@ TEST(Tcontrol_t ,out_RENAME_OUT_READ_RA [i]->read(), read_ra ); +#ifdef DEBUG TEST(Tgeneral_address_t,out_RENAME_OUT_NUM_REG_RA_LOG [i]->read(), num_reg_ra_log ); +#endif if (read_ra) TEST(Tgeneral_address_t,out_RENAME_OUT_NUM_REG_RA_PHY [i]->read(), rat_gpr[front_end_id][context_id][num_reg_ra_log]); TEST(Tcontrol_t ,out_RENAME_OUT_READ_RB [i]->read(), read_rb ); +#ifdef DEBUG TEST(Tgeneral_address_t,out_RENAME_OUT_NUM_REG_RB_LOG [i]->read(), num_reg_rb_log ); +#endif if (read_rb) TEST(Tgeneral_address_t,out_RENAME_OUT_NUM_REG_RB_PHY [i]->read(), rat_gpr[front_end_id][context_id][num_reg_rb_log]); TEST(Tcontrol_t ,out_RENAME_OUT_READ_RC [i]->read(), read_rc ); +#ifdef DEBUG TEST(Tspecial_address_t,out_RENAME_OUT_NUM_REG_RC_LOG [i]->read(), num_reg_rc_log ); +#endif if (read_rc) TEST(Tspecial_address_t,out_RENAME_OUT_NUM_REG_RC_PHY [i]->read(), rat_spr[front_end_id][context_id][num_reg_rc_log]); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Dependency_checking_unit/include/Dependency_checking_unit.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Dependency_checking_unit/include/Dependency_checking_unit.h (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Dependency_checking_unit/include/Dependency_checking_unit.h (revision 121) @@ -92,11 +92,17 @@ public : SC_OUT(Tcontext_t ) ** out_RENAME_OUT_CONTEXT_ID ;//[nb_inst_insert] public : SC_OUT(Tcontrol_t ) ** out_RENAME_OUT_READ_RA ;//[nb_inst_insert] +#ifdef DEBUG public : SC_OUT(Tgeneral_address_t) ** out_RENAME_OUT_NUM_REG_RA_LOG ;//[nb_inst_insert] +#endif public : SC_OUT(Tgeneral_address_t) ** out_RENAME_OUT_NUM_REG_RA_PHY ;//[nb_inst_insert] public : SC_OUT(Tcontrol_t ) ** out_RENAME_OUT_READ_RB ;//[nb_inst_insert] +#ifdef DEBUG public : SC_OUT(Tgeneral_address_t) ** out_RENAME_OUT_NUM_REG_RB_LOG ;//[nb_inst_insert] +#endif public : SC_OUT(Tgeneral_address_t) ** out_RENAME_OUT_NUM_REG_RB_PHY ;//[nb_inst_insert] public : SC_OUT(Tcontrol_t ) ** out_RENAME_OUT_READ_RC ;//[nb_inst_insert] +#ifdef DEBUG public : SC_OUT(Tspecial_address_t) ** out_RENAME_OUT_NUM_REG_RC_LOG ;//[nb_inst_insert] +#endif public : SC_OUT(Tspecial_address_t) ** out_RENAME_OUT_NUM_REG_RC_PHY ;//[nb_inst_insert] public : SC_OUT(Tcontrol_t ) ** out_RENAME_OUT_WRITE_RD ;//[nb_inst_insert] Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Dependency_checking_unit/src/Dependency_checking_unit.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Dependency_checking_unit/src/Dependency_checking_unit.cpp (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Dependency_checking_unit/src/Dependency_checking_unit.cpp (revision 121) @@ -131,9 +131,15 @@ (*(out_RENAME_OUT_CONTEXT_ID [i])) (*(in_RENAME_IN_CONTEXT_ID [i])); (*(out_RENAME_OUT_READ_RA [i])) (*(in_RENAME_IN_READ_RA [i])); +#ifdef DEBUG (*(out_RENAME_OUT_NUM_REG_RA_LOG [i])) (*(in_RENAME_IN_NUM_REG_RA_LOG [i])); +#endif (*(out_RENAME_OUT_READ_RB [i])) (*(in_RENAME_IN_READ_RB [i])); +#ifdef DEBUG (*(out_RENAME_OUT_NUM_REG_RB_LOG [i])) (*(in_RENAME_IN_NUM_REG_RB_LOG [i])); +#endif (*(out_RENAME_OUT_READ_RC [i])) (*(in_RENAME_IN_READ_RC [i])); +#ifdef DEBUG (*(out_RENAME_OUT_NUM_REG_RC_LOG [i])) (*(in_RENAME_IN_NUM_REG_RC_LOG [i])); +#endif (*(out_RENAME_OUT_WRITE_RD [i])) (*(in_RENAME_IN_WRITE_RD [i])); (*(out_RENAME_OUT_NUM_REG_RD_LOG [i])) (*(in_RENAME_IN_NUM_REG_RD_LOG [i])); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Dependency_checking_unit/src/Dependency_checking_unit_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Dependency_checking_unit/src/Dependency_checking_unit_allocation.cpp (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Dependency_checking_unit/src/Dependency_checking_unit_allocation.cpp (revision 121) @@ -94,11 +94,17 @@ ALLOC1_SIGNAL_OUT(out_RENAME_OUT_CONTEXT_ID ,"context_id" ,Tcontext_t ,_param->_size_context_id ); ALLOC1_SIGNAL_OUT(out_RENAME_OUT_READ_RA ,"read_ra" ,Tcontrol_t ,1 ); +#ifdef DEBUG ALLOC1_SIGNAL_OUT(out_RENAME_OUT_NUM_REG_RA_LOG ,"num_reg_ra_log" ,Tgeneral_address_t,_param->_size_general_register_logic); +#endif ALLOC1_SIGNAL_OUT(out_RENAME_OUT_NUM_REG_RA_PHY ,"num_reg_ra_phy" ,Tgeneral_address_t,_param->_size_general_register ); ALLOC1_SIGNAL_OUT(out_RENAME_OUT_READ_RB ,"read_rb" ,Tcontrol_t ,1 ); +#ifdef DEBUG ALLOC1_SIGNAL_OUT(out_RENAME_OUT_NUM_REG_RB_LOG ,"num_reg_rb_log" ,Tgeneral_address_t,_param->_size_general_register_logic); +#endif ALLOC1_SIGNAL_OUT(out_RENAME_OUT_NUM_REG_RB_PHY ,"num_reg_rb_phy" ,Tgeneral_address_t,_param->_size_general_register ); ALLOC1_SIGNAL_OUT(out_RENAME_OUT_READ_RC ,"read_rc" ,Tcontrol_t ,1 ); +#ifdef DEBUG ALLOC1_SIGNAL_OUT(out_RENAME_OUT_NUM_REG_RC_LOG ,"num_reg_rc_log" ,Tspecial_address_t,_param->_size_special_register_logic); +#endif ALLOC1_SIGNAL_OUT(out_RENAME_OUT_NUM_REG_RC_PHY ,"num_reg_rc_phy" ,Tspecial_address_t,_param->_size_special_register ); ALLOC1_SIGNAL_OUT(out_RENAME_OUT_WRITE_RD ,"write_rd" ,Tcontrol_t ,1 ); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Dependency_checking_unit/src/Dependency_checking_unit_deallocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Dependency_checking_unit/src/Dependency_checking_unit_deallocation.cpp (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Dependency_checking_unit/src/Dependency_checking_unit_deallocation.cpp (revision 121) @@ -57,11 +57,17 @@ DELETE1_SIGNAL(out_RENAME_OUT_CONTEXT_ID ,_param->_nb_inst_insert,_param->_size_context_id ); DELETE1_SIGNAL(out_RENAME_OUT_READ_RA ,_param->_nb_inst_insert,1 ); +#ifdef DEBUG DELETE1_SIGNAL(out_RENAME_OUT_NUM_REG_RA_LOG ,_param->_nb_inst_insert,_param->_size_general_register_logic); +#endif DELETE1_SIGNAL(out_RENAME_OUT_NUM_REG_RA_PHY ,_param->_nb_inst_insert,_param->_size_general_register ); DELETE1_SIGNAL(out_RENAME_OUT_READ_RB ,_param->_nb_inst_insert,1 ); +#ifdef DEBUG DELETE1_SIGNAL(out_RENAME_OUT_NUM_REG_RB_LOG ,_param->_nb_inst_insert,_param->_size_general_register_logic); +#endif DELETE1_SIGNAL(out_RENAME_OUT_NUM_REG_RB_PHY ,_param->_nb_inst_insert,_param->_size_general_register ); DELETE1_SIGNAL(out_RENAME_OUT_READ_RC ,_param->_nb_inst_insert,1 ); +#ifdef DEBUG DELETE1_SIGNAL(out_RENAME_OUT_NUM_REG_RC_LOG ,_param->_nb_inst_insert,_param->_size_special_register_logic); +#endif DELETE1_SIGNAL(out_RENAME_OUT_NUM_REG_RC_PHY ,_param->_nb_inst_insert,_param->_size_special_register ); DELETE1_SIGNAL(out_RENAME_OUT_WRITE_RD ,_param->_nb_inst_insert,1 ); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Dependency_checking_unit/src/Dependency_checking_unit_genMealy.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Dependency_checking_unit/src/Dependency_checking_unit_genMealy.cpp (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Dependency_checking_unit/src/Dependency_checking_unit_genMealy.cpp (revision 121) @@ -200,11 +200,17 @@ PORT_WRITE(out_RENAME_OUT_CONTEXT_ID [i], context_id [i]); PORT_WRITE(out_RENAME_OUT_READ_RA [i], read_ra [i]); +#ifdef DEBUG PORT_WRITE(out_RENAME_OUT_NUM_REG_RA_LOG [i], num_reg_ra_log [i]); +#endif PORT_WRITE(out_RENAME_OUT_NUM_REG_RA_PHY [i], num_reg_ra_phy [i]); PORT_WRITE(out_RENAME_OUT_READ_RB [i], read_rb [i]); +#ifdef DEBUG PORT_WRITE(out_RENAME_OUT_NUM_REG_RB_LOG [i], num_reg_rb_log [i]); +#endif PORT_WRITE(out_RENAME_OUT_NUM_REG_RB_PHY [i], num_reg_rb_phy [i]); PORT_WRITE(out_RENAME_OUT_READ_RC [i], read_rc [i]); +#ifdef DEBUG PORT_WRITE(out_RENAME_OUT_NUM_REG_RC_LOG [i], num_reg_rc_log [i]); +#endif PORT_WRITE(out_RENAME_OUT_NUM_REG_RC_PHY [i], num_reg_rc_phy [i]); PORT_WRITE(out_RENAME_OUT_WRITE_RD [i], write_rd [i]); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/SelfTest/src/test.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/SelfTest/src/test.cpp (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/SelfTest/src/test.cpp (revision 121) @@ -91,10 +91,10 @@ ALLOC1_SC_SIGNAL( in_RETIRE_FRONT_END_ID ," in_RETIRE_FRONT_END_ID ",Tcontext_t ,_param->_nb_inst_retire); ALLOC1_SC_SIGNAL( in_RETIRE_CONTEXT_ID ," in_RETIRE_CONTEXT_ID ",Tcontext_t ,_param->_nb_inst_retire); - ALLOC1_SC_SIGNAL( in_RETIRE_READ_RA ," in_RETIRE_READ_RA ",Tcontrol_t ,_param->_nb_inst_retire); - ALLOC1_SC_SIGNAL( in_RETIRE_NUM_REG_RA_PHY ," in_RETIRE_NUM_REG_RA_PHY ",Tgeneral_address_t,_param->_nb_inst_retire); - ALLOC1_SC_SIGNAL( in_RETIRE_READ_RB ," in_RETIRE_READ_RB ",Tcontrol_t ,_param->_nb_inst_retire); - ALLOC1_SC_SIGNAL( in_RETIRE_NUM_REG_RB_PHY ," in_RETIRE_NUM_REG_RB_PHY ",Tgeneral_address_t,_param->_nb_inst_retire); - ALLOC1_SC_SIGNAL( in_RETIRE_READ_RC ," in_RETIRE_READ_RC ",Tcontrol_t ,_param->_nb_inst_retire); - ALLOC1_SC_SIGNAL( in_RETIRE_NUM_REG_RC_PHY ," in_RETIRE_NUM_REG_RC_PHY ",Tspecial_address_t,_param->_nb_inst_retire); +// ALLOC1_SC_SIGNAL( in_RETIRE_READ_RA ," in_RETIRE_READ_RA ",Tcontrol_t ,_param->_nb_inst_retire); +// ALLOC1_SC_SIGNAL( in_RETIRE_NUM_REG_RA_PHY ," in_RETIRE_NUM_REG_RA_PHY ",Tgeneral_address_t,_param->_nb_inst_retire); +// ALLOC1_SC_SIGNAL( in_RETIRE_READ_RB ," in_RETIRE_READ_RB ",Tcontrol_t ,_param->_nb_inst_retire); +// ALLOC1_SC_SIGNAL( in_RETIRE_NUM_REG_RB_PHY ," in_RETIRE_NUM_REG_RB_PHY ",Tgeneral_address_t,_param->_nb_inst_retire); +// ALLOC1_SC_SIGNAL( in_RETIRE_READ_RC ," in_RETIRE_READ_RC ",Tcontrol_t ,_param->_nb_inst_retire); +// ALLOC1_SC_SIGNAL( in_RETIRE_NUM_REG_RC_PHY ," in_RETIRE_NUM_REG_RC_PHY ",Tspecial_address_t,_param->_nb_inst_retire); ALLOC1_SC_SIGNAL( in_RETIRE_WRITE_RD ," in_RETIRE_WRITE_RD ",Tcontrol_t ,_param->_nb_inst_retire); ALLOC1_SC_SIGNAL( in_RETIRE_NUM_REG_RD_LOG ," in_RETIRE_NUM_REG_RD_LOG ",Tgeneral_address_t,_param->_nb_inst_retire); @@ -143,11 +143,17 @@ INSTANCE1_SC_SIGNAL(_Register_translation_unit,out_INSERT_CONTEXT_ID ,_param->_nb_inst_insert); INSTANCE1_SC_SIGNAL(_Register_translation_unit,out_INSERT_READ_RA ,_param->_nb_inst_insert); +#ifdef DEBUG INSTANCE1_SC_SIGNAL(_Register_translation_unit,out_INSERT_NUM_REG_RA_LOG ,_param->_nb_inst_insert); +#endif INSTANCE1_SC_SIGNAL(_Register_translation_unit,out_INSERT_NUM_REG_RA_PHY ,_param->_nb_inst_insert); INSTANCE1_SC_SIGNAL(_Register_translation_unit,out_INSERT_READ_RB ,_param->_nb_inst_insert); +#ifdef DEBUG INSTANCE1_SC_SIGNAL(_Register_translation_unit,out_INSERT_NUM_REG_RB_LOG ,_param->_nb_inst_insert); +#endif INSTANCE1_SC_SIGNAL(_Register_translation_unit,out_INSERT_NUM_REG_RB_PHY ,_param->_nb_inst_insert); INSTANCE1_SC_SIGNAL(_Register_translation_unit,out_INSERT_READ_RC ,_param->_nb_inst_insert); +#ifdef DEBUG INSTANCE1_SC_SIGNAL(_Register_translation_unit,out_INSERT_NUM_REG_RC_LOG ,_param->_nb_inst_insert); +#enif INSTANCE1_SC_SIGNAL(_Register_translation_unit,out_INSERT_NUM_REG_RC_PHY ,_param->_nb_inst_insert); INSTANCE1_SC_SIGNAL(_Register_translation_unit,out_INSERT_WRITE_RD ,_param->_nb_inst_insert); @@ -166,10 +172,10 @@ if (_param->_have_port_context_id) INSTANCE1_SC_SIGNAL(_Register_translation_unit, in_RETIRE_CONTEXT_ID ,_param->_nb_inst_retire); - INSTANCE1_SC_SIGNAL(_Register_translation_unit, in_RETIRE_READ_RA ,_param->_nb_inst_retire); - INSTANCE1_SC_SIGNAL(_Register_translation_unit, in_RETIRE_NUM_REG_RA_PHY ,_param->_nb_inst_retire); - INSTANCE1_SC_SIGNAL(_Register_translation_unit, in_RETIRE_READ_RB ,_param->_nb_inst_retire); - INSTANCE1_SC_SIGNAL(_Register_translation_unit, in_RETIRE_NUM_REG_RB_PHY ,_param->_nb_inst_retire); - INSTANCE1_SC_SIGNAL(_Register_translation_unit, in_RETIRE_READ_RC ,_param->_nb_inst_retire); - INSTANCE1_SC_SIGNAL(_Register_translation_unit, in_RETIRE_NUM_REG_RC_PHY ,_param->_nb_inst_retire); +// INSTANCE1_SC_SIGNAL(_Register_translation_unit, in_RETIRE_READ_RA ,_param->_nb_inst_retire); +// INSTANCE1_SC_SIGNAL(_Register_translation_unit, in_RETIRE_NUM_REG_RA_PHY ,_param->_nb_inst_retire); +// INSTANCE1_SC_SIGNAL(_Register_translation_unit, in_RETIRE_READ_RB ,_param->_nb_inst_retire); +// INSTANCE1_SC_SIGNAL(_Register_translation_unit, in_RETIRE_NUM_REG_RB_PHY ,_param->_nb_inst_retire); +// INSTANCE1_SC_SIGNAL(_Register_translation_unit, in_RETIRE_READ_RC ,_param->_nb_inst_retire); +// INSTANCE1_SC_SIGNAL(_Register_translation_unit, in_RETIRE_NUM_REG_RC_PHY ,_param->_nb_inst_retire); INSTANCE1_SC_SIGNAL(_Register_translation_unit, in_RETIRE_WRITE_RD ,_param->_nb_inst_retire); INSTANCE1_SC_SIGNAL(_Register_translation_unit, in_RETIRE_NUM_REG_RD_LOG ,_param->_nb_inst_retire); @@ -249,11 +255,17 @@ delete [] out_INSERT_CONTEXT_ID ; delete [] out_INSERT_READ_RA ; +#ifdef DEBUG delete [] out_INSERT_NUM_REG_RA_LOG ; +#endif delete [] out_INSERT_NUM_REG_RA_PHY ; delete [] out_INSERT_READ_RB ; +#ifdef DEBUG delete [] out_INSERT_NUM_REG_RB_LOG ; +#endif delete [] out_INSERT_NUM_REG_RB_PHY ; delete [] out_INSERT_READ_RC ; +#ifdef DEBUG delete [] out_INSERT_NUM_REG_RC_LOG ; +#endif delete [] out_INSERT_NUM_REG_RC_PHY ; delete [] out_INSERT_WRITE_RD ; @@ -270,10 +282,10 @@ delete [] in_RETIRE_FRONT_END_ID ; delete [] in_RETIRE_CONTEXT_ID ; - delete [] in_RETIRE_READ_RA ; - delete [] in_RETIRE_NUM_REG_RA_PHY ; - delete [] in_RETIRE_READ_RB ; - delete [] in_RETIRE_NUM_REG_RB_PHY ; - delete [] in_RETIRE_READ_RC ; - delete [] in_RETIRE_NUM_REG_RC_PHY ; +// delete [] in_RETIRE_READ_RA ; +// delete [] in_RETIRE_NUM_REG_RA_PHY ; +// delete [] in_RETIRE_READ_RB ; +// delete [] in_RETIRE_NUM_REG_RB_PHY ; +// delete [] in_RETIRE_READ_RC ; +// delete [] in_RETIRE_NUM_REG_RC_PHY ; delete [] in_RETIRE_WRITE_RD ; delete [] in_RETIRE_NUM_REG_RD_LOG ; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Stat_List_unit/include/Stat_List_unit.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Stat_List_unit/include/Stat_List_unit.h (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Stat_List_unit/include/Stat_List_unit.h (revision 121) @@ -82,10 +82,10 @@ public : SC_OUT(Tcontrol_t ) ** out_RETIRE_ACK ;//[nb_inst_retire] public : SC_IN (Tcontrol_t ) ** in_RETIRE_RESTORE ;//[nb_inst_retire] - public : SC_IN (Tcontrol_t ) ** in_RETIRE_READ_RA ;//[nb_inst_retire] - public : SC_IN (Tgeneral_address_t) ** in_RETIRE_NUM_REG_RA_PHY ;//[nb_inst_retire] - public : SC_IN (Tcontrol_t ) ** in_RETIRE_READ_RB ;//[nb_inst_retire] - public : SC_IN (Tgeneral_address_t) ** in_RETIRE_NUM_REG_RB_PHY ;//[nb_inst_retire] - public : SC_IN (Tcontrol_t ) ** in_RETIRE_READ_RC ;//[nb_inst_retire] - public : SC_IN (Tspecial_address_t) ** in_RETIRE_NUM_REG_RC_PHY ;//[nb_inst_retire] +// public : SC_IN (Tcontrol_t ) ** in_RETIRE_READ_RA ;//[nb_inst_retire] +// public : SC_IN (Tgeneral_address_t) ** in_RETIRE_NUM_REG_RA_PHY ;//[nb_inst_retire] +// public : SC_IN (Tcontrol_t ) ** in_RETIRE_READ_RB ;//[nb_inst_retire] +// public : SC_IN (Tgeneral_address_t) ** in_RETIRE_NUM_REG_RB_PHY ;//[nb_inst_retire] +// public : SC_IN (Tcontrol_t ) ** in_RETIRE_READ_RC ;//[nb_inst_retire] +// public : SC_IN (Tspecial_address_t) ** in_RETIRE_NUM_REG_RC_PHY ;//[nb_inst_retire] public : SC_IN (Tcontrol_t ) ** in_RETIRE_WRITE_RD ;//[nb_inst_retire] public : SC_IN (Tcontrol_t ) ** in_RETIRE_RESTORE_RD_PHY_OLD;//[nb_inst_retire] Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Stat_List_unit/src/Stat_List_unit_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Stat_List_unit/src/Stat_List_unit_allocation.cpp (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Stat_List_unit/src/Stat_List_unit_allocation.cpp (revision 121) @@ -85,10 +85,10 @@ ALLOC1_VALACK_OUT(out_RETIRE_ACK ,ACK); ALLOC1_SIGNAL_IN ( in_RETIRE_RESTORE ,"restore" ,Tcontrol_t ,1 ); - ALLOC1_SIGNAL_IN ( in_RETIRE_READ_RA ,"read_ra" ,Tcontrol_t ,1 ); - ALLOC1_SIGNAL_IN ( in_RETIRE_NUM_REG_RA_PHY ,"num_reg_ra_phy" ,Tgeneral_address_t,_param->_size_general_register); - ALLOC1_SIGNAL_IN ( in_RETIRE_READ_RB ,"read_rb" ,Tcontrol_t ,1 ); - ALLOC1_SIGNAL_IN ( in_RETIRE_NUM_REG_RB_PHY ,"num_reg_rb_phy" ,Tgeneral_address_t,_param->_size_general_register); - ALLOC1_SIGNAL_IN ( in_RETIRE_READ_RC ,"read_rc" ,Tcontrol_t ,1 ); - ALLOC1_SIGNAL_IN ( in_RETIRE_NUM_REG_RC_PHY ,"num_reg_rc_phy" ,Tspecial_address_t,_param->_size_special_register); +// ALLOC1_SIGNAL_IN ( in_RETIRE_READ_RA ,"read_ra" ,Tcontrol_t ,1 ); +// ALLOC1_SIGNAL_IN ( in_RETIRE_NUM_REG_RA_PHY ,"num_reg_ra_phy" ,Tgeneral_address_t,_param->_size_general_register); +// ALLOC1_SIGNAL_IN ( in_RETIRE_READ_RB ,"read_rb" ,Tcontrol_t ,1 ); +// ALLOC1_SIGNAL_IN ( in_RETIRE_NUM_REG_RB_PHY ,"num_reg_rb_phy" ,Tgeneral_address_t,_param->_size_general_register); +// ALLOC1_SIGNAL_IN ( in_RETIRE_READ_RC ,"read_rc" ,Tcontrol_t ,1 ); +// ALLOC1_SIGNAL_IN ( in_RETIRE_NUM_REG_RC_PHY ,"num_reg_rc_phy" ,Tspecial_address_t,_param->_size_special_register); ALLOC1_SIGNAL_IN ( in_RETIRE_WRITE_RD ,"write_rd" ,Tcontrol_t ,1 ); ALLOC1_SIGNAL_IN ( in_RETIRE_RESTORE_RD_PHY_OLD,"restore_rd_phy_old",Tcontrol_t ,1 ); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Stat_List_unit/src/Stat_List_unit_deallocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Stat_List_unit/src/Stat_List_unit_deallocation.cpp (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Stat_List_unit/src/Stat_List_unit_deallocation.cpp (revision 121) @@ -48,10 +48,10 @@ DELETE1_SIGNAL(out_RETIRE_ACK ,_param->_nb_inst_retire,1); DELETE1_SIGNAL( in_RETIRE_RESTORE ,_param->_nb_inst_retire,1 ); - DELETE1_SIGNAL( in_RETIRE_READ_RA ,_param->_nb_inst_retire,1 ); - DELETE1_SIGNAL( in_RETIRE_NUM_REG_RA_PHY ,_param->_nb_inst_retire,_param->_size_general_register); - DELETE1_SIGNAL( in_RETIRE_READ_RB ,_param->_nb_inst_retire,1 ); - DELETE1_SIGNAL( in_RETIRE_NUM_REG_RB_PHY ,_param->_nb_inst_retire,_param->_size_general_register); - DELETE1_SIGNAL( in_RETIRE_READ_RC ,_param->_nb_inst_retire,1 ); - DELETE1_SIGNAL( in_RETIRE_NUM_REG_RC_PHY ,_param->_nb_inst_retire,_param->_size_special_register); +// DELETE1_SIGNAL( in_RETIRE_READ_RA ,_param->_nb_inst_retire,1 ); +// DELETE1_SIGNAL( in_RETIRE_NUM_REG_RA_PHY ,_param->_nb_inst_retire,_param->_size_general_register); +// DELETE1_SIGNAL( in_RETIRE_READ_RB ,_param->_nb_inst_retire,1 ); +// DELETE1_SIGNAL( in_RETIRE_NUM_REG_RB_PHY ,_param->_nb_inst_retire,_param->_size_general_register); +// DELETE1_SIGNAL( in_RETIRE_READ_RC ,_param->_nb_inst_retire,1 ); +// DELETE1_SIGNAL( in_RETIRE_NUM_REG_RC_PHY ,_param->_nb_inst_retire,_param->_size_special_register); DELETE1_SIGNAL( in_RETIRE_WRITE_RD ,_param->_nb_inst_retire,1 ); DELETE1_SIGNAL( in_RETIRE_RESTORE_RD_PHY_OLD,_param->_nb_inst_retire,1 ); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/include/Register_translation_unit.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/include/Register_translation_unit.h (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/include/Register_translation_unit.h (revision 121) @@ -89,11 +89,17 @@ public : SC_OUT(Tcontext_t ) ** out_INSERT_CONTEXT_ID ;//[nb_inst_insert] public : SC_OUT(Tcontrol_t ) ** out_INSERT_READ_RA ;//[nb_inst_insert] +#ifdef DEBUG public : SC_OUT(Tgeneral_address_t) ** out_INSERT_NUM_REG_RA_LOG ;//[nb_inst_insert] +#endif public : SC_OUT(Tgeneral_address_t) ** out_INSERT_NUM_REG_RA_PHY ;//[nb_inst_insert] public : SC_OUT(Tcontrol_t ) ** out_INSERT_READ_RB ;//[nb_inst_insert] +#ifdef DEBUG public : SC_OUT(Tgeneral_address_t) ** out_INSERT_NUM_REG_RB_LOG ;//[nb_inst_insert] +#endif public : SC_OUT(Tgeneral_address_t) ** out_INSERT_NUM_REG_RB_PHY ;//[nb_inst_insert] public : SC_OUT(Tcontrol_t ) ** out_INSERT_READ_RC ;//[nb_inst_insert] +#ifdef DEBUG public : SC_OUT(Tspecial_address_t) ** out_INSERT_NUM_REG_RC_LOG ;//[nb_inst_insert] +#endif public : SC_OUT(Tspecial_address_t) ** out_INSERT_NUM_REG_RC_PHY ;//[nb_inst_insert] public : SC_OUT(Tcontrol_t ) ** out_INSERT_WRITE_RD ;//[nb_inst_insert] @@ -111,10 +117,10 @@ public : SC_IN (Tcontext_t ) ** in_RETIRE_FRONT_END_ID ;//[nb_inst_retire] public : SC_IN (Tcontext_t ) ** in_RETIRE_CONTEXT_ID ;//[nb_inst_retire] - public : SC_IN (Tcontrol_t ) ** in_RETIRE_READ_RA ;//[nb_inst_retire] - public : SC_IN (Tgeneral_address_t) ** in_RETIRE_NUM_REG_RA_PHY ;//[nb_inst_retire] - public : SC_IN (Tcontrol_t ) ** in_RETIRE_READ_RB ;//[nb_inst_retire] - public : SC_IN (Tgeneral_address_t) ** in_RETIRE_NUM_REG_RB_PHY ;//[nb_inst_retire] - public : SC_IN (Tcontrol_t ) ** in_RETIRE_READ_RC ;//[nb_inst_retire] - public : SC_IN (Tspecial_address_t) ** in_RETIRE_NUM_REG_RC_PHY ;//[nb_inst_retire] +// public : SC_IN (Tcontrol_t ) ** in_RETIRE_READ_RA ;//[nb_inst_retire] +// public : SC_IN (Tgeneral_address_t) ** in_RETIRE_NUM_REG_RA_PHY ;//[nb_inst_retire] +// public : SC_IN (Tcontrol_t ) ** in_RETIRE_READ_RB ;//[nb_inst_retire] +// public : SC_IN (Tgeneral_address_t) ** in_RETIRE_NUM_REG_RB_PHY ;//[nb_inst_retire] +// public : SC_IN (Tcontrol_t ) ** in_RETIRE_READ_RC ;//[nb_inst_retire] +// public : SC_IN (Tspecial_address_t) ** in_RETIRE_NUM_REG_RC_PHY ;//[nb_inst_retire] public : SC_IN (Tcontrol_t ) ** in_RETIRE_WRITE_RD ;//[nb_inst_retire] public : SC_IN (Tgeneral_address_t) ** in_RETIRE_NUM_REG_RD_LOG ;//[nb_inst_retire] Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/src/Register_translation_unit_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/src/Register_translation_unit_allocation.cpp (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/src/Register_translation_unit_allocation.cpp (revision 121) @@ -87,11 +87,17 @@ ALLOC1_SIGNAL_OUT(out_INSERT_CONTEXT_ID ,"context_id" ,Tcontext_t ,_param->_size_context_id ); ALLOC1_SIGNAL_OUT(out_INSERT_READ_RA ,"read_ra" ,Tcontrol_t ,1 ); +#ifdef DEBUG ALLOC1_SIGNAL_OUT(out_INSERT_NUM_REG_RA_LOG ,"num_reg_ra_log" ,Tgeneral_address_t,_param->_size_general_register_logic); +#endif ALLOC1_SIGNAL_OUT(out_INSERT_NUM_REG_RA_PHY ,"num_reg_ra_phy" ,Tgeneral_address_t,_param->_size_general_register ); ALLOC1_SIGNAL_OUT(out_INSERT_READ_RB ,"read_rb" ,Tcontrol_t ,1 ); +#ifdef DEBUG ALLOC1_SIGNAL_OUT(out_INSERT_NUM_REG_RB_LOG ,"num_reg_rb_log" ,Tgeneral_address_t,_param->_size_general_register_logic); +#endif ALLOC1_SIGNAL_OUT(out_INSERT_NUM_REG_RB_PHY ,"num_reg_rb_phy" ,Tgeneral_address_t,_param->_size_general_register ); ALLOC1_SIGNAL_OUT(out_INSERT_READ_RC ,"read_rc" ,Tcontrol_t ,1 ); +#ifdef DEBUG ALLOC1_SIGNAL_OUT(out_INSERT_NUM_REG_RC_LOG ,"num_reg_rc_log" ,Tspecial_address_t,_param->_size_special_register_logic); +#endif ALLOC1_SIGNAL_OUT(out_INSERT_NUM_REG_RC_PHY ,"num_reg_rc_phy" ,Tspecial_address_t,_param->_size_special_register ); ALLOC1_SIGNAL_OUT(out_INSERT_WRITE_RD ,"write_rd" ,Tcontrol_t ,1 ); @@ -115,10 +121,10 @@ ALLOC1_SIGNAL_IN ( in_RETIRE_FRONT_END_ID ,"front_end_id" ,Tcontext_t ,_param->_size_front_end_id ); ALLOC1_SIGNAL_IN ( in_RETIRE_CONTEXT_ID ,"context_id" ,Tcontext_t ,_param->_size_context_id ); - ALLOC1_SIGNAL_IN ( in_RETIRE_READ_RA ,"read_ra" ,Tcontrol_t ,1 ); - ALLOC1_SIGNAL_IN ( in_RETIRE_NUM_REG_RA_PHY ,"num_reg_ra_phy" ,Tgeneral_address_t,_param->_size_general_register ); - ALLOC1_SIGNAL_IN ( in_RETIRE_READ_RB ,"read_rb" ,Tcontrol_t ,1 ); - ALLOC1_SIGNAL_IN ( in_RETIRE_NUM_REG_RB_PHY ,"num_reg_rb_phy" ,Tgeneral_address_t,_param->_size_general_register ); - ALLOC1_SIGNAL_IN ( in_RETIRE_READ_RC ,"read_rc" ,Tcontrol_t ,1 ); - ALLOC1_SIGNAL_IN ( in_RETIRE_NUM_REG_RC_PHY ,"num_reg_rc_phy" ,Tspecial_address_t,_param->_size_special_register ); +// ALLOC1_SIGNAL_IN ( in_RETIRE_READ_RA ,"read_ra" ,Tcontrol_t ,1 ); +// ALLOC1_SIGNAL_IN ( in_RETIRE_NUM_REG_RA_PHY ,"num_reg_ra_phy" ,Tgeneral_address_t,_param->_size_general_register ); +// ALLOC1_SIGNAL_IN ( in_RETIRE_READ_RB ,"read_rb" ,Tcontrol_t ,1 ); +// ALLOC1_SIGNAL_IN ( in_RETIRE_NUM_REG_RB_PHY ,"num_reg_rb_phy" ,Tgeneral_address_t,_param->_size_general_register ); +// ALLOC1_SIGNAL_IN ( in_RETIRE_READ_RC ,"read_rc" ,Tcontrol_t ,1 ); +// ALLOC1_SIGNAL_IN ( in_RETIRE_NUM_REG_RC_PHY ,"num_reg_rc_phy" ,Tspecial_address_t,_param->_size_special_register ); ALLOC1_SIGNAL_IN ( in_RETIRE_WRITE_RD ,"write_rd" ,Tcontrol_t ,1 ); ALLOC1_SIGNAL_IN ( in_RETIRE_NUM_REG_RD_LOG ,"num_reg_rd_log" ,Tgeneral_address_t,_param->_size_general_register_logic); @@ -549,4 +555,5 @@ PORT_MAP(_component,src ,"out_RENAME_OUT_"+toString(i)+"_CONTEXT_ID" , dest,"out_INSERT_"+toString(i)+"_CONTEXT_ID" ); +#ifdef DEBUG PORT_MAP(_component,src ,"out_RENAME_OUT_"+toString(i)+"_NUM_REG_RA_LOG" , dest,"out_INSERT_"+toString(i)+"_NUM_REG_RA_LOG" ); @@ -555,4 +562,5 @@ PORT_MAP(_component,src ,"out_RENAME_OUT_"+toString(i)+"_NUM_REG_RC_LOG" , dest,"out_INSERT_"+toString(i)+"_NUM_REG_RC_LOG" ); +#endif // PORT_MAP(_component,src ,"out_RENAME_OUT_"+toString(i)+"_VAL" , @@ -659,16 +667,16 @@ #endif - PORT_MAP(_component,src , "in_RETIRE_"+toString(i)+"_READ_RA" , - dest, "in_RETIRE_"+toString(i)+"_READ_RA" ); - PORT_MAP(_component,src , "in_RETIRE_"+toString(i)+"_NUM_REG_RA_PHY" , - dest, "in_RETIRE_"+toString(i)+"_NUM_REG_RA_PHY" ); - PORT_MAP(_component,src , "in_RETIRE_"+toString(i)+"_READ_RB" , - dest, "in_RETIRE_"+toString(i)+"_READ_RB" ); - PORT_MAP(_component,src , "in_RETIRE_"+toString(i)+"_NUM_REG_RB_PHY" , - dest, "in_RETIRE_"+toString(i)+"_NUM_REG_RB_PHY" ); - PORT_MAP(_component,src , "in_RETIRE_"+toString(i)+"_READ_RC" , - dest, "in_RETIRE_"+toString(i)+"_READ_RC" ); - PORT_MAP(_component,src , "in_RETIRE_"+toString(i)+"_NUM_REG_RC_PHY" , - dest, "in_RETIRE_"+toString(i)+"_NUM_REG_RC_PHY" ); +// PORT_MAP(_component,src , "in_RETIRE_"+toString(i)+"_READ_RA" , +// dest, "in_RETIRE_"+toString(i)+"_READ_RA" ); +// PORT_MAP(_component,src , "in_RETIRE_"+toString(i)+"_NUM_REG_RA_PHY" , +// dest, "in_RETIRE_"+toString(i)+"_NUM_REG_RA_PHY" ); +// PORT_MAP(_component,src , "in_RETIRE_"+toString(i)+"_READ_RB" , +// dest, "in_RETIRE_"+toString(i)+"_READ_RB" ); +// PORT_MAP(_component,src , "in_RETIRE_"+toString(i)+"_NUM_REG_RB_PHY" , +// dest, "in_RETIRE_"+toString(i)+"_NUM_REG_RB_PHY" ); +// PORT_MAP(_component,src , "in_RETIRE_"+toString(i)+"_READ_RC" , +// dest, "in_RETIRE_"+toString(i)+"_READ_RC" ); +// PORT_MAP(_component,src , "in_RETIRE_"+toString(i)+"_NUM_REG_RC_PHY" , +// dest, "in_RETIRE_"+toString(i)+"_NUM_REG_RC_PHY" ); PORT_MAP(_component,src , "in_RETIRE_"+toString(i)+"_WRITE_RD" , dest, "in_RETIRE_"+toString(i)+"_WRITE_RD" ); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/src/Register_translation_unit_deallocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/src/Register_translation_unit_deallocation.cpp (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/src/Register_translation_unit_deallocation.cpp (revision 121) @@ -49,11 +49,17 @@ DELETE1_SIGNAL(out_INSERT_CONTEXT_ID ,_param->_nb_inst_insert,_param->_size_context_id ); DELETE1_SIGNAL(out_INSERT_READ_RA ,_param->_nb_inst_insert,1 ); +#ifdef DEBUG DELETE1_SIGNAL(out_INSERT_NUM_REG_RA_LOG ,_param->_nb_inst_insert,_param->_size_general_register_logic); +#endif DELETE1_SIGNAL(out_INSERT_NUM_REG_RA_PHY ,_param->_nb_inst_insert,_param->_size_general_register ); DELETE1_SIGNAL(out_INSERT_READ_RB ,_param->_nb_inst_insert,1 ); +#ifdef DEBUG DELETE1_SIGNAL(out_INSERT_NUM_REG_RB_LOG ,_param->_nb_inst_insert,_param->_size_general_register_logic); +#endif DELETE1_SIGNAL(out_INSERT_NUM_REG_RB_PHY ,_param->_nb_inst_insert,_param->_size_general_register ); DELETE1_SIGNAL(out_INSERT_READ_RC ,_param->_nb_inst_insert,1 ); +#ifdef DEBUG DELETE1_SIGNAL(out_INSERT_NUM_REG_RC_LOG ,_param->_nb_inst_insert,_param->_size_special_register_logic); +#endif DELETE1_SIGNAL(out_INSERT_NUM_REG_RC_PHY ,_param->_nb_inst_insert,_param->_size_special_register ); DELETE1_SIGNAL(out_INSERT_WRITE_RD ,_param->_nb_inst_insert,1 ); @@ -70,10 +76,10 @@ DELETE1_SIGNAL( in_RETIRE_FRONT_END_ID ,_param->_nb_inst_retire,_param->_size_front_end_id ); DELETE1_SIGNAL( in_RETIRE_CONTEXT_ID ,_param->_nb_inst_retire,_param->_size_context_id ); - DELETE1_SIGNAL( in_RETIRE_READ_RA ,_param->_nb_inst_retire,1 ); - DELETE1_SIGNAL( in_RETIRE_NUM_REG_RA_PHY ,_param->_nb_inst_retire,_param->_size_general_register ); - DELETE1_SIGNAL( in_RETIRE_READ_RB ,_param->_nb_inst_retire,1 ); - DELETE1_SIGNAL( in_RETIRE_NUM_REG_RB_PHY ,_param->_nb_inst_retire,_param->_size_general_register ); - DELETE1_SIGNAL( in_RETIRE_READ_RC ,_param->_nb_inst_retire,1 ); - DELETE1_SIGNAL( in_RETIRE_NUM_REG_RC_PHY ,_param->_nb_inst_retire,_param->_size_special_register ); +// DELETE1_SIGNAL( in_RETIRE_READ_RA ,_param->_nb_inst_retire,1 ); +// DELETE1_SIGNAL( in_RETIRE_NUM_REG_RA_PHY ,_param->_nb_inst_retire,_param->_size_general_register ); +// DELETE1_SIGNAL( in_RETIRE_READ_RB ,_param->_nb_inst_retire,1 ); +// DELETE1_SIGNAL( in_RETIRE_NUM_REG_RB_PHY ,_param->_nb_inst_retire,_param->_size_general_register ); +// DELETE1_SIGNAL( in_RETIRE_READ_RC ,_param->_nb_inst_retire,1 ); +// DELETE1_SIGNAL( in_RETIRE_NUM_REG_RC_PHY ,_param->_nb_inst_retire,_param->_size_special_register ); DELETE1_SIGNAL( in_RETIRE_WRITE_RD ,_param->_nb_inst_retire,1 ); DELETE1_SIGNAL( in_RETIRE_NUM_REG_RD_LOG ,_param->_nb_inst_retire,_param->_size_general_register_logic); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/SelfTest/src/test.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/SelfTest/src/test.cpp (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/SelfTest/src/test.cpp (revision 121) @@ -121,10 +121,10 @@ ALLOC1_SC_SIGNAL( in_RETIRE_STORE_QUEUE_PTR_WRITE," in_RETIRE_STORE_QUEUE_PTR_WRITE",Tlsq_ptr_t ,_param->_nb_inst_retire); ALLOC1_SC_SIGNAL( in_RETIRE_LOAD_QUEUE_PTR_WRITE ," in_RETIRE_LOAD_QUEUE_PTR_WRITE ",Tlsq_ptr_t ,_param->_nb_inst_retire); - ALLOC1_SC_SIGNAL( in_RETIRE_READ_RA ," in_RETIRE_READ_RA ",Tcontrol_t ,_param->_nb_inst_retire); - ALLOC1_SC_SIGNAL( in_RETIRE_NUM_REG_RA_PHY ," in_RETIRE_NUM_REG_RA_PHY ",Tgeneral_address_t,_param->_nb_inst_retire); - ALLOC1_SC_SIGNAL( in_RETIRE_READ_RB ," in_RETIRE_READ_RB ",Tcontrol_t ,_param->_nb_inst_retire); - ALLOC1_SC_SIGNAL( in_RETIRE_NUM_REG_RB_PHY ," in_RETIRE_NUM_REG_RB_PHY ",Tgeneral_address_t,_param->_nb_inst_retire); - ALLOC1_SC_SIGNAL( in_RETIRE_READ_RC ," in_RETIRE_READ_RC ",Tcontrol_t ,_param->_nb_inst_retire); - ALLOC1_SC_SIGNAL( in_RETIRE_NUM_REG_RC_PHY ," in_RETIRE_NUM_REG_RC_PHY ",Tspecial_address_t,_param->_nb_inst_retire); +// ALLOC1_SC_SIGNAL( in_RETIRE_READ_RA ," in_RETIRE_READ_RA ",Tcontrol_t ,_param->_nb_inst_retire); +// ALLOC1_SC_SIGNAL( in_RETIRE_NUM_REG_RA_PHY ," in_RETIRE_NUM_REG_RA_PHY ",Tgeneral_address_t,_param->_nb_inst_retire); +// ALLOC1_SC_SIGNAL( in_RETIRE_READ_RB ," in_RETIRE_READ_RB ",Tcontrol_t ,_param->_nb_inst_retire); +// ALLOC1_SC_SIGNAL( in_RETIRE_NUM_REG_RB_PHY ," in_RETIRE_NUM_REG_RB_PHY ",Tgeneral_address_t,_param->_nb_inst_retire); +// ALLOC1_SC_SIGNAL( in_RETIRE_READ_RC ," in_RETIRE_READ_RC ",Tcontrol_t ,_param->_nb_inst_retire); +// ALLOC1_SC_SIGNAL( in_RETIRE_NUM_REG_RC_PHY ," in_RETIRE_NUM_REG_RC_PHY ",Tspecial_address_t,_param->_nb_inst_retire); ALLOC1_SC_SIGNAL( in_RETIRE_WRITE_RD ," in_RETIRE_WRITE_RD ",Tcontrol_t ,_param->_nb_inst_retire); ALLOC1_SC_SIGNAL( in_RETIRE_NUM_REG_RD_LOG ," in_RETIRE_NUM_REG_RD_LOG ",Tgeneral_address_t,_param->_nb_inst_retire); @@ -204,11 +204,17 @@ INSTANCE1_SC_SIGNAL(_Rename_unit,out_INSERT_EXCEPTION ,_param->_nb_inst_insert); INSTANCE1_SC_SIGNAL(_Rename_unit,out_INSERT_READ_RA ,_param->_nb_inst_insert); +#ifdef DEBUG INSTANCE1_SC_SIGNAL(_Rename_unit,out_INSERT_NUM_REG_RA_LOG ,_param->_nb_inst_insert); +#endif INSTANCE1_SC_SIGNAL(_Rename_unit,out_INSERT_NUM_REG_RA_PHY ,_param->_nb_inst_insert); INSTANCE1_SC_SIGNAL(_Rename_unit,out_INSERT_READ_RB ,_param->_nb_inst_insert); +#ifdef DEBUG INSTANCE1_SC_SIGNAL(_Rename_unit,out_INSERT_NUM_REG_RB_LOG ,_param->_nb_inst_insert); +#endif INSTANCE1_SC_SIGNAL(_Rename_unit,out_INSERT_NUM_REG_RB_PHY ,_param->_nb_inst_insert); INSTANCE1_SC_SIGNAL(_Rename_unit,out_INSERT_READ_RC ,_param->_nb_inst_insert); +#ifdef DEBUG INSTANCE1_SC_SIGNAL(_Rename_unit,out_INSERT_NUM_REG_RC_LOG ,_param->_nb_inst_insert); +#endif INSTANCE1_SC_SIGNAL(_Rename_unit,out_INSERT_NUM_REG_RC_PHY ,_param->_nb_inst_insert); INSTANCE1_SC_SIGNAL(_Rename_unit,out_INSERT_WRITE_RD ,_param->_nb_inst_insert); @@ -234,10 +240,10 @@ if (_param->_have_port_load_queue_ptr) INSTANCE1_SC_SIGNAL(_Rename_unit, in_RETIRE_LOAD_QUEUE_PTR_WRITE ,_param->_nb_inst_retire); - INSTANCE1_SC_SIGNAL(_Rename_unit, in_RETIRE_READ_RA ,_param->_nb_inst_retire); - INSTANCE1_SC_SIGNAL(_Rename_unit, in_RETIRE_NUM_REG_RA_PHY ,_param->_nb_inst_retire); - INSTANCE1_SC_SIGNAL(_Rename_unit, in_RETIRE_READ_RB ,_param->_nb_inst_retire); - INSTANCE1_SC_SIGNAL(_Rename_unit, in_RETIRE_NUM_REG_RB_PHY ,_param->_nb_inst_retire); - INSTANCE1_SC_SIGNAL(_Rename_unit, in_RETIRE_READ_RC ,_param->_nb_inst_retire); - INSTANCE1_SC_SIGNAL(_Rename_unit, in_RETIRE_NUM_REG_RC_PHY ,_param->_nb_inst_retire); +// INSTANCE1_SC_SIGNAL(_Rename_unit, in_RETIRE_READ_RA ,_param->_nb_inst_retire); +// INSTANCE1_SC_SIGNAL(_Rename_unit, in_RETIRE_NUM_REG_RA_PHY ,_param->_nb_inst_retire); +// INSTANCE1_SC_SIGNAL(_Rename_unit, in_RETIRE_READ_RB ,_param->_nb_inst_retire); +// INSTANCE1_SC_SIGNAL(_Rename_unit, in_RETIRE_NUM_REG_RB_PHY ,_param->_nb_inst_retire); +// INSTANCE1_SC_SIGNAL(_Rename_unit, in_RETIRE_READ_RC ,_param->_nb_inst_retire); +// INSTANCE1_SC_SIGNAL(_Rename_unit, in_RETIRE_NUM_REG_RC_PHY ,_param->_nb_inst_retire); INSTANCE1_SC_SIGNAL(_Rename_unit, in_RETIRE_WRITE_RD ,_param->_nb_inst_retire); INSTANCE1_SC_SIGNAL(_Rename_unit, in_RETIRE_NUM_REG_RD_LOG ,_param->_nb_inst_retire); @@ -375,10 +381,10 @@ DELETE1_SC_SIGNAL( in_RETIRE_STORE_QUEUE_PTR_WRITE,_param->_nb_inst_retire); DELETE1_SC_SIGNAL( in_RETIRE_LOAD_QUEUE_PTR_WRITE ,_param->_nb_inst_retire); - DELETE1_SC_SIGNAL( in_RETIRE_READ_RA ,_param->_nb_inst_retire); - DELETE1_SC_SIGNAL( in_RETIRE_NUM_REG_RA_PHY ,_param->_nb_inst_retire); - DELETE1_SC_SIGNAL( in_RETIRE_READ_RB ,_param->_nb_inst_retire); - DELETE1_SC_SIGNAL( in_RETIRE_NUM_REG_RB_PHY ,_param->_nb_inst_retire); - DELETE1_SC_SIGNAL( in_RETIRE_READ_RC ,_param->_nb_inst_retire); - DELETE1_SC_SIGNAL( in_RETIRE_NUM_REG_RC_PHY ,_param->_nb_inst_retire); +// DELETE1_SC_SIGNAL( in_RETIRE_READ_RA ,_param->_nb_inst_retire); +// DELETE1_SC_SIGNAL( in_RETIRE_NUM_REG_RA_PHY ,_param->_nb_inst_retire); +// DELETE1_SC_SIGNAL( in_RETIRE_READ_RB ,_param->_nb_inst_retire); +// DELETE1_SC_SIGNAL( in_RETIRE_NUM_REG_RB_PHY ,_param->_nb_inst_retire); +// DELETE1_SC_SIGNAL( in_RETIRE_READ_RC ,_param->_nb_inst_retire); +// DELETE1_SC_SIGNAL( in_RETIRE_NUM_REG_RC_PHY ,_param->_nb_inst_retire); DELETE1_SC_SIGNAL( in_RETIRE_WRITE_RD ,_param->_nb_inst_retire); DELETE1_SC_SIGNAL( in_RETIRE_NUM_REG_RD_LOG ,_param->_nb_inst_retire); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/include/Rename_unit.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/include/Rename_unit.h (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/include/Rename_unit.h (revision 121) @@ -116,11 +116,17 @@ public : SC_OUT(Tlsq_ptr_t ) ** out_INSERT_LOAD_QUEUE_PTR_WRITE ;//[nb_inst_insert] public : SC_OUT(Tcontrol_t ) ** out_INSERT_READ_RA ;//[nb_inst_insert] +#ifdef DEBUG public : SC_OUT(Tgeneral_address_t) ** out_INSERT_NUM_REG_RA_LOG ;//[nb_inst_insert] +#endif public : SC_OUT(Tgeneral_address_t) ** out_INSERT_NUM_REG_RA_PHY ;//[nb_inst_insert] public : SC_OUT(Tcontrol_t ) ** out_INSERT_READ_RB ;//[nb_inst_insert] +#ifdef DEBUG public : SC_OUT(Tgeneral_address_t) ** out_INSERT_NUM_REG_RB_LOG ;//[nb_inst_insert] +#endif public : SC_OUT(Tgeneral_address_t) ** out_INSERT_NUM_REG_RB_PHY ;//[nb_inst_insert] public : SC_OUT(Tcontrol_t ) ** out_INSERT_READ_RC ;//[nb_inst_insert] +#ifdef DEBUG public : SC_OUT(Tspecial_address_t) ** out_INSERT_NUM_REG_RC_LOG ;//[nb_inst_insert] +#endif public : SC_OUT(Tspecial_address_t) ** out_INSERT_NUM_REG_RC_PHY ;//[nb_inst_insert] public : SC_OUT(Tcontrol_t ) ** out_INSERT_WRITE_RD ;//[nb_inst_insert] @@ -146,10 +152,10 @@ public : SC_IN (Tlsq_ptr_t ) ** in_RETIRE_STORE_QUEUE_PTR_WRITE;//[nb_inst_retire] public : SC_IN (Tlsq_ptr_t ) ** in_RETIRE_LOAD_QUEUE_PTR_WRITE ;//[nb_inst_retire] - public : SC_IN (Tcontrol_t ) ** in_RETIRE_READ_RA ;//[nb_inst_retire] - public : SC_IN (Tgeneral_address_t) ** in_RETIRE_NUM_REG_RA_PHY ;//[nb_inst_retire] - public : SC_IN (Tcontrol_t ) ** in_RETIRE_READ_RB ;//[nb_inst_retire] - public : SC_IN (Tgeneral_address_t) ** in_RETIRE_NUM_REG_RB_PHY ;//[nb_inst_retire] - public : SC_IN (Tcontrol_t ) ** in_RETIRE_READ_RC ;//[nb_inst_retire] - public : SC_IN (Tspecial_address_t) ** in_RETIRE_NUM_REG_RC_PHY ;//[nb_inst_retire] +// public : SC_IN (Tcontrol_t ) ** in_RETIRE_READ_RA ;//[nb_inst_retire] +// public : SC_IN (Tgeneral_address_t) ** in_RETIRE_NUM_REG_RA_PHY ;//[nb_inst_retire] +// public : SC_IN (Tcontrol_t ) ** in_RETIRE_READ_RB ;//[nb_inst_retire] +// public : SC_IN (Tgeneral_address_t) ** in_RETIRE_NUM_REG_RB_PHY ;//[nb_inst_retire] +// public : SC_IN (Tcontrol_t ) ** in_RETIRE_READ_RC ;//[nb_inst_retire] +// public : SC_IN (Tspecial_address_t) ** in_RETIRE_NUM_REG_RC_PHY ;//[nb_inst_retire] public : SC_IN (Tcontrol_t ) ** in_RETIRE_WRITE_RD ;//[nb_inst_retire] public : SC_IN (Tgeneral_address_t) ** in_RETIRE_NUM_REG_RD_LOG ;//[nb_inst_retire] Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/src/Rename_unit_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/src/Rename_unit_allocation.cpp (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/src/Rename_unit_allocation.cpp (revision 121) @@ -115,11 +115,17 @@ ALLOC1_SIGNAL_OUT(out_INSERT_EXCEPTION ,"exception" ,Texception_t ,_param->_size_exception ); ALLOC1_SIGNAL_OUT(out_INSERT_READ_RA ,"read_ra" ,Tcontrol_t ,1 ); +#ifdef DEBUG ALLOC1_SIGNAL_OUT(out_INSERT_NUM_REG_RA_LOG ,"num_reg_ra_log" ,Tgeneral_address_t,_param->_size_general_register_logic); +#endif ALLOC1_SIGNAL_OUT(out_INSERT_NUM_REG_RA_PHY ,"num_reg_ra_phy" ,Tgeneral_address_t,_param->_size_general_register ); ALLOC1_SIGNAL_OUT(out_INSERT_READ_RB ,"read_rb" ,Tcontrol_t ,1 ); +#ifdef DEBUG ALLOC1_SIGNAL_OUT(out_INSERT_NUM_REG_RB_LOG ,"num_reg_rb_log" ,Tgeneral_address_t,_param->_size_general_register_logic); +#endif ALLOC1_SIGNAL_OUT(out_INSERT_NUM_REG_RB_PHY ,"num_reg_rb_phy" ,Tgeneral_address_t,_param->_size_general_register ); ALLOC1_SIGNAL_OUT(out_INSERT_READ_RC ,"read_rc" ,Tcontrol_t ,1 ); +#ifdef DEBUG ALLOC1_SIGNAL_OUT(out_INSERT_NUM_REG_RC_LOG ,"num_reg_rc_log" ,Tspecial_address_t,_param->_size_special_register_logic); +#endif ALLOC1_SIGNAL_OUT(out_INSERT_NUM_REG_RC_PHY ,"num_reg_rc_phy" ,Tspecial_address_t,_param->_size_special_register ); ALLOC1_SIGNAL_OUT(out_INSERT_WRITE_RD ,"write_rd" ,Tcontrol_t ,1 ); @@ -149,10 +155,10 @@ ALLOC1_SIGNAL_IN ( in_RETIRE_STORE_QUEUE_PTR_WRITE,"store_queue_ptr_write",Tlsq_ptr_t ,_param->_size_store_queue_ptr ); ALLOC1_SIGNAL_IN ( in_RETIRE_LOAD_QUEUE_PTR_WRITE ,"load_queue_ptr_write" ,Tlsq_ptr_t ,_param->_size_load_queue_ptr ); - ALLOC1_SIGNAL_IN ( in_RETIRE_READ_RA ,"read_ra" ,Tcontrol_t ,1 ); - ALLOC1_SIGNAL_IN ( in_RETIRE_NUM_REG_RA_PHY ,"num_reg_ra_phy" ,Tgeneral_address_t,_param->_size_general_register ); - ALLOC1_SIGNAL_IN ( in_RETIRE_READ_RB ,"read_rb" ,Tcontrol_t ,1 ); - ALLOC1_SIGNAL_IN ( in_RETIRE_NUM_REG_RB_PHY ,"num_reg_rb_phy" ,Tgeneral_address_t,_param->_size_general_register ); - ALLOC1_SIGNAL_IN ( in_RETIRE_READ_RC ,"read_rc" ,Tcontrol_t ,1 ); - ALLOC1_SIGNAL_IN ( in_RETIRE_NUM_REG_RC_PHY ,"num_reg_rc_phy" ,Tspecial_address_t,_param->_size_special_register ); +// ALLOC1_SIGNAL_IN ( in_RETIRE_READ_RA ,"read_ra" ,Tcontrol_t ,1 ); +// ALLOC1_SIGNAL_IN ( in_RETIRE_NUM_REG_RA_PHY ,"num_reg_ra_phy" ,Tgeneral_address_t,_param->_size_general_register ); +// ALLOC1_SIGNAL_IN ( in_RETIRE_READ_RB ,"read_rb" ,Tcontrol_t ,1 ); +// ALLOC1_SIGNAL_IN ( in_RETIRE_NUM_REG_RB_PHY ,"num_reg_rb_phy" ,Tgeneral_address_t,_param->_size_general_register ); +// ALLOC1_SIGNAL_IN ( in_RETIRE_READ_RC ,"read_rc" ,Tcontrol_t ,1 ); +// ALLOC1_SIGNAL_IN ( in_RETIRE_NUM_REG_RC_PHY ,"num_reg_rc_phy" ,Tspecial_address_t,_param->_size_special_register ); ALLOC1_SIGNAL_IN ( in_RETIRE_WRITE_RD ,"write_rd" ,Tcontrol_t ,1 ); ALLOC1_SIGNAL_IN ( in_RETIRE_NUM_REG_RD_LOG ,"num_reg_rd_log" ,Tgeneral_address_t,_param->_size_general_register_logic); @@ -528,18 +534,24 @@ PORT_MAP(_component,src ,"out_INSERT_"+toString(i)+"_READ_RA" , dest,"out_INSERT_"+toString(i)+"_READ_RA" ); +#ifdef DEBUG PORT_MAP(_component,src ,"out_INSERT_"+toString(i)+"_NUM_REG_RA_LOG" , dest,"out_INSERT_"+toString(i)+"_NUM_REG_RA_LOG" ); +#endif PORT_MAP(_component,src ,"out_INSERT_"+toString(i)+"_NUM_REG_RA_PHY" , dest,"out_INSERT_"+toString(i)+"_NUM_REG_RA_PHY" ); PORT_MAP(_component,src ,"out_INSERT_"+toString(i)+"_READ_RB" , dest,"out_INSERT_"+toString(i)+"_READ_RB" ); +#ifdef DEBUG PORT_MAP(_component,src ,"out_INSERT_"+toString(i)+"_NUM_REG_RB_LOG" , dest,"out_INSERT_"+toString(i)+"_NUM_REG_RB_LOG" ); +#endif PORT_MAP(_component,src ,"out_INSERT_"+toString(i)+"_NUM_REG_RB_PHY" , dest,"out_INSERT_"+toString(i)+"_NUM_REG_RB_PHY" ); PORT_MAP(_component,src ,"out_INSERT_"+toString(i)+"_READ_RC" , dest,"out_INSERT_"+toString(i)+"_READ_RC" ); +#ifdef DEBUG PORT_MAP(_component,src ,"out_INSERT_"+toString(i)+"_NUM_REG_RC_LOG" , dest,"out_INSERT_"+toString(i)+"_NUM_REG_RC_LOG" ); +#endif PORT_MAP(_component,src ,"out_INSERT_"+toString(i)+"_NUM_REG_RC_PHY" , dest,"out_INSERT_"+toString(i)+"_NUM_REG_RC_PHY" ); @@ -582,16 +594,16 @@ PORT_MAP(_component,src , "in_RETIRE_"+toString(i)+"_CONTEXT_ID" , dest, "in_RETIRE_"+toString(i)+"_CONTEXT_ID" ); - PORT_MAP(_component,src , "in_RETIRE_"+toString(i)+"_READ_RA" , - dest, "in_RETIRE_"+toString(i)+"_READ_RA" ); - PORT_MAP(_component,src , "in_RETIRE_"+toString(i)+"_NUM_REG_RA_PHY" , - dest, "in_RETIRE_"+toString(i)+"_NUM_REG_RA_PHY" ); - PORT_MAP(_component,src , "in_RETIRE_"+toString(i)+"_READ_RB" , - dest, "in_RETIRE_"+toString(i)+"_READ_RB" ); - PORT_MAP(_component,src , "in_RETIRE_"+toString(i)+"_NUM_REG_RB_PHY" , - dest, "in_RETIRE_"+toString(i)+"_NUM_REG_RB_PHY" ); - PORT_MAP(_component,src , "in_RETIRE_"+toString(i)+"_READ_RC" , - dest, "in_RETIRE_"+toString(i)+"_READ_RC" ); - PORT_MAP(_component,src , "in_RETIRE_"+toString(i)+"_NUM_REG_RC_PHY" , - dest, "in_RETIRE_"+toString(i)+"_NUM_REG_RC_PHY" ); +// PORT_MAP(_component,src , "in_RETIRE_"+toString(i)+"_READ_RA" , +// dest, "in_RETIRE_"+toString(i)+"_READ_RA" ); +// PORT_MAP(_component,src , "in_RETIRE_"+toString(i)+"_NUM_REG_RA_PHY" , +// dest, "in_RETIRE_"+toString(i)+"_NUM_REG_RA_PHY" ); +// PORT_MAP(_component,src , "in_RETIRE_"+toString(i)+"_READ_RB" , +// dest, "in_RETIRE_"+toString(i)+"_READ_RB" ); +// PORT_MAP(_component,src , "in_RETIRE_"+toString(i)+"_NUM_REG_RB_PHY" , +// dest, "in_RETIRE_"+toString(i)+"_NUM_REG_RB_PHY" ); +// PORT_MAP(_component,src , "in_RETIRE_"+toString(i)+"_READ_RC" , +// dest, "in_RETIRE_"+toString(i)+"_READ_RC" ); +// PORT_MAP(_component,src , "in_RETIRE_"+toString(i)+"_NUM_REG_RC_PHY" , +// dest, "in_RETIRE_"+toString(i)+"_NUM_REG_RC_PHY" ); PORT_MAP(_component,src , "in_RETIRE_"+toString(i)+"_WRITE_RD" , dest, "in_RETIRE_"+toString(i)+"_WRITE_RD" ); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/src/Rename_unit_deallocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/src/Rename_unit_deallocation.cpp (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/src/Rename_unit_deallocation.cpp (revision 121) @@ -76,11 +76,17 @@ DELETE1_SIGNAL(out_INSERT_EXCEPTION ,_param->_nb_inst_insert,_param->_size_exception ); DELETE1_SIGNAL(out_INSERT_READ_RA ,_param->_nb_inst_insert,1 ); +#ifdef DEBUG DELETE1_SIGNAL(out_INSERT_NUM_REG_RA_LOG ,_param->_nb_inst_insert,_param->_size_general_register_logic); +#endif DELETE1_SIGNAL(out_INSERT_NUM_REG_RA_PHY ,_param->_nb_inst_insert,_param->_size_general_register ); DELETE1_SIGNAL(out_INSERT_READ_RB ,_param->_nb_inst_insert,1 ); +#ifdef DEBUG DELETE1_SIGNAL(out_INSERT_NUM_REG_RB_LOG ,_param->_nb_inst_insert,_param->_size_general_register_logic); +#endif DELETE1_SIGNAL(out_INSERT_NUM_REG_RB_PHY ,_param->_nb_inst_insert,_param->_size_general_register ); DELETE1_SIGNAL(out_INSERT_READ_RC ,_param->_nb_inst_insert,1 ); +#ifdef DEBUG DELETE1_SIGNAL(out_INSERT_NUM_REG_RC_LOG ,_param->_nb_inst_insert,_param->_size_special_register_logic); +#endif DELETE1_SIGNAL(out_INSERT_NUM_REG_RC_PHY ,_param->_nb_inst_insert,_param->_size_special_register ); DELETE1_SIGNAL(out_INSERT_WRITE_RD ,_param->_nb_inst_insert,1 ); @@ -103,10 +109,10 @@ DELETE1_SIGNAL( in_RETIRE_STORE_QUEUE_PTR_WRITE,_param->_nb_inst_retire,_param->_size_store_queue_ptr ); DELETE1_SIGNAL( in_RETIRE_LOAD_QUEUE_PTR_WRITE ,_param->_nb_inst_retire,_param->_size_load_queue_ptr ); - DELETE1_SIGNAL( in_RETIRE_READ_RA ,_param->_nb_inst_retire,1 ); - DELETE1_SIGNAL( in_RETIRE_NUM_REG_RA_PHY ,_param->_nb_inst_retire,_param->_size_general_register ); - DELETE1_SIGNAL( in_RETIRE_READ_RB ,_param->_nb_inst_retire,1 ); - DELETE1_SIGNAL( in_RETIRE_NUM_REG_RB_PHY ,_param->_nb_inst_retire,_param->_size_general_register ); - DELETE1_SIGNAL( in_RETIRE_READ_RC ,_param->_nb_inst_retire,1 ); - DELETE1_SIGNAL( in_RETIRE_NUM_REG_RC_PHY ,_param->_nb_inst_retire,_param->_size_special_register ); +// DELETE1_SIGNAL( in_RETIRE_READ_RA ,_param->_nb_inst_retire,1 ); +// DELETE1_SIGNAL( in_RETIRE_NUM_REG_RA_PHY ,_param->_nb_inst_retire,_param->_size_general_register ); +// DELETE1_SIGNAL( in_RETIRE_READ_RB ,_param->_nb_inst_retire,1 ); +// DELETE1_SIGNAL( in_RETIRE_NUM_REG_RB_PHY ,_param->_nb_inst_retire,_param->_size_general_register ); +// DELETE1_SIGNAL( in_RETIRE_READ_RC ,_param->_nb_inst_retire,1 ); +// DELETE1_SIGNAL( in_RETIRE_NUM_REG_RC_PHY ,_param->_nb_inst_retire,_param->_size_special_register ); DELETE1_SIGNAL( in_RETIRE_WRITE_RD ,_param->_nb_inst_retire,1 ); DELETE1_SIGNAL( in_RETIRE_NUM_REG_RD_LOG ,_param->_nb_inst_retire,_param->_size_general_register_logic); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/src/OOO_Engine_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/src/OOO_Engine_allocation.cpp (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/src/OOO_Engine_allocation.cpp (revision 121) @@ -519,4 +519,5 @@ COMPONENT_MAP(_component,src ,"out_INSERT_"+toString(j) +"_EXCEPTION" , dest, "in_INSERT_"+toString(i)+"_"+toString(j)+"_EXCEPTION" ); +#ifdef DEBUG COMPONENT_MAP(_component,src ,"out_INSERT_"+toString(j) +"_NUM_REG_RA_LOG", dest, "in_INSERT_"+toString(i)+"_"+toString(j)+"_NUM_REG_RA_LOG"); @@ -525,4 +526,5 @@ COMPONENT_MAP(_component,src ,"out_INSERT_"+toString(j) +"_NUM_REG_RC_LOG", dest, "in_INSERT_"+toString(i)+"_"+toString(j)+"_NUM_REG_RC_LOG"); +#endif COMPONENT_MAP(_component,src ,"out_INSERT_"+toString(j) +"_NUM_REG_RD_LOG", dest, "in_INSERT_"+toString(i)+"_"+toString(j)+"_NUM_REG_RD_LOG"); @@ -635,16 +637,16 @@ COMPONENT_MAP(_component,src , "in_RETIRE_"+toString(j)+ "_LOAD_QUEUE_PTR_WRITE" , dest,"out_RETIRE_"+toString(i)+"_"+toString(j)+"_LOAD_QUEUE_PTR_WRITE" ); - COMPONENT_MAP(_component,src , "in_RETIRE_"+toString(j)+ "_READ_RA" , - dest,"out_RETIRE_"+toString(i)+"_"+toString(j)+"_READ_RA" ); - COMPONENT_MAP(_component,src , "in_RETIRE_"+toString(j)+ "_NUM_REG_RA_PHY" , - dest,"out_RETIRE_"+toString(i)+"_"+toString(j)+"_NUM_REG_RA_PHY" ); - COMPONENT_MAP(_component,src , "in_RETIRE_"+toString(j)+ "_READ_RB" , - dest,"out_RETIRE_"+toString(i)+"_"+toString(j)+"_READ_RB" ); - COMPONENT_MAP(_component,src , "in_RETIRE_"+toString(j)+ "_NUM_REG_RB_PHY" , - dest,"out_RETIRE_"+toString(i)+"_"+toString(j)+"_NUM_REG_RB_PHY" ); - COMPONENT_MAP(_component,src , "in_RETIRE_"+toString(j)+ "_READ_RC" , - dest,"out_RETIRE_"+toString(i)+"_"+toString(j)+"_READ_RC" ); - COMPONENT_MAP(_component,src , "in_RETIRE_"+toString(j)+ "_NUM_REG_RC_PHY" , - dest,"out_RETIRE_"+toString(i)+"_"+toString(j)+"_NUM_REG_RC_PHY" ); +// COMPONENT_MAP(_component,src , "in_RETIRE_"+toString(j)+ "_READ_RA" , +// dest,"out_RETIRE_"+toString(i)+"_"+toString(j)+"_READ_RA" ); +// COMPONENT_MAP(_component,src , "in_RETIRE_"+toString(j)+ "_NUM_REG_RA_PHY" , +// dest,"out_RETIRE_"+toString(i)+"_"+toString(j)+"_NUM_REG_RA_PHY" ); +// COMPONENT_MAP(_component,src , "in_RETIRE_"+toString(j)+ "_READ_RB" , +// dest,"out_RETIRE_"+toString(i)+"_"+toString(j)+"_READ_RB" ); +// COMPONENT_MAP(_component,src , "in_RETIRE_"+toString(j)+ "_NUM_REG_RB_PHY" , +// dest,"out_RETIRE_"+toString(i)+"_"+toString(j)+"_NUM_REG_RB_PHY" ); +// COMPONENT_MAP(_component,src , "in_RETIRE_"+toString(j)+ "_READ_RC" , +// dest,"out_RETIRE_"+toString(i)+"_"+toString(j)+"_READ_RC" ); +// COMPONENT_MAP(_component,src , "in_RETIRE_"+toString(j)+ "_NUM_REG_RC_PHY" , +// dest,"out_RETIRE_"+toString(i)+"_"+toString(j)+"_NUM_REG_RC_PHY" ); COMPONENT_MAP(_component,src , "in_RETIRE_"+toString(j)+ "_NUM_REG_RD_LOG" , dest,"out_RETIRE_"+toString(i)+"_"+toString(j)+"_NUM_REG_RD_LOG" ); @@ -755,4 +757,5 @@ COMPONENT_MAP(_component,src , "in_INSERT_"+toString(i)+"_"+toString(j)+ "_LOAD_QUEUE_PTR_WRITE" , dest,"out_INSERT_"+toString(i)+"_"+toString(j)+"_COMMIT_UNIT_LOAD_QUEUE_PTR_WRITE" ); +#ifdef DEBUG COMPONENT_MAP(_component,src , "in_INSERT_"+toString(i)+"_"+toString(j)+ "_READ_RA" , dest,"out_INSERT_"+toString(i)+"_"+toString(j)+"_COMMIT_UNIT_READ_RA" ); @@ -767,4 +770,5 @@ COMPONENT_MAP(_component,src , "in_INSERT_"+toString(i)+"_"+toString(j)+ "_NUM_REG_RC_PHY" , dest,"out_INSERT_"+toString(i)+"_"+toString(j)+"_COMMIT_UNIT_NUM_REG_RC_PHY" ); +#endif COMPONENT_MAP(_component,src , "in_INSERT_"+toString(i)+"_"+toString(j)+ "_WRITE_RD" , dest,"out_INSERT_"+toString(i)+"_"+toString(j)+"_COMMIT_UNIT_WRITE_RD" ); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Version.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Version.h (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Version.h (revision 121) @@ -10,8 +10,8 @@ #define MORPHEO_MAJOR_VERSION "0" #define MORPHEO_MINOR_VERSION "2" -#define MORPHEO_REVISION "120" +#define MORPHEO_REVISION "121" #define MORPHEO_CODENAME "Castor" -#define MORPHEO_DATE_DAY "26" +#define MORPHEO_DATE_DAY "27" #define MORPHEO_DATE_MONTH "05" #define MORPHEO_DATE_YEAR "2009" Index: trunk/IPs/systemC/processor/Morpheo/Common/include/Filename.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Common/include/Filename.h (revision 120) +++ trunk/IPs/systemC/processor/Morpheo/Common/include/Filename.h (revision 121) @@ -10,8 +10,5 @@ #include "Common/include/ToString.h" -#include -#include -#include -#include +#include namespace morpheo { @@ -24,66 +21,5 @@ bool with_pid, bool overwrite - ) - { - std::string str = directory+"/"+filename_prefix; - - if (with_date) - { - time_t current_time; - time (¤t_time); - - struct tm * _localtime = localtime (¤t_time); - - int year = 1900+_localtime->tm_year; - int mon = 1+_localtime->tm_mon ; - int mday = _localtime->tm_mday; - int hour = _localtime->tm_hour; - int min = _localtime->tm_min ; - int sec = _localtime->tm_sec ; - - str+= "_"+ toString(year) - +((mon <10)?"0":"") + toString(mon ) - +((mday<10)?"0":"") + toString(mday) - +"_"+((hour<10)?"0":"") + toString(hour) - +((min <10)?"0":"") + toString(min ) - +((sec <10)?"0":"") + toString(sec ); - } - - if (with_pid) - { - str+="_"+toString(getpid()); - } - - str+=filename_suffix; - - if (not overwrite) - { - int it = 0; - bool find; - do - { - find = false; - - std::ifstream inputStream; - std::string name = str+((it!=0)?("_"+toString(it)):""); - - inputStream.open(name.c_str(),std::ios_base::in); - - if (inputStream) - { - find = true; - it ++; - } - inputStream.close(); - } - while (find); - - str+= str+((it!=0)?("_"+toString(it)):""); - } - - str+="."+extension; - - return str; - } + ); }; // end namespace morpheo Index: trunk/Softwares/Test/Test_073/src/c/main.c =================================================================== --- trunk/Softwares/Test/Test_073/src/c/main.c (revision 120) +++ trunk/Softwares/Test/Test_073/src/c/main.c (revision 121) @@ -40,5 +40,6 @@ const int it3 = 10; - for (i0 = 0; i0 < it0; ++i0) + for (i0 = 0; i0 < it0; ++i0); +