Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Configuration.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Configuration.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Configuration.cpp (revision 110) @@ -43,5 +43,6 @@ fromString (_simulator->getParam("debug_cycle_start")), fromString (_simulator->getParam("debug_cycle_stop")), - fromString (_simulator->getParam("debug_cycle_idle"))); + fromString (_simulator->getParam("debug_idle_cycle")), + fromString (_simulator->getParam("debug_idle_time"))); log_init(fromString(_simulator->getParam("debug_have_log_file")), @@ -124,4 +125,5 @@ delete _generator; delete _instance; +// simulation_destroy(); delete _param_statistics; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Simulator_fromFile.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Simulator_fromFile.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Simulator_fromFile.cpp (revision 110) @@ -74,9 +74,9 @@ } //-------------------------------------------- - // Child : Simulation + // Child : Component //-------------------------------------------- else { - testNodeName (xml,"simulation"); + testNodeName (xml,"component"); testSingleton (xml,true); } Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/include/Load_store_unit.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/include/Load_store_unit.h (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/include/Load_store_unit.h (revision 110) @@ -67,4 +67,8 @@ private : counter_t * _stat_percent_use_load_queue; private : counter_t * _stat_percent_use_speculative_access_queue; + + private : counter_t * _stat_nb_inst_load; + private : counter_t * _stat_nb_inst_load_commit_speculative; + private : counter_t * _stat_nb_inst_load_commit_miss; // private : counter_t * _stat_nb_load_miss_speculation; @@ -226,5 +230,6 @@ #ifdef STATISTICS - public : void statistics_declaration (morpheo::behavioural::Parameters_Statistics * param_statistics); + public : void statistics_allocation (morpheo::behavioural::Parameters_Statistics * param_statistics); + public : void statistics_deallocation (void); #endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit.cpp (revision 110) @@ -56,5 +56,5 @@ log_printf(INFO,Load_store_unit,FUNCTION,"Allocation of statistics"); - statistics_declaration(param_statistics); + statistics_allocation(param_statistics); } #endif @@ -181,9 +181,5 @@ #ifdef STATISTICS if (usage_is_set(_usage,USE_STATISTICS)) - { - log_printf(INFO,Load_store_unit,FUNCTION,"Generate Statistics file"); - - delete _stat; - } + statistics_deallocation (); #endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit_function_speculative_load_commit_transition.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit_function_speculative_load_commit_transition.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit_function_speculative_load_commit_transition.cpp (revision 110) @@ -602,4 +602,9 @@ _load_queue[index_load]._exception = EXCEPTION_MEMORY_MISS_SPECULATION; _load_queue[index_load]._write_rd = 1; // write the good result + +#ifdef STATISTICS + if (usage_is_set(_usage,USE_STATISTICS)) + (*_stat_nb_inst_load_commit_miss) ++; +#endif } @@ -696,5 +701,5 @@ #ifdef DEBUG_TEST if (is_operation_memory_store_head(operation) == true) - throw ErrorMorpheo(_("Transaction in memory_in's interface, actual state of store_queue is \"STORE_QUEUE_NO_VALID_NO_SPECULATIVE\", also a previous store_head have been receiveid. But this operation is a store_head.")); + throw ERRORMORPHEO(FUNCTION,_("Transaction in memory_in's interface, actual state of store_queue is \"STORE_QUEUE_NO_VALID_NO_SPECULATIVE\", also a previous store_head have been receiveid. But this operation is a store_head.")); #endif // Test if have a new exception (priority : miss_speculation) @@ -714,5 +719,5 @@ #ifdef DEBUG_TEST if (is_operation_memory_store_head(operation) == false) - throw ErrorMorpheo(_("Transaction in memory_in's interface, actual state of store_queue is \"STORE_QUEUE_VALID_SPECULATIVE\", also a previous access with register and address have been receiveid. But this operation is a not store_head.")); + throw ERRORMORPHEO(FUNCTION,_("Transaction in memory_in's interface, actual state of store_queue is \"STORE_QUEUE_VALID_SPECULATIVE\", also a previous access with register and address have been receiveid. But this operation is a not store_head.")); #endif if (operation == OPERATION_MEMORY_STORE_HEAD_KO) @@ -729,5 +734,5 @@ case STORE_QUEUE_COMMIT : { - throw ErrorMorpheo(" Invalid state and operation"); + throw ERRORMORPHEO(FUNCTION," Invalid state and operation"); } } @@ -847,4 +852,10 @@ // if the speculation is a miss, write_rd is re set at 1. _load_queue [internal_MEMORY_OUT_PTR]._write_rd = 0; + +#ifdef STATISTICS + if (usage_is_set(_usage,USE_STATISTICS)) + (*_stat_nb_inst_load_commit_speculative) ++; +#endif + break; } @@ -889,5 +900,5 @@ case SELECT_LOAD_QUEUE : { - throw ErrorMorpheo(_("Invalid selection")); + throw ERRORMORPHEO(FUNCTION,_("Invalid selection")); break; } @@ -964,5 +975,10 @@ _speculative_access_queue_control->pop(); - } + +#ifdef STATISTICS + if (usage_is_set(_usage,USE_STATISTICS)) + (*_stat_nb_inst_load) ++; +#endif + } //================================================================ @@ -993,5 +1009,5 @@ #ifdef DEBUG_TEST if (not have_dcache_rsp(_load_queue [packet_id]._operation)) - throw ErrorMorpheo(_("Receive of respons, but the corresponding operation don't wait a respons.")); + throw ERRORMORPHEO(FUNCTION,_("Receive of respons, but the corresponding operation don't wait a respons.")); #endif @@ -1032,5 +1048,5 @@ case LOAD_QUEUE_WAIT_CHECK : _load_queue [packet_id]._state = LOAD_QUEUE_COMMIT_CHECK; break; case LOAD_QUEUE_WAIT : _load_queue [packet_id]._state = LOAD_QUEUE_COMMIT ; break; - default : throw ErrorMorpheo(_("Illegal state (dcache_rsp).")); break; + default : throw ERRORMORPHEO(FUNCTION,_("Illegal state (dcache_rsp).")); break; } } Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit_statistics_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit_statistics_allocation.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit_statistics_allocation.cpp (revision 110) @@ -0,0 +1,72 @@ +#ifdef STATISTICS +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/include/Load_store_unit.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_execute_loop { +namespace execute_loop { +namespace multi_execute_unit { +namespace execute_unit { +namespace load_store_unit { + + +#undef FUNCTION +#define FUNCTION "Load_store_unit::statistics_allocation" + void Load_store_unit::statistics_allocation (morpheo::behavioural::Parameters_Statistics * param_statistics) + { + log_printf(FUNC,Load_store_unit,FUNCTION,"Begin"); + + _stat = new Stat (static_cast(_name), + "Load_store_unit", + param_statistics); + + _stat_use_store_queue = _stat->create_variable("use_store_queue"); + _stat_use_load_queue = _stat->create_variable("use_load_queue"); + _stat_use_speculative_access_queue = _stat->create_variable("use_speculative_access_queue"); + + _stat_average_use_store_queue = _stat->create_counter("average_use_store_queue" , "", "Average by cycle of the store_queue occupation "); + _stat_average_use_load_queue = _stat->create_counter("average_use_load_queue" , "", "Average by cycle of the load_queue occupation"); + _stat_average_use_speculative_access_queue = _stat->create_counter("average_use_speculative_access_queue" , "", "Average by cycle of the speculative_access_queue occupation"); + + _stat_percent_use_store_queue = _stat->create_counter("percent_use_store_queue" , "%", "Percent of store_queue usage"); + _stat_percent_use_load_queue = _stat->create_counter("percent_use_load_queue" , "%", "Percent of load_queue usage"); + _stat_percent_use_speculative_access_queue = _stat->create_counter("percent_use_speculative_access_queue" , "%", "Percent of speculative_access_queue usage"); + + _stat->create_expr("average_use_store_queue" , "/ use_store_queue cycle", false); + _stat->create_expr("average_use_load_queue" , "/ use_load_queue cycle", false); + _stat->create_expr("average_use_speculative_access_queue", "/ use_speculative_access_queue cycle", false); + + _stat->create_expr("percent_use_store_queue" , "/ * average_use_store_queue 100 " + toString(_param->_size_store_queue ), false); + _stat->create_expr("percent_use_load_queue" , "/ * average_use_load_queue 100 " + toString(_param->_size_load_queue ), false); + _stat->create_expr("percent_use_speculative_access_queue" , "/ * average_use_speculative_access_queue 100 " + toString(_param->_size_speculative_access_queue), false); + + + _stat_nb_inst_load = _stat->create_variable("nb_inst_load" ); + _stat_nb_inst_load_commit_speculative = _stat->create_variable("nb_inst_load_commit_speculative"); + _stat_nb_inst_load_commit_miss = _stat->create_variable("nb_inst_load_commit_miss" ); + + _stat->create_expr_percent("percent_nb_inst_load_commit_speculative","nb_inst_load_commit_speculative", "nb_inst_load" , "Percent of load instruction with a speculative commit "); + _stat->create_expr_percent("percent_nb_inst_load_commit_miss" ,"nb_inst_load_commit_miss" , "nb_inst_load_commit_speculative", "Percent of load instruction with a miss speculative commit"); + + + log_printf(FUNC,Load_store_unit,FUNCTION,"End"); + }; + +}; // end namespace load_store_unit +}; // end namespace execute_unit +}; // end namespace multi_execute_unit +}; // end namespace execute_loop +}; // end namespace multi_execute_loop +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit_statistics_deallocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit_statistics_deallocation.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit_statistics_deallocation.cpp (revision 110) @@ -0,0 +1,43 @@ +#ifdef STATISTICS +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/include/Load_store_unit.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_execute_loop { +namespace execute_loop { +namespace multi_execute_unit { +namespace execute_unit { +namespace load_store_unit { + + +#undef FUNCTION +#define FUNCTION "Load_store_unit::statistics_deallocation" + void Load_store_unit::statistics_deallocation (void) + { + log_printf(FUNC,Load_store_unit,FUNCTION,"Begin"); + + log_printf(INFO,Load_store_unit,FUNCTION,"Generate Statistics file"); + + delete _stat; + + log_printf(FUNC,Load_store_unit,FUNCTION,"End"); + }; + +}; // end namespace load_store_unit +}; // end namespace execute_unit +}; // end namespace multi_execute_unit +}; // end namespace execute_loop +}; // end namespace multi_execute_loop +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit_statistics_declaration.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit_statistics_declaration.cpp (revision 109) +++ (revision ) @@ -1,63 +1,0 @@ -#ifdef STATISTICS -/* - * $Id$ - * - * [ Description ] - * - */ - -#include "Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/include/Load_store_unit.h" - -namespace morpheo { -namespace behavioural { -namespace core { -namespace multi_execute_loop { -namespace execute_loop { -namespace multi_execute_unit { -namespace execute_unit { -namespace load_store_unit { - - -#undef FUNCTION -#define FUNCTION "Load_store_unit::statistics_declaration" - void Load_store_unit::statistics_declaration (morpheo::behavioural::Parameters_Statistics * param_statistics) - { - log_printf(FUNC,Load_store_unit,FUNCTION,"Begin"); - - _stat = new Stat (static_cast(_name), - "Load_store_unit", - param_statistics); - - _stat_use_store_queue = _stat->create_variable("use_store_queue"); - _stat_use_load_queue = _stat->create_variable("use_load_queue"); - _stat_use_speculative_access_queue = _stat->create_variable("use_speculative_access_queue"); - - _stat_average_use_store_queue = _stat->create_counter("average_use_store_queue" , "", "Average by cycle of the store_queue occupation "); - _stat_average_use_load_queue = _stat->create_counter("average_use_load_queue" , "", "Average by cycle of the load_queue occupation"); - _stat_average_use_speculative_access_queue = _stat->create_counter("average_use_speculative_access_queue" , "", "Average by cycle of the speculative_access_queue occupation"); - - _stat_percent_use_store_queue = _stat->create_counter("percent_use_store_queue" , "%", "Percent of store_queue usage"); - _stat_percent_use_load_queue = _stat->create_counter("percent_use_load_queue" , "%", "Percent of load_queue usage"); - _stat_percent_use_speculative_access_queue = _stat->create_counter("percent_use_speculative_access_queue" , "%", "Percent of speculative_access_queue usage"); - - _stat->create_expr("average_use_store_queue" , "/ use_store_queue cycle", false); - _stat->create_expr("average_use_load_queue" , "/ use_load_queue cycle", false); - _stat->create_expr("average_use_speculative_access_queue", "/ use_speculative_access_queue cycle", false); - - _stat->create_expr("percent_use_store_queue" , "/ * average_use_store_queue 100 " + toString(_param->_size_store_queue ), false); - _stat->create_expr("percent_use_load_queue" , "/ * average_use_load_queue 100 " + toString(_param->_size_load_queue ), false); - _stat->create_expr("percent_use_speculative_access_queue" , "/ * average_use_speculative_access_queue 100 " + toString(_param->_size_speculative_access_queue), false); - - log_printf(FUNC,Load_store_unit,FUNCTION,"End"); - }; - -}; // end namespace load_store_unit -}; // end namespace execute_unit -}; // end namespace multi_execute_unit -}; // end namespace execute_loop -}; // end namespace multi_execute_loop -}; // end namespace core - -}; // end namespace behavioural -}; // end namespace morpheo -#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station/src/Reservation_station_genMoore.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station/src/Reservation_station_genMoore.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station/src/Reservation_station_genMoore.cpp (revision 110) @@ -4,5 +4,5 @@ * $Id$ * - * [ Description ] + * [ Description ] * */ @@ -27,5 +27,5 @@ log_function(Reservation_station,FUNCTION,_name.c_str()); - // ~~~~~[ Interface "insert" ]~~~~~~~~~~~~~~~~~~~~~~~~ + // ~~~~~[ Interface "insert" ]~~~~~~~~~~~~~~~~~~~~~~~~ // accept a new instructions when reservation_station is not full @@ -38,5 +38,5 @@ PORT_WRITE(out_INSERT_ACK, internal_INSERT_ACK); - // ~~~~~[ Interface "retire" ]~~~~~~~~~~~~~~~~~~~~~~~ + // ~~~~~[ Interface "retire" ]~~~~~~~~~~~~~~~~~~~~~~~ uint32_t index_queue=0; @@ -46,5 +46,7 @@ { bool val = false; - uint32_t index_find = 0;; + uint32_t index_find = 0; + + log_printf(TRACE,Reservation_station,FUNCTION," * RETIRE [%d]",i); for (; ( @@ -67,5 +69,5 @@ ( #ifdef SYSTEMC_VHDL_COMPATIBILITY - _queue_valid [index_queue] and + _queue_valid [index_queue] and #endif _queue[index_find]._data_ra_val and @@ -74,9 +76,17 @@ ); -// cout << "========== Moore : " << endl -// << " * i : " << i << endl -// << " * val : " << val << endl -// << " * index_queue : " << index_queue << endl -// << " * index_find : " << index_find << endl; + log_printf( +#ifdef SYSTEMC_VHDL_COMPATIBILITY + TRACE,Reservation_station,FUNCTION," [%d] valid : %d, data ra %d, rb %d, rc %d - %d", + index_find, + _queue_valid [index_queue], +#else + TRACE,Reservation_station,FUNCTION," [%d] data ra %d, rb %d, rc %d - %d", + index_find, +#endif + _queue[index_find]._data_ra_val, + _queue[index_find]._data_rb_val, + _queue[index_find]._data_rc_val, + val); } Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/SelfTest/src/test.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/SelfTest/src/test.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/SelfTest/src/test.cpp (revision 110) @@ -100,5 +100,5 @@ ALLOC1_SC_SIGNAL(out_PREDICT_ADDRESS_SRC ,"out_PREDICT_ADDRESS_SRC ",Tgeneral_data_t ,_param->_nb_inst_decod); ALLOC1_SC_SIGNAL(out_PREDICT_ADDRESS_DEST ,"out_PREDICT_ADDRESS_DEST ",Tgeneral_data_t ,_param->_nb_inst_decod); -// ALLOC1_SC_SIGNAL( in_PREDICT_CAN_CONTINUE ," in_PREDICT_CAN_CONTINUE ",Tcontrol_t ,_param->_nb_inst_decod); + ALLOC1_SC_SIGNAL( in_PREDICT_CAN_CONTINUE ," in_PREDICT_CAN_CONTINUE ",Tcontrol_t ,_param->_nb_inst_decod); ALLOC1_SC_SIGNAL( in_CONTEXT_DECOD_ENABLE ," in_CONTEXT_DECOD_ENABLE ",Tcontrol_t ,_param->_nb_context); ALLOC1_SC_SIGNAL( in_CONTEXT_DEPTH_VAL ," in_CONTEXT_DEPTH_VAL ",Tcontrol_t ,_param->_nb_context); @@ -183,5 +183,5 @@ INSTANCE1_SC_SIGNAL(_Decod,out_PREDICT_ADDRESS_SRC ,_param->_nb_inst_decod); INSTANCE1_SC_SIGNAL(_Decod,out_PREDICT_ADDRESS_DEST ,_param->_nb_inst_decod); -// INSTANCE1_SC_SIGNAL(_Decod, in_PREDICT_CAN_CONTINUE ,_param->_nb_inst_decod); + INSTANCE1_SC_SIGNAL(_Decod, in_PREDICT_CAN_CONTINUE ,_param->_nb_inst_decod); INSTANCE1_SC_SIGNAL(_Decod, in_CONTEXT_DECOD_ENABLE ,_param->_nb_context); INSTANCE1_SC_SIGNAL(_Decod, in_CONTEXT_DEPTH_VAL ,_param->_nb_context); @@ -306,5 +306,5 @@ in_PREDICT_ACK [i]->write((rand()%100)write(0); + in_PREDICT_CAN_CONTINUE [i]->write(0); } } @@ -486,5 +486,5 @@ delete [] out_PREDICT_ADDRESS_SRC ; delete [] out_PREDICT_ADDRESS_DEST ; -//delete [] in_PREDICT_CAN_CONTINUE ; + delete [] in_PREDICT_CAN_CONTINUE ; delete [] in_CONTEXT_DECOD_ENABLE ; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/include/Decod.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/include/Decod.h (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/include/Decod.h (revision 110) @@ -119,5 +119,5 @@ public : SC_OUT(Tgeneral_data_t ) ** out_PREDICT_ADDRESS_SRC ;//[nb_inst_decod] public : SC_OUT(Tgeneral_data_t ) ** out_PREDICT_ADDRESS_DEST ;//[nb_inst_decod] -//public : SC_IN (Tcontrol_t ) ** in_PREDICT_CAN_CONTINUE ;//[nb_inst_decod] + public : SC_IN (Tcontrol_t ) ** in_PREDICT_CAN_CONTINUE ;//[nb_inst_decod] // ~~~~~[ Interface : "context" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/src/Decod_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/src/Decod_allocation.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/src/Decod_allocation.cpp (revision 110) @@ -124,5 +124,5 @@ ALLOC1_SIGNAL_OUT(out_PREDICT_ADDRESS_SRC ,"address_src" ,Tgeneral_data_t ,_param->_size_instruction_address ); ALLOC1_SIGNAL_OUT(out_PREDICT_ADDRESS_DEST ,"address_dest" ,Tgeneral_data_t ,_param->_size_instruction_address ); -// ALLOC1_SIGNAL_IN ( in_PREDICT_CAN_CONTINUE ,"can_continue" ,Tcontrol_t ,1 ); + ALLOC1_SIGNAL_IN ( in_PREDICT_CAN_CONTINUE ,"can_continue" ,Tcontrol_t ,1 ); } Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/src/Decod_deallocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/src/Decod_deallocation.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/src/Decod_deallocation.cpp (revision 110) @@ -79,5 +79,5 @@ DELETE1_SIGNAL(out_PREDICT_ADDRESS_SRC ,_param->_nb_inst_decod,_param->_size_instruction_address ); DELETE1_SIGNAL(out_PREDICT_ADDRESS_DEST ,_param->_nb_inst_decod,_param->_size_instruction_address ); -// DELETE1_SIGNAL( in_PREDICT_CAN_CONTINUE ,_param->_nb_inst_decod,1 ); + DELETE1_SIGNAL( in_PREDICT_CAN_CONTINUE ,_param->_nb_inst_decod,1 ); DELETE1_SIGNAL(in_CONTEXT_DECOD_ENABLE, _param->_nb_context,1); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/src/Decod_genMealy.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/src/Decod_genMealy.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/src/Decod_genMealy.cpp (revision 110) @@ -43,6 +43,5 @@ Tcontrol_t can_continue [_param->_nb_context]; -// Tcontrol_t can_continue_next [_param->_nb_context]; -// Tcontrol_t have_decod_branch [_param->_nb_context]; + Tcontrol_t have_decod_branch [_param->_nb_context]; for (uint32_t i=0; i<_param->_nb_context; i++) @@ -53,6 +52,5 @@ can_continue [i] = PORT_READ(in_CONTEXT_DECOD_ENABLE [i]); -// can_continue_next [i] = PORT_READ(in_CONTEXT_DECOD_ENABLE [i]); -// have_decod_branch [i] = false; + have_decod_branch [i] = false; } @@ -80,6 +78,4 @@ log_printf(TRACE,Decod,FUNCTION," * IFETCH [%d][%d]",x,y); log_printf(TRACE,Decod,FUNCTION," * decod_ack [%d] : %d",i,PORT_READ(in_DECOD_ACK [i])); - -// can_continue [x] = can_continue_next [x]; decod_val [i] = true; // fetch_val and decod_enable @@ -131,6 +127,10 @@ Ttype_t type = _decod_instruction->_type; - Tdepth_t depth = (_param->_have_port_depth)?PORT_READ(in_CONTEXT_DEPTH [x]):0; // DEPTH_CURRENT - + // Depth current. If have decod a branch and i can continue : depth = depth_next + Tdepth_t depth = (_param->_have_port_depth)?PORT_READ(in_CONTEXT_DEPTH [x]):0; + + if ((_param->_nb_branch_speculated[x] > 0) and have_decod_branch [x]) + depth = (depth+1)%_param->_nb_branch_speculated[x]; + if (_param->_have_port_context_id) PORT_WRITE(out_DECOD_CONTEXT_ID [i], x); @@ -179,8 +179,9 @@ log_printf(TRACE,Decod,FUNCTION," * address dest : %.8x (%.8x)",_decod_instruction->_address_next,_decod_instruction->_address_next<<2); - predict_val [i] = ifetch_ack [x][y] // and decod_val [i] + // test if have already decod an branch : one branch per context + predict_val [i] = not have_decod_branch [x] and ifetch_ack [x][y] // and decod_val [i] ; - decod_val [i] &= PORT_READ(in_PREDICT_ACK [i]);// predict_ack and fetch_val and decod_enable - ifetch_ack [x][y] &= PORT_READ(in_PREDICT_ACK [i]);// predict_ack and fetch_val and decod_enable and decod_ack + decod_val [i] &= not have_decod_branch [x] and PORT_READ(in_PREDICT_ACK [i]);// predict_ack and fetch_val and decod_enable + ifetch_ack [x][y] &= not have_decod_branch [x] and PORT_READ(in_PREDICT_ACK [i]);// predict_ack and fetch_val and decod_enable and decod_ack if (_param->_have_port_context_id) @@ -196,8 +197,9 @@ PORT_WRITE(out_PREDICT_ADDRESS_DEST [i],_decod_instruction->_address_next ); - //can_continue_next [x] = PORT_READ(in_PREDICT_CAN_CONTINUE [i]); // can continue is set if direction is "not take" (also, continue is sequential order) - can_continue [x] = false; // one branch per context, the DS don't execute -// can_continue_next [x] = false; // one branch per context, the DS don't execute -// have_decod_branch [x] = true; + // can continue is set if direction is "not take" (also, continue is sequential order) + +// can_continue [x] = false; // one branch per context, the DS don't execute + can_continue [x]&= PORT_READ(in_PREDICT_CAN_CONTINUE [i]); // one branch per context, the DS don't execute + have_decod_branch [x] = true; } Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/src/Decod_statistics_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/src/Decod_statistics_allocation.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/src/Decod_statistics_allocation.cpp (revision 110) @@ -33,6 +33,4 @@ _stat->create_expr_average_by_cycle ("average_nb_inst_decod","sum_inst_decod","","Average of decod instruction by cycle"); _stat->create_expr_percent ("percent_nb_inst_decod","average_nb_inst_decod", toString(_param->_nb_inst_decod), "Percent of decod instruction by cycle"); - - log_printf(FUNC,Decod,FUNCTION,"End"); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod_queue/include/Decod_queue.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod_queue/include/Decod_queue.h (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod_queue/include/Decod_queue.h (revision 110) @@ -55,4 +55,8 @@ private : counter_t ** _stat_nb_inst; private : counter_t * _stat_use_queue; + + private : counter_t * _stat_sum_inst_enable; + private : counter_t * _stat_sum_transaction_decod_in; + private : counter_t * _stat_average_occupation_bundle; #endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod_queue/src/Decod_queue_statistics_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod_queue/src/Decod_queue_statistics_allocation.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod_queue/src/Decod_queue_statistics_allocation.cpp (revision 110) @@ -29,4 +29,11 @@ param_statistics); + _stat_sum_transaction_decod_in = _stat->create_variable("sum_transaction_decod_in"); + _stat_sum_inst_enable = _stat->create_variable("sum_inst_enable"); + _stat_average_occupation_bundle= _stat->create_counter ("average_occupation_bundle", "", "Occupation average of instruction's bundle."); + + _stat->create_expr ("average_occupation_bundle" ,"/ sum_inst_enable sum_transaction_decod_in"); + _stat->create_expr_percent ("percent_occupation_bundle" ,"average_occupation_bundle", toString(_param->_nb_inst_decod),"Percent of instruction's bundle occupation."); + _stat_use_queue = _stat->create_variable ("use_queue"); _stat_nb_inst = new counter_t * [_param->_nb_context]; @@ -39,5 +46,5 @@ _stat->create_expr_average_by_cycle("average_inst_"+toString(i), "nb_inst_"+toString(i), "", toString(_("Average instruction number in decod_queue by cycle (context %d)"),i)); - _stat->create_expr_percent ("percent_use_inst_"+toString(i) , "average_inst_"+toString(i), toString(_param->_size_queue), toString(_("Percent decod_queue's occupation (context %d)"),i)); + _stat->create_expr_percent ("percent_use_inst_"+toString(i) , "average_inst_"+toString(i), toString(_param->_nb_instruction_in_queue), toString(_("Percent decod_queue's occupation (context %d)"),i)); if (i == 0) @@ -48,8 +55,8 @@ _stat->create_expr_average_by_cycle("average_inst", expr_average_inst, "", _("Average instruction number in decod_queue by cycle (all context)")); - _stat->create_expr_percent ("percent_use_inst" , "average_inst", toString(_param->_size_queue), _("Percent decod_queue's occupation (all context)")); + _stat->create_expr_percent ("percent_use_inst" , "average_inst", toString(_param->_nb_instruction_in_queue), _("Percent decod_queue's occupation (all context)")); _stat->create_expr_average_by_cycle("average_use_queue", "use_queue", "", _("Average slot decod_queue occupation by cycle.")); - _stat->create_expr_percent ("percent_use_queue", "average_use_queue", toString(_param->_size_queue), _("Percent slot decod_queue occupation.")); + _stat->create_expr_percent ("percent_use_queue", "average_use_queue", toString(_param->_nb_instruction_in_queue), _("Percent slot decod_queue occupation.")); log_end(Decod_queue,FUNCTION); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod_queue/src/Decod_queue_transition.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod_queue/src/Decod_queue_transition.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod_queue/src/Decod_queue_transition.cpp (revision 110) @@ -51,5 +51,15 @@ entry = new decod_queue_entry_t (_param->_nb_inst_decod); reg_QUEUE->push_back(entry); + +#ifdef STATISTICS + if (usage_is_set(_usage,USE_STATISTICS)) + (*_stat_sum_transaction_decod_in) ++; +#endif } + +#ifdef STATISTICS + if (usage_is_set(_usage,USE_STATISTICS)) + (*_stat_sum_inst_enable) ++; +#endif Tcontext_t context = (_param->_have_port_context_id)?PORT_READ(in_DECOD_IN_CONTEXT_ID [i]):0; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/SelfTest/src/test.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/SelfTest/src/test.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/SelfTest/src/test.cpp (revision 110) @@ -103,5 +103,5 @@ ALLOC1_SC_SIGNAL(out_PREDICT_ADDRESS_SRC ,"out_PREDICT_ADDRESS_SRC ",Tgeneral_data_t ,_param->_nb_inst_decod); ALLOC1_SC_SIGNAL(out_PREDICT_ADDRESS_DEST ,"out_PREDICT_ADDRESS_DEST ",Tgeneral_data_t ,_param->_nb_inst_decod); -//ALLOC1_SC_SIGNAL( in_PREDICT_CAN_CONTINUE ," in_PREDICT_CAN_CONTINUE ",Tcontrol_t ,_param->_nb_inst_decod); + ALLOC1_SC_SIGNAL( in_PREDICT_CAN_CONTINUE ," in_PREDICT_CAN_CONTINUE ",Tcontrol_t ,_param->_nb_inst_decod); ALLOC1_SC_SIGNAL( in_DEPTH_MIN ," in_DEPTH_MIN ",Tdepth_t ,_param->_nb_context); @@ -194,5 +194,5 @@ INSTANCE1_SC_SIGNAL(_Decod_unit,out_PREDICT_ADDRESS_SRC ,_param->_nb_inst_decod); INSTANCE1_SC_SIGNAL(_Decod_unit,out_PREDICT_ADDRESS_DEST ,_param->_nb_inst_decod); -//INSTANCE1_SC_SIGNAL(_Decod_unit, in_PREDICT_CAN_CONTINUE ,_param->_nb_inst_decod); + INSTANCE1_SC_SIGNAL(_Decod_unit, in_PREDICT_CAN_CONTINUE ,_param->_nb_inst_decod); if (_param->_have_port_depth) @@ -332,5 +332,5 @@ in_PREDICT_ACK [i]->write((rand()%100)write(0); + in_PREDICT_CAN_CONTINUE [i]->write(0); } } @@ -526,5 +526,5 @@ DELETE1_SC_SIGNAL(out_PREDICT_ADDRESS_SRC ,_param->_nb_inst_decod); DELETE1_SC_SIGNAL(out_PREDICT_ADDRESS_DEST ,_param->_nb_inst_decod); -//DELETE1_SC_SIGNAL( in_PREDICT_CAN_CONTINUE ,_param->_nb_inst_decod); + DELETE1_SC_SIGNAL( in_PREDICT_CAN_CONTINUE ,_param->_nb_inst_decod); DELETE1_SC_SIGNAL( in_DEPTH_MIN ,_param->_nb_context); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/include/Decod_unit.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/include/Decod_unit.h (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/include/Decod_unit.h (revision 110) @@ -118,5 +118,5 @@ public : SC_OUT(Tgeneral_data_t ) ** out_PREDICT_ADDRESS_SRC ;//[nb_inst_decod] public : SC_OUT(Tgeneral_data_t ) ** out_PREDICT_ADDRESS_DEST ;//[nb_inst_decod] -//public : SC_IN (Tcontrol_t ) ** in_PREDICT_CAN_CONTINUE ;//[nb_inst_decod] + public : SC_IN (Tcontrol_t ) ** in_PREDICT_CAN_CONTINUE ;//[nb_inst_decod] // ~~~~~[ Interface : "depth" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/src/Decod_unit_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/src/Decod_unit_allocation.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/src/Decod_unit_allocation.cpp (revision 110) @@ -124,5 +124,5 @@ ALLOC1_SIGNAL_OUT(out_PREDICT_ADDRESS_SRC ,"address_src" ,Tgeneral_data_t ,_param->_size_instruction_address ); ALLOC1_SIGNAL_OUT(out_PREDICT_ADDRESS_DEST ,"address_dest" ,Tgeneral_data_t ,_param->_size_instruction_address ); -// ALLOC1_SIGNAL_IN ( in_PREDICT_CAN_CONTINUE ,"can_continue" ,Tcontrol_t ,1 ); + ALLOC1_SIGNAL_IN ( in_PREDICT_CAN_CONTINUE ,"can_continue" ,Tcontrol_t ,1 ); } @@ -365,6 +365,6 @@ PORT_MAP(_component,src ,"out_PREDICT_"+toString(i)+"_ADDRESS_DEST" , dest,"out_PREDICT_"+toString(i)+"_ADDRESS_DEST" ); -// PORT_MAP(_component,src , "in_PREDICT_"+toString(i)+"_CAN_CONTINUE" , -// dest, "in_PREDICT_"+toString(i)+"_CAN_CONTINUE" ); + PORT_MAP(_component,src , "in_PREDICT_"+toString(i)+"_CAN_CONTINUE" , + dest, "in_PREDICT_"+toString(i)+"_CAN_CONTINUE" ); } Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/src/Decod_unit_deallocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/src/Decod_unit_deallocation.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/src/Decod_unit_deallocation.cpp (revision 110) @@ -78,5 +78,5 @@ DELETE1_SIGNAL(out_PREDICT_ADDRESS_SRC ,_param->_nb_inst_decod,_param->_size_instruction_address); DELETE1_SIGNAL(out_PREDICT_ADDRESS_DEST ,_param->_nb_inst_decod,_param->_size_instruction_address); -// DELETE1_SIGNAL( in_PREDICT_CAN_CONTINUE ,_param->_nb_inst_decod,1 ); + DELETE1_SIGNAL( in_PREDICT_CAN_CONTINUE ,_param->_nb_inst_decod,1 ); DELETE1_SIGNAL( in_DEPTH_MIN ,_param->_nb_context,_param->_size_depth); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Ifetch_unit/Ifetch_queue/src/Ifetch_queue_statistics_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Ifetch_unit/Ifetch_queue/src/Ifetch_queue_statistics_allocation.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Ifetch_unit/Ifetch_queue/src/Ifetch_queue_statistics_allocation.cpp (revision 110) @@ -42,5 +42,5 @@ _stat->create_expr ("sum_use_queue" ,"+ + sum_use_queue_wait_rsp sum_use_queue_have_rsp sum_use_queue_error_wait_rsp"); _stat->create_expr_average_by_cycle("average_use_queue" ,"sum_use_queue" ,"","Average occupation of ifetch queue"); - _stat->create_expr_percent ("percent_use_queue" ,"average_use_queue" ,toString(_param->_size_queue),"Percent of occupation of ifetch queue"); + _stat->create_expr_percent ("percent_use_queue" ,"average_use_queue" ,toString(_param->_nb_instruction_in_queue),"Percent of occupation of ifetch queue"); _stat->create_expr_percent ("percent_use_queue_wait_rsp" ,"sum_use_queue_wait_rsp" ,"sum_use_queue","Part of ifetch queue that wait the respons icache"); _stat->create_expr_percent ("percent_use_queue_have_rsp" ,"sum_use_queue_have_rsp" ,"sum_use_queue","Part of ifetch queue that wait the decod"); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Makefile.deps =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Makefile.deps (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Makefile.deps (revision 110) @@ -16,7 +16,7 @@ include $(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Direction_Glue/Makefile.deps endif -#ifndef Meta_Predictor -#include $(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Makefile.deps -#endif +ifndef Meta_Predictor +include $(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Makefile.deps +endif #-----[ Directory ]---------------------------------------- @@ -28,11 +28,11 @@ Direction_LIBRARY = -lDirection \ $(Behavioural_LIBRARY) \ - $(Direction_Glue_LIBRARY) -# $(Meta_Predictor_LIBRARY) + $(Direction_Glue_LIBRARY) \ + $(Meta_Predictor_LIBRARY) Direction_DIR_LIBRARY = -L$(Direction_DIR)/lib \ $(Behavioural_DIR_LIBRARY) \ - $(Direction_Glue_DIR_LIBRARY) -# $(Meta_Predictor_DIR_LIBRARY) + $(Direction_Glue_DIR_LIBRARY) \ + $(Meta_Predictor_DIR_LIBRARY) #-----[ Rules ]-------------------------------------------- @@ -43,5 +43,5 @@ $(MAKE) Direction_Glue_library; \ $(MAKE) --directory=$(Direction_DIR) --makefile=Makefile; -# $(MAKE) Meta_Predictor_library; \ + $(MAKE) Meta_Predictor_library; \ Direction_library_clean : @@ -50,3 +50,3 @@ $(MAKE) Direction_Glue_library_clean; \ $(MAKE) --directory=$(Direction_DIR) --makefile=Makefile clean; -# $(MAKE) Meta_Predictor_library_clean; \ + $(MAKE) Meta_Predictor_library_clean; \ Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Makefile =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Makefile (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Makefile (revision 110) @@ -0,0 +1,24 @@ +# +# $Id$ +# +# [ Description ] +# +# Makefile +# + +#-----[ Directory ]---------------------------------------- +DIR_COMPONENT = ./ +include $(DIR_COMPONENT)/Makefile.defs + +#-----[ Library ]------------------------------------------ +LIBRARY = $(DIR_LIB)/libMeta_Predictor.a + + +#-----[ include ]------------------------------------------ + +all : + @$(MAKE) all_component + +include $(DIR_MORPHEO)/Behavioural/Makefile.flags +include $(DIR_MORPHEO)/Behavioural/Makefile.Common +include $(DIR_MORPHEO)/Behavioural/Makefile.Component Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Makefile.defs =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Makefile.defs (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Makefile.defs (revision 110) @@ -0,0 +1,11 @@ +# +# $Id$ +# +# [ Description ] +# +# Makefile +# + +#-----[ Directory ]---------------------------------------- +DIR_COMPONENT_MORPHEO = ../../../../../../.. +DIR_MORPHEO = $(DIR_COMPONENT)/$(DIR_COMPONENT_MORPHEO) Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Makefile.deps =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Makefile.deps (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Makefile.deps (revision 110) @@ -0,0 +1,52 @@ +# +# $Id$ +# +# [ Description ] +# +# Makefile +# +# DIR_MORPHEO must be defined + +Meta_Predictor = yes + +ifndef Behavioural +include $(DIR_MORPHEO)/Behavioural/Makefile.deps +endif +ifndef Meta_Predictor_Glue +include $(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/Makefile.deps +endif +ifndef Two_Level_Branch_Predictor +include $(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Makefile.deps +endif + +#-----[ Directory ]---------------------------------------- + +Meta_Predictor_DIR = $(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor + +#-----[ Library ]------------------------------------------ + +Meta_Predictor_LIBRARY = -lMeta_Predictor \ + $(Meta_Predictor_Glue_LIBRARY) \ + $(Two_Level_Branch_Predictor_LIBRARY) \ + $(Behavioural_LIBRARY) + +Meta_Predictor_DIR_LIBRARY = -L$(Meta_Predictor_DIR)/lib \ + $(Meta_Predictor_Glue_DIR_LIBRARY) \ + $(Two_Level_Branch_Predictor_DIR_LIBRARY) \ + $(Behavioural_DIR_LIBRARY) + +#-----[ Rules ]-------------------------------------------- + +Meta_Predictor_library : + @\ + $(MAKE) Behavioural_library; \ + $(MAKE) Meta_Predictor_Glue_library; \ + $(MAKE) Two_Level_Branch_Predictor_library; \ + $(MAKE) --directory=$(Meta_Predictor_DIR) --makefile=Makefile; + +Meta_Predictor_library_clean : + @\ + $(MAKE) Behavioural_library_clean; \ + $(MAKE) Meta_Predictor_Glue_library_clean; \ + $(MAKE) Two_Level_Branch_Predictor_library_clean; \ + $(MAKE) --directory=$(Meta_Predictor_DIR) --makefile=Makefile clean; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/Makefile =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/Makefile (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/Makefile (revision 110) @@ -0,0 +1,24 @@ +# +# $Id$ +# +# [ Description ] +# +# Makefile +# + +#-----[ Directory ]---------------------------------------- +DIR_COMPONENT = ./ +include $(DIR_COMPONENT)/Makefile.defs + +#-----[ Library ]------------------------------------------ +LIBRARY = $(DIR_LIB)/libMeta_Predictor_Glue.a + + +#-----[ include ]------------------------------------------ + +all : + @$(MAKE) all_component + +include $(DIR_MORPHEO)/Behavioural/Makefile.flags +include $(DIR_MORPHEO)/Behavioural/Makefile.Common +include $(DIR_MORPHEO)/Behavioural/Makefile.Component Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/Makefile.defs =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/Makefile.defs (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/Makefile.defs (revision 110) @@ -0,0 +1,11 @@ +# +# $Id$ +# +# [ Description ] +# +# Makefile +# + +#-----[ Directory ]---------------------------------------- +DIR_COMPONENT_MORPHEO = ../../../../../../../.. +DIR_MORPHEO = $(DIR_COMPONENT)/$(DIR_COMPONENT_MORPHEO) Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/Makefile.deps =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/Makefile.deps (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/Makefile.deps (revision 110) @@ -0,0 +1,38 @@ +# +# $Id$ +# +# [ Description ] +# +# Makefile +# +# DIR_MORPHEO must be defined + +Meta_Predictor_Glue = yes + +ifndef Behavioural +include $(DIR_MORPHEO)/Behavioural/Makefile.deps +endif + +#-----[ Directory ]---------------------------------------- + +Meta_Predictor_Glue_DIR = $(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue + +#-----[ Library ]------------------------------------------ + +Meta_Predictor_Glue_LIBRARY = -lMeta_Predictor_Glue \ + $(Behavioural_LIBRARY) + +Meta_Predictor_Glue_DIR_LIBRARY = -L$(Meta_Predictor_Glue_DIR)/lib \ + $(Behavioural_DIR_LIBRARY) + +#-----[ Rules ]-------------------------------------------- + +Meta_Predictor_Glue_library : + @\ + $(MAKE) Behavioural_library; \ + $(MAKE) --directory=$(Meta_Predictor_Glue_DIR) --makefile=Makefile; + +Meta_Predictor_Glue_library_clean : + @\ + $(MAKE) Behavioural_library_clean; \ + $(MAKE) --directory=$(Meta_Predictor_Glue_DIR) --makefile=Makefile clean; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/Makefile =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/Makefile (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/Makefile (revision 110) @@ -0,0 +1,32 @@ +# +# $Id$ +# +# [ Description ] +# +# Makefile +# + +#-----[ Directory ]---------------------------------------- +DIR_COMPONENT = ../ +include $(DIR_COMPONENT)/Makefile.defs + +LIBRARY = $(Meta_Predictor_Glue_LIBRARY) + +DIR_LIBRARY = $(Meta_Predictor_Glue_DIR_LIBRARY) + +#-----[ include ]------------------------------------------ + +all : + @$(MAKE) all_selftest + +library : Meta_Predictor_Glue_library + +library_clean : Meta_Predictor_Glue_library_clean + +local_clean : + +include $(DIR_COMPONENT)/Makefile.deps +include $(DIR_MORPHEO)/Behavioural/Makefile.flags +include $(DIR_MORPHEO)/Behavioural/Makefile.Common +include $(DIR_MORPHEO)/Behavioural/Makefile.Selftest +include $(DIR_MORPHEO)/Behavioural/Makefile.Synthesis Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/configuration.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/configuration.cfg (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/configuration.cfg (revision 110) @@ -0,0 +1,1 @@ +Meta_Predictor_Glue Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/include/test.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/include/test.h (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/include/test.h (revision 110) @@ -0,0 +1,33 @@ +/* + * $Id$ + * + * [ Description ] + * + * Test "RegisterFile" + */ + +#ifdef SYSTEMC +#include "systemc.h" +#endif + +#define NB_ITERATION 1 +#define CYCLE_MAX (1024*NB_ITERATION) + +#include "Common/include/Test.h" +#include "Common/include/Time.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" + +using namespace std; +using namespace morpheo; +using namespace morpheo::behavioural; +using namespace morpheo::behavioural::core; +using namespace morpheo::behavioural::core::multi_front_end; +using namespace morpheo::behavioural::core::multi_front_end::front_end; +using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit; +using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction; +using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor; + +using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::meta_predictor_glue; + +void test (string name, + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::meta_predictor_glue::Parameters * param); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/src/main.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/src/main.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/src/main.cpp (revision 110) @@ -0,0 +1,66 @@ +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/include/test.h" + +#define NB_PARAMS 0 + +void usage (int argc, char * argv[]) +{ + err (_(" %s name_instance list_params.\n"),argv[0]); + err (_("list_params is :\n")); + err (_(" * ()\n")); + + exit (1); +} + +#ifndef SYSTEMC +int main (int argc, char * argv[]) +#else +int sc_main (int argc, char * argv[]) +#endif +{ + if (argc != static_cast(2+NB_PARAMS)) + usage (argc, argv); + + uint32_t x = 1; + + string name = argv[x++]; + + int _return = EXIT_SUCCESS; + try + { + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::meta_predictor_glue::Parameters * param = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::meta_predictor_glue::Parameters + ( + true //is_toplevel + ); + + msg(_("%s"),param->print(0).c_str()); + + test (name,param); + } + catch (morpheo::ErrorMorpheo & error) + { + msg (_("<%s> :\n%s"),name.c_str(), error.what ()); + _return = EXIT_FAILURE; + } + + try + { + if (_return == EXIT_SUCCESS) + TEST_OK("Meta_Predictor_Glue : no error"); + else + TEST_KO("Meta_Predictor_Glue : a lot of error"); + } + catch (morpheo::ErrorMorpheo & error) + { +// msg (_("<%s> :\n%s"),name.c_str(), error.what ()); + _return = EXIT_FAILURE; + } + + return (_return); +} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/src/test.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/src/test.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/src/test.cpp (revision 110) @@ -0,0 +1,113 @@ +/* + * $Id$ + * + * [ Description ] + * + * Test + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/include/test.h" +#include "Behavioural/include/Allocation.h" + +void test (string name, + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::meta_predictor_glue::Parameters * _param) +{ + msg(_("<%s> : Simulation SystemC.\n"),name.c_str()); + + if (setlocale (LC_ALL, "") == NULL) + msg(_("setlocale ko.\n")); + +#ifdef STATISTICS + morpheo::behavioural::Parameters_Statistics * _parameters_statistics = new morpheo::behavioural::Parameters_Statistics (5,CYCLE_MAX); +#endif + + Tusage_t _usage = USE_ALL; + +// _usage = usage_unset(_usage,USE_SYSTEMC ); +// _usage = usage_unset(_usage,USE_VHDL ); +// _usage = usage_unset(_usage,USE_VHDL_TESTBENCH ); +// _usage = usage_unset(_usage,USE_VHDL_TESTBENCH_ASSERT); +// _usage = usage_unset(_usage,USE_POSITION ); +// _usage = usage_unset(_usage,USE_STATISTICS ); +// _usage = usage_unset(_usage,USE_INFORMATION ); + + Meta_Predictor_Glue * _Meta_Predictor_Glue = new Meta_Predictor_Glue + (name.c_str(), +#ifdef STATISTICS + _parameters_statistics, +#endif + _param, + _usage); + +#ifdef SYSTEMC + if (usage_is_set(_usage,USE_SYSTEMC)) + { + /********************************************************************* + * Déclarations des signaux + *********************************************************************/ + string rename; + + sc_clock * in_CLOCK = new sc_clock ("clock", 1.0, 0.5); + sc_signal * in_NRESET = new sc_signal ("NRESET"); + + /******************************************************** + * Instanciation + ********************************************************/ + + msg(_("<%s> : Instanciation of _Meta_Predictor_Glue.\n"),name.c_str()); + + (*(_Meta_Predictor_Glue->in_CLOCK)) (*(in_CLOCK)); + (*(_Meta_Predictor_Glue->in_NRESET)) (*(in_NRESET)); + + + msg(_("<%s> : Start Simulation ............\n"),name.c_str()); + + Time * _time = new Time(); + + /******************************************************** + * Simulation - Begin + ********************************************************/ + + // Initialisation + + const uint32_t seed = 0; +//const uint32_t seed = static_cast(time(NULL)); + + srand(seed); + + SC_START(0); + LABEL("Initialisation"); + + LABEL("Reset"); + in_NRESET->write(0); + SC_START(5); + in_NRESET->write(1); + + LABEL("Loop of Test"); + + for (uint32_t iteration=0; iteration : ............ Stop Simulation\n"),name.c_str()); + + delete in_CLOCK; + delete in_NRESET; + } +#endif + + delete _Meta_Predictor_Glue; +#ifdef STATISTICS + delete _parameters_statistics; +#endif +} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/Makefile =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/Makefile (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/Makefile (revision 110) @@ -0,0 +1,19 @@ +# +# $Id$ +# +# [ Description ] +# +# Makefile +# + +#-----[ Directory ]---------------------------------------- +DIR_COMPONENT = ../ +include $(DIR_COMPONENT)/Makefile.defs + +#-----[ include ]------------------------------------------ + +all : + $(MAKE) all_documentation + +include $(DIR_MORPHEO)/Behavioural/Makefile.Common +include $(DIR_MORPHEO)/Behavioural/Makefile.Documentation Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/Meta_Predictor_Glue.tex =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/Meta_Predictor_Glue.tex (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/Meta_Predictor_Glue.tex (revision 110) @@ -0,0 +1,42 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\documentclass[10pt,a4paper,twocolumn]{article} + +\def\dirdoc{tex} +\def\dirschema{eps} + +% Package de variables d'environnement : Titre, command etc ... +\usepackage{../../../../../../../../../Behavioural/doc/sty/doc-style} +\usepackage{sty/header} + + +%------------------------------------------------------------------------------ +% Début document +%------------------------------------------------------------------------------ + +\pagestyle{empty} + +\begin{document} + +% Créez une page de titre +\maketitle +\thispagestyle{empty} + +%Table des matières et des figures +%\tableofcontents +%\newpage +%\listoffigures + +%------------------------------------------------------------------------------ +% Ajout du corps du documents +%------------------------------------------------------------------------------ + +\input{tex/root} + +%------------------------------------------------------------------------------ +% Fin d'ajout du corps du document +%------------------------------------------------------------------------------ + +\end{document} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/sty/header.sty =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/sty/header.sty (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/sty/header.sty (revision 110) @@ -0,0 +1,16 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\def\review{YYYY/MM/DD} +%\def\review{\number\day/\number\month/\number\year\xspace} + +\title{Meta_Predictor_Glue} + +\author{} + +\affiliation{} + +\email{} + +\date{\review} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/tex/01_introduction.tex =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/tex/01_introduction.tex (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/tex/01_introduction.tex (revision 110) @@ -0,0 +1,5 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\Section{Introduction} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/tex/02_features.tex =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/tex/02_features.tex (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/tex/02_features.tex (revision 110) @@ -0,0 +1,5 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\Section{Features} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/tex/03_description.tex =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/tex/03_description.tex (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/tex/03_description.tex (revision 110) @@ -0,0 +1,5 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\Section{Functional Description} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/tex/04_pinout.tex =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/tex/04_pinout.tex (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/tex/04_pinout.tex (revision 110) @@ -0,0 +1,5 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\Section{Pin out} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/tex/05_parameters.tex =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/tex/05_parameters.tex (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/tex/05_parameters.tex (revision 110) @@ -0,0 +1,5 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\Section{Parameters} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/tex/06_performance.tex =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/tex/06_performance.tex (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/tex/06_performance.tex (revision 110) @@ -0,0 +1,5 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\Section{Performance} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/tex/07_details.tex =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/tex/07_details.tex (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/tex/07_details.tex (revision 110) @@ -0,0 +1,5 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\Section{Details} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/tex/08_history.tex =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/tex/08_history.tex (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/tex/08_history.tex (revision 110) @@ -0,0 +1,14 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\Section{Revision History} + +\begin{tabular}{|c|c|c|} +\hline +Revision Date & By & Modifications\\ +\hline +\hline +yyyy/mm/dd & xxx & Initial document \\ +\hline +\end{tabular} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/tex/root.tex =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/tex/root.tex (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/doc/tex/root.tex (revision 110) @@ -0,0 +1,12 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\input{\dirdoc/01_introduction} +\input{\dirdoc/02_features} +\input{\dirdoc/03_description} +\input{\dirdoc/04_pinout} +\input{\dirdoc/05_parameters} +\input{\dirdoc/06_performance} +\input{\dirdoc/07_details} +\input{\dirdoc/08_history} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h (revision 110) @@ -0,0 +1,135 @@ +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_meta_predictor_glue_Meta_Predictor_Glue_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_meta_predictor_glue_Meta_Predictor_Glue_h + +/* + * $Id$ + * + * [ Description ] + * + */ + +#ifdef SYSTEMC +#include "systemc.h" +#endif + + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Types.h" +#ifdef STATISTICS +#include "Behavioural/include/Stat.h" +#endif +#include "Behavioural/include/Component.h" +#ifdef VHDL +#include "Behavioural/include/Vhdl.h" +#endif +#include "Behavioural/include/Usage.h" + +#include "Common/include/ToString.h" +#include "Common/include/Debug.h" + +#include + +namespace morpheo { +namespace behavioural { + +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace meta_predictor_glue { + + + class Meta_Predictor_Glue +#if SYSTEMC + : public sc_module +#endif + { + // -----[ fields ]---------------------------------------------------- + // Parameters + protected : const std::string _name; + protected : const Parameters * _param; + private : const Tusage_t _usage; + +#ifdef STATISTICS + public : Stat * _stat; +#endif + + public : Component * _component; + private : Interfaces * _interfaces; + +#ifdef SYSTEMC + // ~~~~~[ Interface ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // ~~~~~[ Interface : "" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + public : SC_CLOCK * in_CLOCK ; + public : SC_IN (Tcontrol_t) * in_NRESET ; + + // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + // ~~~~~[ Register ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + // ~~~~~[ Internal ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +#endif + + // -----[ Methods ]--------------------------------------------------- + +#ifdef SYSTEMC + SC_HAS_PROCESS (Meta_Predictor_Glue); +#endif + public : Meta_Predictor_Glue + ( +#ifdef SYSTEMC + sc_module_name name, +#else + std::string name, +#endif +#ifdef STATISTICS + morpheo::behavioural::Parameters_Statistics * param_statistics, +#endif + Parameters * param, + morpheo::behavioural::Tusage_t usage + ); + public : ~Meta_Predictor_Glue (void); + + private : void allocation ( +#ifdef STATISTICS + morpheo::behavioural::Parameters_Statistics * param_statistics +#else + void +#endif + ); + private : void deallocation (void); + +#ifdef SYSTEMC + public : void transition (void); +//public : void genMoore (void); +#endif + +#if VHDL + public : void vhdl (void); + private : void vhdl_declaration (Vhdl * & vhdl); + private : void vhdl_body (Vhdl * & vhdl); +#endif + +#ifdef STATISTICS + public : void statistics_allocation (morpheo::behavioural::Parameters_Statistics * param_statistics); + public : void statistics_deallocation (void); +#endif +#if defined(STATISTICS) or defined(VHDL_TESTBENCH) + private : void end_cycle (void); +#endif + }; + +}; // end namespace meta_predictor_glue +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo + +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h (revision 110) @@ -0,0 +1,54 @@ +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_meta_predictor_glue_Parameters_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_meta_predictor_glue_Parameters_h + +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/include/Parameters.h" +#include "Common/include/Debug.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace meta_predictor_glue { + + + class Parameters : public morpheo::behavioural::Parameters + { + //-----[ fields ]------------------------------------------------------------ + + //-----[ methods ]----------------------------------------------------------- + public : Parameters (bool is_toplevel=false); +//public : Parameters (Parameters & param) ; + public : ~Parameters (void); + + public : void copy (void); + + public : Parameters_test msg_error (void); + + public : std::string print (uint32_t depth); + public : friend std::ostream& operator<< (std::ostream& output_stream, + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::meta_predictor_glue::Parameters & x); + }; + +}; // end namespace meta_predictor_glue +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo + +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Types.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Types.h (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Types.h (revision 110) @@ -0,0 +1,35 @@ +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_meta_predictor_glue_Types_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_meta_predictor_glue_Types_h + +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/include/Types.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace meta_predictor_glue { + + +}; // end namespace meta_predictor_glue +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo + +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue.cpp (revision 110) @@ -0,0 +1,127 @@ +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace meta_predictor_glue { + + +#undef FUNCTION +#define FUNCTION "Meta_Predictor_Glue::Meta_Predictor_Glue" + Meta_Predictor_Glue::Meta_Predictor_Glue + ( +#ifdef SYSTEMC + sc_module_name name, +#else + string name, +#endif +#ifdef STATISTICS + morpheo::behavioural::Parameters_Statistics * param_statistics, +#endif + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::meta_predictor_glue::Parameters * param, + morpheo::behavioural::Tusage_t usage + ): + _name (name) + ,_param (param) + ,_usage (usage) + { + log_begin(Meta_Predictor_Glue,FUNCTION); + + usage_environment(_usage); + + log_printf(INFO,Meta_Predictor_Glue,FUNCTION,_("<%s> : Allocation"),_name.c_str()); + + allocation ( +#ifdef STATISTICS + param_statistics +#endif + ); + +#ifdef STATISTICS + if (usage_is_set(_usage,USE_STATISTICS)) + { + log_printf(INFO,Meta_Predictor_Glue,FUNCTION,_("<%s> : Allocation of statistics"),_name.c_str()); + + statistics_allocation(param_statistics); + } +#endif + +#ifdef VHDL + if (usage_is_set(_usage,USE_VHDL)) + { + // generate the vhdl + log_printf(INFO,Meta_Predictor_Glue,FUNCTION,_("<%s> : Generate the vhdl"),_name.c_str()); + + vhdl(); + } +#endif + +#ifdef SYSTEMC + if (usage_is_set(_usage,USE_SYSTEMC)) + { + log_printf(INFO,Meta_Predictor_Glue,FUNCTION,_("<%s> : Method - transition"),_name.c_str()); + + SC_METHOD (transition); + dont_initialize (); + sensitive << (*(in_CLOCK)).pos(); + +# ifdef SYSTEMCASS_SPECIFIC + // List dependency information +# endif + +// log_printf(INFO,Meta_Predictor_Glue,FUNCTION,_("<%s> : Method - genMoore"),_name.c_str()); + +// SC_METHOD (genMoore); +// dont_initialize (); +// sensitive << (*(in_CLOCK)).neg(); // need internal register + +// # ifdef SYSTEMCASS_SPECIFIC +// // List dependency information +// # endif + +#endif + } + log_end(Meta_Predictor_Glue,FUNCTION); + }; + +#undef FUNCTION +#define FUNCTION "Meta_Predictor_Glue::~Meta_Predictor_Glue" + Meta_Predictor_Glue::~Meta_Predictor_Glue (void) + { + log_begin(Meta_Predictor_Glue,FUNCTION); + +#ifdef STATISTICS + if (usage_is_set(_usage,USE_STATISTICS)) + { + statistics_deallocation(); + } +#endif + + log_printf(INFO,Meta_Predictor_Glue,FUNCTION,_("<%s> : Deallocation"),_name.c_str()); + deallocation (); + + log_end(Meta_Predictor_Glue,FUNCTION); + }; + +}; // end namespace meta_predictor_glue +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_allocation.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_allocation.cpp (revision 110) @@ -0,0 +1,79 @@ +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" +#include "Behavioural/include/Allocation.h" +#include "Common/include/Max.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace meta_predictor_glue { + + + +#undef FUNCTION +#define FUNCTION "Meta_Predictor_Glue::allocation" + void Meta_Predictor_Glue::allocation ( +#ifdef STATISTICS + morpheo::behavioural::Parameters_Statistics * param_statistics +#else + void +#endif + ) + { + log_begin(Meta_Predictor_Glue,FUNCTION); + + _component = new Component (_usage); + + Entity * entity = _component->set_entity (_name + ,"Meta_Predictor_Glue" +#ifdef POSITION + ,COMBINATORY +#endif + ); + + _interfaces = entity->set_interfaces(); + + // ~~~~~[ Interface : "" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + { + Interface * interface = _interfaces->set_interface("" +#ifdef POSITION + ,IN + ,SOUTH, + _("Generalist interface") +#endif + ); + + in_CLOCK = interface->set_signal_clk ("clock" ,1, CLOCK_VHDL_YES); + in_NRESET = interface->set_signal_in ("nreset",1, RESET_VHDL_YES); + } + // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +#ifdef POSITION + if (usage_is_set(_usage,USE_POSITION)) + _component->generate_file(); +#endif + + log_end(Meta_Predictor_Glue,FUNCTION); + }; + +}; // end namespace meta_predictor_glue +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_deallocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_deallocation.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_deallocation.cpp (revision 110) @@ -0,0 +1,49 @@ +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" +#include "Behavioural/include/Allocation.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace meta_predictor_glue { + + +#undef FUNCTION +#define FUNCTION "Meta_Predictor_Glue::deallocation" + void Meta_Predictor_Glue::deallocation (void) + { + log_begin(Meta_Predictor_Glue,FUNCTION); + + if (usage_is_set(_usage,USE_SYSTEMC)) + { + delete in_CLOCK ; + delete in_NRESET; + } + // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + delete _component; + + log_end(Meta_Predictor_Glue,FUNCTION); + }; + +}; // end namespace meta_predictor_glue +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_end_cycle.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_end_cycle.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_end_cycle.cpp (revision 110) @@ -0,0 +1,53 @@ +#if defined(STATISTICS) or defined(VHDL_TESTBENCH) +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace meta_predictor_glue { + + +#undef FUNCTION +#define FUNCTION "Meta_Predictor_Glue::end_cycle" +void Meta_Predictor_Glue::end_cycle () + { + log_begin(Meta_Predictor_Glue,FUNCTION); + +#ifdef STATISTICS + if (usage_is_set(_usage,USE_STATISTICS)) + _stat->end_cycle(); +#endif + +#ifdef VHDL_TESTBENCH + // Evaluation before read the ouput signal +// sc_start(0); + if (usage_is_set(_usage,USE_VHDL_TESTBENCH)) + _interfaces->testbench(); +#endif + + log_end(Meta_Predictor_Glue,FUNCTION); + }; + +}; // end namespace meta_predictor_glue +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_statistics_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_statistics_allocation.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_statistics_allocation.cpp (revision 110) @@ -0,0 +1,45 @@ +#ifdef STATISTICS +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace meta_predictor_glue { + + +#undef FUNCTION +#define FUNCTION "Meta_Predictor_Glue::statistics_allocation" + void Meta_Predictor_Glue::statistics_allocation (morpheo::behavioural::Parameters_Statistics * param_statistics) + { + log_begin(Meta_Predictor_Glue,FUNCTION); + + _stat = new Stat (static_cast(_name), + "Meta_Predictor_Glue", + param_statistics); + + log_end(Meta_Predictor_Glue,FUNCTION); + }; + +}; // end namespace meta_predictor_glue +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_statistics_deallocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_statistics_deallocation.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_statistics_deallocation.cpp (revision 110) @@ -0,0 +1,45 @@ +#ifdef STATISTICS +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace meta_predictor_glue { + + +#undef FUNCTION +#define FUNCTION "Meta_Predictor_Glue::statistics_deallocation" + void Meta_Predictor_Glue::statistics_deallocation (void) + { + log_begin(Meta_Predictor_Glue,FUNCTION); + + log_printf(INFO,Meta_Predictor_Glue,FUNCTION,_("<%s> : Generate Statistics file"),_name.c_str()); + + delete _stat; + + log_end(Meta_Predictor_Glue,FUNCTION); + }; + +}; // end namespace meta_predictor_glue +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_transition.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_transition.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_transition.cpp (revision 110) @@ -0,0 +1,45 @@ +#ifdef SYSTEMC +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace meta_predictor_glue { + + +#undef FUNCTION +#define FUNCTION "Meta_Predictor_Glue::transition" + void Meta_Predictor_Glue::transition (void) + { + log_begin(Meta_Predictor_Glue,FUNCTION); + +#if defined(STATISTICS) or defined(VHDL_TESTBENCH) + end_cycle (); +#endif + + log_end(Meta_Predictor_Glue,FUNCTION); + }; + +}; // end namespace meta_predictor_glue +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl.cpp (revision 110) @@ -0,0 +1,54 @@ +#ifdef VHDL +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" +#include "Behavioural/include/Vhdl.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace meta_predictor_glue { + + +#undef FUNCTION +#define FUNCTION "Meta_Predictor_Glue::vhdl" + void Meta_Predictor_Glue::vhdl (void) + { + log_begin(Meta_Predictor_Glue,FUNCTION); + + Vhdl * vhdl = new Vhdl (_name); + + _interfaces->set_port(vhdl); + _component->vhdl_instance(vhdl); + + vhdl_declaration (vhdl); + vhdl_body (vhdl); + + vhdl->generate_file(); + + delete vhdl; + + log_end(Meta_Predictor_Glue,FUNCTION); + }; + +}; // end namespace meta_predictor_glue +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_body.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_body.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_body.cpp (revision 110) @@ -0,0 +1,41 @@ +#ifdef VHDL +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace meta_predictor_glue { + + +#undef FUNCTION +#define FUNCTION "Meta_Predictor_Glue::vhdl_body" + void Meta_Predictor_Glue::vhdl_body (Vhdl * & vhdl) + { + log_begin(Meta_Predictor_Glue,FUNCTION); + vhdl->set_body (""); + log_end(Meta_Predictor_Glue,FUNCTION); + }; + +}; // end namespace meta_predictor_glue +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_declaration.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_declaration.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_declaration.cpp (revision 110) @@ -0,0 +1,40 @@ +#ifdef VHDL +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace meta_predictor_glue { + + +#undef FUNCTION +#define FUNCTION "Meta_Predictor_Glue::vhdl_declaration" + void Meta_Predictor_Glue::vhdl_declaration (Vhdl * & vhdl) + { + log_begin(Meta_Predictor_Glue,FUNCTION); + log_end(Meta_Predictor_Glue,FUNCTION); + }; + +}; // end namespace meta_predictor_glue +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Parameters.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Parameters.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Parameters.cpp (revision 110) @@ -0,0 +1,71 @@ +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace meta_predictor_glue { + + +#undef FUNCTION +#define FUNCTION "Meta_Predictor_Glue::Parameters" + Parameters::Parameters (bool is_toplevel) + { + log_begin(Meta_Predictor_Glue,FUNCTION); + + test(); + + if (is_toplevel) + { + copy(); + } + + log_end(Meta_Predictor_Glue,FUNCTION); + }; + +// #undef FUNCTION +// #define FUNCTION "Meta_Predictor_Glue::Parameters (copy)" +// Parameters::Parameters (Parameters & param) +// { +// log_begin(Meta_Predictor_Glue,FUNCTION); +// test(); +// log_end(Meta_Predictor_Glue,FUNCTION); +// }; + +#undef FUNCTION +#define FUNCTION "Meta_Predictor_Glue::~Parameters" + Parameters::~Parameters (void) + { + log_begin(Meta_Predictor_Glue,FUNCTION); + log_end(Meta_Predictor_Glue,FUNCTION); + }; + +#undef FUNCTION +#define FUNCTION "Meta_Predictor_Glue::copy" + void Parameters::copy (void) + { + log_begin(Meta_Predictor_Glue,FUNCTION); + log_end(Meta_Predictor_Glue,FUNCTION); + }; + +}; // end namespace meta_predictor_glue +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Parameters_msg_error.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Parameters_msg_error.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Parameters_msg_error.cpp (revision 110) @@ -0,0 +1,45 @@ +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/include/Types.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h" +#include + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace meta_predictor_glue { + + +#undef FUNCTION +#define FUNCTION "Meta_Predictor_Glue::msg_error" + Parameters_test Parameters::msg_error(void) + { + log_begin(Meta_Predictor_Glue,FUNCTION); + + Parameters_test test ("Meta_Predictor_Glue"); + + log_end(Meta_Predictor_Glue,FUNCTION); + + return test; + }; + +}; // end namespace meta_predictor_glue +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Parameters_print.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Parameters_print.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Parameters_print.cpp (revision 110) @@ -0,0 +1,62 @@ +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h" +#include "Behavioural/include/XML.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace meta_predictor_glue { + + +#undef FUNCTION +#define FUNCTION "Meta_Predictor_Glue::print" + std::string Parameters::print (uint32_t depth) + { + log_begin(Meta_Predictor_Glue,FUNCTION); + + XML xml ("meta_predictor_glue"); + + xml.balise_open("meta_predictor_glue"); +// xml.singleton_begin(""); xml.attribut("value",toString(_)); xml.singleton_end(); + xml.balise_close(); + + log_end(Meta_Predictor_Glue,FUNCTION); + + return xml.get_body(depth); + }; + +#undef FUNCTION +#define FUNCTION "Meta_Predictor_Glue::operator<<" + std::ostream& operator<< (std::ostream& output_stream , + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::meta_predictor_glue::Parameters & x) + { + log_begin(Meta_Predictor_Glue,FUNCTION); + + output_stream << x.print(0); + + log_end(Meta_Predictor_Glue,FUNCTION); + + return output_stream; + }; + +}; // end namespace meta_predictor_glue +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/Makefile =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/Makefile (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/Makefile (revision 110) @@ -0,0 +1,32 @@ +# +# $Id$ +# +# [ Description ] +# +# Makefile +# + +#-----[ Directory ]---------------------------------------- +DIR_COMPONENT = ../ +include $(DIR_COMPONENT)/Makefile.defs + +LIBRARY = $(Meta_Predictor_LIBRARY) + +DIR_LIBRARY = $(Meta_Predictor_DIR_LIBRARY) + +#-----[ include ]------------------------------------------ + +all : + @$(MAKE) all_selftest + +library : Meta_Predictor_library + +library_clean : Meta_Predictor_library_clean + +local_clean : + +include $(DIR_COMPONENT)/Makefile.deps +include $(DIR_MORPHEO)/Behavioural/Makefile.flags +include $(DIR_MORPHEO)/Behavioural/Makefile.Common +include $(DIR_MORPHEO)/Behavioural/Makefile.Selftest +include $(DIR_MORPHEO)/Behavioural/Makefile.Synthesis Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/configuration.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/configuration.cfg (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/configuration.cfg (revision 110) @@ -0,0 +1,1 @@ +Meta_Predictor Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/include/test.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/include/test.h (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/include/test.h (revision 110) @@ -0,0 +1,36 @@ +/* + * $Id$ + * + * [ Description ] + * + * Test "RegisterFile" + */ + +#ifdef SYSTEMC +#include "systemc.h" +#endif + +#define NB_ITERATION 1 +#define CYCLE_MAX (1024*NB_ITERATION) + +#include "Common/include/Test.h" +#include "Common/include/Time.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h" + +#include +#include +#include + +using namespace std; +using namespace morpheo; +using namespace morpheo::behavioural; +using namespace morpheo::behavioural::core; +using namespace morpheo::behavioural::core::multi_front_end; +using namespace morpheo::behavioural::core::multi_front_end::front_end; +using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit; +using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction; + +using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor; + +void test (string name, + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::Parameters * param); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/src/main.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/src/main.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/src/main.cpp (revision 110) @@ -0,0 +1,66 @@ +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/include/test.h" + +#define NB_PARAMS 0 + +void usage (int argc, char * argv[]) +{ + err (_(" %s name_instance list_params.\n"),argv[0]); + err (_("list_params is :\n")); + err (_(" * ()\n")); + + exit (1); +} + +#ifndef SYSTEMC +int main (int argc, char * argv[]) +#else +int sc_main (int argc, char * argv[]) +#endif +{ + if (argc != static_cast(2+NB_PARAMS)) + usage (argc, argv); + + uint32_t x = 1; + + string name = argv[x++]; + + int _return = EXIT_SUCCESS; + try + { + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::Parameters * param = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::Parameters + ( + true // is_toplevel + ); + + msg(_("%s"),param->print(0).c_str()); + + test (name,param); + } + catch (morpheo::ErrorMorpheo & error) + { + msg (_("<%s> :\n%s"),name.c_str(), error.what ()); + _return = EXIT_FAILURE; + } + + try + { + if (_return == EXIT_SUCCESS) + TEST_OK("Meta_Predictor : no error"); + else + TEST_KO("Meta_Predictor : a lot of error"); + } + catch (morpheo::ErrorMorpheo & error) + { +// msg (_("<%s> :\n%s"),name.c_str(), error.what ()); + _return = EXIT_FAILURE; + } + + return (_return); +} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/src/test.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/src/test.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/src/test.cpp (revision 110) @@ -0,0 +1,113 @@ +/* + * $Id$ + * + * [ Description ] + * + * Test + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/include/test.h" +#include "Behavioural/include/Allocation.h" + +void test (string name, + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::Parameters * _param) +{ + msg(_("<%s> : Simulation SystemC.\n"),name.c_str()); + + if (setlocale (LC_ALL, "") == NULL) + msg(_("setlocale ko.\n")); + +#ifdef STATISTICS + morpheo::behavioural::Parameters_Statistics * _parameters_statistics = new morpheo::behavioural::Parameters_Statistics (5,CYCLE_MAX); +#endif + + Tusage_t _usage = USE_ALL; + +// _usage = usage_unset(_usage,USE_SYSTEMC ); +// _usage = usage_unset(_usage,USE_VHDL ); +// _usage = usage_unset(_usage,USE_VHDL_TESTBENCH ); +// _usage = usage_unset(_usage,USE_VHDL_TESTBENCH_ASSERT); +// _usage = usage_unset(_usage,USE_POSITION ); +// _usage = usage_unset(_usage,USE_STATISTICS ); +// _usage = usage_unset(_usage,USE_INFORMATION ); + + Meta_Predictor * _Meta_Predictor = new Meta_Predictor + (name.c_str(), +#ifdef STATISTICS + _parameters_statistics, +#endif + _param, + _usage); + +#ifdef SYSTEMC + if (usage_is_set(_usage,USE_SYSTEMC)) + { + /********************************************************************* + * Déclarations des signaux + *********************************************************************/ + string rename; + + sc_clock * in_CLOCK = new sc_clock ("clock", 1.0, 0.5); + sc_signal * in_NRESET = new sc_signal ("NRESET"); + + /******************************************************** + * Instanciation + ********************************************************/ + + msg(_("<%s> : Instanciation of _Meta_Predictor.\n"),name.c_str()); + + (*(_Meta_Predictor->in_CLOCK)) (*(in_CLOCK)); + (*(_Meta_Predictor->in_NRESET)) (*(in_NRESET)); + + + msg(_("<%s> : Start Simulation ............\n"),name.c_str()); + + Time * _time = new Time(); + + /******************************************************** + * Simulation - Begin + ********************************************************/ + + // Initialisation + + const uint32_t seed = 0; +//const uint32_t seed = static_cast(time(NULL)); + + srand(seed); + + SC_START(0); + LABEL("Initialisation"); + + LABEL("Reset"); + in_NRESET->write(0); + SC_START(5); + in_NRESET->write(1); + + LABEL("Loop of Test"); + + for (uint32_t iteration=0; iteration : ............ Stop Simulation\n"),name.c_str()); + + delete in_CLOCK; + delete in_NRESET; + } +#endif + + delete _Meta_Predictor; +#ifdef STATISTICS + delete _parameters_statistics; +#endif +} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Makefile =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Makefile (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Makefile (revision 110) @@ -0,0 +1,24 @@ +# +# $Id$ +# +# [ Description ] +# +# Makefile +# + +#-----[ Directory ]---------------------------------------- +DIR_COMPONENT = ./ +include $(DIR_COMPONENT)/Makefile.defs + +#-----[ Library ]------------------------------------------ +LIBRARY = $(DIR_LIB)/libTwo_Level_Branch_Predictor.a + + +#-----[ include ]------------------------------------------ + +all : + @$(MAKE) all_component + +include $(DIR_MORPHEO)/Behavioural/Makefile.flags +include $(DIR_MORPHEO)/Behavioural/Makefile.Common +include $(DIR_MORPHEO)/Behavioural/Makefile.Component Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Makefile.defs =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Makefile.defs (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Makefile.defs (revision 110) @@ -0,0 +1,11 @@ +# +# $Id$ +# +# [ Description ] +# +# Makefile +# + +#-----[ Directory ]---------------------------------------- +DIR_COMPONENT_MORPHEO = ../../../../../../../.. +DIR_MORPHEO = $(DIR_COMPONENT)/$(DIR_COMPONENT_MORPHEO) Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Makefile.deps =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Makefile.deps (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Makefile.deps (revision 110) @@ -0,0 +1,38 @@ +# +# $Id$ +# +# [ Description ] +# +# Makefile +# +# DIR_MORPHEO must be defined + +Two_Level_Branch_Predictor = yes + +ifndef Behavioural +include $(DIR_MORPHEO)/Behavioural/Makefile.deps +endif + +#-----[ Directory ]---------------------------------------- + +Two_Level_Branch_Predictor_DIR = $(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor + +#-----[ Library ]------------------------------------------ + +Two_Level_Branch_Predictor_LIBRARY = -lTwo_Level_Branch_Predictor \ + $(Behavioural_LIBRARY) + +Two_Level_Branch_Predictor_DIR_LIBRARY = -L$(Two_Level_Branch_Predictor_DIR)/lib \ + $(Behavioural_DIR_LIBRARY) + +#-----[ Rules ]-------------------------------------------- + +Two_Level_Branch_Predictor_library : + @\ + $(MAKE) Behavioural_library; \ + $(MAKE) --directory=$(Two_Level_Branch_Predictor_DIR) --makefile=Makefile; + +Two_Level_Branch_Predictor_library_clean : + @\ + $(MAKE) Behavioural_library_clean; \ + $(MAKE) --directory=$(Two_Level_Branch_Predictor_DIR) --makefile=Makefile clean; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/Makefile =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/Makefile (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/Makefile (revision 110) @@ -0,0 +1,32 @@ +# +# $Id$ +# +# [ Description ] +# +# Makefile +# + +#-----[ Directory ]---------------------------------------- +DIR_COMPONENT = ../ +include $(DIR_COMPONENT)/Makefile.defs + +LIBRARY = $(Two_Level_Branch_Predictor_LIBRARY) + +DIR_LIBRARY = $(Two_Level_Branch_Predictor_DIR_LIBRARY) + +#-----[ include ]------------------------------------------ + +all : + @$(MAKE) all_selftest + +library : Two_Level_Branch_Predictor_library + +library_clean : Two_Level_Branch_Predictor_library_clean + +local_clean : + +include $(DIR_COMPONENT)/Makefile.deps +include $(DIR_MORPHEO)/Behavioural/Makefile.flags +include $(DIR_MORPHEO)/Behavioural/Makefile.Common +include $(DIR_MORPHEO)/Behavioural/Makefile.Selftest +include $(DIR_MORPHEO)/Behavioural/Makefile.Synthesis Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/configuration.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/configuration.cfg (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/configuration.cfg (revision 110) @@ -0,0 +1,1 @@ +Two_Level_Branch_Predictor Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/include/test.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/include/test.h (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/include/test.h (revision 110) @@ -0,0 +1,33 @@ +/* + * $Id$ + * + * [ Description ] + * + * Test "RegisterFile" + */ + +#ifdef SYSTEMC +#include "systemc.h" +#endif + +#define NB_ITERATION 1 +#define CYCLE_MAX (1024*NB_ITERATION) + +#include "Common/include/Test.h" +#include "Common/include/Time.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" + +using namespace std; +using namespace morpheo; +using namespace morpheo::behavioural; +using namespace morpheo::behavioural::core; +using namespace morpheo::behavioural::core::multi_front_end; +using namespace morpheo::behavioural::core::multi_front_end::front_end; +using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit; +using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction; +using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor; + +using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor; + +void test (string name, + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters * param); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/src/main.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/src/main.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/src/main.cpp (revision 110) @@ -0,0 +1,66 @@ +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/include/test.h" + +#define NB_PARAMS 0 + +void usage (int argc, char * argv[]) +{ + err (_(" %s name_instance list_params.\n"),argv[0]); + err (_("list_params is :\n")); + err (_(" * ()\n")); + + exit (1); +} + +#ifndef SYSTEMC +int main (int argc, char * argv[]) +#else +int sc_main (int argc, char * argv[]) +#endif +{ + if (argc != static_cast(2+NB_PARAMS)) + usage (argc, argv); + + uint32_t x = 1; + + string name = argv[x++]; + + int _return = EXIT_SUCCESS; + try + { + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters * param = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters + ( + true //is_toplevel + ); + + msg(_("%s"),param->print(0).c_str()); + + test (name,param); + } + catch (morpheo::ErrorMorpheo & error) + { + msg (_("<%s> :\n%s"),name.c_str(), error.what ()); + _return = EXIT_FAILURE; + } + + try + { + if (_return == EXIT_SUCCESS) + TEST_OK("Two_Level_Branch_Predictor : no error"); + else + TEST_KO("Two_Level_Branch_Predictor : a lot of error"); + } + catch (morpheo::ErrorMorpheo & error) + { +// msg (_("<%s> :\n%s"),name.c_str(), error.what ()); + _return = EXIT_FAILURE; + } + + return (_return); +} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/src/test.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/src/test.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/src/test.cpp (revision 110) @@ -0,0 +1,113 @@ +/* + * $Id$ + * + * [ Description ] + * + * Test + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/include/test.h" +#include "Behavioural/include/Allocation.h" + +void test (string name, + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters * _param) +{ + msg(_("<%s> : Simulation SystemC.\n"),name.c_str()); + + if (setlocale (LC_ALL, "") == NULL) + msg(_("setlocale ko.\n")); + +#ifdef STATISTICS + morpheo::behavioural::Parameters_Statistics * _parameters_statistics = new morpheo::behavioural::Parameters_Statistics (5,CYCLE_MAX); +#endif + + Tusage_t _usage = USE_ALL; + +// _usage = usage_unset(_usage,USE_SYSTEMC ); +// _usage = usage_unset(_usage,USE_VHDL ); +// _usage = usage_unset(_usage,USE_VHDL_TESTBENCH ); +// _usage = usage_unset(_usage,USE_VHDL_TESTBENCH_ASSERT); +// _usage = usage_unset(_usage,USE_POSITION ); +// _usage = usage_unset(_usage,USE_STATISTICS ); +// _usage = usage_unset(_usage,USE_INFORMATION ); + + Two_Level_Branch_Predictor * _Two_Level_Branch_Predictor = new Two_Level_Branch_Predictor + (name.c_str(), +#ifdef STATISTICS + _parameters_statistics, +#endif + _param, + _usage); + +#ifdef SYSTEMC + if (usage_is_set(_usage,USE_SYSTEMC)) + { + /********************************************************************* + * Déclarations des signaux + *********************************************************************/ + string rename; + + sc_clock * in_CLOCK = new sc_clock ("clock", 1.0, 0.5); + sc_signal * in_NRESET = new sc_signal ("NRESET"); + + /******************************************************** + * Instanciation + ********************************************************/ + + msg(_("<%s> : Instanciation of _Two_Level_Branch_Predictor.\n"),name.c_str()); + + (*(_Two_Level_Branch_Predictor->in_CLOCK)) (*(in_CLOCK)); + (*(_Two_Level_Branch_Predictor->in_NRESET)) (*(in_NRESET)); + + + msg(_("<%s> : Start Simulation ............\n"),name.c_str()); + + Time * _time = new Time(); + + /******************************************************** + * Simulation - Begin + ********************************************************/ + + // Initialisation + + const uint32_t seed = 0; +//const uint32_t seed = static_cast(time(NULL)); + + srand(seed); + + SC_START(0); + LABEL("Initialisation"); + + LABEL("Reset"); + in_NRESET->write(0); + SC_START(5); + in_NRESET->write(1); + + LABEL("Loop of Test"); + + for (uint32_t iteration=0; iteration : ............ Stop Simulation\n"),name.c_str()); + + delete in_CLOCK; + delete in_NRESET; + } +#endif + + delete _Two_Level_Branch_Predictor; +#ifdef STATISTICS + delete _parameters_statistics; +#endif +} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/Makefile =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/Makefile (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/Makefile (revision 110) @@ -0,0 +1,19 @@ +# +# $Id$ +# +# [ Description ] +# +# Makefile +# + +#-----[ Directory ]---------------------------------------- +DIR_COMPONENT = ../ +include $(DIR_COMPONENT)/Makefile.defs + +#-----[ include ]------------------------------------------ + +all : + $(MAKE) all_documentation + +include $(DIR_MORPHEO)/Behavioural/Makefile.Common +include $(DIR_MORPHEO)/Behavioural/Makefile.Documentation Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/Two_Level_Branch_Predictor.tex =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/Two_Level_Branch_Predictor.tex (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/Two_Level_Branch_Predictor.tex (revision 110) @@ -0,0 +1,42 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\documentclass[10pt,a4paper,twocolumn]{article} + +\def\dirdoc{tex} +\def\dirschema{eps} + +% Package de variables d'environnement : Titre, command etc ... +\usepackage{../../../../../../../../../Behavioural/doc/sty/doc-style} +\usepackage{sty/header} + + +%------------------------------------------------------------------------------ +% Début document +%------------------------------------------------------------------------------ + +\pagestyle{empty} + +\begin{document} + +% Créez une page de titre +\maketitle +\thispagestyle{empty} + +%Table des matières et des figures +%\tableofcontents +%\newpage +%\listoffigures + +%------------------------------------------------------------------------------ +% Ajout du corps du documents +%------------------------------------------------------------------------------ + +\input{tex/root} + +%------------------------------------------------------------------------------ +% Fin d'ajout du corps du document +%------------------------------------------------------------------------------ + +\end{document} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/sty/header.sty =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/sty/header.sty (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/sty/header.sty (revision 110) @@ -0,0 +1,16 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\def\review{YYYY/MM/DD} +%\def\review{\number\day/\number\month/\number\year\xspace} + +\title{Two_Level_Branch_Predictor} + +\author{} + +\affiliation{} + +\email{} + +\date{\review} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/tex/01_introduction.tex =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/tex/01_introduction.tex (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/tex/01_introduction.tex (revision 110) @@ -0,0 +1,5 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\Section{Introduction} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/tex/02_features.tex =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/tex/02_features.tex (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/tex/02_features.tex (revision 110) @@ -0,0 +1,5 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\Section{Features} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/tex/03_description.tex =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/tex/03_description.tex (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/tex/03_description.tex (revision 110) @@ -0,0 +1,5 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\Section{Functional Description} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/tex/04_pinout.tex =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/tex/04_pinout.tex (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/tex/04_pinout.tex (revision 110) @@ -0,0 +1,5 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\Section{Pin out} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/tex/05_parameters.tex =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/tex/05_parameters.tex (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/tex/05_parameters.tex (revision 110) @@ -0,0 +1,5 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\Section{Parameters} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/tex/06_performance.tex =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/tex/06_performance.tex (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/tex/06_performance.tex (revision 110) @@ -0,0 +1,5 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\Section{Performance} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/tex/07_details.tex =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/tex/07_details.tex (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/tex/07_details.tex (revision 110) @@ -0,0 +1,5 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\Section{Details} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/tex/08_history.tex =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/tex/08_history.tex (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/tex/08_history.tex (revision 110) @@ -0,0 +1,14 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\Section{Revision History} + +\begin{tabular}{|c|c|c|} +\hline +Revision Date & By & Modifications\\ +\hline +\hline +yyyy/mm/dd & xxx & Initial document \\ +\hline +\end{tabular} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/tex/root.tex =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/tex/root.tex (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/tex/root.tex (revision 110) @@ -0,0 +1,12 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\input{\dirdoc/01_introduction} +\input{\dirdoc/02_features} +\input{\dirdoc/03_description} +\input{\dirdoc/04_pinout} +\input{\dirdoc/05_parameters} +\input{\dirdoc/06_performance} +\input{\dirdoc/07_details} +\input{\dirdoc/08_history} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h (revision 110) @@ -0,0 +1,54 @@ +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_Parameters_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_Parameters_h + +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/include/Parameters.h" +#include "Common/include/Debug.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace two_level_branch_predictor { + + + class Parameters : public morpheo::behavioural::Parameters + { + //-----[ fields ]------------------------------------------------------------ + + //-----[ methods ]----------------------------------------------------------- + public : Parameters (bool is_toplevel=false); +//public : Parameters (Parameters & param) ; + public : ~Parameters (void); + + public : void copy (void); + + public : Parameters_test msg_error (void); + + public : std::string print (uint32_t depth); + public : friend std::ostream& operator<< (std::ostream& output_stream, + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters & x); + }; + +}; // end namespace two_level_branch_predictor +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo + +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h (revision 110) @@ -0,0 +1,135 @@ +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_Two_Level_Branch_Predictor_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_Two_Level_Branch_Predictor_h + +/* + * $Id$ + * + * [ Description ] + * + */ + +#ifdef SYSTEMC +#include "systemc.h" +#endif + + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Types.h" +#ifdef STATISTICS +#include "Behavioural/include/Stat.h" +#endif +#include "Behavioural/include/Component.h" +#ifdef VHDL +#include "Behavioural/include/Vhdl.h" +#endif +#include "Behavioural/include/Usage.h" + +#include "Common/include/ToString.h" +#include "Common/include/Debug.h" + +#include + +namespace morpheo { +namespace behavioural { + +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace two_level_branch_predictor { + + + class Two_Level_Branch_Predictor +#if SYSTEMC + : public sc_module +#endif + { + // -----[ fields ]---------------------------------------------------- + // Parameters + protected : const std::string _name; + protected : const Parameters * _param; + private : const Tusage_t _usage; + +#ifdef STATISTICS + public : Stat * _stat; +#endif + + public : Component * _component; + private : Interfaces * _interfaces; + +#ifdef SYSTEMC + // ~~~~~[ Interface ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // ~~~~~[ Interface : "" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + public : SC_CLOCK * in_CLOCK ; + public : SC_IN (Tcontrol_t) * in_NRESET ; + + // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + // ~~~~~[ Register ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + // ~~~~~[ Internal ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +#endif + + // -----[ Methods ]--------------------------------------------------- + +#ifdef SYSTEMC + SC_HAS_PROCESS (Two_Level_Branch_Predictor); +#endif + public : Two_Level_Branch_Predictor + ( +#ifdef SYSTEMC + sc_module_name name, +#else + std::string name, +#endif +#ifdef STATISTICS + morpheo::behavioural::Parameters_Statistics * param_statistics, +#endif + Parameters * param, + morpheo::behavioural::Tusage_t usage + ); + public : ~Two_Level_Branch_Predictor (void); + + private : void allocation ( +#ifdef STATISTICS + morpheo::behavioural::Parameters_Statistics * param_statistics +#else + void +#endif + ); + private : void deallocation (void); + +#ifdef SYSTEMC + public : void transition (void); +//public : void genMoore (void); +#endif + +#if VHDL + public : void vhdl (void); + private : void vhdl_declaration (Vhdl * & vhdl); + private : void vhdl_body (Vhdl * & vhdl); +#endif + +#ifdef STATISTICS + public : void statistics_allocation (morpheo::behavioural::Parameters_Statistics * param_statistics); + public : void statistics_deallocation (void); +#endif +#if defined(STATISTICS) or defined(VHDL_TESTBENCH) + private : void end_cycle (void); +#endif + }; + +}; // end namespace two_level_branch_predictor +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo + +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Types.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Types.h (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Types.h (revision 110) @@ -0,0 +1,35 @@ +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_Types_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_Types_h + +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/include/Types.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace two_level_branch_predictor { + + +}; // end namespace two_level_branch_predictor +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo + +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Parameters.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Parameters.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Parameters.cpp (revision 110) @@ -0,0 +1,71 @@ +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace two_level_branch_predictor { + + +#undef FUNCTION +#define FUNCTION "Two_Level_Branch_Predictor::Parameters" + Parameters::Parameters (bool is_toplevel) + { + log_begin(Two_Level_Branch_Predictor,FUNCTION); + + test(); + + if (is_toplevel) + { + copy(); + } + + log_end(Two_Level_Branch_Predictor,FUNCTION); + }; + +// #undef FUNCTION +// #define FUNCTION "Two_Level_Branch_Predictor::Parameters (copy)" +// Parameters::Parameters (Parameters & param) +// { +// log_begin(Two_Level_Branch_Predictor,FUNCTION); +// test(); +// log_end(Two_Level_Branch_Predictor,FUNCTION); +// }; + +#undef FUNCTION +#define FUNCTION "Two_Level_Branch_Predictor::~Parameters" + Parameters::~Parameters (void) + { + log_begin(Two_Level_Branch_Predictor,FUNCTION); + log_end(Two_Level_Branch_Predictor,FUNCTION); + }; + +#undef FUNCTION +#define FUNCTION "Two_Level_Branch_Predictor::copy" + void Parameters::copy (void) + { + log_begin(Two_Level_Branch_Predictor,FUNCTION); + log_end(Two_Level_Branch_Predictor,FUNCTION); + }; + +}; // end namespace two_level_branch_predictor +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Parameters_msg_error.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Parameters_msg_error.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Parameters_msg_error.cpp (revision 110) @@ -0,0 +1,45 @@ +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/include/Types.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h" +#include + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace two_level_branch_predictor { + + +#undef FUNCTION +#define FUNCTION "Two_Level_Branch_Predictor::msg_error" + Parameters_test Parameters::msg_error(void) + { + log_begin(Two_Level_Branch_Predictor,FUNCTION); + + Parameters_test test ("Two_Level_Branch_Predictor"); + + log_end(Two_Level_Branch_Predictor,FUNCTION); + + return test; + }; + +}; // end namespace two_level_branch_predictor +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Parameters_print.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Parameters_print.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Parameters_print.cpp (revision 110) @@ -0,0 +1,62 @@ +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h" +#include "Behavioural/include/XML.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace two_level_branch_predictor { + + +#undef FUNCTION +#define FUNCTION "Two_Level_Branch_Predictor::print" + std::string Parameters::print (uint32_t depth) + { + log_begin(Two_Level_Branch_Predictor,FUNCTION); + + XML xml ("two_level_branch_predictor"); + + xml.balise_open("two_level_branch_predictor"); +// xml.singleton_begin(""); xml.attribut("value",toString(_)); xml.singleton_end(); + xml.balise_close(); + + log_end(Two_Level_Branch_Predictor,FUNCTION); + + return xml.get_body(depth); + }; + +#undef FUNCTION +#define FUNCTION "Two_Level_Branch_Predictor::operator<<" + std::ostream& operator<< (std::ostream& output_stream , + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters & x) + { + log_begin(Two_Level_Branch_Predictor,FUNCTION); + + output_stream << x.print(0); + + log_end(Two_Level_Branch_Predictor,FUNCTION); + + return output_stream; + }; + +}; // end namespace two_level_branch_predictor +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor.cpp (revision 110) @@ -0,0 +1,127 @@ +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace two_level_branch_predictor { + + +#undef FUNCTION +#define FUNCTION "Two_Level_Branch_Predictor::Two_Level_Branch_Predictor" + Two_Level_Branch_Predictor::Two_Level_Branch_Predictor + ( +#ifdef SYSTEMC + sc_module_name name, +#else + string name, +#endif +#ifdef STATISTICS + morpheo::behavioural::Parameters_Statistics * param_statistics, +#endif + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters * param, + morpheo::behavioural::Tusage_t usage + ): + _name (name) + ,_param (param) + ,_usage (usage) + { + log_begin(Two_Level_Branch_Predictor,FUNCTION); + + usage_environment(_usage); + + log_printf(INFO,Two_Level_Branch_Predictor,FUNCTION,_("<%s> : Allocation"),_name.c_str()); + + allocation ( +#ifdef STATISTICS + param_statistics +#endif + ); + +#ifdef STATISTICS + if (usage_is_set(_usage,USE_STATISTICS)) + { + log_printf(INFO,Two_Level_Branch_Predictor,FUNCTION,_("<%s> : Allocation of statistics"),_name.c_str()); + + statistics_allocation(param_statistics); + } +#endif + +#ifdef VHDL + if (usage_is_set(_usage,USE_VHDL)) + { + // generate the vhdl + log_printf(INFO,Two_Level_Branch_Predictor,FUNCTION,_("<%s> : Generate the vhdl"),_name.c_str()); + + vhdl(); + } +#endif + +#ifdef SYSTEMC + if (usage_is_set(_usage,USE_SYSTEMC)) + { + log_printf(INFO,Two_Level_Branch_Predictor,FUNCTION,_("<%s> : Method - transition"),_name.c_str()); + + SC_METHOD (transition); + dont_initialize (); + sensitive << (*(in_CLOCK)).pos(); + +# ifdef SYSTEMCASS_SPECIFIC + // List dependency information +# endif + +// log_printf(INFO,Two_Level_Branch_Predictor,FUNCTION,_("<%s> : Method - genMoore"),_name.c_str()); + +// SC_METHOD (genMoore); +// dont_initialize (); +// sensitive << (*(in_CLOCK)).neg(); // need internal register + +// # ifdef SYSTEMCASS_SPECIFIC +// // List dependency information +// # endif + +#endif + } + log_end(Two_Level_Branch_Predictor,FUNCTION); + }; + +#undef FUNCTION +#define FUNCTION "Two_Level_Branch_Predictor::~Two_Level_Branch_Predictor" + Two_Level_Branch_Predictor::~Two_Level_Branch_Predictor (void) + { + log_begin(Two_Level_Branch_Predictor,FUNCTION); + +#ifdef STATISTICS + if (usage_is_set(_usage,USE_STATISTICS)) + { + statistics_deallocation(); + } +#endif + + log_printf(INFO,Two_Level_Branch_Predictor,FUNCTION,_("<%s> : Deallocation"),_name.c_str()); + deallocation (); + + log_end(Two_Level_Branch_Predictor,FUNCTION); + }; + +}; // end namespace two_level_branch_predictor +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_allocation.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_allocation.cpp (revision 110) @@ -0,0 +1,79 @@ +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" +#include "Behavioural/include/Allocation.h" +#include "Common/include/Max.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace two_level_branch_predictor { + + + +#undef FUNCTION +#define FUNCTION "Two_Level_Branch_Predictor::allocation" + void Two_Level_Branch_Predictor::allocation ( +#ifdef STATISTICS + morpheo::behavioural::Parameters_Statistics * param_statistics +#else + void +#endif + ) + { + log_begin(Two_Level_Branch_Predictor,FUNCTION); + + _component = new Component (_usage); + + Entity * entity = _component->set_entity (_name + ,"Two_Level_Branch_Predictor" +#ifdef POSITION + ,COMBINATORY +#endif + ); + + _interfaces = entity->set_interfaces(); + + // ~~~~~[ Interface : "" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + { + Interface * interface = _interfaces->set_interface("" +#ifdef POSITION + ,IN + ,SOUTH, + _("Generalist interface") +#endif + ); + + in_CLOCK = interface->set_signal_clk ("clock" ,1, CLOCK_VHDL_YES); + in_NRESET = interface->set_signal_in ("nreset",1, RESET_VHDL_YES); + } + // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +#ifdef POSITION + if (usage_is_set(_usage,USE_POSITION)) + _component->generate_file(); +#endif + + log_end(Two_Level_Branch_Predictor,FUNCTION); + }; + +}; // end namespace two_level_branch_predictor +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_deallocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_deallocation.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_deallocation.cpp (revision 110) @@ -0,0 +1,49 @@ +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" +#include "Behavioural/include/Allocation.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace two_level_branch_predictor { + + +#undef FUNCTION +#define FUNCTION "Two_Level_Branch_Predictor::deallocation" + void Two_Level_Branch_Predictor::deallocation (void) + { + log_begin(Two_Level_Branch_Predictor,FUNCTION); + + if (usage_is_set(_usage,USE_SYSTEMC)) + { + delete in_CLOCK ; + delete in_NRESET; + } + // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + delete _component; + + log_end(Two_Level_Branch_Predictor,FUNCTION); + }; + +}; // end namespace two_level_branch_predictor +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_end_cycle.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_end_cycle.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_end_cycle.cpp (revision 110) @@ -0,0 +1,53 @@ +#if defined(STATISTICS) or defined(VHDL_TESTBENCH) +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace two_level_branch_predictor { + + +#undef FUNCTION +#define FUNCTION "Two_Level_Branch_Predictor::end_cycle" +void Two_Level_Branch_Predictor::end_cycle () + { + log_begin(Two_Level_Branch_Predictor,FUNCTION); + +#ifdef STATISTICS + if (usage_is_set(_usage,USE_STATISTICS)) + _stat->end_cycle(); +#endif + +#ifdef VHDL_TESTBENCH + // Evaluation before read the ouput signal +// sc_start(0); + if (usage_is_set(_usage,USE_VHDL_TESTBENCH)) + _interfaces->testbench(); +#endif + + log_end(Two_Level_Branch_Predictor,FUNCTION); + }; + +}; // end namespace two_level_branch_predictor +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_statistics_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_statistics_allocation.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_statistics_allocation.cpp (revision 110) @@ -0,0 +1,45 @@ +#ifdef STATISTICS +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace two_level_branch_predictor { + + +#undef FUNCTION +#define FUNCTION "Two_Level_Branch_Predictor::statistics_allocation" + void Two_Level_Branch_Predictor::statistics_allocation (morpheo::behavioural::Parameters_Statistics * param_statistics) + { + log_begin(Two_Level_Branch_Predictor,FUNCTION); + + _stat = new Stat (static_cast(_name), + "Two_Level_Branch_Predictor", + param_statistics); + + log_end(Two_Level_Branch_Predictor,FUNCTION); + }; + +}; // end namespace two_level_branch_predictor +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_statistics_deallocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_statistics_deallocation.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_statistics_deallocation.cpp (revision 110) @@ -0,0 +1,45 @@ +#ifdef STATISTICS +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace two_level_branch_predictor { + + +#undef FUNCTION +#define FUNCTION "Two_Level_Branch_Predictor::statistics_deallocation" + void Two_Level_Branch_Predictor::statistics_deallocation (void) + { + log_begin(Two_Level_Branch_Predictor,FUNCTION); + + log_printf(INFO,Two_Level_Branch_Predictor,FUNCTION,_("<%s> : Generate Statistics file"),_name.c_str()); + + delete _stat; + + log_end(Two_Level_Branch_Predictor,FUNCTION); + }; + +}; // end namespace two_level_branch_predictor +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_transition.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_transition.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_transition.cpp (revision 110) @@ -0,0 +1,45 @@ +#ifdef SYSTEMC +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace two_level_branch_predictor { + + +#undef FUNCTION +#define FUNCTION "Two_Level_Branch_Predictor::transition" + void Two_Level_Branch_Predictor::transition (void) + { + log_begin(Two_Level_Branch_Predictor,FUNCTION); + +#if defined(STATISTICS) or defined(VHDL_TESTBENCH) + end_cycle (); +#endif + + log_end(Two_Level_Branch_Predictor,FUNCTION); + }; + +}; // end namespace two_level_branch_predictor +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_vhdl.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_vhdl.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_vhdl.cpp (revision 110) @@ -0,0 +1,54 @@ +#ifdef VHDL +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" +#include "Behavioural/include/Vhdl.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace two_level_branch_predictor { + + +#undef FUNCTION +#define FUNCTION "Two_Level_Branch_Predictor::vhdl" + void Two_Level_Branch_Predictor::vhdl (void) + { + log_begin(Two_Level_Branch_Predictor,FUNCTION); + + Vhdl * vhdl = new Vhdl (_name); + + _interfaces->set_port(vhdl); + _component->vhdl_instance(vhdl); + + vhdl_declaration (vhdl); + vhdl_body (vhdl); + + vhdl->generate_file(); + + delete vhdl; + + log_end(Two_Level_Branch_Predictor,FUNCTION); + }; + +}; // end namespace two_level_branch_predictor +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_vhdl_body.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_vhdl_body.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_vhdl_body.cpp (revision 110) @@ -0,0 +1,41 @@ +#ifdef VHDL +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace two_level_branch_predictor { + + +#undef FUNCTION +#define FUNCTION "Two_Level_Branch_Predictor::vhdl_body" + void Two_Level_Branch_Predictor::vhdl_body (Vhdl * & vhdl) + { + log_begin(Two_Level_Branch_Predictor,FUNCTION); + vhdl->set_body (""); + log_end(Two_Level_Branch_Predictor,FUNCTION); + }; + +}; // end namespace two_level_branch_predictor +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_vhdl_declaration.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_vhdl_declaration.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_vhdl_declaration.cpp (revision 110) @@ -0,0 +1,40 @@ +#ifdef VHDL +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { +namespace two_level_branch_predictor { + + +#undef FUNCTION +#define FUNCTION "Two_Level_Branch_Predictor::vhdl_declaration" + void Two_Level_Branch_Predictor::vhdl_declaration (Vhdl * & vhdl) + { + log_begin(Two_Level_Branch_Predictor,FUNCTION); + log_end(Two_Level_Branch_Predictor,FUNCTION); + }; + +}; // end namespace two_level_branch_predictor +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/Makefile =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/Makefile (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/Makefile (revision 110) @@ -0,0 +1,19 @@ +# +# $Id$ +# +# [ Description ] +# +# Makefile +# + +#-----[ Directory ]---------------------------------------- +DIR_COMPONENT = ../ +include $(DIR_COMPONENT)/Makefile.defs + +#-----[ include ]------------------------------------------ + +all : + $(MAKE) all_documentation + +include $(DIR_MORPHEO)/Behavioural/Makefile.Common +include $(DIR_MORPHEO)/Behavioural/Makefile.Documentation Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/Meta_Predictor.tex =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/Meta_Predictor.tex (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/Meta_Predictor.tex (revision 110) @@ -0,0 +1,42 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\documentclass[10pt,a4paper,twocolumn]{article} + +\def\dirdoc{tex} +\def\dirschema{eps} + +% Package de variables d'environnement : Titre, command etc ... +\usepackage{../../../../../../../../Behavioural/doc/sty/doc-style} +\usepackage{sty/header} + + +%------------------------------------------------------------------------------ +% Début document +%------------------------------------------------------------------------------ + +\pagestyle{empty} + +\begin{document} + +% Créez une page de titre +\maketitle +\thispagestyle{empty} + +%Table des matières et des figures +%\tableofcontents +%\newpage +%\listoffigures + +%------------------------------------------------------------------------------ +% Ajout du corps du documents +%------------------------------------------------------------------------------ + +\input{tex/root} + +%------------------------------------------------------------------------------ +% Fin d'ajout du corps du document +%------------------------------------------------------------------------------ + +\end{document} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/sty/header.sty =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/sty/header.sty (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/sty/header.sty (revision 110) @@ -0,0 +1,16 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\def\review{YYYY/MM/DD} +%\def\review{\number\day/\number\month/\number\year\xspace} + +\title{Meta_Predictor} + +\author{} + +\affiliation{} + +\email{} + +\date{\review} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/tex/01_introduction.tex =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/tex/01_introduction.tex (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/tex/01_introduction.tex (revision 110) @@ -0,0 +1,5 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\Section{Introduction} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/tex/02_features.tex =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/tex/02_features.tex (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/tex/02_features.tex (revision 110) @@ -0,0 +1,5 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\Section{Features} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/tex/03_description.tex =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/tex/03_description.tex (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/tex/03_description.tex (revision 110) @@ -0,0 +1,5 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\Section{Functional Description} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/tex/04_pinout.tex =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/tex/04_pinout.tex (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/tex/04_pinout.tex (revision 110) @@ -0,0 +1,5 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\Section{Pin out} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/tex/05_parameters.tex =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/tex/05_parameters.tex (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/tex/05_parameters.tex (revision 110) @@ -0,0 +1,5 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\Section{Parameters} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/tex/06_performance.tex =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/tex/06_performance.tex (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/tex/06_performance.tex (revision 110) @@ -0,0 +1,5 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\Section{Performance} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/tex/07_details.tex =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/tex/07_details.tex (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/tex/07_details.tex (revision 110) @@ -0,0 +1,5 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\Section{Details} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/tex/08_history.tex =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/tex/08_history.tex (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/tex/08_history.tex (revision 110) @@ -0,0 +1,14 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\Section{Revision History} + +\begin{tabular}{|c|c|c|} +\hline +Revision Date & By & Modifications\\ +\hline +\hline +yyyy/mm/dd & xxx & Initial document \\ +\hline +\end{tabular} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/tex/root.tex =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/tex/root.tex (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/tex/root.tex (revision 110) @@ -0,0 +1,12 @@ +%------------------------------------------------------------------------------ +% $Id$ +%------------------------------------------------------------------------------ + +\input{\dirdoc/01_introduction} +\input{\dirdoc/02_features} +\input{\dirdoc/03_description} +\input{\dirdoc/04_pinout} +\input{\dirdoc/05_parameters} +\input{\dirdoc/06_performance} +\input{\dirdoc/07_details} +\input{\dirdoc/08_history} Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h (revision 110) @@ -0,0 +1,132 @@ +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_Meta_Predictor_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_Meta_Predictor_h + +/* + * $Id$ + * + * [ Description ] + * + */ + +#ifdef SYSTEMC +#include "systemc.h" +#endif + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Parameters.h" +#include "Behavioural/include/Types.h" + +#ifdef STATISTICS +#include "Behavioural/include/Stat.h" +#endif +#include "Behavioural/include/Component.h" +#ifdef VHDL +#include "Behavioural/include/Vhdl.h" +#endif +#include "Behavioural/include/Usage.h" + +#include "Common/include/ToString.h" +#include "Common/include/Debug.h" + +#include + +namespace morpheo { +namespace behavioural { + +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { + + + class Meta_Predictor +#if SYSTEMC + : public sc_module +#endif + { + // -----[ fields ]---------------------------------------------------- + // Parameters + protected : const std::string _name; + protected : const Parameters * _param; + private : const Tusage_t _usage; + +#ifdef STATISTICS + public : Stat * _stat; +#endif + + public : Component * _component; + private : Interfaces * _interfaces; + +#ifdef SYSTEMC + // ~~~~~[ Interface ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // ~~~~~[ Interface : "" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + public : SC_CLOCK * in_CLOCK ; + public : SC_IN (Tcontrol_t) * in_NRESET ; + + // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + // ~~~~~[ Register ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + // ~~~~~[ Internal ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +#endif + + // -----[ Methods ]--------------------------------------------------- + +#ifdef SYSTEMC + SC_HAS_PROCESS (Meta_Predictor); +#endif + public : Meta_Predictor + ( +#ifdef SYSTEMC + sc_module_name name, +#else + std::string name, +#endif +#ifdef STATISTICS + morpheo::behavioural::Parameters_Statistics * param_statistics, +#endif + Parameters * param, + morpheo::behavioural::Tusage_t usage + ); + public : ~Meta_Predictor (void); + + private : void allocation ( +#ifdef STATISTICS + morpheo::behavioural::Parameters_Statistics * param_statistics +#else + void +#endif + ); + private : void deallocation (void); + +#ifdef SYSTEMC +# if defined(STATISTICS) or defined(VHDL_TESTBENCH) + public : void transition (void); +# endif +#endif + +#if VHDL + public : void vhdl (void); +#endif + +#ifdef STATISTICS + public : void statistics_allocation (morpheo::behavioural::Parameters_Statistics * param_statistics); + public : void statistics_deallocation (void); +#endif +#if defined(STATISTICS) or defined(VHDL_TESTBENCH) + private : void end_cycle (void); +#endif + }; + +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo + +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Parameters.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Parameters.h (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Parameters.h (revision 110) @@ -0,0 +1,52 @@ +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_Parameters_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_Parameters_h + +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/include/Parameters.h" +#include "Common/include/Debug.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { + + + class Parameters : public morpheo::behavioural::Parameters + { + //-----[ fields ]------------------------------------------------------------ + + //-----[ methods ]----------------------------------------------------------- + public : Parameters (bool is_toplevel=false); +//public : Parameters (Parameters & param) ; + public : ~Parameters (void); + + public : void copy (void); + + public : Parameters_test msg_error (void); + + public : std::string print (uint32_t depth); + public : friend std::ostream& operator<< (std::ostream& output, + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::Parameters & x); + }; + +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo + +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor.cpp (revision 110) @@ -0,0 +1,115 @@ +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { + + +#undef FUNCTION +#define FUNCTION "Meta_Predictor::Meta_Predictor" + Meta_Predictor::Meta_Predictor + ( +#ifdef SYSTEMC + sc_module_name name, +#else + string name, +#endif +#ifdef STATISTICS + morpheo::behavioural::Parameters_Statistics * param_statistics, +#endif + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::Parameters * param, + morpheo::behavioural::Tusage_t usage + ): + _name (name) + ,_param (param) + ,_usage (usage) + { + log_begin(Meta_Predictor,FUNCTION); + + usage_environment(_usage); + + log_printf(INFO,Meta_Predictor,FUNCTION,_("<%s> : Allocation"),_name.c_str()); + + allocation ( +#ifdef STATISTICS + param_statistics +#endif + ); + +#ifdef STATISTICS + if (usage_is_set(_usage,USE_STATISTICS)) + { + log_printf(INFO,Meta_Predictor,FUNCTION,_("<%s> : Allocation of statistics"),_name.c_str()); + + statistics_allocation(param_statistics); + } +#endif + +#ifdef VHDL + if (usage_is_set(_usage,USE_VHDL)) + { + // generate the vhdl + log_printf(INFO,Meta_Predictor,FUNCTION,_("<%s> : Generate the vhdl"),_name.c_str()); + + vhdl(); + } +#endif + +#ifdef SYSTEMC + if (usage_is_set(_usage,USE_SYSTEMC)) + { + log_printf(INFO,Meta_Predictor,FUNCTION,_("<%s> : Method - transition"),_name.c_str()); + + SC_METHOD (transition); + dont_initialize (); + sensitive << (*(in_CLOCK)).pos(); + +# ifdef SYSTEMCASS_SPECIFIC + // List dependency information +# endif + +#endif + } + log_end(Meta_Predictor,FUNCTION); + }; + +#undef FUNCTION +#define FUNCTION "Meta_Predictor::~Meta_Predictor" + Meta_Predictor::~Meta_Predictor (void) + { + log_begin(Meta_Predictor,FUNCTION); + +#ifdef STATISTICS + if (usage_is_set(_usage,USE_STATISTICS)) + { + statistics_deallocation(); + } +#endif + + log_printf(INFO,Meta_Predictor,FUNCTION,_("<%s> : Deallocation"),_name.c_str()); + deallocation (); + + log_end(Meta_Predictor,FUNCTION); + }; + +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_allocation.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_allocation.cpp (revision 110) @@ -0,0 +1,85 @@ +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h" +#include "Behavioural/include/Allocation.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { + + + +#undef FUNCTION +#define FUNCTION "Meta_Predictor::allocation" + void Meta_Predictor::allocation + ( +#ifdef STATISTICS + morpheo::behavioural::Parameters_Statistics * param_statistics +#else + void +#endif + ) + { + log_begin(Meta_Predictor,FUNCTION); + + _component = new Component (_usage); + + Entity * entity = _component->set_entity (_name + ,"Meta_Predictor" +#ifdef POSITION + ,COMBINATORY +#endif + ); + + _interfaces = entity->set_interfaces(); + + // ~~~~~[ Interface : "" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + { + Interface * interface = _interfaces->set_interface("" +#ifdef POSITION + ,IN + ,SOUTH, + "Generalist interface" +#endif + ); + + in_CLOCK = interface->set_signal_clk ("clock" ,1, CLOCK_VHDL_YES); + in_NRESET = interface->set_signal_in ("nreset",1, RESET_VHDL_YES); + } + + // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + // ~~~~~[ Instanciation ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + std::string src,dest; + + // ~~~~~[ Others ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + if (DEBUG_Meta_Predictor == true) + _component->test_map(); + +#ifdef POSITION + if (usage_is_set(_usage,USE_POSITION)) + _component->generate_file(); +#endif + + log_end(Meta_Predictor,FUNCTION); + }; + +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_deallocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_deallocation.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_deallocation.cpp (revision 110) @@ -0,0 +1,47 @@ +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h" +#include "Behavioural/include/Allocation.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { + + +#undef FUNCTION +#define FUNCTION "Meta_Predictor::deallocation" + void Meta_Predictor::deallocation (void) + { + log_begin(Meta_Predictor,FUNCTION); + + if (usage_is_set(_usage,USE_SYSTEMC)) + { + delete in_CLOCK ; + delete in_NRESET; + } + // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + delete _component; + + log_end(Meta_Predictor,FUNCTION); + }; + +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_end_cycle.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_end_cycle.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_end_cycle.cpp (revision 110) @@ -0,0 +1,51 @@ +#if defined(STATISTICS) or defined(VHDL_TESTBENCH) +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { + + +#undef FUNCTION +#define FUNCTION "Meta_Predictor::end_cycle" +void Meta_Predictor::end_cycle () + { + log_begin(Meta_Predictor,FUNCTION); + +#ifdef STATISTICS + if (usage_is_set(_usage,USE_STATISTICS)) + _stat->end_cycle(); +#endif + +#ifdef VHDL_TESTBENCH + // Evaluation before read the ouput signal +// sc_start(0); + if (usage_is_set(_usage,USE_VHDL_TESTBENCH)) + _interfaces->testbench(); +#endif + + log_end(Meta_Predictor,FUNCTION); + }; + +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_statistics_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_statistics_allocation.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_statistics_allocation.cpp (revision 110) @@ -0,0 +1,43 @@ +#ifdef STATISTICS +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { + + +#undef FUNCTION +#define FUNCTION "Meta_Predictor::statistics_allocation" + void Meta_Predictor::statistics_allocation (morpheo::behavioural::Parameters_Statistics * param_statistics) + { + log_begin(Meta_Predictor,FUNCTION); + + _stat = new Stat (static_cast(_name), + "Meta_Predictor", + param_statistics); + + log_end(Meta_Predictor,FUNCTION); + }; + +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_statistics_deallocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_statistics_deallocation.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_statistics_deallocation.cpp (revision 110) @@ -0,0 +1,43 @@ +#ifdef STATISTICS +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { + + +#undef FUNCTION +#define FUNCTION "Meta_Predictor::statistics_deallocation" + void Meta_Predictor::statistics_deallocation (void) + { + log_begin(Meta_Predictor,FUNCTION); + + log_printf(INFO,Meta_Predictor,FUNCTION,_("<%s> : Generate Statistics file"),_name.c_str()); + + delete _stat; + + log_end(Meta_Predictor,FUNCTION); + }; + +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_transition.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_transition.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_transition.cpp (revision 110) @@ -0,0 +1,45 @@ +# if defined(STATISTICS) or defined(VHDL_TESTBENCH) +#ifdef SYSTEMC +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { + + +#undef FUNCTION +#define FUNCTION "Meta_Predictor::transition" + void Meta_Predictor::transition (void) + { + log_begin(Meta_Predictor,FUNCTION); + +#if defined(STATISTICS) or defined(VHDL_TESTBENCH) + end_cycle (); +#endif + + log_end(Meta_Predictor,FUNCTION); + }; + +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo +# endif +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_vhdl.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_vhdl.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_vhdl.cpp (revision 110) @@ -0,0 +1,49 @@ +#ifdef VHDL +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h" +#include "Behavioural/include/Vhdl.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { + + +#undef FUNCTION +#define FUNCTION "Meta_Predictor::vhdl" + void Meta_Predictor::vhdl (void) + { + log_begin(Meta_Predictor,FUNCTION); + + Vhdl * vhdl = new Vhdl (_name); + + _interfaces->set_port(vhdl); + _component->vhdl_instance(vhdl); + + vhdl->generate_file(); + + delete vhdl; + + log_end(Meta_Predictor,FUNCTION); + }; + +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Parameters.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Parameters.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Parameters.cpp (revision 110) @@ -0,0 +1,69 @@ +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Parameters.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { + + +#undef FUNCTION +#define FUNCTION "Meta_Predictor::Parameters" + Parameters::Parameters (bool is_toplevel) + { + log_begin(Meta_Predictor,FUNCTION); + + test(); + + if (is_toplevel) + { + copy(); + } + + log_end(Meta_Predictor,FUNCTION); + }; + +// #undef FUNCTION +// #define FUNCTION "Meta_Predictor::Parameters (copy)" +// Parameters::Parameters (Parameters & param) +// { +// log_begin(Meta_Predictor,FUNCTION); +// test(); +// log_end(Meta_Predictor,FUNCTION); +// }; + +#undef FUNCTION +#define FUNCTION "Meta_Predictor::~Parameters" + Parameters::~Parameters (void) + { + log_begin(Meta_Predictor,FUNCTION); + log_end(Meta_Predictor,FUNCTION); + }; + +#undef FUNCTION +#define FUNCTION "Meta_Predictor::copy" + void Parameters::copy (void) + { + log_begin(Meta_Predictor,FUNCTION); + log_end(Meta_Predictor,FUNCTION); + }; + +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Parameters_msg_error.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Parameters_msg_error.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Parameters_msg_error.cpp (revision 110) @@ -0,0 +1,43 @@ +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/include/Types.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Parameters.h" +#include + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { + + +#undef FUNCTION +#define FUNCTION "Meta_Predictor::msg_error" + Parameters_test Parameters::msg_error(void) + { + log_begin(Meta_Predictor,FUNCTION); + + Parameters_test test ("Meta_Predictor"); + + log_end(Meta_Predictor,FUNCTION); + + return test; + }; + +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Parameters_print.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Parameters_print.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Parameters_print.cpp (revision 110) @@ -0,0 +1,60 @@ +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Parameters.h" +#include "Behavioural/include/XML.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { +namespace meta_predictor { + + +#undef FUNCTION +#define FUNCTION "Meta_Predictor::print" + std::string Parameters::print (uint32_t depth) + { + log_begin(Meta_Predictor,FUNCTION); + + XML xml ("meta_predictor"); + + xml.balise_open("meta_predictor"); +// xml.singleton_begin(""); xml.attribut("value",toString(_)); xml.singleton_end(); + xml.balise_close(); + + log_end(Meta_Predictor,FUNCTION); + + return xml.get_body(depth); + }; + +#undef FUNCTION +#define FUNCTION "Meta_Predictor::operator<<" + std::ostream& operator<< (std::ostream& output_stream , + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::Parameters & x) + { + log_begin(Meta_Predictor,FUNCTION); + + output_stream << x.print(0); + + log_end(Meta_Predictor,FUNCTION); + + return output_stream; + }; + +}; // end namespace meta_predictor +}; // end namespace direction +}; // end namespace prediction_unit +}; // end namespace front_end +}; // end namespace multi_front_end +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Prediction_unit_Glue/SelfTest/src/test.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Prediction_unit_Glue/SelfTest/src/test.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Prediction_unit_Glue/SelfTest/src/test.cpp (revision 110) @@ -115,4 +115,5 @@ ALLOC2_SC_SIGNAL( in_DECOD_ADDRESS_SRC ," in_DECOD_ADDRESS_SRC ",Taddress_t ,_param->_nb_decod_unit,_param->_nb_inst_decod[it1]); ALLOC2_SC_SIGNAL( in_DECOD_ADDRESS_DEST ," in_DECOD_ADDRESS_DEST ",Taddress_t ,_param->_nb_decod_unit,_param->_nb_inst_decod[it1]); + ALLOC2_SC_SIGNAL(out_DECOD_CAN_CONTINUE ,"out_DECOD_CAN_CONTINUE ",Tcontrol_t ,_param->_nb_decod_unit,_param->_nb_inst_decod[it1]); ALLOC1_SC_SIGNAL(out_DECOD_BTB_VAL ,"out_DECOD_BTB_VAL ",Tcontrol_t ,_param->_nb_inst_branch_decod); ALLOC1_SC_SIGNAL( in_DECOD_BTB_ACK ," in_DECOD_BTB_ACK ",Tcontrol_t ,_param->_nb_inst_branch_decod); @@ -146,4 +147,5 @@ ALLOC1_SC_SIGNAL(out_DECOD_UPT_UPDATE_PREDICTION_ID ,"out_DECOD_UPT_UPDATE_PREDICTION_ID ",Tprediction_ptr_t ,_param->_nb_inst_branch_decod); ALLOC1_SC_SIGNAL(out_DECOD_UPT_IS_ACCURATE ,"out_DECOD_UPT_IS_ACCURATE ",Tcontrol_t ,_param->_nb_inst_branch_decod); + ALLOC1_SC_SIGNAL( in_DECOD_UPT_CAN_CONTINUE ," in_DECOD_UPT_CAN_CONTINUE ",Tcontrol_t ,_param->_nb_inst_branch_decod); ALLOC1_SC_SIGNAL(out_UPDATE_BTB_VAL ,"out_UPDATE_BTB_VAL ",Tcontrol_t ,_param->_nb_inst_branch_update); @@ -268,4 +270,5 @@ INSTANCE2_SC_SIGNAL(_Prediction_unit_Glue, in_DECOD_ADDRESS_SRC ,_param->_nb_decod_unit,_param->_nb_inst_decod[it1]); INSTANCE2_SC_SIGNAL(_Prediction_unit_Glue, in_DECOD_ADDRESS_DEST ,_param->_nb_decod_unit,_param->_nb_inst_decod[it1]); + INSTANCE2_SC_SIGNAL(_Prediction_unit_Glue,out_DECOD_CAN_CONTINUE ,_param->_nb_decod_unit,_param->_nb_inst_decod[it1]); INSTANCE1_SC_SIGNAL(_Prediction_unit_Glue,out_DECOD_BTB_VAL ,_param->_nb_inst_branch_decod); INSTANCE1_SC_SIGNAL(_Prediction_unit_Glue, in_DECOD_BTB_ACK ,_param->_nb_inst_branch_decod); @@ -303,4 +306,5 @@ INSTANCE1_SC_SIGNAL(_Prediction_unit_Glue,out_DECOD_UPT_UPDATE_PREDICTION_ID ,_param->_nb_inst_branch_decod); INSTANCE1_SC_SIGNAL(_Prediction_unit_Glue,out_DECOD_UPT_IS_ACCURATE ,_param->_nb_inst_branch_decod); + INSTANCE1_SC_SIGNAL(_Prediction_unit_Glue, in_DECOD_UPT_CAN_CONTINUE ,_param->_nb_inst_branch_decod); INSTANCE1_SC_SIGNAL(_Prediction_unit_Glue,out_UPDATE_BTB_VAL ,_param->_nb_inst_branch_update); @@ -799,4 +803,5 @@ DELETE2_SC_SIGNAL( in_DECOD_ADDRESS_SRC ,_param->_nb_decod_unit,_param->_nb_inst_decod[it1]); DELETE2_SC_SIGNAL( in_DECOD_ADDRESS_DEST ,_param->_nb_decod_unit,_param->_nb_inst_decod[it1]); + DELETE2_SC_SIGNAL(out_DECOD_CAN_CONTINUE ,_param->_nb_decod_unit,_param->_nb_inst_decod[it1]); DELETE1_SC_SIGNAL(out_DECOD_BTB_VAL ,_param->_nb_inst_branch_decod); DELETE1_SC_SIGNAL( in_DECOD_BTB_ACK ,_param->_nb_inst_branch_decod); @@ -830,4 +835,5 @@ DELETE1_SC_SIGNAL(out_DECOD_UPT_UPDATE_PREDICTION_ID ,_param->_nb_inst_branch_decod); DELETE1_SC_SIGNAL(out_DECOD_UPT_IS_ACCURATE ,_param->_nb_inst_branch_decod); + DELETE1_SC_SIGNAL( in_DECOD_UPT_CAN_CONTINUE ,_param->_nb_inst_branch_decod); DELETE1_SC_SIGNAL(out_UPDATE_BTB_VAL ,_param->_nb_inst_branch_update); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Prediction_unit_Glue/include/Prediction_unit_Glue.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Prediction_unit_Glue/include/Prediction_unit_Glue.h (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Prediction_unit_Glue/include/Prediction_unit_Glue.h (revision 110) @@ -128,4 +128,5 @@ public : SC_IN (Taddress_t ) *** in_DECOD_ADDRESS_SRC ; //[nb_decod_unit][nb_inst_decod] public : SC_IN (Taddress_t ) *** in_DECOD_ADDRESS_DEST ; //[nb_decod_unit][nb_inst_decod] + public : SC_OUT(Tcontrol_t ) *** out_DECOD_CAN_CONTINUE ; //[nb_decod_unit][nb_inst_decod] public : SC_OUT(Tcontrol_t ) ** out_DECOD_BTB_VAL ; //[nb_inst_branch_decod] @@ -162,4 +163,5 @@ public : SC_OUT(Tprediction_ptr_t ) ** out_DECOD_UPT_UPDATE_PREDICTION_ID ; //[nb_inst_branch_decod] public : SC_OUT(Tcontrol_t ) ** out_DECOD_UPT_IS_ACCURATE ; //[nb_inst_branch_decod] + public : SC_IN (Tcontrol_t ) ** in_DECOD_UPT_CAN_CONTINUE ; //[nb_inst_branch_decod] // ~~~~~[ Interface : "update" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Prediction_unit_Glue/src/Prediction_unit_Glue.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Prediction_unit_Glue/src/Prediction_unit_Glue.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Prediction_unit_Glue/src/Prediction_unit_Glue.cpp (revision 110) @@ -1058,5 +1058,6 @@ << (*(in_DECOD_RAS_ADDRESS_POP [i] )) // << (*(in_DECOD_RAS_INDEX [i] )) - << (*(in_DECOD_UPT_ACK [i] )) ; + << (*(in_DECOD_UPT_ACK [i] )) + << (*(in_DECOD_UPT_CAN_CONTINUE [i] )) ; } Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Prediction_unit_Glue/src/Prediction_unit_Glue_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Prediction_unit_Glue/src/Prediction_unit_Glue_allocation.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Prediction_unit_Glue/src/Prediction_unit_Glue_allocation.cpp (revision 110) @@ -149,4 +149,5 @@ _ALLOC2_SIGNAL_IN ( in_DECOD_ADDRESS_SRC ,"address_src" ,Taddress_t ,_param->_size_instruction_address ,_param->_nb_decod_unit,_param->_nb_inst_decod[it1]); _ALLOC2_SIGNAL_IN ( in_DECOD_ADDRESS_DEST ,"address_dest" ,Taddress_t ,_param->_size_instruction_address ,_param->_nb_decod_unit,_param->_nb_inst_decod[it1]); + _ALLOC2_SIGNAL_OUT(out_DECOD_CAN_CONTINUE ,"can_continue" ,Tcontrol_t ,1 ,_param->_nb_decod_unit,_param->_nb_inst_decod[it1]); } @@ -195,4 +196,5 @@ ALLOC1_SIGNAL_OUT(out_DECOD_UPT_UPDATE_PREDICTION_ID,"update_prediction_id",Tprediction_ptr_t ,_param->_size_depth ); ALLOC1_SIGNAL_OUT(out_DECOD_UPT_IS_ACCURATE ,"is_accurate" ,Tcontrol_t ,1); + ALLOC1_SIGNAL_IN ( in_DECOD_UPT_CAN_CONTINUE ,"can_continue" ,Tcontrol_t ,1); } } Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Prediction_unit_Glue/src/Prediction_unit_Glue_deallocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Prediction_unit_Glue/src/Prediction_unit_Glue_deallocation.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Prediction_unit_Glue/src/Prediction_unit_Glue_deallocation.cpp (revision 110) @@ -91,4 +91,6 @@ DELETE2_SIGNAL( in_DECOD_ADDRESS_SRC ,_param->_nb_decod_unit,_param->_nb_inst_decod[it1],_param->_size_instruction_address ); DELETE2_SIGNAL( in_DECOD_ADDRESS_DEST ,_param->_nb_decod_unit,_param->_nb_inst_decod[it1],_param->_size_instruction_address ); + DELETE2_SIGNAL(out_DECOD_CAN_CONTINUE ,_param->_nb_decod_unit,_param->_nb_inst_decod[it1],1); + DELETE1_SIGNAL(out_DECOD_BTB_VAL ,_param->_nb_inst_branch_decod,1); DELETE1_SIGNAL( in_DECOD_BTB_ACK ,_param->_nb_inst_branch_decod,1); @@ -124,4 +126,5 @@ DELETE1_SIGNAL(out_DECOD_UPT_UPDATE_PREDICTION_ID,_param->_nb_inst_branch_decod,_param->_size_depth); DELETE1_SIGNAL(out_DECOD_UPT_IS_ACCURATE ,_param->_nb_inst_branch_decod,1); + DELETE1_SIGNAL( in_DECOD_UPT_CAN_CONTINUE ,_param->_nb_inst_branch_decod,1); // ~~~~~[ Interface : "update" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Prediction_unit_Glue/src/Prediction_unit_Glue_genMealy_decod.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Prediction_unit_Glue/src/Prediction_unit_Glue_genMealy_decod.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Prediction_unit_Glue/src/Prediction_unit_Glue_genMealy_decod.cpp (revision 110) @@ -78,4 +78,5 @@ // * branch was not detected Tcontrol_t miss_decod = (branch_state == BRANCH_STATE_NONE); + Tcontrol_t can_continue = false; log_printf(TRACE,Prediction_unit_Glue,FUNCTION," * DECOD [%d][%d] : valid",decod_unit,i); @@ -90,5 +91,5 @@ { Tbranch_condition_t condition = PORT_READ(in_DECOD_BRANCH_CONDITION [decod_unit][i]); - Tcontrol_t direction = PORT_READ(in_DECOD_BRANCH_DIRECTION [decod_unit][i]); + Tcontrol_t take; Taddress_t address_src = PORT_READ(in_DECOD_ADDRESS_SRC [decod_unit][i]); Taddress_t address_dest = PORT_READ(in_DECOD_ADDRESS_DEST [decod_unit][i]); @@ -105,4 +106,5 @@ log_printf(TRACE,Prediction_unit_Glue,FUNCTION," * BRANCH_CONDITION_NONE_WITH_WRITE_STACK"); + take = true ; is_accurate = true ;//PORT_READ(in_DECOD_RAS_HIT [port]); use_ras = true ; @@ -119,4 +121,5 @@ log_printf(TRACE,Prediction_unit_Glue,FUNCTION," * BRANCH_CONDITION_READ_REGISTER_WITH_WRITE_STACK"); + take = true ; is_accurate = false; // address unknow : in a register use_ras = true; @@ -132,4 +135,5 @@ log_printf(TRACE,Prediction_unit_Glue,FUNCTION," * BRANCH_CONDITION_READ_STACK"); + take = true ; is_accurate = PORT_READ(in_DECOD_RAS_HIT [port]); use_ras = true; @@ -146,4 +150,5 @@ // * READ_REGISTER_WITHOUT_WRITE_STACK : Take but destination is unknow - don't continue + take = true ; is_accurate = false; // address unknow : in a register @@ -158,4 +163,5 @@ log_printf(TRACE,Prediction_unit_Glue,FUNCTION," * BRANCH_CONDITION_FLAG"); + take = PORT_READ(in_DECOD_BRANCH_DIRECTION [decod_unit][i]); is_accurate = true; // address dest is know @@ -168,4 +174,5 @@ log_printf(TRACE,Prediction_unit_Glue,FUNCTION," * BRANCH_CONDITION_NONE_WITHOUT_WRITE_STACK"); + take = true; is_accurate = true; @@ -173,4 +180,6 @@ } } + + log_printf(TRACE,Prediction_unit_Glue,FUNCTION," * take : %d",take); if (use_btb) @@ -181,5 +190,5 @@ PORT_WRITE(out_DECOD_BTB_ADDRESS_DEST [port],address_dest); PORT_WRITE(out_DECOD_BTB_CONDITION [port],condition); - PORT_WRITE(out_DECOD_BTB_LAST_TAKE [port],direction); + PORT_WRITE(out_DECOD_BTB_LAST_TAKE [port],take); PORT_WRITE(out_DECOD_BTB_MISS_PREDICTION [port],1); PORT_WRITE(out_DECOD_BTB_IS_ACCURATE [port],is_accurate); @@ -198,22 +207,32 @@ PORT_WRITE(out_DECOD_UPT_BTB_ADDRESS_DEST[port],address_dest); PORT_WRITE(out_DECOD_UPT_BTB_CONDITION [port],condition); - PORT_WRITE(out_DECOD_UPT_BTB_LAST_TAKE [port],direction); + PORT_WRITE(out_DECOD_UPT_BTB_LAST_TAKE [port],take); PORT_WRITE(out_DECOD_UPT_RAS_ADDRESS [port],PORT_READ(in_DECOD_RAS_ADDRESS_POP [port])); PORT_WRITE(out_DECOD_UPT_IS_ACCURATE [port],is_accurate); } + + can_continue = false; // need update upt } -// else -// { -// log_printf(TRACE,Prediction_unit_Glue,FUNCTION," * hit"); + else + { + log_printf(TRACE,Prediction_unit_Glue,FUNCTION," * hit"); + + if (branch_state == BRANCH_STATE_SPEC_NTAKE) + can_continue = PORT_READ(in_DECOD_UPT_CAN_CONTINUE [port]); + else + // BRANCH_STATE_NONE -> miss + // BRANCH_STATE_NSPEC_TAKE -> take + // BRANCH_STATE_SPEC_TAKE -> take + can_continue = false; // miss_decod = false; // // Hit speculation -// } + } - // in all case - log_printf(TRACE,Prediction_unit_Glue,FUNCTION," * use_btb : %d",use_btb); - log_printf(TRACE,Prediction_unit_Glue,FUNCTION," * use_ras : %d",use_ras); - log_printf(TRACE,Prediction_unit_Glue,FUNCTION," * use_upt : %d",use_upt); + log_printf(TRACE,Prediction_unit_Glue,FUNCTION," * can_continue : %d",can_continue); + log_printf(TRACE,Prediction_unit_Glue,FUNCTION," * use_btb : %d",use_btb); + log_printf(TRACE,Prediction_unit_Glue,FUNCTION," * use_ras : %d",use_ras); + log_printf(TRACE,Prediction_unit_Glue,FUNCTION," * use_upt : %d",use_upt); log_printf(TRACE,Prediction_unit_Glue,FUNCTION," * btb_ack [%d] : %d",port,PORT_READ(in_DECOD_BTB_ACK [port])); log_printf(TRACE,Prediction_unit_Glue,FUNCTION," * ras_ack [%d] : %d",port,PORT_READ(in_DECOD_RAS_ACK [port])); @@ -250,5 +269,6 @@ if (_param->_have_port_depth) PORT_WRITE(out_DECOD_UPT_UPDATE_PREDICTION_ID [port],depth); - + PORT_WRITE(out_DECOD_CAN_CONTINUE [decod_unit][i], can_continue); + port ++; // have find port } Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/SelfTest/src/test.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/SelfTest/src/test.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/SelfTest/src/test.cpp (revision 110) @@ -73,4 +73,5 @@ ALLOC2_SC_SIGNAL( in_DECOD_ADDRESS_SRC ," in_DECOD_ADDRESS_SRC ",Taddress_t ,_param->_nb_decod_unit,_param->_nb_inst_decod[it1]); ALLOC2_SC_SIGNAL( in_DECOD_ADDRESS_DEST ," in_DECOD_ADDRESS_DEST ",Taddress_t ,_param->_nb_decod_unit,_param->_nb_inst_decod[it1]); + ALLOC2_SC_SIGNAL(out_DECOD_CAN_CONTINUE ," in_DECOD_CAN_CONTINUE ",Tcontrol_t ,_param->_nb_decod_unit,_param->_nb_inst_decod[it1]); ALLOC1_SC_SIGNAL( in_BRANCH_COMPLETE_VAL ," in_BRANCH_COMPLETE_VAL ",Tcontrol_t ,_param->_nb_inst_branch_complete); @@ -139,4 +140,5 @@ INSTANCE2_SC_SIGNAL(_Prediction_unit, in_DECOD_ADDRESS_SRC ,_param->_nb_decod_unit,_param->_nb_inst_decod[it1]); INSTANCE2_SC_SIGNAL(_Prediction_unit, in_DECOD_ADDRESS_DEST ,_param->_nb_decod_unit,_param->_nb_inst_decod[it1]); + INSTANCE2_SC_SIGNAL(_Prediction_unit,out_DECOD_CAN_CONTINUE ,_param->_nb_decod_unit,_param->_nb_inst_decod[it1]); INSTANCE1_SC_SIGNAL(_Prediction_unit, in_BRANCH_COMPLETE_VAL ,_param->_nb_inst_branch_complete); @@ -350,4 +352,5 @@ DELETE2_SC_SIGNAL( in_DECOD_ADDRESS_SRC ,_param->_nb_decod_unit,_param->_nb_inst_decod[it1]); DELETE2_SC_SIGNAL( in_DECOD_ADDRESS_DEST ,_param->_nb_decod_unit,_param->_nb_inst_decod[it1]); + DELETE2_SC_SIGNAL(out_DECOD_CAN_CONTINUE ,_param->_nb_decod_unit,_param->_nb_inst_decod[it1]); DELETE1_SC_SIGNAL( in_BRANCH_COMPLETE_VAL ,_param->_nb_inst_branch_complete); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/SelfTest/src/test.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/SelfTest/src/test.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/SelfTest/src/test.cpp (revision 110) @@ -99,4 +99,5 @@ //ALLOC1_SC_SIGNAL(out_DECOD_DEPTH ,"out_DECOD_DEPTH ",Tdepth_t ,_param->_nb_inst_decod); ALLOC1_SC_SIGNAL( in_DECOD_IS_ACCURATE ," in_DECOD_IS_ACCURATE ",Tcontrol_t ,_param->_nb_inst_decod); + ALLOC1_SC_SIGNAL(out_DECOD_CAN_CONTINUE ,"out_DECOD_CAN_CONTINUE ",Tcontrol_t ,_param->_nb_inst_decod); ALLOC1_SC_SIGNAL( in_BRANCH_COMPLETE_VAL ," in_BRANCH_COMPLETE_VAL ",Tcontrol_t ,_param->_nb_inst_branch_complete); @@ -190,4 +191,6 @@ //INSTANCE1_SC_SIGNAL(_Update_Prediction_Table,out_DECOD_DEPTH ,_param->_nb_inst_decod); INSTANCE1_SC_SIGNAL(_Update_Prediction_Table, in_DECOD_IS_ACCURATE ,_param->_nb_inst_decod); + INSTANCE1_SC_SIGNAL(_Update_Prediction_Table,out_DECOD_CAN_CONTINUE ,_param->_nb_inst_decod); + INSTANCE1_SC_SIGNAL(_Update_Prediction_Table, in_BRANCH_COMPLETE_VAL ,_param->_nb_inst_branch_complete); INSTANCE1_SC_SIGNAL(_Update_Prediction_Table,out_BRANCH_COMPLETE_ACK ,_param->_nb_inst_branch_complete); @@ -2833,10 +2836,10 @@ delete [] in_DECOD_RAS_ADDRESS ; delete [] in_DECOD_RAS_INDEX ; - delete [] in_DECOD_MISS_IFETCH ; delete [] in_DECOD_MISS_DECOD ; delete [] in_DECOD_UPDATE_PREDICTION_ID ; //delete [] out_DECOD_DEPTH ; delete [] in_DECOD_IS_ACCURATE ; - + delete [] out_DECOD_CAN_CONTINUE ; + // ~~~~~[ Interface : "branch_complete" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ delete [] in_BRANCH_COMPLETE_VAL ; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/include/Update_Prediction_Table.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/include/Update_Prediction_Table.h (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/include/Update_Prediction_Table.h (revision 110) @@ -99,4 +99,5 @@ //public : SC_OUT(Tdepth_t ) ** out_DECOD_DEPTH ; //[nb_inst_decod] public : SC_IN (Tcontrol_t ) ** in_DECOD_IS_ACCURATE ; //[nb_inst_decod] + public : SC_OUT(Tcontrol_t ) ** out_DECOD_CAN_CONTINUE ; //[nb_inst_decod] // ~~~~~[ Interface : "branch_complete" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/src/Update_Prediction_Table_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/src/Update_Prediction_Table_allocation.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/src/Update_Prediction_Table_allocation.cpp (revision 110) @@ -92,4 +92,5 @@ // ALLOC1_SIGNAL_OUT(out_DECOD_DEPTH ,"depth" ,Tdepth_t ,_param->_size_depth); ALLOC1_SIGNAL_IN ( in_DECOD_IS_ACCURATE ,"is_accurate" ,Tcontrol_t ,1); + ALLOC1_SIGNAL_OUT(out_DECOD_CAN_CONTINUE ,"can_continue" ,Tcontrol_t ,1); } Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/src/Update_Prediction_Table_deallocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/src/Update_Prediction_Table_deallocation.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/src/Update_Prediction_Table_deallocation.cpp (revision 110) @@ -64,4 +64,5 @@ // delete [] out_DECOD_DEPTH ; delete [] in_DECOD_IS_ACCURATE ; + delete [] out_DECOD_CAN_CONTINUE ; // ~~~~~[ Interface : "branch_complete" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/src/Update_Prediction_Table_genMealy_decod.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/src/Update_Prediction_Table_genMealy_decod.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/src/Update_Prediction_Table_genMealy_decod.cpp (revision 110) @@ -36,4 +36,7 @@ event_state_t event_state = reg_EVENT_STATE [context]; uint32_t ptr_write = reg_UPT_TOP [context]; + // can continue if next slot is empty + Tcontrol_t can_continue= ((reg_UPDATE_PREDICTION_TABLE [context][(reg_UPT_TOP [context]+1)%_param->_size_upt_queue[context]]._state == UPDATE_PREDICTION_STATE_EMPTY) and + (reg_EVENT_STATE [context] == EVENT_STATE_OK)); log_printf(TRACE,Update_Prediction_Table,FUNCTION," * context : %d",context ); @@ -42,4 +45,5 @@ log_printf(TRACE,Update_Prediction_Table,FUNCTION," * ptr_write : %d",ptr_write ); log_printf(TRACE,Update_Prediction_Table,FUNCTION," * upt_state : %s",toString(reg_UPDATE_PREDICTION_TABLE [context][ptr_write]._state).c_str()); + log_printf(TRACE,Update_Prediction_Table,FUNCTION," * can_continue: %d",can_continue); // ack : @@ -58,5 +62,6 @@ log_printf(TRACE,Update_Prediction_Table,FUNCTION," * ack : %d",internal_DECOD_ACK [i]); - PORT_WRITE(out_DECOD_ACK [i], internal_DECOD_ACK [i]); + PORT_WRITE(out_DECOD_ACK [i], internal_DECOD_ACK [i]); + PORT_WRITE(out_DECOD_CAN_CONTINUE [i], can_continue); } } Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/include/Prediction_unit.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/include/Prediction_unit.h (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/include/Prediction_unit.h (revision 110) @@ -91,4 +91,5 @@ public : SC_IN (Taddress_t ) *** in_DECOD_ADDRESS_SRC ; //[nb_decod_unit][nb_inst_decod] public : SC_IN (Taddress_t ) *** in_DECOD_ADDRESS_DEST ; //[nb_decod_unit][nb_inst_decod] + public : SC_OUT(Tcontrol_t ) *** out_DECOD_CAN_CONTINUE ; //[nb_decod_unit][nb_inst_decod] // ~~~~~[ Interface : "branch_complete" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -115,8 +116,8 @@ // ~~~~~[ Interface : "event" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - public : SC_IN (Tcontrol_t ) ** in_EVENT_VAL ; //[nb_context] - public : SC_OUT(Tcontrol_t ) ** out_EVENT_ACK ; //[nb_context] - public : SC_IN (Tevent_type_t ) ** in_EVENT_TYPE ; //[nb_context] - public : SC_IN (Tdepth_t ) ** in_EVENT_DEPTH ; //[nb_context] + public : SC_IN (Tcontrol_t ) ** in_EVENT_VAL ; //[nb_context] + public : SC_OUT(Tcontrol_t ) ** out_EVENT_ACK ; //[nb_context] + public : SC_IN (Tevent_type_t ) ** in_EVENT_TYPE ; //[nb_context] + public : SC_IN (Tdepth_t ) ** in_EVENT_DEPTH ; //[nb_context] // ~~~~~[ Interface : "depth" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/src/Prediction_unit_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/src/Prediction_unit_allocation.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/src/Prediction_unit_allocation.cpp (revision 110) @@ -90,4 +90,5 @@ _ALLOC2_SIGNAL_IN ( in_DECOD_ADDRESS_SRC ,"address_src" ,Taddress_t ,_param->_size_address ,_param->_nb_decod_unit,_param->_nb_inst_decod[it1]); _ALLOC2_SIGNAL_IN ( in_DECOD_ADDRESS_DEST ,"address_dest" ,Taddress_t ,_param->_size_address ,_param->_nb_decod_unit,_param->_nb_inst_decod[it1]); + _ALLOC2_SIGNAL_OUT(out_DECOD_CAN_CONTINUE ,"can_continue" ,Tcontrol_t ,1 ,_param->_nb_decod_unit,_param->_nb_inst_decod[it1]); } } @@ -617,4 +618,6 @@ COMPONENT_MAP(_component,src , "in_DECOD_" +toString(i)+"_IS_ACCURATE" , dest,"out_DECOD_UPT_"+toString(i)+"_IS_ACCURATE" ); + COMPONENT_MAP(_component,src ,"out_DECOD_" +toString(i)+"_CAN_CONTINUE" , + dest, "in_DECOD_UPT_"+toString(i)+"_CAN_CONTINUE" ); //out_DECOD_UPT_RAS_INDEX - component_map return_address_stack @@ -857,4 +860,6 @@ PORT_MAP(_component,src , "in_DECOD_"+toString(i)+"_"+toString(j)+"_ADDRESS_DEST" , dest, "in_DECOD_"+toString(i)+"_"+toString(j)+"_ADDRESS_DEST" ); + PORT_MAP(_component,src ,"out_DECOD_"+toString(i)+"_"+toString(j)+"_CAN_CONTINUE" , + dest,"out_DECOD_"+toString(i)+"_"+toString(j)+"_CAN_CONTINUE" ); } Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/src/Prediction_unit_deallocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/src/Prediction_unit_deallocation.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/src/Prediction_unit_deallocation.cpp (revision 110) @@ -50,4 +50,5 @@ DELETE2_SIGNAL( in_DECOD_ADDRESS_SRC ,_param->_nb_decod_unit,_param->_nb_inst_decod[it1],_param->_size_instruction_address ); DELETE2_SIGNAL( in_DECOD_ADDRESS_DEST ,_param->_nb_decod_unit,_param->_nb_inst_decod[it1],_param->_size_instruction_address ); + DELETE2_SIGNAL(out_DECOD_CAN_CONTINUE ,_param->_nb_decod_unit,_param->_nb_inst_decod[it1],1); DELETE1_SIGNAL( in_BRANCH_COMPLETE_VAL ,_param->_nb_inst_branch_complete,1); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/src/Front_end_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/src/Front_end_allocation.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/src/Front_end_allocation.cpp (revision 110) @@ -784,6 +784,6 @@ COMPONENT_MAP(_component,src ,"out_PREDICT_"+toString(j)+ "_ADDRESS_DEST" , dest, "in_DECOD_" +toString(i)+"_"+toString(j)+"_ADDRESS_DEST" ); -// COMPONENT_MAP(_component,src , "in_PREDICT_"+toString(j)+ "_CAN_CONTINUE" , -// dest,"out_DECOD_" +toString(i)+"_"+toString(j)+"_CAN_CONTINUE" ); + COMPONENT_MAP(_component,src , "in_PREDICT_"+toString(j)+ "_CAN_CONTINUE" , + dest,"out_DECOD_" +toString(i)+"_"+toString(j)+"_CAN_CONTINUE" ); } Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/SelfTest/src/main.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/SelfTest/src/main.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/SelfTest/src/main.cpp (revision 110) @@ -7,4 +7,5 @@ #include "Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/SelfTest/include/test.h" +#include "Behavioural/include/Allocation.h" #define NB_PARAMS 16 @@ -99,4 +100,14 @@ uint32_t _nb_rename_unit_select = fromString(argv[x++]); + uint32_t _nb_thread ; + uint32_t ** _translate_num_context_to_num_thread; //[nb_front_end][nb_context] + + ALLOC2(_translate_num_context_to_num_thread,uint32_t,_nb_front_end,_nb_context[it1]); + + _nb_thread = 0; + for (uint32_t i=0; i<_nb_front_end; i++) + for (uint32_t j=0; j<_nb_context [i]; j++) + _translate_num_context_to_num_thread [i][j] = _nb_thread ++; + int _return = EXIT_SUCCESS; try @@ -123,4 +134,6 @@ _load_balancing , _nb_rename_unit_select , + _nb_thread , + _translate_num_context_to_num_thread, true // is_toplevel ); @@ -149,4 +162,6 @@ } + DELETE2(_translate_num_context_to_num_thread,_nb_front_end,_nb_context[it1]); + delete [] _nb_context ; delete [] _nb_inst_insert; 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 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/SelfTest/src/test.cpp (revision 110) @@ -9,4 +9,5 @@ #include "Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/SelfTest/include/test.h" #include "Behavioural/include/Allocation.h" +#include "Behavioural/include/Simulation.h" #include "Common/include/Max.h" @@ -27,4 +28,8 @@ morpheo::behavioural::Parameters_Statistics * _parameters_statistics = new morpheo::behavioural::Parameters_Statistics (5,CYCLE_MAX); #endif + + simulation_init(0,0); + + debug_idle_cycle = CYCLE_MAX; Tusage_t _usage = USE_ALL; @@ -744,4 +749,5 @@ delete _Commit_unit; + #ifdef STATISTICS delete _parameters_statistics; 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 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/include/Commit_unit.h (revision 110) @@ -54,10 +54,12 @@ #ifdef STATISTICS public : Stat * _stat; - public : counter_t ** _stat_nb_inst_insert; - public : counter_t * _stat_nb_inst_commit; + public : counter_t ** _stat_nb_inst_insert ;//[nb_rename_unit] + public : counter_t ** _stat_nb_inst_retire ;//[nb_rename_unit] + public : counter_t * _stat_nb_inst_commit ; public : counter_t * _stat_nb_inst_commit_conflit_access; - public : counter_t ** _stat_nb_inst_retire_ok; - public : counter_t ** _stat_nb_inst_retire_ko; - public : counter_t ** _stat_bank_nb_inst;// [nb_bank] + public : counter_t ** _stat_nb_inst_retire_ok ;//[nb_thread] + public : counter_t ** _stat_nb_inst_retire_ko ;//[nb_thread] + public : counter_t ** _stat_nb_inst_type ;//[nb_type] + public : counter_t ** _stat_bank_nb_inst ;//[nb_bank] #endif @@ -254,4 +256,5 @@ private : entry_t * ** internal_BANK_COMMIT_ENTRY ;//[nb_bank][nb_bank_access_commit] + private : uint32_t internal_BANK_RETIRE_HEAD ; private : Tcontrol_t * internal_BANK_RETIRE_VAL ;//[nb_bank] private : uint32_t * internal_BANK_RETIRE_NUM_RENAME_UNIT ;//[nb_bank] Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/include/Parameters.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/include/Parameters.h (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/include/Parameters.h (revision 110) @@ -24,25 +24,27 @@ { //-----[ fields ]------------------------------------------------------------ - public : uint32_t _nb_front_end ; - public : uint32_t * _nb_context ;//[nb_front_end] - public : uint32_t _nb_rename_unit ; - public : uint32_t _size_queue ; - public : uint32_t _nb_bank ; - public : uint32_t * _nb_inst_insert ;//[nb_rename_unit] - public : uint32_t * _nb_inst_retire ;//[nb_rename_unit] - public : uint32_t _nb_inst_commit ; - public : uint32_t _nb_inst_reexecute ; - public : uint32_t _nb_inst_branch_complete ; - public : uint32_t ** _nb_branch_speculated ;//[nb_front_end][nb_context] -//public : uint32_t _size_general_data ; -//public : uint32_t _size_store_queue_ptr ; -//public : uint32_t _size_load_queue_ptr ; -//public : uint32_t _size_general_register ; -//public : uint32_t _size_special_register ; - public : Tpriority_t _priority ; - public : Tload_balancing_t _load_balancing ; - public : uint32_t _nb_rename_unit_select ; - public : const uint32_t _nb_bank_access_commit ; - public : const retire_ooo_t _retire_ooo ; + public : uint32_t _nb_front_end ; + public : uint32_t * _nb_context ;//[nb_front_end] + public : uint32_t _nb_rename_unit ; + public : uint32_t _size_queue ; + public : uint32_t _nb_bank ; + public : uint32_t * _nb_inst_insert ;//[nb_rename_unit] + public : uint32_t * _nb_inst_retire ;//[nb_rename_unit] + public : uint32_t _nb_inst_commit ; + public : uint32_t _nb_inst_reexecute ; + public : uint32_t _nb_inst_branch_complete ; + public : uint32_t ** _nb_branch_speculated ;//[nb_front_end][nb_context] +//public : uint32_t _size_general_data ; +//public : uint32_t _size_store_queue_ptr ; +//public : uint32_t _size_load_queue_ptr ; +//public : uint32_t _size_general_register ; +//public : uint32_t _size_special_register ; + public : Tpriority_t _priority ; + public : Tload_balancing_t _load_balancing ; + public : uint32_t _nb_rename_unit_select ; + public : uint32_t _nb_thread ; + public : uint32_t ** _translate_num_context_to_num_thread; //[nb_front_end][nb_context] + public : const uint32_t _nb_bank_access_commit ; + public : const retire_ooo_t _retire_ooo ; public : uint32_t _max_nb_context ; @@ -69,25 +71,29 @@ //public : bool ** _have_port_depth ;//[nb_front_end][nb_context] + public : bool * _have_thread ;//[nb_thread] + //-----[ methods ]----------------------------------------------------------- - public : Parameters (uint32_t nb_front_end , - uint32_t * nb_context , - uint32_t nb_rename_unit , - uint32_t size_queue , - uint32_t nb_bank , - uint32_t * nb_inst_insert , - uint32_t * nb_inst_retire , - uint32_t nb_inst_commit , - uint32_t nb_inst_reexecute , - uint32_t nb_inst_branch_complete , - uint32_t ** nb_branch_speculated , - uint32_t size_nb_inst_decod , - uint32_t size_general_data , - uint32_t size_store_queue_ptr , - uint32_t size_load_queue_ptr , - uint32_t size_general_register , - uint32_t size_special_register , - Tpriority_t priority , - Tload_balancing_t load_balancing , - uint32_t nb_rename_unit_select , + public : Parameters (uint32_t nb_front_end , + uint32_t * nb_context ,//[nb_front_end] + uint32_t nb_rename_unit , + uint32_t size_queue , + uint32_t nb_bank , + uint32_t * nb_inst_insert ,//[nb_rename_unit] + uint32_t * nb_inst_retire ,//[nb_rename_unit] + uint32_t nb_inst_commit , + uint32_t nb_inst_reexecute , + uint32_t nb_inst_branch_complete , + uint32_t ** nb_branch_speculated ,//[nb_front_end][nb_context] + uint32_t size_nb_inst_decod , + uint32_t size_general_data , + uint32_t size_store_queue_ptr , + uint32_t size_load_queue_ptr , + uint32_t size_general_register , + uint32_t size_special_register , + Tpriority_t priority , + Tload_balancing_t load_balancing , + uint32_t nb_rename_unit_select , + uint32_t nb_thread , + uint32_t ** translate_num_context_to_num_thread, //[nb_front_end][nb_context] bool is_toplevel=false ); 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 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit.cpp (revision 110) @@ -7,4 +7,5 @@ #include "Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/include/Commit_unit.h" +#include "Behavioural/include/Simulation.h" namespace morpheo { @@ -260,4 +261,8 @@ #endif + + // Init stop condition + while (_simulation_nb_instruction_commited.size() < _param->_nb_thread) + _simulation_nb_instruction_commited.push_back(0); } log_end(Commit_unit,FUNCTION); 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 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_genMealy_retire.cpp (revision 110) @@ -57,7 +57,8 @@ } // Scan Top of each bank + internal_BANK_RETIRE_HEAD = reg_NUM_BANK_HEAD; for (uint32_t i=0; i<_param->_nb_bank; i++) { - uint32_t num_bank = (reg_NUM_BANK_HEAD+i)%_param->_nb_bank; + uint32_t num_bank = (internal_BANK_RETIRE_HEAD+i)%_param->_nb_bank; if (not _rob[num_bank].empty()) @@ -167,4 +168,9 @@ PORT_WRITE(out_RETIRE_NUM_REG_RE_PHY_OLD [x][y], entry->num_reg_re_phy_old ); PORT_WRITE(out_RETIRE_NUM_REG_RE_PHY_NEW [x][y], entry->num_reg_re_phy_new ); + + // Event -> rob must be manage this event + if ((state == ROB_END_BRANCH_MISS) or + (state == ROB_END_LOAD_MISS)) + can_retire [x] = false; } } Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_statistics_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_statistics_allocation.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_statistics_allocation.cpp (revision 110) @@ -28,43 +28,88 @@ _stat_nb_inst_insert = new counter_t * [_param->_nb_rename_unit]; - _stat_nb_inst_retire_ok = new counter_t * [_param->_nb_rename_unit]; - _stat_nb_inst_retire_ko = new counter_t * [_param->_nb_rename_unit]; + _stat_nb_inst_retire = new counter_t * [_param->_nb_rename_unit]; + _stat_nb_inst_retire_ok = new counter_t * [_param->_nb_thread]; + _stat_nb_inst_retire_ko = new counter_t * [_param->_nb_thread]; + _stat_nb_inst_type = new counter_t * [_param->_nb_type]; _stat_bank_nb_inst = new counter_t * [_param->_nb_bank]; { std::string sum_nb_inst_insert = "0"; - std::string sum_nb_inst_retire_ok = "0"; - std::string sum_nb_inst_retire_ko = "0"; + std::string sum_nb_inst_retire = "0"; for (uint32_t i=0; i<_param->_nb_rename_unit; i++) { _stat_nb_inst_insert [i] = _stat->create_variable("nb_inst_insert_" +toString(i)); - _stat_nb_inst_retire_ok [i] = _stat->create_variable("nb_inst_retire_ok_"+toString(i)); - _stat_nb_inst_retire_ko [i] = _stat->create_variable("nb_inst_retire_ko_"+toString(i)); + _stat_nb_inst_retire [i] = _stat->create_variable("nb_inst_retire_" +toString(i)); _stat->create_expr_average_by_cycle("average_use_interface_insert_"+toString(i), "nb_inst_insert_"+toString(i), "", toString(_("Average instruction by cycle on insert interface (rename_unit %d)"),i)); - _stat->create_expr_average_by_cycle("average_use_interface_retire_"+toString(i), "+ nb_inst_retire_ok_"+toString(i)+" nb_inst_retire_ko_"+toString(i), "", toString(_("Average instruction by cycle on retire interface (rename_unit %d)"),i)); + _stat->create_expr_average_by_cycle("average_use_interface_retire_"+toString(i), "nb_inst_retire_"+toString(i), "", toString(_("Average instruction by cycle on retire interface (rename_unit %d)"),i)); _stat->create_expr_percent ("percent_use_interface_insert_"+toString(i) , "average_use_interface_insert_"+toString(i), toString(_param->_nb_inst_insert [i]), toString(_("Percent usage of insert interface (rename_unit %d)"),i)); _stat->create_expr_percent ("percent_use_interface_retire_"+toString(i) , "average_use_interface_retire_"+toString(i), toString(_param->_nb_inst_retire [i]), toString(_("Percent usage of retire interface (rename_unit %d)"),i)); sum_nb_inst_insert = "+ nb_inst_insert_"+ toString(i) + " " +sum_nb_inst_insert; - sum_nb_inst_retire_ok = "+ nb_inst_retire_ok_"+toString(i) + " " +sum_nb_inst_retire_ok; - sum_nb_inst_retire_ko = "+ nb_inst_retire_ko_"+toString(i) + " " +sum_nb_inst_retire_ko; - } + sum_nb_inst_retire = "+ nb_inst_retire_"+ toString(i) + " " +sum_nb_inst_retire; + } _stat->create_expr_average_by_cycle("average_inst_insert" , sum_nb_inst_insert , "", _("Average instruction insert by cycle")); - _stat->create_expr_average_by_cycle("average_inst_retire_ok", sum_nb_inst_retire_ok, "", _("Average instruction retire ok by cycle (IPC)")); - _stat->create_expr_average_by_cycle("average_inst_retire_ko", sum_nb_inst_retire_ko, "", _("Average instruction retire ko (event, miss) by cycle")); - _stat->create_expr_average_by_cycle("average_inst_retire" , "+ "+sum_nb_inst_retire_ok+" "+sum_nb_inst_retire_ko, "", _("Average instruction retire by cycle")); + _stat->create_expr_average_by_cycle("average_inst_retire" , sum_nb_inst_retire , "", _("Average instruction retire by cycle")); + } - _stat->create_expr ("IPC_ok" , "average_inst_retire_ok", TYPE_COUNTER, "inst/cycle", "Instruction Per Cycle (Instruction Ok)"); + { + std::string sum_nb_inst_retire_ok = "0"; + std::string sum_nb_inst_retire_ko = "0"; + + for (uint32_t i=0; i<_param->_nb_thread; i++) + if (_param->_have_thread [i]) + { + _stat_nb_inst_retire_ok [i] = _stat->create_variable("nb_inst_retire_ok_"+toString(i)); + _stat_nb_inst_retire_ko [i] = _stat->create_variable("nb_inst_retire_ko_"+toString(i)); + + sum_nb_inst_retire_ok = "+ nb_inst_retire_ok_"+toString(i) + " " +sum_nb_inst_retire_ok; + sum_nb_inst_retire_ko = "+ nb_inst_retire_ko_"+toString(i) + " " +sum_nb_inst_retire_ko; + + _stat->create_expr_average_by_cycle("average_inst_retire_ok_"+toString(i), sum_nb_inst_retire_ok, "", toString(_("Average instruction retire ok by cycle (IPC) (thread %d)"),i)); + _stat->create_expr_average_by_cycle("average_inst_retire_ko_"+toString(i), sum_nb_inst_retire_ko, "", toString(_("Average instruction retire ko (event, miss) by cycle (thread %d)"),i)); + + _stat->create_expr ("IPC_ok_"+toString(i) , "average_inst_retire_ok_"+toString(i), TYPE_COUNTER, "inst/cycle", toString("Instruction Per Cycle (Instruction Ok) (thread %d)",i)); + _stat->create_expr ("CPI_ok_"+toString(i) , "/ 1 IPC_ok_"+toString(i) , TYPE_COUNTER, "cycle/inst", toString("Cycle Per Instruction (Instruction Ok) (thread %d)",i)); + + _stat->create_expr ("IPC_ko_"+toString(i) , "average_inst_retire_ko_"+toString(i), TYPE_COUNTER, "inst/cycle", toString("Instruction Per Cycle (Instruction Ko) (thread %d)",i)); + _stat->create_expr ("CPI_ko_"+toString(i) , "/ 1 IPC_ko_"+toString(i) , TYPE_COUNTER, "cycle/inst", toString("Cycle Per Instruction (Instruction Ko) (thread %d)",i)); + + _stat->create_expr ("IPC_all_"+toString(i), "+ IPC_ok_"+toString(i)+" IPC_ko_"+toString(i), TYPE_COUNTER, "inst/cycle", toString("Instruction Per Cycle (Instruction Ok and Ko) (thread %d)",i)); + _stat->create_expr ("CPI_all_"+toString(i), "/ 1 IPC_all_"+toString(i) , TYPE_COUNTER, "cycle/inst", toString("Cycle Per Instruction (Instruction Ok and Ko) (thread %d)",i)); + } + + _stat->create_expr ("IPC_ok" , "/ "+sum_nb_inst_retire_ok+" cycle", TYPE_COUNTER, "inst/cycle", "Instruction Per Cycle (Instruction Ok)"); _stat->create_expr ("CPI_ok" , "/ 1 IPC_ok" , TYPE_COUNTER, "cycle/inst", "Cycle Per Instruction (Instruction Ok)"); - _stat->create_expr ("IPC_ko" , "average_inst_retire_ko", TYPE_COUNTER, "inst/cycle", "Instruction Per Cycle (Instruction Ko)"); + _stat->create_expr ("IPC_ko" , "/ "+sum_nb_inst_retire_ko+" cycle", TYPE_COUNTER, "inst/cycle", "Instruction Per Cycle (Instruction Ko)"); _stat->create_expr ("CPI_ko" , "/ 1 IPC_ko" , TYPE_COUNTER, "cycle/inst", "Cycle Per Instruction (Instruction Ko)"); - _stat->create_expr ("IPC_all", "average_inst_retire" , TYPE_COUNTER, "inst/cycle", "Instruction Per Cycle (Instruction Ok and Ko)"); + _stat->create_expr ("IPC_all", "+ IPC_ok IPC_ko" , TYPE_COUNTER, "inst/cycle", "Instruction Per Cycle (Instruction Ok and Ko)"); _stat->create_expr ("CPI_all", "/ 1 IPC_all" , TYPE_COUNTER, "cycle/inst", "Cycle Per Instruction (Instruction Ok and Ko)"); } + + { + std::string sum_nb_inst_type = "0"; + + for (uint32_t i=0; i<_param->_nb_type; i++) + if (is_type_valid(i)) + { + _stat_nb_inst_type [i] = _stat->create_variable("nb_inst_type_"+toString(i)); + + sum_nb_inst_type = "+ nb_inst_type_"+toString(i) + " " +sum_nb_inst_type; + } + + for (uint32_t i=0; i<_param->_nb_type; i++) + if (is_type_valid(i)) + { + std::string name = toString(static_cast(i)).c_str(); +// _stat->create_expr_average_by_cycle("average_inst_type_"+toString(name), "nb_inst_type_"+toString(i), "", toString(_("Average instruction retire ok by cycle (type %s)"),name.c_str())); + _stat->create_expr_percent ("percent_inst_type_"+toString(name), "nb_inst_type_"+toString(i), sum_nb_inst_type, toString(_("Percent instruction retire ok by cycle (type %s)"),name.c_str())); + } + } + _stat_nb_inst_commit = _stat->create_variable("nb_inst_commit"); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_statistics_deallocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_statistics_deallocation.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_statistics_deallocation.cpp (revision 110) @@ -28,6 +28,8 @@ delete [] _stat_nb_inst_insert; + delete [] _stat_nb_inst_retire; delete [] _stat_nb_inst_retire_ok; delete [] _stat_nb_inst_retire_ko; + delete [] _stat_nb_inst_type; delete [] _stat_bank_nb_inst; 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 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_transition.cpp (revision 110) @@ -8,4 +8,5 @@ #include "Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/include/Commit_unit.h" +#include "Behavioural/include/Simulation.h" namespace morpheo { @@ -114,9 +115,4 @@ { log_printf(TRACE,Commit_unit,FUNCTION," * INSERT [%d][%d]",x,y); - -#ifdef STATISTICS - if (usage_is_set(_usage,USE_STATISTICS)) - (*_stat_nb_inst_insert [x]) ++; -#endif // get information @@ -219,4 +215,9 @@ } } + +#ifdef STATISTICS + if (usage_is_set(_usage,USE_STATISTICS)) + (*_stat_nb_inst_insert [x]) ++; +#endif // Push in rob @@ -346,71 +347,96 @@ // =================================================================== for (uint32_t i=0; i<_param->_nb_bank; i++) - if (internal_BANK_RETIRE_VAL [i]) - { - uint32_t x = internal_BANK_RETIRE_NUM_RENAME_UNIT [i]; - uint32_t y = internal_BANK_RETIRE_NUM_INST [i]; - - log_printf(TRACE,Commit_unit,FUNCTION," * RETIRE [%d][%d]",x,y); - + { + uint32_t num_bank = (internal_BANK_RETIRE_HEAD+i)%_param->_nb_bank; + + if (internal_BANK_RETIRE_VAL [num_bank]) + { + uint32_t x = internal_BANK_RETIRE_NUM_RENAME_UNIT [num_bank]; + uint32_t y = internal_BANK_RETIRE_NUM_INST [num_bank]; + + log_printf(TRACE,Commit_unit,FUNCTION," * RETIRE [%d][%d]",x,y); + #ifdef DEBUG_TEST - if (not PORT_READ(in_RETIRE_ACK [x][y])) - throw ERRORMORPHEO(FUNCTION,_("Retire : retire_ack must be set.\n")); -#endif - - entry_t * entry = _rob [i].front(); - rob_state_t state = entry->state; - -#ifdef STATISTICS - if (usage_is_set(_usage,USE_STATISTICS)) - { - if (state == ROB_END_OK) - (*_stat_nb_inst_retire_ok [x]) ++; - else - (*_stat_nb_inst_retire_ko [x]) ++; - } -#endif - - Tcontext_t front_end_id = entry->front_end_id; - Tcontext_t context_id = entry->context_id ; - Ttype_t type = entry->type ; - - if ((state == ROB_END_OK ) or -// (state == ROB_END_KO ) or - (state == ROB_END_BRANCH_MISS) or - (state == ROB_END_LOAD_MISS )// or -// (state == ROB_END_MISS ) or -// (state == ROB_END_EXCEPTION ) - ) - { -// reg_PC_PREVIOUS [front_end_id][context_id] = reg_PC_CURRENT [front_end_id][context_id]; - reg_PC_CURRENT [front_end_id][context_id] = reg_PC_NEXT [front_end_id][context_id]; - reg_PC_CURRENT_IS_DS [front_end_id][context_id] = entry->type == TYPE_BRANCH; - reg_PC_CURRENT_IS_DS_TAKE [front_end_id][context_id] = entry->no_sequence; - reg_PC_NEXT [front_end_id][context_id] = (entry->no_sequence)?(entry->address_next):(reg_PC_CURRENT [front_end_id][context_id]+1); + if (not PORT_READ(in_RETIRE_ACK [x][y])) + throw ERRORMORPHEO(FUNCTION,_("Retire : retire_ack must be set.\n")); +#endif + + entry_t * entry = _rob [num_bank].front(); + rob_state_t state = entry->state; + + Tcontext_t front_end_id = entry->front_end_id; + Tcontext_t context_id = entry->context_id ; + uint32_t num_thread = _param->_translate_num_context_to_num_thread [front_end_id][context_id]; + Ttype_t type = entry->type ; + bool retire_ok = false; + + log_printf(TRACE,Commit_unit,FUNCTION," * front_end_id : %d",front_end_id ); + log_printf(TRACE,Commit_unit,FUNCTION," * context_id : %d",context_id ); + log_printf(TRACE,Commit_unit,FUNCTION," * num_thread : %d",num_thread ); + log_printf(TRACE,Commit_unit,FUNCTION," * type : %s",toString(type).c_str()); + log_printf(TRACE,Commit_unit,FUNCTION," * state : %s",toString(state).c_str()); + + if ((state == ROB_END_OK ) or +// (state == ROB_END_KO ) or + (state == ROB_END_BRANCH_MISS) or + (state == ROB_END_LOAD_MISS )// or +// (state == ROB_END_MISS ) or +// (state == ROB_END_EXCEPTION ) + ) + { + log_printf(TRACE,Commit_unit,FUNCTION," * retire_ok"); + + retire_ok = true; + +// reg_PC_PREVIOUS [front_end_id][context_id] = reg_PC_CURRENT [front_end_id][context_id]; + reg_PC_CURRENT [front_end_id][context_id] = reg_PC_NEXT [front_end_id][context_id]; + reg_PC_CURRENT_IS_DS [front_end_id][context_id] = entry->type == TYPE_BRANCH; + reg_PC_CURRENT_IS_DS_TAKE [front_end_id][context_id] = entry->no_sequence; + reg_PC_NEXT [front_end_id][context_id] = (entry->no_sequence)?(entry->address_next):(reg_PC_CURRENT [front_end_id][context_id]+1); // if (entry->address_next != reg_PC_NEXT [front_end_id][context_id]) // throw ERRORMORPHEO(FUNCTION,toString(_("Retire : Instruction's address_next (%.8x) is different of commit_unit's address_next (%.8x)"),entry->address_next,reg_PC_NEXT [front_end_id][context_id])); - } - - if ((state == ROB_END_BRANCH_MISS) or - (state == ROB_END_LOAD_MISS)) - { - reg_EVENT_STATE [front_end_id][context_id] = EVENT_STATE_EVENT; - reg_EVENT_FLUSH [front_end_id][context_id] = true; - } - - // Update nb_inst - reg_NB_INST_COMMIT_ALL [front_end_id][context_id] --; - if (type == TYPE_MEMORY) - reg_NB_INST_COMMIT_MEM [front_end_id][context_id] --; - - reg_NUM_BANK_HEAD = (reg_NUM_BANK_HEAD+1)%_param->_nb_bank; - - _rob [i].pop_front(); - delete entry; - - // Transaction on retire interface : reset watch dog timer. - _nb_cycle_idle [front_end_id][context_id] = 0; - } + } + + if ((state == ROB_END_BRANCH_MISS) or + (state == ROB_END_LOAD_MISS)) + { + reg_EVENT_STATE [front_end_id][context_id] = EVENT_STATE_EVENT; + reg_EVENT_FLUSH [front_end_id][context_id] = true; + } + + // Update nb_inst + reg_NB_INST_COMMIT_ALL [front_end_id][context_id] --; + if (type == TYPE_MEMORY) + reg_NB_INST_COMMIT_MEM [front_end_id][context_id] --; + + reg_NUM_BANK_HEAD = (reg_NUM_BANK_HEAD+1)%_param->_nb_bank; + + _rob [num_bank].pop_front(); + delete entry; + + // Transaction on retire interface : reset watch dog timer. + _nb_cycle_idle [front_end_id][context_id] = 0; + + // Increase stop condition + if (retire_ok) + _simulation_nb_instruction_commited [num_thread] ++; + +#ifdef STATISTICS + if (usage_is_set(_usage,USE_STATISTICS)) + { + (*_stat_nb_inst_retire [x]) ++; + + if (retire_ok) + { + (*_stat_nb_inst_retire_ok [num_thread]) ++; + (*_stat_nb_inst_type [type] ) ++; + } + else + (*_stat_nb_inst_retire_ko [num_thread]) ++; + } +#endif + } + } // =================================================================== @@ -652,5 +678,5 @@ for (uint32_t j=0; j<_param->_nb_context [i]; j++) { - log_printf(TRACE,Commit_unit,FUNCTION," * [%d][%d]",i,j); + log_printf(TRACE,Commit_unit,FUNCTION," * [%d][%d] - %d",i,j,_param->_translate_num_context_to_num_thread [i][j]); log_printf(TRACE,Commit_unit,FUNCTION," * EVENT_STATE : %s",toString(reg_EVENT_STATE [i][j]).c_str()); log_printf(TRACE,Commit_unit,FUNCTION," * EVENT_FLUSH : %d",reg_EVENT_FLUSH [i][j]); @@ -667,11 +693,12 @@ log_printf(TRACE,Commit_unit,FUNCTION," * Bank [%d] size : %d, ptr : %d",num_bank,(int)_rob[num_bank].size(), reg_BANK_PTR [i]); - uint32_t x=0; for (std::list::iterator it=_rob[num_bank].begin(); it!=_rob[num_bank].end(); it++) { - log_printf(TRACE,Commit_unit,FUNCTION," [%.4d] %.4d %.4d %.4d %.4d, %.3d %.3d, %.1d, %.1d %.4d, %.1d %.4d, %s - %d", - x, + log_printf(TRACE,Commit_unit,FUNCTION," [%.4d][%.4d] (%.4d) %.4d %.4d %.4d %.4d, %.3d %.3d, %.1d, %.1d %.4d, %.1d %.4d, %s", + num_bank , + (*it)->ptr , + ((num_bank << _param->_shift_num_bank) | (*it)->ptr), (*it)->front_end_id , (*it)->context_id , @@ -685,7 +712,6 @@ (*it)->use_load_queue , (*it)->load_queue_ptr_write , - toString((*it)->state).c_str() , - (*it)->ptr ); - log_printf(TRACE,Commit_unit,FUNCTION," %.1d %.2d %.6d, %.1d %.2d %.6d, %.1d %.1d %.6d, %.1d %.2d %.6d %.6d, %.1d %.1d %.6d %.6d ", + toString((*it)->state).c_str() ); + log_printf(TRACE,Commit_unit,FUNCTION," %.1d %.2d %.6d, %.1d %.2d %.6d, %.1d %.1d %.6d, %.1d %.2d %.6d %.6d, %.1d %.1d %.6d %.6d ", (*it)->read_ra , (*it)->num_reg_ra_log , @@ -706,5 +732,5 @@ (*it)->num_reg_re_phy_new ); - log_printf(TRACE,Commit_unit,FUNCTION," %.2d %.2d %.1d %.1d %.1d - %.8x (%.8x) %.8x (%.8x)", + log_printf(TRACE,Commit_unit,FUNCTION," %.2d %.2d %.1d %.1d %.1d - %.8x (%.8x) %.8x (%.8x)", (*it)->exception_use , (*it)->exception , @@ -717,6 +743,4 @@ (*it)->address_next<<2 ); - - x++; } } @@ -772,6 +796,6 @@ for (uint32_t i=0; i<_param->_nb_front_end; i++) for (uint32_t j=0; j<_param->_nb_context [i]; j++) - if (_nb_cycle_idle [i][j] >= debug_cycle_idle) - throw ERRORMORPHEO(FUNCTION,toString(_("Context [%d][%d] is idle since %.0f cycles.\n"),i,j,_nb_cycle_idle [i][j])); + if (_nb_cycle_idle [i][j] >= debug_idle_cycle) + throw ERRORMORPHEO(FUNCTION,toString(_("Thread [%d] is idle since %.0f cycles.\n"),_param->_translate_num_context_to_num_thread[i][j],_nb_cycle_idle [i][j])); log_end(Commit_unit,FUNCTION); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Parameters.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Parameters.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Parameters.cpp (revision 110) @@ -7,4 +7,5 @@ #include "Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/include/Parameters.h" +#include "Behavioural/include/Allocation.h" #include "Common/include/Max.h" #include "Common/include/BitManipulation.h" @@ -20,24 +21,26 @@ #undef FUNCTION #define FUNCTION "Commit_unit::Parameters" - Parameters::Parameters (uint32_t nb_front_end , - uint32_t * nb_context , - uint32_t nb_rename_unit , - uint32_t size_queue , - uint32_t nb_bank , - uint32_t * nb_inst_insert , - uint32_t * nb_inst_retire , - uint32_t nb_inst_commit , - uint32_t nb_inst_reexecute , - uint32_t nb_inst_branch_complete , - uint32_t ** nb_branch_speculated , - uint32_t size_nb_inst_decod , - uint32_t size_general_data , - uint32_t size_store_queue_ptr , - uint32_t size_load_queue_ptr , - uint32_t size_general_register , - uint32_t size_special_register , - Tpriority_t priority , - Tload_balancing_t load_balancing , - uint32_t nb_rename_unit_select , + Parameters::Parameters (uint32_t nb_front_end , + uint32_t * nb_context , + uint32_t nb_rename_unit , + uint32_t size_queue , + uint32_t nb_bank , + uint32_t * nb_inst_insert , + uint32_t * nb_inst_retire , + uint32_t nb_inst_commit , + uint32_t nb_inst_reexecute , + uint32_t nb_inst_branch_complete , + uint32_t ** nb_branch_speculated , + uint32_t size_nb_inst_decod , + uint32_t size_general_data , + uint32_t size_store_queue_ptr , + uint32_t size_load_queue_ptr , + uint32_t size_general_register , + uint32_t size_special_register , + Tpriority_t priority , + Tload_balancing_t load_balancing , + uint32_t nb_rename_unit_select , + uint32_t nb_thread , + uint32_t ** translate_num_context_to_num_thread, bool is_toplevel): _nb_bank_access_commit (1 ), @@ -46,18 +49,20 @@ log_begin(Commit_unit,FUNCTION); - _nb_front_end = nb_front_end ; - _nb_context = nb_context ; - _nb_rename_unit = nb_rename_unit ; - _size_queue = size_queue ; - _nb_bank = nb_bank ; - _nb_inst_insert = nb_inst_insert ; - _nb_inst_retire = nb_inst_retire ; - _nb_inst_commit = nb_inst_commit ; - _nb_inst_reexecute = nb_inst_reexecute ; - _nb_inst_branch_complete = nb_inst_branch_complete; - _nb_branch_speculated = nb_branch_speculated ; - _priority = priority ; - _load_balancing = load_balancing ; - _nb_rename_unit_select = nb_rename_unit_select ; + _nb_front_end = nb_front_end ; + _nb_context = nb_context ; + _nb_rename_unit = nb_rename_unit ; + _size_queue = size_queue ; + _nb_bank = nb_bank ; + _nb_inst_insert = nb_inst_insert ; + _nb_inst_retire = nb_inst_retire ; + _nb_inst_commit = nb_inst_commit ; + _nb_inst_reexecute = nb_inst_reexecute ; + _nb_inst_branch_complete = nb_inst_branch_complete ; + _nb_branch_speculated = nb_branch_speculated ; + _priority = priority ; + _load_balancing = load_balancing ; + _nb_rename_unit_select = nb_rename_unit_select ; + _nb_thread = nb_thread ; + _translate_num_context_to_num_thread = translate_num_context_to_num_thread; _size_rename_unit_id = log2(_nb_rename_unit); @@ -71,13 +76,17 @@ _have_port_rename_unit_id = _size_rename_unit_id > 0; - _array_size_depth = new uint32_t * [_nb_front_end]; + ALLOC2(_array_size_depth,uint32_t,_nb_front_end,_nb_context [it1]); for (uint32_t i=0; i<_nb_front_end; i++) - { - _array_size_depth [i] = new uint32_t [_nb_context [i]]; - for (uint32_t j=0; j<_nb_context [i]; j++) - _array_size_depth [i][j] = (_nb_branch_speculated [i][j] == 0)?0:log2(_nb_branch_speculated [i][j]); - } + for (uint32_t j=0; j<_nb_context [i]; j++) + _array_size_depth [i][j] = (_nb_branch_speculated [i][j] == 0)?0:log2(_nb_branch_speculated [i][j]); test(); + + ALLOC1(_have_thread,bool,_nb_thread); + for (uint32_t i=0; i<_nb_thread; i++) + _have_thread[i] = false; + for (uint32_t i=0; i<_nb_front_end; i++) + for (uint32_t j=0; j<_nb_context [i]; j++) + _have_thread[_translate_num_context_to_num_thread [i][j]] = true; if (is_toplevel) @@ -123,9 +132,6 @@ log_begin(Commit_unit,FUNCTION); - for (uint32_t i=0; i<_nb_front_end; i++) - { - delete [] _array_size_depth [i]; - } - delete [] _array_size_depth; + DELETE1(_have_thread ,_nb_thread); + DELETE2(_array_size_depth,_nb_front_end,_nb_context [it1]); log_end(Commit_unit,FUNCTION); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Parameters_msg_error.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Parameters_msg_error.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Parameters_msg_error.cpp (revision 110) @@ -35,16 +35,29 @@ if (_nb_rename_unit_select > _nb_rename_unit) - test.error("nb_rename_unit must be >= nb_rename_unit_select.\n"); + test.error(_("nb_rename_unit must be >= nb_rename_unit_select.\n")); if (not is_multiple(_size_queue, _nb_bank)) - test.error("nb_bank must be a multiple of size_queue.\n"); + test.error(_("nb_bank must be a multiple of size_queue.\n")); if (_nb_inst_reexecute != 1) - test.error("nb_inst_reexecute must be set at 1. Anothers value is unsupported.\n"); + test.error(_("nb_inst_reexecute must be set at 1. Anothers value is unsupported.\n")); + + for (uint32_t i=0; i<_nb_front_end; ++i) + for (uint32_t j=0; j<_nb_context[i]; ++j) + if (_translate_num_context_to_num_thread [i][j] >= _nb_thread) + test.error(toString(_("num_thread [%d][%d] (%d) is >= at nb_thread (%d).\n"),i,j,_translate_num_context_to_num_thread [i][j],_nb_thread)); + + for (uint32_t i=0; i<_nb_front_end; ++i) + for (uint32_t j=0; j<_nb_context[i]-1; ++j) + for (uint32_t x=i; x<_nb_front_end; ++x) + for (uint32_t y=j+1; y<_nb_context[i]; ++y) + if (_translate_num_context_to_num_thread [i][j] == _translate_num_context_to_num_thread [x][y]) + test.error(toString(_("To context [%d][%d] and [%d][%d], num_thread is the same (%d).\n"),i,j,x,y,_translate_num_context_to_num_thread [i][j])); + if (_size_queue == 1) - test.information ("Instructions are issued In-Order.\n"); + test.information (_("Instructions are issued In-Order.\n")); else - test.information ("Instructions are issued Out-Of-Order.\n"); + test.information (_("Instructions are issued Out-Of-Order.\n")); log_end(Commit_unit,FUNCTION); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/SelfTest/src/test.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/SelfTest/src/test.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/SelfTest/src/test.cpp (revision 110) @@ -333,5 +333,5 @@ } - bool test_size = issue_queue.size() <= _param->_size_queue; + bool test_size = issue_queue.size() <= (_param->_size_queue+_param->_size_reexecute_queue); TEST(bool,test_size,true); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/include/Issue_queue.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/include/Issue_queue.h (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/include/Issue_queue.h (revision 110) @@ -144,13 +144,17 @@ // ~~~~~[ Register ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ private : std::list * _issue_queue; + private : std::list _reexecute_queue; // ~~~~~[ Internal ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ private : Tcontrol_t * internal_BANK_IN_ACK ;//[nb_bank] - private : bool * internal_BANK_IN_IS_REEXECUTE ;//[nb_bank] private : uint32_t * internal_BANK_IN_NUM_RENAME_UNIT ;//[nb_bank] private : uint32_t * internal_BANK_IN_NUM_INST ;//[nb_bank] - private : Tcontrol_t * internal_BANK_OUT_VAL ;//[nb_bank] - private : uint32_t * internal_BANK_OUT_NUM_INST ;//[nb_bank] + private : Tcontrol_t * internal_ISSUE_OUT_VAL ;//[nb_inst_issue] + private : Tcontrol_t * internal_ISSUE_OUT_FROM_REEXECUTE ;//[nb_inst_issue] + private : uint32_t * internal_ISSUE_OUT_NUM_BANK ;//[nb_inst_issue] + private : entry_t * * internal_ISSUE_OUT_ENTRY ;//[nb_inst_issue] + + private : Tcontrol_t * internal_REEXECUTE_ACK ;//[nb_inst_reexecute] #endif @@ -187,5 +191,4 @@ public : void transition (void); public : void genMoore (void); - public : void genMealy (void); #endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/include/Parameters.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/include/Parameters.h (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/include/Parameters.h (revision 110) @@ -45,6 +45,7 @@ public : bool ** _table_routing ;//[nb_rename_unit][nb_inst_issue] public : bool ** _table_issue_type ;//[nb_inst_issue][nb_type] + public : uint32_t _size_reexecute_queue ; - public : uint32_t _nb_bank_select_out ; +//public : uint32_t _nb_bank_select_out ; public : uint32_t _max_nb_inst_rename ; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/src/Issue_queue.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/src/Issue_queue.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/src/Issue_queue.cpp (revision 110) @@ -95,44 +95,4 @@ # endif - log_printf(INFO,Issue_queue,FUNCTION,_("<%s> : Method - genMealy"),_name.c_str()); - - SC_METHOD (genMealy); - dont_initialize (); - sensitive << (*(in_CLOCK)).neg(); // need internal register - for (uint32_t i=0; i<_param->_nb_inst_reexecute; i++) - sensitive << (*(in_REEXECUTE_VAL [i])) - << (*(in_REEXECUTE_TYPE [i])); - for (uint32_t i=0; i<_param->_nb_rename_unit; i++) - for (uint32_t j=0; j<_param->_nb_inst_rename[i]; j++) - sensitive // << (*(in_ISSUE_IN_VAL [i][j])) - << (*(in_ISSUE_IN_TYPE [i][j])); - -# ifdef SYSTEMCASS_SPECIFIC - // List dependency information - for (uint32_t i=0; i<_param->_nb_inst_reexecute; i++) - for (uint32_t x=0; x<_param->_nb_inst_reexecute; x++) - { - (*(out_REEXECUTE_ACK [i])) (*(in_REEXECUTE_VAL [x])); - (*(out_REEXECUTE_ACK [i])) (*(in_REEXECUTE_TYPE [x])); - } - - for (uint32_t i=0; i<_param->_nb_rename_unit; i++) - for (uint32_t j=0; j<_param->_nb_inst_rename[i]; j++) - { - for (uint32_t x=0; x<_param->_nb_inst_reexecute; x++) - { - (*(out_ISSUE_IN_ACK [i][j])) (*(in_REEXECUTE_VAL [x])); - (*(out_ISSUE_IN_ACK [i][j])) (*(in_REEXECUTE_TYPE [x])); - } - - for (uint32_t x=0; x<_param->_nb_rename_unit; x++) - for (uint32_t y=0; y<_param->_nb_inst_rename[x]; y++) - { - (*(out_ISSUE_IN_ACK [i][j])) (*(in_ISSUE_IN_VAL [x][y])); - (*(out_ISSUE_IN_ACK [i][j])) (*(in_ISSUE_IN_TYPE [x][y])); - } - } -# endif - #endif } Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/src/Issue_queue_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/src/Issue_queue_allocation.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/src/Issue_queue_allocation.cpp (revision 110) @@ -141,14 +141,17 @@ { // ~~~~~[ Registers ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - _issue_queue = new std::list [_param->_nb_bank]; + _issue_queue = new std::list [_param->_nb_bank]; // ~~~~~[ Internal ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - internal_BANK_IN_ACK = new Tcontrol_t [_param->_nb_bank]; - internal_BANK_IN_IS_REEXECUTE = new bool [_param->_nb_bank]; - internal_BANK_IN_NUM_RENAME_UNIT = new uint32_t [_param->_nb_bank]; - internal_BANK_IN_NUM_INST = new uint32_t [_param->_nb_bank]; - - internal_BANK_OUT_VAL = new Tcontrol_t [_param->_nb_bank]; - internal_BANK_OUT_NUM_INST = new uint32_t [_param->_nb_bank]; + ALLOC1(internal_BANK_IN_ACK ,Tcontrol_t,_param->_nb_bank); + ALLOC1(internal_BANK_IN_NUM_RENAME_UNIT ,uint32_t ,_param->_nb_bank); + ALLOC1(internal_BANK_IN_NUM_INST ,uint32_t ,_param->_nb_bank); + + ALLOC1(internal_ISSUE_OUT_VAL ,Tcontrol_t,_param->_nb_inst_issue); + ALLOC1(internal_ISSUE_OUT_FROM_REEXECUTE,Tcontrol_t,_param->_nb_inst_issue); + ALLOC1(internal_ISSUE_OUT_NUM_BANK ,uint32_t ,_param->_nb_inst_issue); + ALLOC1(internal_ISSUE_OUT_ENTRY ,entry_t * ,_param->_nb_inst_issue); + + ALLOC1(internal_REEXECUTE_ACK ,Tcontrol_t,_param->_nb_inst_reexecute); } @@ -164,9 +167,9 @@ _priority_out = new generic::priority::Priority (_name+"_priority_out" , _param->_priority , - _param->_nb_bank_select_out, - _param->_nb_bank_select_out); + _param->_nb_bank, + _param->_nb_bank); - _priority_reg = new generic::priority::Priority (_name+"_priority_reg", - PRIORITY_ROUND_ROBIN , + _priority_reg = new generic::priority::Priority (_name+"_priority_reg" , + _param->_priority , _param->_nb_bank, _param->_nb_bank); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/src/Issue_queue_deallocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/src/Issue_queue_deallocation.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/src/Issue_queue_deallocation.cpp (revision 110) @@ -98,11 +98,14 @@ // ~~~~~[ Internal ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - delete [] internal_BANK_IN_ACK ; - delete [] internal_BANK_IN_IS_REEXECUTE ; - delete [] internal_BANK_IN_NUM_RENAME_UNIT; - delete [] internal_BANK_IN_NUM_INST ; - - delete [] internal_BANK_OUT_VAL ; - delete [] internal_BANK_OUT_NUM_INST ; + DELETE1(internal_BANK_IN_ACK ,_param->_nb_bank); + DELETE1(internal_BANK_IN_NUM_RENAME_UNIT ,_param->_nb_bank); + DELETE1(internal_BANK_IN_NUM_INST ,_param->_nb_bank); + + DELETE1(internal_ISSUE_OUT_VAL ,_param->_nb_inst_issue); + DELETE1(internal_ISSUE_OUT_FROM_REEXECUTE,_param->_nb_inst_issue); + DELETE1(internal_ISSUE_OUT_NUM_BANK ,_param->_nb_inst_issue); + DELETE1(internal_ISSUE_OUT_ENTRY ,_param->_nb_inst_issue); + + DELETE1(internal_REEXECUTE_ACK ,_param->_nb_inst_reexecute); } Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/src/Issue_queue_genMealy.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/src/Issue_queue_genMealy.cpp (revision 109) +++ (revision ) @@ -1,133 +1,0 @@ -#ifdef SYSTEMC -/* - * $Id$ - * - * [ Description ] - * - */ - -#include "Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/include/Issue_queue.h" - -namespace morpheo { -namespace behavioural { -namespace core { -namespace multi_ooo_engine { -namespace ooo_engine { -namespace issue_queue { - - -#undef FUNCTION -#define FUNCTION "Issue_queue::genMealy" - void Issue_queue::genMealy (void) - { - log_begin(Issue_queue,FUNCTION); - log_function(Issue_queue,FUNCTION,_name.c_str()); - - Tcontrol_t bank_full [_param->_nb_bank]; - Tcontrol_t issue_ack [_param->_nb_rename_unit][_param->_max_nb_inst_rename]; - Tcontrol_t reexecute_ack [_param->_nb_inst_reexecute]; - bool can_rename_select [_param->_nb_rename_unit]; - - // Initialisation - for (uint32_t i=0; i<_param->_nb_bank; i++) - { - internal_BANK_IN_ACK [i] = false; - bank_full [i] = not (_issue_queue[i].size() < _param->_size_bank); - } - for (uint32_t i=0; i<_param->_nb_rename_unit; i++) - { - can_rename_select [i] = true; - for (uint32_t j=0; j<_param->_nb_inst_rename[i]; j++) - issue_ack [i][j] = false; - } - for (uint32_t i=0; i<_param->_nb_inst_reexecute; i++) - reexecute_ack [i] = false; - - std::list * select_reg = _priority_reg->select(); // same select for all issue - - // Priority at the Reexecute instruction ! - for (uint32_t i=0; i<_param->_nb_inst_reexecute; i++) - // Test if have instruction - if (PORT_READ(in_REEXECUTE_VAL [i])) - { - Ttype_t type = PORT_READ(in_REEXECUTE_TYPE [i]); - - // scan all bank - for (std::list::iterator it=select_reg->begin(); - it!=select_reg->end(); - it++) - { - uint32_t num_bank = it->grp; - uint32_t num_issue = num_bank/_param->_nb_bank_select_out; - // test if bank is not busy (full or previous access) and if type match - if (not internal_BANK_IN_ACK [num_bank] and not bank_full [num_bank] and _param->_table_issue_type[num_issue][type]) - { - // find - reexecute_ack [i] = true; - internal_BANK_IN_ACK [num_bank] = true; - internal_BANK_IN_IS_REEXECUTE [num_bank] = 1; - internal_BANK_IN_NUM_INST [num_bank] = i; - break; - } - } - } - - // issue_in interface - std::list * select_in = _priority_in ->select(); // same select for all issue - for (std::list::iterator it=select_in ->begin(); - it!=select_in ->end(); - it++) - { - uint32_t num_rename_unit = it->grp; - uint32_t num_inst_rename = it->elt; - - // Test if have instruction - if (can_rename_select [num_rename_unit]// and -// PORT_READ(in_ISSUE_IN_VAL [num_rename_unit][num_inst_rename]) - ) - { - Ttype_t type = PORT_READ(in_ISSUE_IN_TYPE [num_rename_unit][num_inst_rename]); - - // scan all bank - for (std::list::iterator it=select_reg->begin(); - it!=select_reg->end(); - it++) - { - uint32_t num_bank = it->grp; - uint32_t num_issue = num_bank/_param->_nb_bank_select_out; - // test if bank is not busy (full or previous access) and if type match - if (not internal_BANK_IN_ACK [num_bank] and not bank_full [num_bank] and _param->_table_issue_type[num_issue][type]) - { - // find - issue_ack [num_rename_unit][num_inst_rename] = true; - internal_BANK_IN_ACK [num_bank] = true; - internal_BANK_IN_IS_REEXECUTE [num_bank] = 0; - internal_BANK_IN_NUM_RENAME_UNIT [num_bank] = num_rename_unit; - internal_BANK_IN_NUM_INST [num_bank] = num_inst_rename; - break; - } - } - - // is a valid instruction, but it's not send at a bank - // ... invalid this rename_unit (because, rename in_order) - can_rename_select [num_rename_unit] |= issue_ack [num_rename_unit][num_inst_rename]; - } - } - - for (uint32_t i=0; i<_param->_nb_rename_unit; i++) - for (uint32_t j=0; j<_param->_nb_inst_rename[i]; j++) - PORT_WRITE(out_ISSUE_IN_ACK [i][j],issue_ack [i][j]); - for (uint32_t i=0; i<_param->_nb_inst_reexecute; i++) - PORT_WRITE(out_REEXECUTE_ACK [i],reexecute_ack [i]); - - log_end(Issue_queue,FUNCTION); - }; - -}; // end namespace issue_queue -}; // end namespace ooo_engine -}; // end namespace multi_ooo_engine -}; // end namespace core - -}; // end namespace behavioural -}; // end namespace morpheo -#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/src/Issue_queue_genMoore.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/src/Issue_queue_genMoore.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/src/Issue_queue_genMoore.cpp (revision 110) @@ -24,71 +24,202 @@ log_function(Issue_queue,FUNCTION,_name.c_str()); - for (uint32_t i=0; i<_param->_nb_bank; i++) - internal_BANK_OUT_VAL [i] = false; - - std::list * select = _priority_out->select(); // same select for all issue - - uint32_t num_bank_offset = 0; - for (uint32_t i=0; i<_param->_nb_inst_issue; i++) + // =================================================================== + // =====[ REEXECUTE_UNIT ]============================================ + // =================================================================== + + for (uint32_t i=0; i<_param->_nb_inst_reexecute; ++i) { -// log_printf(TRACE,Issue_queue,FUNCTION," * ISSUE_OUT [%d]",i); - Tcontrol_t val = false; - uint32_t num_bank = 0; - - // find a non empty bank - for (std::list::iterator it=select->begin(); - it!=select->end(); - it++) - { - num_bank=num_bank_offset+it->grp; - -// log_printf(TRACE,Issue_queue,FUNCTION," * Bank [%d]",num_bank); + log_printf(TRACE,Issue_queue,FUNCTION," * REEXECUTE [%d]",i); + + internal_REEXECUTE_ACK [i] = (_reexecute_queue.size()+i) < _param->_size_reexecute_queue; + + log_printf(TRACE,Issue_queue,FUNCTION," * ACK : %d",internal_REEXECUTE_ACK [i]); + + PORT_WRITE(out_REEXECUTE_ACK [i], internal_REEXECUTE_ACK [i]); + } + + // =================================================================== + // =====[ ISSUE_IN ]================================================== + // =================================================================== + { + Tcontrol_t ack [_param->_nb_rename_unit][_param->_max_nb_inst_rename]; + + // Initialisation + for (uint32_t i=0; i<_param->_nb_bank; i++) + internal_BANK_IN_ACK [i] = false; + + for (uint32_t i=0; i<_param->_nb_rename_unit; i++) + for (uint32_t j=0; j<_param->_nb_inst_rename[i]; j++) + ack [i][j] = false; + + std::list * select_reg = _priority_reg->select(); // same select for all issue + + // issue_in interface + std::list * select_in = _priority_in ->select(); // same select for all issue + for (std::list::iterator it=select_in ->begin(); + it!=select_in ->end(); + it++) + { + // Get num interface + uint32_t num_rename_unit = it->grp; + uint32_t num_inst_rename = it->elt; + + log_printf(TRACE,Issue_queue,FUNCTION," * ISSUE_IN [%d][%d]",num_rename_unit,num_inst_rename); + + // scan all bank + for (std::list::iterator it=select_reg->begin(); + it!=select_reg->end(); + it++) + { + uint32_t num_bank = it->grp; + + log_printf(TRACE,Issue_queue,FUNCTION," * BANK [%d]",num_bank); + + // test if bank is not busy (full or previous access) + if (not internal_BANK_IN_ACK [num_bank] and (_issue_queue[num_bank].size() < _param->_size_bank)) + { + log_printf(TRACE,Issue_queue,FUNCTION," * find"); + + // find + ack [num_rename_unit][num_inst_rename] = true; + internal_BANK_IN_ACK [num_bank] = true; + internal_BANK_IN_NUM_RENAME_UNIT [num_bank] = num_rename_unit; + internal_BANK_IN_NUM_INST [num_bank] = num_inst_rename; + + break; // Stop scan + } + else + log_printf(TRACE,Issue_queue,FUNCTION," * not find"); + } + } + + for (uint32_t i=0; i<_param->_nb_rename_unit; i++) + for (uint32_t j=0; j<_param->_nb_inst_rename[i]; j++) + PORT_WRITE(out_ISSUE_IN_ACK [i][j],ack [i][j]); + } + + // =================================================================== + // =====[ ISSUE_OUT ]================================================= + // =================================================================== + { + Tcontrol_t val [_param->_nb_inst_issue]; + + for (uint32_t i=0; i<_param->_nb_inst_issue; i++) + val [i] = 0; + + // From Reexecute_queue + +// uint32_t num_reexecute_entry = 0; + for (std::list::iterator it=_reexecute_queue.begin(); + it!=_reexecute_queue.end(); + ++it) + { + entry_t* entry = (*it); + + for (uint32_t i=0; i<_param->_nb_inst_issue; i++) + // test if no previous transaction and can accept this type + if ((val[i] == 0) and _param->_table_issue_type [i][entry->_type]) + { + // find a issue port + val [i] = 1; - if (not _issue_queue [num_bank].empty()) - { -// log_printf(TRACE,Issue_queue,FUNCTION," * Not Empty !!!"); - val = true; - - internal_BANK_OUT_NUM_INST [num_bank] = i; - break; // quit scearch loop - } - } - - PORT_WRITE(out_ISSUE_OUT_VAL [i], val); - - if (val) - { - // have find a bank with a data - internal_BANK_OUT_VAL [num_bank] = true; - - entry_t* entry = _issue_queue [num_bank].front(); - - if (_param->_have_port_context_id) - PORT_WRITE(out_ISSUE_OUT_CONTEXT_ID [i], entry->_context_id ); - if (_param->_have_port_front_end_id) - PORT_WRITE(out_ISSUE_OUT_FRONT_END_ID [i], entry->_front_end_id ); - if (_param->_have_port_rob_ptr ) - PORT_WRITE(out_ISSUE_OUT_PACKET_ID [i], entry->_packet_id ); - PORT_WRITE(out_ISSUE_OUT_OPERATION [i], entry->_operation ); - PORT_WRITE(out_ISSUE_OUT_TYPE [i], entry->_type ); - PORT_WRITE(out_ISSUE_OUT_STORE_QUEUE_PTR_WRITE [i], entry->_store_queue_ptr_write); - if (_param->_have_port_load_queue_ptr) - PORT_WRITE(out_ISSUE_OUT_LOAD_QUEUE_PTR_WRITE [i], entry->_load_queue_ptr_write ); - PORT_WRITE(out_ISSUE_OUT_HAS_IMMEDIAT [i], entry->_has_immediat ); - PORT_WRITE(out_ISSUE_OUT_IMMEDIAT [i], entry->_immediat ); - PORT_WRITE(out_ISSUE_OUT_READ_RA [i], entry->_read_ra ); - PORT_WRITE(out_ISSUE_OUT_NUM_REG_RA [i], entry->_num_reg_ra ); - PORT_WRITE(out_ISSUE_OUT_READ_RB [i], entry->_read_rb ); - PORT_WRITE(out_ISSUE_OUT_NUM_REG_RB [i], entry->_num_reg_rb ); - PORT_WRITE(out_ISSUE_OUT_READ_RC [i], entry->_read_rc ); - PORT_WRITE(out_ISSUE_OUT_NUM_REG_RC [i], entry->_num_reg_rc ); - PORT_WRITE(out_ISSUE_OUT_WRITE_RD [i], entry->_write_rd ); - PORT_WRITE(out_ISSUE_OUT_NUM_REG_RD [i], entry->_num_reg_rd ); - PORT_WRITE(out_ISSUE_OUT_WRITE_RE [i], entry->_write_re ); - PORT_WRITE(out_ISSUE_OUT_NUM_REG_RE [i], entry->_num_reg_re ); - } - - num_bank_offset += _param->_nb_bank_select_out; - } + if (_param->_have_port_context_id) + PORT_WRITE(out_ISSUE_OUT_CONTEXT_ID [i], entry->_context_id ); + if (_param->_have_port_front_end_id) + PORT_WRITE(out_ISSUE_OUT_FRONT_END_ID [i], entry->_front_end_id ); + if (_param->_have_port_rob_ptr ) + PORT_WRITE(out_ISSUE_OUT_PACKET_ID [i], entry->_packet_id ); + PORT_WRITE(out_ISSUE_OUT_OPERATION [i], entry->_operation ); + PORT_WRITE(out_ISSUE_OUT_TYPE [i], entry->_type ); + PORT_WRITE(out_ISSUE_OUT_STORE_QUEUE_PTR_WRITE [i], entry->_store_queue_ptr_write); + if (_param->_have_port_load_queue_ptr) + PORT_WRITE(out_ISSUE_OUT_LOAD_QUEUE_PTR_WRITE [i], entry->_load_queue_ptr_write ); + PORT_WRITE(out_ISSUE_OUT_HAS_IMMEDIAT [i], entry->_has_immediat ); + PORT_WRITE(out_ISSUE_OUT_IMMEDIAT [i], entry->_immediat ); + PORT_WRITE(out_ISSUE_OUT_READ_RA [i], entry->_read_ra ); + PORT_WRITE(out_ISSUE_OUT_NUM_REG_RA [i], entry->_num_reg_ra ); + PORT_WRITE(out_ISSUE_OUT_READ_RB [i], entry->_read_rb ); + PORT_WRITE(out_ISSUE_OUT_NUM_REG_RB [i], entry->_num_reg_rb ); + PORT_WRITE(out_ISSUE_OUT_READ_RC [i], entry->_read_rc ); + PORT_WRITE(out_ISSUE_OUT_NUM_REG_RC [i], entry->_num_reg_rc ); + PORT_WRITE(out_ISSUE_OUT_WRITE_RD [i], entry->_write_rd ); + PORT_WRITE(out_ISSUE_OUT_NUM_REG_RD [i], entry->_num_reg_rd ); + PORT_WRITE(out_ISSUE_OUT_WRITE_RE [i], entry->_write_re ); + PORT_WRITE(out_ISSUE_OUT_NUM_REG_RE [i], entry->_num_reg_re ); + + internal_ISSUE_OUT_FROM_REEXECUTE [i] = true; +// internal_ISSUE_OUT_NUM_BANK [i] = num_reexecute_entry; + internal_ISSUE_OUT_ENTRY [i] = entry; + + break; // stop scan + } +// num_reexecute_entry ++; + } + + // From Issue_queue + + std::list * select = _priority_out->select(); // same select for all issue + + for (std::list::iterator it=select->begin(); + it!=select->end(); + it++) + { + uint32_t num_bank=it->grp; + +// log_printf(TRACE,Issue_queue,Issue_queue,FUNCTION," * Bank [%d]",num_bank); + + // Have instruction ? + if (not _issue_queue [num_bank].empty()) + { +// log_printf(TRACE,Issue_queue,Issue_queue,FUNCTION," * Not Empty !!!"); + + entry_t* entry = _issue_queue [num_bank].front(); + + for (uint32_t i=0; i<_param->_nb_inst_issue; i++) + // test if no previous transaction and can accept this type + if ((val[i] == 0) and _param->_table_issue_type [i][entry->_type]) + { + // find a issue port + val [i] = 1; + + if (_param->_have_port_context_id) + PORT_WRITE(out_ISSUE_OUT_CONTEXT_ID [i], entry->_context_id ); + if (_param->_have_port_front_end_id) + PORT_WRITE(out_ISSUE_OUT_FRONT_END_ID [i], entry->_front_end_id ); + if (_param->_have_port_rob_ptr ) + PORT_WRITE(out_ISSUE_OUT_PACKET_ID [i], entry->_packet_id ); + PORT_WRITE(out_ISSUE_OUT_OPERATION [i], entry->_operation ); + PORT_WRITE(out_ISSUE_OUT_TYPE [i], entry->_type ); + PORT_WRITE(out_ISSUE_OUT_STORE_QUEUE_PTR_WRITE [i], entry->_store_queue_ptr_write); + if (_param->_have_port_load_queue_ptr) + PORT_WRITE(out_ISSUE_OUT_LOAD_QUEUE_PTR_WRITE [i], entry->_load_queue_ptr_write ); + PORT_WRITE(out_ISSUE_OUT_HAS_IMMEDIAT [i], entry->_has_immediat ); + PORT_WRITE(out_ISSUE_OUT_IMMEDIAT [i], entry->_immediat ); + PORT_WRITE(out_ISSUE_OUT_READ_RA [i], entry->_read_ra ); + PORT_WRITE(out_ISSUE_OUT_NUM_REG_RA [i], entry->_num_reg_ra ); + PORT_WRITE(out_ISSUE_OUT_READ_RB [i], entry->_read_rb ); + PORT_WRITE(out_ISSUE_OUT_NUM_REG_RB [i], entry->_num_reg_rb ); + PORT_WRITE(out_ISSUE_OUT_READ_RC [i], entry->_read_rc ); + PORT_WRITE(out_ISSUE_OUT_NUM_REG_RC [i], entry->_num_reg_rc ); + PORT_WRITE(out_ISSUE_OUT_WRITE_RD [i], entry->_write_rd ); + PORT_WRITE(out_ISSUE_OUT_NUM_REG_RD [i], entry->_num_reg_rd ); + PORT_WRITE(out_ISSUE_OUT_WRITE_RE [i], entry->_write_re ); + PORT_WRITE(out_ISSUE_OUT_NUM_REG_RE [i], entry->_num_reg_re ); + + internal_ISSUE_OUT_FROM_REEXECUTE [i] = false; + internal_ISSUE_OUT_NUM_BANK [i] = num_bank; + internal_ISSUE_OUT_ENTRY [i] = entry; + + break; // stop scan + } + } + } + + for (uint32_t i=0; i<_param->_nb_inst_issue; i++) + { + internal_ISSUE_OUT_VAL [i] = val [i]; + PORT_WRITE(out_ISSUE_OUT_VAL [i], internal_ISSUE_OUT_VAL [i]); + } + } log_end(Issue_queue,FUNCTION); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/src/Issue_queue_transition.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/src/Issue_queue_transition.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/src/Issue_queue_transition.cpp (revision 110) @@ -32,4 +32,5 @@ for (uint32_t i=0; i<_param->_nb_bank; i++) _issue_queue [i].clear(); + _reexecute_queue.clear(); } else @@ -42,123 +43,118 @@ // =====[ ISSUE_IN ]================================================== // =================================================================== + for (uint32_t i=0; i<_param->_nb_bank; i++) if (internal_BANK_IN_ACK [i]) { - entry_t * entry = NULL; - - if (internal_BANK_IN_IS_REEXECUTE [i]) - { - uint32_t y = internal_BANK_IN_NUM_INST [i]; - - if (PORT_READ(in_REEXECUTE_VAL [y])) - { - log_printf(TRACE,Issue_queue,FUNCTION," * ISSUE_IN [%d] - Transaction with REEXECUTE [%d]",i,y); + uint32_t x = internal_BANK_IN_NUM_RENAME_UNIT [i]; + uint32_t y = internal_BANK_IN_NUM_INST [i]; + + if (PORT_READ(in_ISSUE_IN_VAL[x][y])) + { + log_printf(TRACE,Issue_queue,FUNCTION," * ISSUE_IN [%d] - Transaction with ISSUE_IN [%d][%d]",i,x,y); + #ifdef STATISTICS - if (usage_is_set(_usage,USE_STATISTICS)) - (*_stat_nb_inst_reexecute) ++; -#endif - entry = new entry_t - ( - (_param->_have_port_context_id )?PORT_READ(in_REEXECUTE_CONTEXT_ID [y]):0, - (_param->_have_port_front_end_id )?PORT_READ(in_REEXECUTE_FRONT_END_ID [y]):0, - (_param->_have_port_rob_ptr )?PORT_READ(in_REEXECUTE_PACKET_ID [y]):0, - PORT_READ(in_REEXECUTE_OPERATION [y]), - PORT_READ(in_REEXECUTE_TYPE [y]), - PORT_READ(in_REEXECUTE_STORE_QUEUE_PTR_WRITE [y]), - (_param->_have_port_load_queue_ptr)?PORT_READ(in_REEXECUTE_LOAD_QUEUE_PTR_WRITE [y]):0, - PORT_READ(in_REEXECUTE_HAS_IMMEDIAT [y]), - PORT_READ(in_REEXECUTE_IMMEDIAT [y]), - PORT_READ(in_REEXECUTE_READ_RA [y]), - PORT_READ(in_REEXECUTE_NUM_REG_RA [y]), - PORT_READ(in_REEXECUTE_READ_RB [y]), - PORT_READ(in_REEXECUTE_NUM_REG_RB [y]), - PORT_READ(in_REEXECUTE_READ_RC [y]), - PORT_READ(in_REEXECUTE_NUM_REG_RC [y]), - PORT_READ(in_REEXECUTE_WRITE_RD [y]), - PORT_READ(in_REEXECUTE_NUM_REG_RD [y]), - PORT_READ(in_REEXECUTE_WRITE_RE [y]), - PORT_READ(in_REEXECUTE_NUM_REG_RE [y]) - ); - } - } - else - { - uint32_t x = internal_BANK_IN_NUM_RENAME_UNIT [i]; - uint32_t y = internal_BANK_IN_NUM_INST [i]; - - if (PORT_READ(in_ISSUE_IN_VAL[x][y])) - { - log_printf(TRACE,Issue_queue,FUNCTION," * ISSUE_IN [%d] - Transaction with ISSUE_IN [%d][%d]",i,x,y); - + if (usage_is_set(_usage,USE_STATISTICS)) + (*_stat_nb_inst_issue_in [x]) ++; +#endif + entry_t * entry = new entry_t + ( + (_param->_have_port_context_id )?PORT_READ(in_ISSUE_IN_CONTEXT_ID [x][y]):0, + (_param->_have_port_front_end_id )?PORT_READ(in_ISSUE_IN_FRONT_END_ID [x][y]):0, + (_param->_have_port_rob_ptr )?PORT_READ(in_ISSUE_IN_PACKET_ID [x][y]):0, + PORT_READ(in_ISSUE_IN_OPERATION [x][y]), + PORT_READ(in_ISSUE_IN_TYPE [x][y]), + PORT_READ(in_ISSUE_IN_STORE_QUEUE_PTR_WRITE [x][y]), + (_param->_have_port_load_queue_ptr)?PORT_READ(in_ISSUE_IN_LOAD_QUEUE_PTR_WRITE [x][y]):0, + PORT_READ(in_ISSUE_IN_HAS_IMMEDIAT [x][y]), + PORT_READ(in_ISSUE_IN_IMMEDIAT [x][y]), + PORT_READ(in_ISSUE_IN_READ_RA [x][y]), + PORT_READ(in_ISSUE_IN_NUM_REG_RA [x][y]), + PORT_READ(in_ISSUE_IN_READ_RB [x][y]), + PORT_READ(in_ISSUE_IN_NUM_REG_RB [x][y]), + PORT_READ(in_ISSUE_IN_READ_RC [x][y]), + PORT_READ(in_ISSUE_IN_NUM_REG_RC [x][y]), + PORT_READ(in_ISSUE_IN_WRITE_RD [x][y]), + PORT_READ(in_ISSUE_IN_NUM_REG_RD [x][y]), + PORT_READ(in_ISSUE_IN_WRITE_RE [x][y]), + PORT_READ(in_ISSUE_IN_NUM_REG_RE [x][y]) + ); + + _issue_queue [i].push_back(entry); + } + } + + // =================================================================== + // =====[ REEXECUTE_UNIT ]============================================ + // =================================================================== + + for (uint32_t i=0; i<_param->_nb_inst_reexecute; ++i) + if (PORT_READ(in_REEXECUTE_VAL [i]) and internal_REEXECUTE_ACK [i]) + { + log_printf(TRACE,Issue_queue,FUNCTION," * REEXECUTE [%d]",i); #ifdef STATISTICS - if (usage_is_set(_usage,USE_STATISTICS)) - (*_stat_nb_inst_issue_in [x]) ++; -#endif - entry = new entry_t - ( - (_param->_have_port_context_id )?PORT_READ(in_ISSUE_IN_CONTEXT_ID [x][y]):0, - (_param->_have_port_front_end_id )?PORT_READ(in_ISSUE_IN_FRONT_END_ID [x][y]):0, - (_param->_have_port_rob_ptr )?PORT_READ(in_ISSUE_IN_PACKET_ID [x][y]):0, - PORT_READ(in_ISSUE_IN_OPERATION [x][y]), - PORT_READ(in_ISSUE_IN_TYPE [x][y]), - PORT_READ(in_ISSUE_IN_STORE_QUEUE_PTR_WRITE [x][y]), - (_param->_have_port_load_queue_ptr)?PORT_READ(in_ISSUE_IN_LOAD_QUEUE_PTR_WRITE [x][y]):0, - PORT_READ(in_ISSUE_IN_HAS_IMMEDIAT [x][y]), - PORT_READ(in_ISSUE_IN_IMMEDIAT [x][y]), - PORT_READ(in_ISSUE_IN_READ_RA [x][y]), - PORT_READ(in_ISSUE_IN_NUM_REG_RA [x][y]), - PORT_READ(in_ISSUE_IN_READ_RB [x][y]), - PORT_READ(in_ISSUE_IN_NUM_REG_RB [x][y]), - PORT_READ(in_ISSUE_IN_READ_RC [x][y]), - PORT_READ(in_ISSUE_IN_NUM_REG_RC [x][y]), - PORT_READ(in_ISSUE_IN_WRITE_RD [x][y]), - PORT_READ(in_ISSUE_IN_NUM_REG_RD [x][y]), - PORT_READ(in_ISSUE_IN_WRITE_RE [x][y]), - PORT_READ(in_ISSUE_IN_NUM_REG_RE [x][y]) - ); - } - } - - if (entry != NULL) - _issue_queue [i].push_back(entry); - } + if (usage_is_set(_usage,USE_STATISTICS)) + (*_stat_nb_inst_reexecute) ++; +#endif + entry_t * entry = new entry_t + ( + (_param->_have_port_context_id )?PORT_READ(in_REEXECUTE_CONTEXT_ID [i]):0, + (_param->_have_port_front_end_id )?PORT_READ(in_REEXECUTE_FRONT_END_ID [i]):0, + (_param->_have_port_rob_ptr )?PORT_READ(in_REEXECUTE_PACKET_ID [i]):0, + PORT_READ(in_REEXECUTE_OPERATION [i]), + PORT_READ(in_REEXECUTE_TYPE [i]), + PORT_READ(in_REEXECUTE_STORE_QUEUE_PTR_WRITE [i]), + (_param->_have_port_load_queue_ptr)?PORT_READ(in_REEXECUTE_LOAD_QUEUE_PTR_WRITE [i]):0, + PORT_READ(in_REEXECUTE_HAS_IMMEDIAT [i]), + PORT_READ(in_REEXECUTE_IMMEDIAT [i]), + PORT_READ(in_REEXECUTE_READ_RA [i]), + PORT_READ(in_REEXECUTE_NUM_REG_RA [i]), + PORT_READ(in_REEXECUTE_READ_RB [i]), + PORT_READ(in_REEXECUTE_NUM_REG_RB [i]), + PORT_READ(in_REEXECUTE_READ_RC [i]), + PORT_READ(in_REEXECUTE_NUM_REG_RC [i]), + PORT_READ(in_REEXECUTE_WRITE_RD [i]), + PORT_READ(in_REEXECUTE_NUM_REG_RD [i]), + PORT_READ(in_REEXECUTE_WRITE_RE [i]), + PORT_READ(in_REEXECUTE_NUM_REG_RE [i]) + ); + + _reexecute_queue.push_back(entry); + } // =================================================================== // =====[ ISSUE_OUT ]================================================= // =================================================================== - for (uint32_t i=0; i<_param->_nb_bank; i++) - { -// log_printf(TRACE,Issue_queue,FUNCTION," * internal_BANK_OUT [%d] val %d, num_inst %d",i,internal_BANK_OUT_VAL [i],internal_BANK_OUT_NUM_INST [i]); - - if (internal_BANK_OUT_VAL [i]) - { -#ifdef STATISTICS - if (usage_is_set(_usage,USE_STATISTICS)) - (*_stat_nb_inst_issue_out) ++; -#endif - - uint32_t x = internal_BANK_OUT_NUM_INST [i]; -// log_printf(TRACE,Issue_queue,FUNCTION," * ISSUE_OUT_ACK : %d",PORT_READ(in_ISSUE_OUT_ACK [x])); - - if (PORT_READ(in_ISSUE_OUT_ACK [x])) - { - log_printf(TRACE,Issue_queue,FUNCTION," * ISSUE_OUT [%d] - Transaction with ISSUE_OUT [%d]",i,x); - - - entry_t * entry = _issue_queue [i].front(); - _issue_queue [i].pop_front(); - delete entry; - } - } - } + + for (uint32_t i=0; i<_param->_nb_inst_issue; ++i) + if (internal_ISSUE_OUT_VAL [i] and PORT_READ(in_ISSUE_OUT_ACK [i])) + { + entry_t * entry = internal_ISSUE_OUT_ENTRY [i]; + + if (internal_ISSUE_OUT_FROM_REEXECUTE [i]) + { + log_printf(TRACE,Issue_queue,FUNCTION," * ISSUE_OUT [%d] - From Reexecute_queue",i); + + _reexecute_queue.remove(entry); + } + else + { + // front ... + uint32_t num_bank = internal_ISSUE_OUT_NUM_BANK [i]; + + log_printf(TRACE,Issue_queue,FUNCTION," * ISSUE_OUT [%d] - From issue_queue [%d]",i,num_bank); + + _issue_queue [num_bank].remove(entry); + } + + delete entry; + } } +#if defined(DEBUG) and defined(DEBUG_Issue_queue) and (DEBUG >= DEBUG_TRACE) log_printf(TRACE,Issue_queue,FUNCTION," * Dump Issue_queue"); + for (uint32_t i=0; i<_param->_nb_bank; i++) { -#ifdef STATISTICS - if (usage_is_set(_usage,USE_STATISTICS)) - *(_stat_bank_nb_inst [i]) += _issue_queue[i].size(); -#endif log_printf(TRACE,Issue_queue,FUNCTION," * Bank [%d] size : %d",i,(int)_issue_queue[i].size()); @@ -199,6 +195,53 @@ ++j; } - } + + { + log_printf(TRACE,Issue_queue,FUNCTION," * Reexecute_queue - size : %d",(int)_reexecute_queue.size()); + + uint32_t i = 0; + + for (std::list::iterator it=_reexecute_queue.begin();it!=_reexecute_queue.end(); ++it) + { + log_printf(TRACE,Issue_queue,FUNCTION," [%.4d] %.2d %.2d %.4d, %.2d %.3d, %.2d %.2d, %.1d %.8x, %.1d %.4d, %.1d %.4d, %.1d %.4d, %.1d %.4d, %.1d %.4d", + i, + + (*it)->_context_id , + (*it)->_front_end_id , + (*it)->_packet_id , + + (*it)->_type , + (*it)->_operation , + + (*it)->_store_queue_ptr_write, + (*it)->_load_queue_ptr_write , + + (*it)->_has_immediat , + (*it)->_immediat , + + (*it)->_read_ra , + (*it)->_num_reg_ra , + + (*it)->_read_rb , + (*it)->_num_reg_rb , + + (*it)->_read_rc , + (*it)->_num_reg_rc , + + (*it)->_write_rd , + (*it)->_num_reg_rd , + + (*it)->_write_re , + (*it)->_num_reg_re ); + ++i; + } + } +#endif + +#ifdef STATISTICS + if (usage_is_set(_usage,USE_STATISTICS)) + for (uint32_t i=0; i<_param->_nb_bank; i++) + *(_stat_bank_nb_inst [i]) += _issue_queue[i].size(); +#endif #if defined(STATISTICS) or defined(VHDL_TESTBENCH) Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/src/Parameters.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/src/Parameters.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/src/Parameters.cpp (revision 110) @@ -56,4 +56,5 @@ _table_routing = table_routing ; _table_issue_type = table_issue_type ; + _size_reexecute_queue = nb_inst_reexecute ; log_printf(TRACE,Issue_queue,FUNCTION," * table_routing [nb_rename_unit][nb_inst_issue]"); @@ -70,5 +71,4 @@ _max_nb_inst_rename = max(_nb_inst_rename,_nb_rename_unit); - _nb_bank_select_out = _nb_bank/nb_inst_issue; _size_bank = _size_queue / _nb_bank; 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 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/OOO_Engine_Glue/SelfTest/src/test.cpp (revision 110) @@ -26,5 +26,5 @@ // _usage = usage_unset(_usage,USE_VHDL_TESTBENCH_ASSERT); // _usage = usage_unset(_usage,USE_POSITION ); - _usage = usage_unset(_usage,USE_STATISTICS ); +// _usage = usage_unset(_usage,USE_STATISTICS ); // _usage = usage_unset(_usage,USE_INFORMATION ); 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 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/OOO_Engine_Glue/include/OOO_Engine_Glue.h (revision 110) @@ -52,4 +52,9 @@ #ifdef STATISTICS public : Stat * _stat; + + private : counter_t * _stat_nb_inst_issue_stall_by_registerfile; +//private : counter_t * _stat_nb_inst_issue_stall_by_rename_unit ; + private : counter_t * _stat_nb_inst_issue_stall_by_commit_unit ; + private : counter_t * _stat_nb_inst_issue_stall_by_issue_queue ; #endif @@ -122,24 +127,24 @@ public : SC_OUT(Tspecial_address_t ) *** out_INSERT_COMMIT_UNIT_NUM_REG_RE_PHY_NEW ;//[nb_rename_unit][nb_inst_insert] - public : SC_OUT(Tcontrol_t ) *** out_INSERT_ISSUE_QUEUE_VAL ;//[nb_rename_unit][nb_inst_rename] - public : SC_IN (Tcontrol_t ) *** in_INSERT_ISSUE_QUEUE_ACK ;//[nb_rename_unit][nb_inst_rename] - public : SC_OUT(Tcontext_t ) *** out_INSERT_ISSUE_QUEUE_CONTEXT_ID ;//[nb_rename_unit][nb_inst_rename] - public : SC_OUT(Tcontext_t ) *** out_INSERT_ISSUE_QUEUE_FRONT_END_ID ;//[nb_rename_unit][nb_inst_rename] - public : SC_OUT(Toperation_t ) *** out_INSERT_ISSUE_QUEUE_OPERATION ;//[nb_rename_unit][nb_inst_rename] - public : SC_OUT(Ttype_t ) *** out_INSERT_ISSUE_QUEUE_TYPE ;//[nb_rename_unit][nb_inst_rename] - public : SC_OUT(Tlsq_ptr_t ) *** out_INSERT_ISSUE_QUEUE_STORE_QUEUE_PTR_WRITE ;//[nb_rename_unit][nb_inst_rename] - public : SC_OUT(Tlsq_ptr_t ) *** out_INSERT_ISSUE_QUEUE_LOAD_QUEUE_PTR_WRITE ;//[nb_rename_unit][nb_inst_rename] - public : SC_OUT(Tcontrol_t ) *** out_INSERT_ISSUE_QUEUE_HAS_IMMEDIAT ;//[nb_rename_unit][nb_inst_rename] - public : SC_OUT(Tgeneral_data_t ) *** out_INSERT_ISSUE_QUEUE_IMMEDIAT ;//[nb_rename_unit][nb_inst_rename] - public : SC_OUT(Tcontrol_t ) *** out_INSERT_ISSUE_QUEUE_READ_RA ;//[nb_rename_unit][nb_inst_rename] - public : SC_OUT(Tgeneral_address_t ) *** out_INSERT_ISSUE_QUEUE_NUM_REG_RA ;//[nb_rename_unit][nb_inst_rename] - public : SC_OUT(Tcontrol_t ) *** out_INSERT_ISSUE_QUEUE_READ_RB ;//[nb_rename_unit][nb_inst_rename] - public : SC_OUT(Tgeneral_address_t ) *** out_INSERT_ISSUE_QUEUE_NUM_REG_RB ;//[nb_rename_unit][nb_inst_rename] - public : SC_OUT(Tcontrol_t ) *** out_INSERT_ISSUE_QUEUE_READ_RC ;//[nb_rename_unit][nb_inst_rename] - public : SC_OUT(Tspecial_address_t ) *** out_INSERT_ISSUE_QUEUE_NUM_REG_RC ;//[nb_rename_unit][nb_inst_rename] - public : SC_OUT(Tcontrol_t ) *** out_INSERT_ISSUE_QUEUE_WRITE_RD ;//[nb_rename_unit][nb_inst_rename] - public : SC_OUT(Tgeneral_address_t ) *** out_INSERT_ISSUE_QUEUE_NUM_REG_RD ;//[nb_rename_unit][nb_inst_rename] - public : SC_OUT(Tcontrol_t ) *** out_INSERT_ISSUE_QUEUE_WRITE_RE ;//[nb_rename_unit][nb_inst_rename] - public : SC_OUT(Tspecial_address_t ) *** out_INSERT_ISSUE_QUEUE_NUM_REG_RE ;//[nb_rename_unit][nb_inst_rename] + public : SC_OUT(Tcontrol_t ) *** out_INSERT_ISSUE_QUEUE_VAL ;//[nb_rename_unit][nb_inst_insert] + public : SC_IN (Tcontrol_t ) *** in_INSERT_ISSUE_QUEUE_ACK ;//[nb_rename_unit][nb_inst_insert] + public : SC_OUT(Tcontext_t ) *** out_INSERT_ISSUE_QUEUE_CONTEXT_ID ;//[nb_rename_unit][nb_inst_insert] + public : SC_OUT(Tcontext_t ) *** out_INSERT_ISSUE_QUEUE_FRONT_END_ID ;//[nb_rename_unit][nb_inst_insert] + public : SC_OUT(Toperation_t ) *** out_INSERT_ISSUE_QUEUE_OPERATION ;//[nb_rename_unit][nb_inst_insert] + public : SC_OUT(Ttype_t ) *** out_INSERT_ISSUE_QUEUE_TYPE ;//[nb_rename_unit][nb_inst_insert] + public : SC_OUT(Tlsq_ptr_t ) *** out_INSERT_ISSUE_QUEUE_STORE_QUEUE_PTR_WRITE ;//[nb_rename_unit][nb_inst_insert] + public : SC_OUT(Tlsq_ptr_t ) *** out_INSERT_ISSUE_QUEUE_LOAD_QUEUE_PTR_WRITE ;//[nb_rename_unit][nb_inst_insert] + public : SC_OUT(Tcontrol_t ) *** out_INSERT_ISSUE_QUEUE_HAS_IMMEDIAT ;//[nb_rename_unit][nb_inst_insert] + public : SC_OUT(Tgeneral_data_t ) *** out_INSERT_ISSUE_QUEUE_IMMEDIAT ;//[nb_rename_unit][nb_inst_insert] + public : SC_OUT(Tcontrol_t ) *** out_INSERT_ISSUE_QUEUE_READ_RA ;//[nb_rename_unit][nb_inst_insert] + public : SC_OUT(Tgeneral_address_t ) *** out_INSERT_ISSUE_QUEUE_NUM_REG_RA ;//[nb_rename_unit][nb_inst_insert] + public : SC_OUT(Tcontrol_t ) *** out_INSERT_ISSUE_QUEUE_READ_RB ;//[nb_rename_unit][nb_inst_insert] + public : SC_OUT(Tgeneral_address_t ) *** out_INSERT_ISSUE_QUEUE_NUM_REG_RB ;//[nb_rename_unit][nb_inst_insert] + public : SC_OUT(Tcontrol_t ) *** out_INSERT_ISSUE_QUEUE_READ_RC ;//[nb_rename_unit][nb_inst_insert] + public : SC_OUT(Tspecial_address_t ) *** out_INSERT_ISSUE_QUEUE_NUM_REG_RC ;//[nb_rename_unit][nb_inst_insert] + public : SC_OUT(Tcontrol_t ) *** out_INSERT_ISSUE_QUEUE_WRITE_RD ;//[nb_rename_unit][nb_inst_insert] + public : SC_OUT(Tgeneral_address_t ) *** out_INSERT_ISSUE_QUEUE_NUM_REG_RD ;//[nb_rename_unit][nb_inst_insert] + public : SC_OUT(Tcontrol_t ) *** out_INSERT_ISSUE_QUEUE_WRITE_RE ;//[nb_rename_unit][nb_inst_insert] + public : SC_OUT(Tspecial_address_t ) *** out_INSERT_ISSUE_QUEUE_NUM_REG_RE ;//[nb_rename_unit][nb_inst_insert] // // ~~~~~[ Interface "retire" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/OOO_Engine_Glue/src/OOO_Engine_Glue_genMealy_insert_valack.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/OOO_Engine_Glue/src/OOO_Engine_Glue_genMealy_insert_valack.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/OOO_Engine_Glue/src/OOO_Engine_Glue_genMealy_insert_valack.cpp (revision 110) @@ -59,5 +59,5 @@ commit_unit_ack and not rename_unit_no_execute); - + PORT_WRITE(out_INSERT_VAL [x] ,val ); PORT_WRITE(out_INSERT_RENAME_UNIT_ACK [i][j],rename_unit_ack); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/OOO_Engine_Glue/src/OOO_Engine_Glue_statistics_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/OOO_Engine_Glue/src/OOO_Engine_Glue_statistics_allocation.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/OOO_Engine_Glue/src/OOO_Engine_Glue_statistics_allocation.cpp (revision 110) @@ -26,4 +26,17 @@ "OOO_Engine_Glue", param_statistics); + + _stat_nb_inst_issue_stall_by_registerfile = _stat->create_variable("nb_inst_issue_stall_by_registerfile"); +// _stat_nb_inst_issue_stall_by_rename_unit = _stat->create_variable("nb_inst_issue_stall_by_rename_unit" ); + _stat_nb_inst_issue_stall_by_commit_unit = _stat->create_variable("nb_inst_issue_stall_by_commit_unit" ); + _stat_nb_inst_issue_stall_by_issue_queue = _stat->create_variable("nb_inst_issue_stall_by_issue_queue" ); + +// std::string nb_inst_issue_stall = "+ + nb_inst_issue_stall_by_registerfile nb_inst_issue_stall_by_rename_unit + nb_inst_issue_stall_by_commit_unit nb_inst_issue_stall_by_issue_queue"; + std::string nb_inst_issue_stall = "+ nb_inst_issue_stall_by_registerfile + nb_inst_issue_stall_by_commit_unit nb_inst_issue_stall_by_issue_queue"; + + _stat->create_expr_percent ("percent_issue_stall_by_registerfile", "nb_inst_issue_stall_by_registerfile", nb_inst_issue_stall, _("Percent of instruction stalled by RegisterFile")); +// _stat->create_expr_percent ("percent_issue_stall_by_rename_unit" , "nb_inst_issue_stall_by_rename_unit" , nb_inst_issue_stall, _("Percent of instruction stalled by Rename_Unit") ); + _stat->create_expr_percent ("percent_issue_stall_by_commit_unit" , "nb_inst_issue_stall_by_commit_unit" , nb_inst_issue_stall, _("Percent of instruction stalled by Commit_Unit") ); + _stat->create_expr_percent ("percent_issue_stall_by_issue_queue" , "nb_inst_issue_stall_by_issue_queue" , nb_inst_issue_stall, _("Percent of instruction stalled by Issue_Queue") ); log_end(OOO_Engine_Glue,FUNCTION); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/OOO_Engine_Glue/src/OOO_Engine_Glue_transition.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/OOO_Engine_Glue/src/OOO_Engine_Glue_transition.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/OOO_Engine_Glue/src/OOO_Engine_Glue_transition.cpp (revision 110) @@ -23,4 +23,25 @@ log_begin(OOO_Engine_Glue,FUNCTION); +#ifdef STATISTICS + if (usage_is_set(_usage,USE_STATISTICS)) + { + uint32_t x=0; + for (uint32_t i=0; i<_param->_nb_rename_unit; ++i) + for (uint32_t j=0; j<_param->_nb_inst_insert[i]; ++j) + { + if (PORT_READ(in_INSERT_RENAME_UNIT_VAL [i][j])) + { + if (PORT_READ(in_INSERT_ACK [x]) == 0) + (*_stat_nb_inst_issue_stall_by_registerfile) ++; + if (PORT_READ(in_INSERT_COMMIT_UNIT_ACK [i][j]) == 0) + (*_stat_nb_inst_issue_stall_by_commit_unit ) ++; + if (PORT_READ(in_INSERT_ISSUE_QUEUE_ACK [i][j]) == 0) + (*_stat_nb_inst_issue_stall_by_issue_queue ) ++; + } + x++; + } + } +#endif + #if defined(STATISTICS) or defined(VHDL_TESTBENCH) end_cycle (); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Load_Store_pointer_unit/SelfTest/configuration.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Load_Store_pointer_unit/SelfTest/configuration.cfg (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Load_Store_pointer_unit/SelfTest/configuration.cfg (revision 110) @@ -5,4 +5,5 @@ 2 4 *2 # size_store_queue [0] [nb_load_store_queue] 1 4 *2 # size_load_queue [0] [nb_load_store_queue] +1 4 *4 # nb_inst_memory [0] [nb_load_store_queue] 0 0 +1 # link_load_store_unit_with_thread [0][0] [nb_front_end][nb_context] 1 4 *4 # nb_inst_insert Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Load_Store_pointer_unit/SelfTest/src/main.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Load_Store_pointer_unit/SelfTest/src/main.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Load_Store_pointer_unit/SelfTest/src/main.cpp (revision 110) @@ -19,4 +19,5 @@ err (_(" * size_store_queue [nb_load_store_queue] (uint32_t)\n")); err (_(" * size_load_queue [nb_load_store_queue] (uint32_t)\n")); + err (_(" * nb_inst_memory [nb_load_store_queue] (uint32_t)\n")); err (_(" * link_load_store_unit_with_thread [nb_front_end][nb_context](uint32_t)\n")); err (_(" * nb_inst_insert (uint32_t)\n")); @@ -53,9 +54,10 @@ uint32_t _nb_load_store_queue = fromString(argv[x++]); - if (argc != static_cast(2+NB_PARAMS+_nb_front_end+2*_nb_load_store_queue+nb_thread)) + if (argc != static_cast(2+NB_PARAMS+_nb_front_end+3*_nb_load_store_queue+nb_thread)) usage (argc, argv); uint32_t * _size_store_queue = new uint32_t [_nb_load_store_queue]; uint32_t * _size_load_queue = new uint32_t [_nb_load_store_queue]; + uint32_t * _nb_inst_memory = new uint32_t [_nb_load_store_queue]; for (uint32_t i=0; i<_nb_load_store_queue; i++) @@ -63,4 +65,6 @@ for (uint32_t i=0; i<_nb_load_store_queue; i++) _size_load_queue [i] = atoi(argv[x++]); + for (uint32_t i=0; i<_nb_load_store_queue; i++) + _nb_inst_memory [i] = atoi(argv[x++]); uint32_t ** _link_load_store_unit_with_thread = new uint32_t * [_nb_front_end]; @@ -84,4 +88,5 @@ _size_store_queue , _size_load_queue , + _nb_inst_memory , _link_load_store_unit_with_thread, _nb_inst_insert , Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Load_Store_pointer_unit/include/Parameters.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Load_Store_pointer_unit/include/Parameters.h (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Load_Store_pointer_unit/include/Parameters.h (revision 110) @@ -29,7 +29,11 @@ public : uint32_t * _size_store_queue ; //[nb_load_store_queue] public : uint32_t * _size_load_queue ; //[nb_load_store_queue] + public : uint32_t * _nb_inst_memory ; //[nb_load_store_queue] public : uint32_t ** _link_load_store_unit_with_thread; //[nb_front_end][nb_context] public : uint32_t _nb_inst_insert ; public : uint32_t _nb_inst_retire ; + + public : uint32_t _max_size_store_queue ; + public : uint32_t _max_size_load_queue ; //public : uint32_t _size_front_end_id ; @@ -50,4 +54,5 @@ uint32_t * size_store_queue , uint32_t * size_load_queue , + uint32_t * nb_inst_memory , uint32_t ** link_load_store_unit_with_thread, uint32_t nb_inst_insert , Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Load_Store_pointer_unit/src/Load_Store_pointer_unit_genMealy_insert.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Load_Store_pointer_unit/src/Load_Store_pointer_unit_genMealy_insert.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Load_Store_pointer_unit/src/Load_Store_pointer_unit_genMealy_insert.cpp (revision 110) @@ -22,52 +22,99 @@ void Load_Store_pointer_unit::genMealy_insert (void) { - log_printf(FUNC,Load_Store_pointer_unit,FUNCTION,"Begin"); + log_begin(Load_Store_pointer_unit,FUNCTION); + log_function(Load_Store_pointer_unit,FUNCTION,_name.c_str()); - bool use_lsq [_param->_nb_load_store_queue]; + // TODO : limité à nb_inst_memory le nombre d'accès par lsq !!! + + uint32_t nb_use_lsq [_param->_nb_load_store_queue]; + Tlsq_ptr_t STORE_QUEUE_PTR_WRITE [_param->_nb_load_store_queue]; + bool STORE_QUEUE_USE [_param->_nb_load_store_queue][_param->_max_size_store_queue]; + Tlsq_ptr_t STORE_QUEUE_NB_USE [_param->_nb_load_store_queue]; + Tlsq_ptr_t LOAD_QUEUE_PTR_WRITE [_param->_nb_load_store_queue]; + bool LOAD_QUEUE_USE [_param->_nb_load_store_queue][_param->_max_size_load_queue]; + for (uint32_t i=0; i<_param->_nb_load_store_queue; i++) - use_lsq [i] = false; + { + nb_use_lsq [i] = _param->_nb_inst_memory[i]; + + STORE_QUEUE_PTR_WRITE [i] = reg_STORE_QUEUE_PTR_WRITE [i]; + STORE_QUEUE_NB_USE [i] = reg_STORE_QUEUE_NB_USE [i]; + LOAD_QUEUE_PTR_WRITE [i] = reg_LOAD_QUEUE_PTR_WRITE [i]; + + for (uint32_t j=0; j<_param->_size_store_queue[i]; j++) + STORE_QUEUE_USE [i][j] = reg_STORE_QUEUE_USE [i][j]; + for (uint32_t j=0; j<_param->_size_load_queue[i]; j++) + LOAD_QUEUE_USE [i][j] = reg_LOAD_QUEUE_USE [i][j]; + } for (uint32_t i=0; i<_param->_nb_inst_insert; i++) { + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * INSERT [%d]",i); + Tcontrol_t ack = false; - Tlsq_ptr_t store_queue_ptr_write = 0; - Tlsq_ptr_t load_queue_ptr_write = 0; if ( (PORT_READ(in_INSERT_VAL [i]) == true ) and (PORT_READ(in_INSERT_TYPE [i]) == TYPE_MEMORY)) { + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * type is memory"); + Tcontext_t front_end_id = (_param->_have_port_front_end_id)?PORT_READ(in_INSERT_FRONT_END_ID [i]):0; Tcontext_t context_id = (_param->_have_port_context_id )?PORT_READ(in_INSERT_CONTEXT_ID [i]):0; - uint32_t lsq = _param->_link_load_store_unit_with_thread[front_end_id][context_id]; + + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * front_end_id : %d",front_end_id); + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * context_id : %d",context_id ); + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * lsq : %d",lsq ); // Test if a previous instruction use the same lsq // Authorize once memory access by load store unit - if (use_lsq [lsq] == false) + if (nb_use_lsq [lsq] > 0) { - use_lsq [lsq] = true; + nb_use_lsq [lsq] --; uint32_t ptr; - - store_queue_ptr_write = reg_STORE_QUEUE_PTR_WRITE [lsq]; - load_queue_ptr_write = reg_LOAD_QUEUE_PTR_WRITE [lsq]; + + PORT_WRITE(out_INSERT_STORE_QUEUE_PTR_WRITE [i], STORE_QUEUE_PTR_WRITE [lsq]); + if (_param->_have_port_load_queue_ptr) + PORT_WRITE(out_INSERT_LOAD_QUEUE_PTR_WRITE [i], LOAD_QUEUE_PTR_WRITE [lsq]); + + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * sq_ptr_write : %d",STORE_QUEUE_PTR_WRITE [lsq]); + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * lq_ptr_write : %d",LOAD_QUEUE_PTR_WRITE [lsq]); // operation became of decod_stage. Also operation is != store_head_ok and store_head_ko if (is_operation_memory_store(PORT_READ(in_INSERT_OPERATION [i]))) { + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * USE_STORE_QUEUE"); + internal_INSERT_OPERATION_USE [i] = OPERATION_USE_STORE_QUEUE; - ptr = reg_STORE_QUEUE_PTR_WRITE [lsq]; + ptr = STORE_QUEUE_PTR_WRITE [lsq]; + ack = not STORE_QUEUE_USE [lsq][ptr] and (static_cast(STORE_QUEUE_NB_USE [lsq]+1) < _param->_size_store_queue[lsq]); - ack = not reg_STORE_QUEUE_USE [lsq][ptr] and (static_cast(reg_STORE_QUEUE_NB_USE [lsq]+1) < _param->_size_store_queue[lsq]); + if (ack) + { + STORE_QUEUE_PTR_WRITE [lsq] = (ptr+1)%_param->_size_store_queue[lsq]; + STORE_QUEUE_NB_USE [lsq] ++; + STORE_QUEUE_USE [lsq][ptr] = true; + } } else { + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * USE_LOAD_QUEUE"); + internal_INSERT_OPERATION_USE [i] = OPERATION_USE_LOAD_QUEUE; - ptr = reg_LOAD_QUEUE_PTR_WRITE [lsq]; + ptr = LOAD_QUEUE_PTR_WRITE [lsq]; + ack = (not LOAD_QUEUE_USE [lsq][ptr]); - ack = (not reg_LOAD_QUEUE_USE [lsq][ptr]); + if (ack) + { + LOAD_QUEUE_PTR_WRITE [lsq] = (ptr+1)%_param->_size_load_queue[lsq]; + LOAD_QUEUE_USE [lsq][ptr] = true; + } } + + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * ptr : %d",ptr ); + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * ack : %d",ack ); internal_INSERT_LSQ [i] = lsq; @@ -85,10 +132,7 @@ internal_INSERT_ACK [i] = ack; PORT_WRITE(out_INSERT_ACK [i], ack); - PORT_WRITE(out_INSERT_STORE_QUEUE_PTR_WRITE [i], store_queue_ptr_write); - if (_param->_have_port_load_queue_ptr) - PORT_WRITE(out_INSERT_LOAD_QUEUE_PTR_WRITE [i], load_queue_ptr_write ); } - log_printf(FUNC,Load_Store_pointer_unit,FUNCTION,"End"); + log_end(Load_Store_pointer_unit,FUNCTION); }; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Load_Store_pointer_unit/src/Load_Store_pointer_unit_genMealy_retire.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Load_Store_pointer_unit/src/Load_Store_pointer_unit_genMealy_retire.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Load_Store_pointer_unit/src/Load_Store_pointer_unit_genMealy_retire.cpp (revision 110) @@ -24,11 +24,11 @@ log_printf(FUNC,Load_Store_pointer_unit,FUNCTION,"Begin"); - bool use_lsq [_param->_nb_load_store_queue]; - for (uint32_t i=0; i<_param->_nb_load_store_queue; i++) - use_lsq [i] = false; +// bool use_lsq [_param->_nb_load_store_queue]; +// for (uint32_t i=0; i<_param->_nb_load_store_queue; i++) +// use_lsq [i] = false; for (uint32_t i=0; i<_param->_nb_inst_retire; i++) { - Tcontrol_t ack = false; + Tcontrol_t ack = true; // always accept Tcontrol_t use_sq = PORT_READ(in_RETIRE_USE_STORE_QUEUE [i]); Tcontrol_t use_lq = PORT_READ(in_RETIRE_USE_LOAD_QUEUE [i]); @@ -41,9 +41,9 @@ // Test if a previous instruction use the same lsq - // Authorize once memory access by load store unit - if (use_lsq [lsq] == false) +// // Authorize once memory access by load store unit +// if (use_lsq [lsq] == false) { - use_lsq [lsq] = true; - ack = true; +// use_lsq [lsq] = true; +// ack = true; uint32_t ptr; @@ -70,5 +70,5 @@ else { - ack = true; +// ack = true; internal_RETIRE_OPERATION_USE [i] = OPERATION_USE_NONE; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Load_Store_pointer_unit/src/Load_Store_pointer_unit_transition.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Load_Store_pointer_unit/src/Load_Store_pointer_unit_transition.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Load_Store_pointer_unit/src/Load_Store_pointer_unit_transition.cpp (revision 110) @@ -22,5 +22,6 @@ void Load_Store_pointer_unit::transition (void) { - log_printf(FUNC,Load_Store_pointer_unit,FUNCTION,"Begin"); + log_begin(Load_Store_pointer_unit,FUNCTION); + log_function(Load_Store_pointer_unit,FUNCTION,_name.c_str()); if (PORT_READ(in_NRESET) == 0) @@ -47,5 +48,5 @@ if (PORT_READ(in_INSERT_VAL [i]) and internal_INSERT_ACK [i]) { -// log_printf(TRACE,Load_Store_pointer_unit,FUNCTION,"INSERT [%d]",i); + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * INSERT [%d]",i); switch (internal_INSERT_OPERATION_USE [i]) @@ -53,11 +54,11 @@ case OPERATION_USE_STORE_QUEUE : { -// log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * use STORE_QUEUE"); + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * use STORE_QUEUE"); uint32_t lsq = internal_INSERT_LSQ [i]; Tlsq_ptr_t ptr = internal_INSERT_PTR [i]; -// log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * lsq : %d",lsq); -// log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * ptr : %d",ptr); + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * lsq : %d",lsq); + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * ptr : %d",ptr); reg_STORE_QUEUE_PTR_WRITE [lsq] = (ptr+1)%_param->_size_store_queue[lsq]; @@ -69,11 +70,11 @@ case OPERATION_USE_LOAD_QUEUE : { -// log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * use LOAD_QUEUE"); + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * use LOAD_QUEUE"); uint32_t lsq = internal_INSERT_LSQ [i]; Tlsq_ptr_t ptr = internal_INSERT_PTR [i]; -// log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * lsq : %d",lsq); -// log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * ptr : %d",ptr); + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * lsq : %d",lsq); + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * ptr : %d",ptr); reg_LOAD_QUEUE_PTR_WRITE [lsq] = (ptr+1)%_param->_size_load_queue[lsq]; @@ -95,5 +96,5 @@ if (PORT_READ(in_RETIRE_VAL [i]) and internal_RETIRE_ACK [i]) { -// log_printf(TRACE,Load_Store_pointer_unit,FUNCTION,"RETIRE [%d]",i); + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * RETIRE [%d]",i); switch (internal_RETIRE_OPERATION_USE [i]) @@ -101,11 +102,11 @@ case OPERATION_USE_STORE_QUEUE : { -// log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * use STORE_QUEUE"); + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * use STORE_QUEUE"); uint32_t lsq = internal_RETIRE_LSQ [i]; Tlsq_ptr_t ptr = internal_RETIRE_PTR [i]; -// log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * lsq : %d",lsq); -// log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * ptr : %d",ptr); + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * lsq : %d",lsq); + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * ptr : %d",ptr); // reg_STORE_QUEUE_PTR_WRITE [lsq] = ((ptr==0)?_param->_size_store_queue[lsq]:ptr)-1; @@ -117,11 +118,11 @@ case OPERATION_USE_LOAD_QUEUE : { -// log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * use LOAD_QUEUE"); + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * use LOAD_QUEUE"); uint32_t lsq = internal_RETIRE_LSQ [i]; Tlsq_ptr_t ptr = internal_RETIRE_PTR [i]; -// log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * lsq : %d",lsq); -// log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * ptr : %d",ptr); + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * lsq : %d",lsq); + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * ptr : %d",ptr); // reg_LOAD_QUEUE_PTR_WRITE [lsq] = ((ptr==0)?_param->_size_load_queue[lsq]:ptr)-1; @@ -138,26 +139,27 @@ } + // =================================================================== + // =====[ OTHER ]===================================================== + // =================================================================== -// for (uint32_t i=0; i<_param->_nb_load_store_queue; i++) -// { -// std::string str; - -// log_printf(TRACE,Load_Store_pointer_unit,FUNCTION,"LOAD_STORE_QUEUE [%d]",i); - -// log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * STORE_QUEUE_PTR_WRITE : %d",reg_STORE_QUEUE_PTR_WRITE [i]); -// log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * STORE_QUEUE_NB_USE : %d",reg_STORE_QUEUE_NB_USE [i]); - -// str = ""; -// for (uint32_t j=0; j<_param->_size_store_queue[i]; j++) -// str += toString(reg_STORE_QUEUE_USE [i][j]) + " "; -// log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * %s",str.c_str()); - -// log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * LOAD_QUEUE_PTR_WRITE : %d",reg_LOAD_QUEUE_PTR_WRITE [i]); - -// str = ""; -// for (uint32_t j=0; j<_param->_size_load_queue[i]; j++) -// str += toString(reg_LOAD_QUEUE_USE [i][j]) + " "; -// log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * %s",str.c_str()); -// } +#if (DEBUG >= DEBUG_TRACE) and (DEBUG_Commit_unit == true) + { + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * Dump Load_Store_pointer Unit"); + + for (uint32_t i=0; i<_param->_nb_load_store_queue; ++i) + { + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * Load_Store_unit [%d]",i); + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * reg_STORE_QUEUE_NB_USE : %d", reg_STORE_QUEUE_NB_USE [i]); + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * reg_STORE_QUEUE_PTR_WRITE : %d", reg_STORE_QUEUE_PTR_WRITE[i]); + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * reg_STORE_QUEUE_USE :"); + for (uint32_t j=0; j<_param->_size_store_queue [i]; ++j) + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," [%d] %d",j,reg_STORE_QUEUE_USE [i][j]); + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * reg_LOAD_QUEUE_PTR_WRITE : %d", reg_LOAD_QUEUE_PTR_WRITE [i]); + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," * reg_LOAD_QUEUE_USE :"); + for (uint32_t j=0; j<_param->_size_load_queue [i]; ++j) + log_printf(TRACE,Load_Store_pointer_unit,FUNCTION," [%d] %d",j,reg_LOAD_QUEUE_USE [i][j]); + } + } +#endif #if defined(STATISTICS) or defined(VHDL_TESTBENCH) @@ -165,5 +167,5 @@ #endif - log_printf(FUNC,Load_Store_pointer_unit,FUNCTION,"End"); + log_end(Load_Store_pointer_unit,FUNCTION); }; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Load_Store_pointer_unit/src/Parameters.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Load_Store_pointer_unit/src/Parameters.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Load_Store_pointer_unit/src/Parameters.cpp (revision 110) @@ -22,9 +22,10 @@ Parameters::Parameters (uint32_t nb_front_end , uint32_t * nb_context , -// uint32_t size_front_end_id , -// uint32_t size_context_id , +// uint32_t size_front_end_id , +// uint32_t size_context_id , uint32_t nb_load_store_queue , uint32_t * size_store_queue , uint32_t * size_load_queue , + uint32_t * nb_inst_memory , uint32_t ** link_load_store_unit_with_thread, uint32_t nb_inst_insert , @@ -40,9 +41,13 @@ _size_store_queue = size_store_queue ; _size_load_queue = size_load_queue ; + _nb_inst_memory = nb_inst_memory ; _link_load_store_unit_with_thread = link_load_store_unit_with_thread; _nb_inst_insert = nb_inst_insert ; _nb_inst_retire = nb_inst_retire ; - + test(); + + _max_size_store_queue = max(_size_store_queue,_nb_load_store_queue); + _max_size_load_queue = max(_size_load_queue ,_nb_load_store_queue); if (is_toplevel) Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Free_List_unit/include/Free_List_unit.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Free_List_unit/include/Free_List_unit.h (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Free_List_unit/include/Free_List_unit.h (revision 110) @@ -55,4 +55,11 @@ #ifdef STATISTICS public : Stat * _stat; + private : counter_t * _stat_nb_inst_pop ; + private : counter_t * _stat_nb_inst_pop_gpr ; + private : counter_t * _stat_nb_inst_pop_spr ; + private : counter_t * _stat_nb_inst_push_gpr; + private : counter_t * _stat_nb_inst_push_spr; + private : counter_t ** _stat_bank_gpr_nb_elt ; //[nb_bank] + private : counter_t ** _stat_bank_spr_nb_elt ; //[nb_bank] #endif @@ -146,5 +153,6 @@ #ifdef STATISTICS - public : void statistics_declaration (morpheo::behavioural::Parameters_Statistics * param_statistics); + public : void statistics_allocation (morpheo::behavioural::Parameters_Statistics * param_statistics); + public : void statistics_deallocation (void); #endif #if defined(STATISTICS) or defined(VHDL_TESTBENCH) Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Free_List_unit/src/Free_List_unit.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Free_List_unit/src/Free_List_unit.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Free_List_unit/src/Free_List_unit.cpp (revision 110) @@ -58,5 +58,5 @@ log_printf(INFO,Free_List_unit,FUNCTION,"Allocation of statistics"); - statistics_declaration(param_statistics); + statistics_allocation(param_statistics); } #endif @@ -157,9 +157,6 @@ #ifdef STATISTICS if (usage_is_set(_usage,USE_STATISTICS)) - { - log_printf(INFO,Free_List_unit,FUNCTION,"Generate Statistics file"); - - delete _stat; - } + statistics_deallocation (); + #endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Free_List_unit/src/Free_List_unit_statistics_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Free_List_unit/src/Free_List_unit_statistics_allocation.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Free_List_unit/src/Free_List_unit_statistics_allocation.cpp (revision 110) @@ -0,0 +1,94 @@ +#ifdef STATISTICS +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Free_List_unit/include/Free_List_unit.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_ooo_engine { +namespace ooo_engine { +namespace rename_unit { +namespace register_translation_unit { +namespace free_list_unit { + + +#undef FUNCTION +#define FUNCTION "Free_List_unit::statistics_allocation" + void Free_List_unit::statistics_allocation (morpheo::behavioural::Parameters_Statistics * param_statistics) + { + log_printf(FUNC,Free_List_unit,FUNCTION,"Begin"); + + _stat = new Stat (static_cast(_name), + "Free_List_unit", + param_statistics); + + std::string sum_bank_gpr_nb_elt = "0"; + _stat_bank_gpr_nb_elt = new counter_t * [_param->_nb_bank]; + + for (uint32_t i=0; i<_param->_nb_bank; ++i) + { + std::string str = "bank_gpr_nb_elt_"+toString(i); + + sum_bank_gpr_nb_elt = "+ "+str+" "+sum_bank_gpr_nb_elt; + + _stat_bank_gpr_nb_elt [i] = _stat->create_variable(str); + + _stat->create_expr_average_by_cycle("average_occupation_bank_gpr_"+toString(i), str, "", toString(_("Average free list occupation (bank %d)"),i)); + _stat->create_expr_percent ("percent_occupation_bank_gpr_"+toString(i) , "average_occupation_bank_gpr_"+toString(i), toString(_param->_bank_gpr_nb_slot), toString(_("Percent free list occupation (bank %d)"),i)); + } + + _stat->create_expr_average_by_cycle("average_occupation_bank_gpr", sum_bank_gpr_nb_elt, "", _("Average free list occupation (bank all)")); + _stat->create_expr_percent ("percent_occupation_bank_gpr", "average_occupation_bank_gpr", toString(_param->_bank_gpr_nb_slot*_param->_nb_bank), _("Percent free list occupation (bank all)")); + + std::string sum_bank_spr_nb_elt = "0"; + _stat_bank_spr_nb_elt = new counter_t * [_param->_nb_bank]; + + for (uint32_t i=0; i<_param->_nb_bank; ++i) + { + std::string str = "bank_spr_nb_elt_"+toString(i); + + sum_bank_spr_nb_elt = "+ "+str+" "+sum_bank_spr_nb_elt; + + _stat_bank_spr_nb_elt [i] = _stat->create_variable(str); + + _stat->create_expr_average_by_cycle("average_occupation_bank_spr_"+toString(i), str, "", toString(_("Average free list occupation (bank %d)"),i)); + _stat->create_expr_percent ("percent_occupation_bank_spr_"+toString(i) , "average_occupation_bank_spr_"+toString(i), toString(_param->_bank_spr_nb_slot), toString(_("Percent free list occupation (bank %d)"),i)); + } + + _stat->create_expr_average_by_cycle("average_occupation_bank_spr", sum_bank_spr_nb_elt, "", _("Average free list occupation (bank all)")); + _stat->create_expr_percent ("percent_occupation_bank_spr", "average_occupation_bank_spr", toString(_param->_bank_spr_nb_slot*_param->_nb_bank), _("Percent free list occupation (bank all)")); + + _stat_nb_inst_pop = _stat->create_variable("nb_inst_pop" ); + _stat_nb_inst_pop_gpr = _stat->create_variable("nb_inst_pop_gpr" ); + _stat_nb_inst_pop_spr = _stat->create_variable("nb_inst_pop_spr" ); + _stat_nb_inst_push_gpr = _stat->create_variable("nb_inst_push_gpr"); + _stat_nb_inst_push_spr = _stat->create_variable("nb_inst_push_spr"); + + _stat->create_expr_average_by_cycle("average_use_interface_pop" , "nb_inst_pop" , "", _("Average instruction per cycle on pop interface")); + _stat->create_expr_average_by_cycle("average_use_interface_pop_gpr" , "nb_inst_pop_gpr" , "", _("Average instruction per cycle on pop interface for gpr")); + _stat->create_expr_average_by_cycle("average_use_interface_pop_spr" , "nb_inst_pop_spr" , "", _("Average instruction per cycle on pop interface for spr")); + _stat->create_expr_average_by_cycle("average_use_interface_push_gpr", "nb_inst_push_gpr", "", _("Average instruction per cycle on push_gpr interface")); + _stat->create_expr_average_by_cycle("average_use_interface_push_spr", "nb_inst_push_spr", "", _("Average instruction per cycle on push_spr interface")); + + _stat->create_expr_percent ("percent_inst_pop_need_gpr" , "nb_inst_pop_gpr" , "nb_inst_pop", _("Percent of pop instruction that need gpr")); + _stat->create_expr_percent ("percent_inst_pop_need_spr" , "nb_inst_pop_spr" , "nb_inst_pop", _("Percent of pop instruction that need spr")); + + log_printf(FUNC,Free_List_unit,FUNCTION,"End"); + }; + +}; // end namespace free_list_unit +}; // end namespace register_translation_unit +}; // end namespace rename_unit +}; // end namespace ooo_engine +}; // end namespace multi_ooo_engine +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Free_List_unit/src/Free_List_unit_statistics_deallocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Free_List_unit/src/Free_List_unit_statistics_deallocation.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Free_List_unit/src/Free_List_unit_statistics_deallocation.cpp (revision 110) @@ -0,0 +1,45 @@ +#ifdef STATISTICS +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Free_List_unit/include/Free_List_unit.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_ooo_engine { +namespace ooo_engine { +namespace rename_unit { +namespace register_translation_unit { +namespace free_list_unit { + + +#undef FUNCTION +#define FUNCTION "Free_List_unit::statistics_deallocation" + void Free_List_unit::statistics_deallocation (void) + { + log_printf(FUNC,Free_List_unit,FUNCTION,"Begin"); + + log_printf(INFO,Free_List_unit,FUNCTION,"Generate Statistics file"); + + delete _stat; + + delete [] _stat_bank_gpr_nb_elt; + + log_printf(FUNC,Free_List_unit,FUNCTION,"End"); + }; + +}; // end namespace free_list_unit +}; // end namespace register_translation_unit +}; // end namespace rename_unit +}; // end namespace ooo_engine +}; // end namespace multi_ooo_engine +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Free_List_unit/src/Free_List_unit_statistics_declaration.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Free_List_unit/src/Free_List_unit_statistics_declaration.cpp (revision 109) +++ (revision ) @@ -1,43 +1,0 @@ -#ifdef STATISTICS -/* - * $Id$ - * - * [ Description ] - * - */ - -#include "Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Free_List_unit/include/Free_List_unit.h" - -namespace morpheo { -namespace behavioural { -namespace core { -namespace multi_ooo_engine { -namespace ooo_engine { -namespace rename_unit { -namespace register_translation_unit { -namespace free_list_unit { - - -#undef FUNCTION -#define FUNCTION "Free_List_unit::statistics_declaration" - void Free_List_unit::statistics_declaration (morpheo::behavioural::Parameters_Statistics * param_statistics) - { - log_printf(FUNC,Free_List_unit,FUNCTION,"Begin"); - - _stat = new Stat (static_cast(_name), - "Free_List_unit", - param_statistics); - - log_printf(FUNC,Free_List_unit,FUNCTION,"End"); - }; - -}; // end namespace free_list_unit -}; // end namespace register_translation_unit -}; // end namespace rename_unit -}; // end namespace ooo_engine -}; // end namespace multi_ooo_engine -}; // end namespace core - -}; // end namespace behavioural -}; // end namespace morpheo -#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Free_List_unit/src/Free_List_unit_transition.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Free_List_unit/src/Free_List_unit_transition.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Free_List_unit/src/Free_List_unit_transition.cpp (revision 110) @@ -50,9 +50,23 @@ log_printf(TRACE,Free_List_unit,FUNCTION," * POP [%d]",i); +#ifdef STATISTICS + (*_stat_nb_inst_pop) ++; +#endif + if (PORT_READ(in_POP_GPR_VAL [i])) - _gpr_list [internal_POP_GPR_BANK[i]].pop_front(); + { +#ifdef STATISTICS + (*_stat_nb_inst_pop_gpr) ++; +#endif + _gpr_list [internal_POP_GPR_BANK[i]].pop_front(); + } if (PORT_READ(in_POP_SPR_VAL [i])) - _spr_list [internal_POP_SPR_BANK[i]].pop_front(); + { +#ifdef STATISTICS + (*_stat_nb_inst_pop_spr) ++; +#endif + _spr_list [internal_POP_SPR_BANK[i]].pop_front(); + } } @@ -67,4 +81,8 @@ log_printf(TRACE,Free_List_unit,FUNCTION," * num_reg : %d",PORT_READ(in_PUSH_GPR_NUM_REG [i])); +#ifdef STATISTICS + (*_stat_nb_inst_push_gpr) ++; +#endif + _gpr_list [internal_PUSH_GPR_BANK[i]].push_back(PORT_READ(in_PUSH_GPR_NUM_REG [i])); } @@ -79,6 +97,18 @@ log_printf(TRACE,Free_List_unit,FUNCTION," * num_reg : %d",PORT_READ(in_PUSH_SPR_NUM_REG [i])); +#ifdef STATISTICS + (*_stat_nb_inst_push_spr) ++; +#endif + _spr_list [internal_PUSH_SPR_BANK[i]].push_back(PORT_READ(in_PUSH_SPR_NUM_REG [i])); } + +#ifdef STATISTICS + for (uint32_t i=0; i<_param->_nb_bank; ++i) + { + (*(_stat_bank_gpr_nb_elt [i])) += _gpr_list[i].size(); + (*(_stat_bank_spr_nb_elt [i])) += _spr_list[i].size(); + } +#endif #if (DEBUG >= DEBUG_TRACE) and (DEBUG_Free_List_unit == true) @@ -140,5 +170,5 @@ if (1) for (uint32_t i=0; i<_param->_nb_bank; ++i) - { + { for (std::list::iterator it1=_gpr_list[i].begin(); it1!=_gpr_list[i].end(); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/include/Register_translation_unit_Glue.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/include/Register_translation_unit_Glue.h (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/include/Register_translation_unit_Glue.h (revision 110) @@ -52,4 +52,12 @@ #ifdef STATISTICS public : Stat * _stat; + + private : counter_t * _stat_nb_inst_issue_rename_select; + private : counter_t * _stat_nb_inst_issue_rename_select_req; + private : counter_t * _stat_nb_inst_issue_stall_by_commit ; + private : counter_t * _stat_nb_inst_issue_stall_by_rat_rename ; + private : counter_t * _stat_nb_inst_issue_stall_by_rat_insert ; + private : counter_t * _stat_nb_inst_issue_stall_by_free_list ; + private : counter_t * _stat_nb_inst_issue_stall_by_stat_list ; #endif @@ -139,4 +147,8 @@ // ~~~~~[ Internal ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +#ifdef STATISTICS + private : Tcontrol_t * internal_INSERT_RENAME_ACK; //[nb_inst_insert] +#endif + #endif @@ -186,5 +198,6 @@ #ifdef STATISTICS - public : void statistics_declaration (morpheo::behavioural::Parameters_Statistics * param_statistics); + public : void statistics_allocation (morpheo::behavioural::Parameters_Statistics * param_statistics); + public : void statistics_deallocation (void); #endif #if defined(STATISTICS) or defined(VHDL_TESTBENCH) Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/src/Register_translation_unit_Glue.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/src/Register_translation_unit_Glue.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/src/Register_translation_unit_Glue.cpp (revision 110) @@ -58,5 +58,5 @@ log_printf(INFO,Register_translation_unit_Glue,FUNCTION,"Allocation of statistics"); - statistics_declaration(param_statistics); + statistics_allocation(param_statistics); } #endif @@ -199,9 +199,5 @@ #ifdef STATISTICS if (usage_is_set(_usage,USE_STATISTICS)) - { - log_printf(INFO,Register_translation_unit_Glue,FUNCTION,"Generate Statistics file"); - - delete _stat; - } + statistics_deallocation (); #endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/src/Register_translation_unit_Glue_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/src/Register_translation_unit_Glue_allocation.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/src/Register_translation_unit_Glue_allocation.cpp (revision 110) @@ -136,6 +136,9 @@ } +#ifdef STATISTICS + ALLOC1(internal_INSERT_RENAME_ACK, Tcontrol_t,_param->_nb_inst_insert); +#endif + // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - #ifdef POSITION if (usage_is_set(_usage,USE_POSITION)) Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/src/Register_translation_unit_Glue_deallocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/src/Register_translation_unit_Glue_deallocation.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/src/Register_translation_unit_Glue_deallocation.cpp (revision 110) @@ -99,5 +99,9 @@ DELETE1_SIGNAL( in_RETIRE_STAT_LIST_ACK,_param->_nb_inst_retire,1); +#ifdef STATISTICS + DELETE1(internal_INSERT_RENAME_ACK, _param->_nb_inst_insert); +#endif } + // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/src/Register_translation_unit_Glue_genMealy_insert_valack.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/src/Register_translation_unit_Glue_genMealy_insert_valack.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/src/Register_translation_unit_Glue_genMealy_insert_valack.cpp (revision 110) @@ -75,4 +75,7 @@ log_printf(TRACE,Register_translation_unit_Glue,FUNCTION," * stat_list_ack (r): %d",stat_list_ack ); +#ifdef STATISTICS + internal_INSERT_RENAME_ACK [i] = rename_ack; +#endif PORT_WRITE(out_INSERT_RENAME_ACK [i], rename_ack ); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/src/Register_translation_unit_Glue_genMealy_retire.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/src/Register_translation_unit_Glue_genMealy_retire.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/src/Register_translation_unit_Glue_genMealy_retire.cpp (revision 110) @@ -32,7 +32,31 @@ Tcontrol_t stat_list_ack = PORT_READ(in_RETIRE_STAT_LIST_ACK [i]); - PORT_WRITE(out_RETIRE_ACK [i], rat_ack and stat_list_ack); - PORT_WRITE(out_RETIRE_RAT_VAL [i], val and stat_list_ack); - PORT_WRITE(out_RETIRE_STAT_LIST_VAL [i], val and rat_ack); + Tcontrol_t ack = (true +// and val + and rat_ack + and stat_list_ack + ); + Tcontrol_t rat_val = (true + and val +// and rat_ack + and stat_list_ack + ); + Tcontrol_t stat_list_val = (true + and val + and rat_ack +// and stat_list_ack + ); + + PORT_WRITE(out_RETIRE_ACK [i], ack ); + PORT_WRITE(out_RETIRE_RAT_VAL [i], rat_val ); + PORT_WRITE(out_RETIRE_STAT_LIST_VAL [i], stat_list_val); + + log_printf(TRACE,Register_translation_unit_Glue,FUNCTION," * inst_insert [%d]",i); + log_printf(TRACE,Register_translation_unit_Glue,FUNCTION," * val (r): %d",val ); + log_printf(TRACE,Register_translation_unit_Glue,FUNCTION," * ack (w): %d",ack ); + log_printf(TRACE,Register_translation_unit_Glue,FUNCTION," * rat_val (w): %d",rat_val ); + log_printf(TRACE,Register_translation_unit_Glue,FUNCTION," * rat_ack (r): %d",rat_ack ); + log_printf(TRACE,Register_translation_unit_Glue,FUNCTION," * stat_list_val (w): %d",stat_list_val ); + log_printf(TRACE,Register_translation_unit_Glue,FUNCTION," * stat_list_ack (r): %d",stat_list_ack ); } Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/src/Register_translation_unit_Glue_statistics_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/src/Register_translation_unit_Glue_statistics_allocation.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/src/Register_translation_unit_Glue_statistics_allocation.cpp (revision 110) @@ -0,0 +1,65 @@ +#ifdef STATISTICS +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/include/Register_translation_unit_Glue.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_ooo_engine { +namespace ooo_engine { +namespace rename_unit { +namespace register_translation_unit { +namespace register_translation_unit_glue { + + +#undef FUNCTION +#define FUNCTION "Register_translation_unit_Glue::statistics_allocation" + void Register_translation_unit_Glue::statistics_allocation (morpheo::behavioural::Parameters_Statistics * param_statistics) + { + log_printf(FUNC,Register_translation_unit_Glue,FUNCTION,"Begin"); + + _stat = new Stat (static_cast(_name), + "Register_translation_unit_Glue", + param_statistics); + + _stat_nb_inst_issue_rename_select = _stat->create_variable("nb_inst_issue_rename_select"); + _stat_nb_inst_issue_rename_select_req = _stat->create_variable("nb_inst_issue_rename_select_req"); + + _stat_nb_inst_issue_stall_by_commit = _stat->create_variable("nb_inst_issue_stall_by_commit"); + _stat_nb_inst_issue_stall_by_rat_rename = _stat->create_variable("nb_inst_issue_stall_by_rat_rename"); + _stat_nb_inst_issue_stall_by_rat_insert = _stat->create_variable("nb_inst_issue_stall_by_rat_insert"); + _stat_nb_inst_issue_stall_by_free_list = _stat->create_variable("nb_inst_issue_stall_by_free_list"); + _stat_nb_inst_issue_stall_by_stat_list = _stat->create_variable("nb_inst_issue_stall_by_stat_list"); + +// std::string nb_inst_issue_stall = "+ + + nb_inst_issue_stall_by_commit nb_inst_issue_stall_by_rat_rename + nb_inst_issue_stall_by_rat_insert nb_inst_issue_stall_by_free_list + nb_inst_issue_stall_by_stat_list nb_inst_issue_stall_by_rename_select"; + std::string nb_inst_issue_stall = "+ + + nb_inst_issue_stall_by_commit nb_inst_issue_stall_by_rat_rename + nb_inst_issue_stall_by_rat_insert nb_inst_issue_stall_by_free_list nb_inst_issue_stall_by_stat_list"; + + _stat->create_expr_average_by_cycle("average_req_interface_insert", "nb_inst_issue_rename_select_req", "", _("Average instruction by cycle on issue interface (request)")); + _stat->create_expr_average_by_cycle("average_use_interface_insert", "nb_inst_issue_rename_select" , "", _("Average instruction by cycle on issue interface")); + +// _stat->create_expr_percent ("percent_issue_stall_by_rename_select", "nb_inst_issue_stall_by_rename_select", nb_inst_issue_stall, _("Percent of instruction stalled by Rename_Select")); + _stat->create_expr_percent ("percent_issue_stall_by_commit" , "nb_inst_issue_stall_by_commit", nb_inst_issue_stall, _("Percent of instruction stalled by Commit_unit or Issue_queue or RegisterFile")); + _stat->create_expr_percent ("percent_issue_stall_by_rat_rename" , "nb_inst_issue_stall_by_rat_rename", nb_inst_issue_stall, _("Percent of instruction stalled by Rat_Rename")); + _stat->create_expr_percent ("percent_issue_stall_by_rat_insert" , "nb_inst_issue_stall_by_rat_insert", nb_inst_issue_stall, _("Percent of instruction stalled by Rat_Insert")); + _stat->create_expr_percent ("percent_issue_stall_by_free_list" , "nb_inst_issue_stall_by_free_list", nb_inst_issue_stall, _("Percent of instruction stalled by Free_List")); + _stat->create_expr_percent ("percent_issue_stall_by_stat_list" , "nb_inst_issue_stall_by_stat_list", nb_inst_issue_stall, _("Percent of instruction stalled by Stat_List")); + + log_printf(FUNC,Register_translation_unit_Glue,FUNCTION,"End"); + }; + +}; // end namespace register_translation_unit_glue +}; // end namespace register_translation_unit +}; // end namespace rename_unit +}; // end namespace ooo_engine +}; // end namespace multi_ooo_engine +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/src/Register_translation_unit_Glue_statistics_deallocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/src/Register_translation_unit_Glue_statistics_deallocation.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/src/Register_translation_unit_Glue_statistics_deallocation.cpp (revision 110) @@ -0,0 +1,43 @@ +#ifdef STATISTICS +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/include/Register_translation_unit_Glue.h" + +namespace morpheo { +namespace behavioural { +namespace core { +namespace multi_ooo_engine { +namespace ooo_engine { +namespace rename_unit { +namespace register_translation_unit { +namespace register_translation_unit_glue { + + +#undef FUNCTION +#define FUNCTION "Register_translation_unit_Glue::statistics_deallocation" + void Register_translation_unit_Glue::statistics_deallocation (void) + { + log_printf(FUNC,Register_translation_unit_Glue,FUNCTION,"Begin"); + + log_printf(INFO,Register_translation_unit_Glue,FUNCTION,_("<%s> : Generate Statistics file"),_name.c_str()); + + delete _stat; + + log_printf(FUNC,Register_translation_unit_Glue,FUNCTION,"End"); + }; + +}; // end namespace register_translation_unit_glue +}; // end namespace register_translation_unit +}; // end namespace rename_unit +}; // end namespace ooo_engine +}; // end namespace multi_ooo_engine +}; // end namespace core + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/src/Register_translation_unit_Glue_statistics_declaration.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/src/Register_translation_unit_Glue_statistics_declaration.cpp (revision 109) +++ (revision ) @@ -1,43 +1,0 @@ -#ifdef STATISTICS -/* - * $Id$ - * - * [ Description ] - * - */ - -#include "Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/include/Register_translation_unit_Glue.h" - -namespace morpheo { -namespace behavioural { -namespace core { -namespace multi_ooo_engine { -namespace ooo_engine { -namespace rename_unit { -namespace register_translation_unit { -namespace register_translation_unit_glue { - - -#undef FUNCTION -#define FUNCTION "Register_translation_unit_Glue::statistics_declaration" - void Register_translation_unit_Glue::statistics_declaration (morpheo::behavioural::Parameters_Statistics * param_statistics) - { - log_printf(FUNC,Register_translation_unit_Glue,FUNCTION,"Begin"); - - _stat = new Stat (static_cast(_name), - "Register_translation_unit_Glue", - param_statistics); - - log_printf(FUNC,Register_translation_unit_Glue,FUNCTION,"End"); - }; - -}; // end namespace register_translation_unit_glue -}; // end namespace register_translation_unit -}; // end namespace rename_unit -}; // end namespace ooo_engine -}; // end namespace multi_ooo_engine -}; // end namespace core - -}; // end namespace behavioural -}; // end namespace morpheo -#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/src/Register_translation_unit_Glue_transition.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/src/Register_translation_unit_Glue_transition.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Register_translation_unit/Register_translation_unit_Glue/src/Register_translation_unit_Glue_transition.cpp (revision 110) @@ -26,4 +26,29 @@ log_printf(FUNC,Register_translation_unit_Glue,FUNCTION,"Begin"); +#ifdef STATISTICS + if (usage_is_set(_usage,USE_STATISTICS)) + { + for (uint32_t i=0; i<_param->_nb_inst_insert; ++i) + // Test request + if (PORT_READ(in_INSERT_RENAME_VAL [i])) + { + (* _stat_nb_inst_issue_rename_select_req) ++; + + if (internal_INSERT_RENAME_ACK [i]) + (* _stat_nb_inst_issue_rename_select)++; + if (PORT_READ(in_INSERT_INSERT_ACK [i]) == 0) + (*_stat_nb_inst_issue_stall_by_commit ) ++; + if (PORT_READ(in_INSERT_RAT_RENAME_ACK [i]) == 0) + (*_stat_nb_inst_issue_stall_by_rat_rename) ++; + if (PORT_READ(in_INSERT_RAT_INSERT_ACK [i]) == 0) + (*_stat_nb_inst_issue_stall_by_rat_insert) ++; + if (PORT_READ(in_INSERT_FREE_LIST_ACK [i]) == 0) + (*_stat_nb_inst_issue_stall_by_free_list ) ++; + if (PORT_READ(in_INSERT_STAT_LIST_ACK [i]) == 0) + (*_stat_nb_inst_issue_stall_by_stat_list ) ++; + } + } +#endif + #if defined(STATISTICS) or defined(VHDL_TESTBENCH) end_cycle (); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Rename_select/src/Rename_select_genMealy.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Rename_select/src/Rename_select_genMealy.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Rename_select/src/Rename_select_genMealy.cpp (revision 110) @@ -43,5 +43,5 @@ for (uint32_t i=0; i<_param->_nb_inst_rename; i++) { - log_printf(TRACE,Rename_select,FUNCTION," * inst_rename [%d]",i); + log_printf(TRACE,Rename_select,FUNCTION," * RENAME_OUT [%d]",i); // Scan all instruction until find @@ -65,14 +65,13 @@ log_printf(TRACE,Rename_select,FUNCTION," * rename_out_ack : %d",PORT_READ(in_RENAME_OUT_ACK[i])); - Tcontext_t front_end_id = (_param->_have_port_front_end_id)?PORT_READ(in_RENAME_IN_FRONT_END_ID [x][y]):0; - Tcontext_t context_id = (_param->_have_port_context_id )?PORT_READ(in_RENAME_IN_CONTEXT_ID [x][y]):0; + Tcontext_t front_end_id = (_param->_have_port_front_end_id)?PORT_READ(in_RENAME_IN_FRONT_END_ID [x][y]):0; + Tcontext_t context_id = (_param->_have_port_context_id )?PORT_READ(in_RENAME_IN_CONTEXT_ID [x][y]):0; - Tcontrol_t no_execute = (PORT_READ(in_RENAME_IN_NO_EXECUTE [x][y])); - - Tcontrol_t read_ra = (PORT_READ(in_RENAME_IN_READ_RA [x][y])); - Tcontrol_t read_rb = (PORT_READ(in_RENAME_IN_READ_RB [x][y])); - Tcontrol_t read_rc = (PORT_READ(in_RENAME_IN_READ_RC [x][y])); - Tcontrol_t write_rd = (PORT_READ(in_RENAME_IN_WRITE_RD [x][y])); - Tcontrol_t write_re = (PORT_READ(in_RENAME_IN_WRITE_RE [x][y])); + Tcontrol_t no_execute = (PORT_READ(in_RENAME_IN_NO_EXECUTE [x][y])); + Tcontrol_t read_ra = (PORT_READ(in_RENAME_IN_READ_RA [x][y])); + Tcontrol_t read_rb = (PORT_READ(in_RENAME_IN_READ_RB [x][y])); + Tcontrol_t read_rc = (PORT_READ(in_RENAME_IN_READ_RC [x][y])); + Tcontrol_t write_rd = (PORT_READ(in_RENAME_IN_WRITE_RD [x][y])); + Tcontrol_t write_re = (PORT_READ(in_RENAME_IN_WRITE_RE [x][y])); // Attention, j'ai enlevé event_state de la liste de sensibilité Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Rename_unit_Glue/src/Rename_unit_Glue_genMealy_insert_valack.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Rename_unit_Glue/src/Rename_unit_Glue_genMealy_insert_valack.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Rename_unit_Glue/src/Rename_unit_Glue_genMealy_insert_valack.cpp (revision 110) @@ -25,5 +25,5 @@ log_function(Rename_unit_Glue,FUNCTION,_name.c_str()); -// // Transaction must be in-order +// // Transaction must be in-order - made in rename_select // Tcontrol_t previous_transaction = true; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Rename_unit_Glue/src/Rename_unit_Glue_genMealy_retire_valack.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Rename_unit_Glue/src/Rename_unit_Glue_genMealy_retire_valack.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Rename_unit_Glue/src/Rename_unit_Glue_genMealy_retire_valack.cpp (revision 110) @@ -25,6 +25,6 @@ log_function(Rename_unit_Glue,FUNCTION,_name.c_str()); - // Transaction must be in-order - Tcontrol_t previous_transaction = true; + // Transaction must be in-order - made in commit_unit +// Tcontrol_t previous_transaction = true; for (uint32_t i=0; i<_param->_nb_inst_retire; i++) @@ -34,11 +34,11 @@ Tcontrol_t REGISTER_TRANSLATION_ACK = PORT_READ(in_RETIRE_REGISTER_TRANSLATION_ACK [i]); - Tcontrol_t ACK = (previous_transaction and + Tcontrol_t ACK = (// previous_transaction and LOAD_STORE_QUEUE_POINTER_ACK and REGISTER_TRANSLATION_ACK ); - Tcontrol_t LOAD_STORE_QUEUE_POINTER_VAL = (previous_transaction and + Tcontrol_t LOAD_STORE_QUEUE_POINTER_VAL = (// previous_transaction and VAL and REGISTER_TRANSLATION_ACK ); - Tcontrol_t REGISTER_TRANSLATION_VAL = (previous_transaction and + Tcontrol_t REGISTER_TRANSLATION_VAL = (// previous_transaction and VAL and LOAD_STORE_QUEUE_POINTER_ACK ); @@ -48,5 +48,13 @@ PORT_WRITE(out_RETIRE_REGISTER_TRANSLATION_VAL [i], REGISTER_TRANSLATION_VAL ); - previous_transaction = VAL and ACK; +// previous_transaction = VAL and ACK; + + log_printf(TRACE,Rename_unit_Glue,FUNCTION," * retire [%d]",i); + log_printf(TRACE,Rename_unit_Glue,FUNCTION," * val (commit_unit) (r) : %d",VAL ); + log_printf(TRACE,Rename_unit_Glue,FUNCTION," * ack (commit_unit) (w) : %d",ACK ); + log_printf(TRACE,Rename_unit_Glue,FUNCTION," * register_translation_val (w) : %d",REGISTER_TRANSLATION_VAL ); + log_printf(TRACE,Rename_unit_Glue,FUNCTION," * register_translation_ack (r) : %d",REGISTER_TRANSLATION_ACK ); + log_printf(TRACE,Rename_unit_Glue,FUNCTION," * load_store_queue_pointer_val (w) : %d",LOAD_STORE_QUEUE_POINTER_VAL); + log_printf(TRACE,Rename_unit_Glue,FUNCTION," * load_store_queue_pointer_ack (r) : %d",LOAD_STORE_QUEUE_POINTER_ACK); } Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/SelfTest/config-min.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/SelfTest/config-min.cfg (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/SelfTest/config-min.cfg (revision 110) @@ -8,4 +8,5 @@ 2 2 +1 # size_store_queue [0] [nb_load_store_queue] 1 1 +1 # size_load_queue [0] [nb_load_store_queue] +1 1 +1 # nb_inst_memory [0] [nb_load_store_queue] 0 0 +1 # link_load_store_unit_with_thread [0][0] [nb_front_end][nb_context] 1 1 +1 # rename_select_priority Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/SelfTest/config-thread_1a.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/SelfTest/config-thread_1a.cfg (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/SelfTest/config-thread_1a.cfg (revision 110) @@ -8,4 +8,5 @@ 8 8 +1 # size_store_queue [0] [nb_load_store_queue] 8 8 +1 # size_load_queue [0] [nb_load_store_queue] +8 8 +1 # nb_inst_memory [0] [nb_load_store_queue] 0 0 +1 # link_load_store_unit_with_thread [0][0] [nb_front_end][nb_context] 1 1 +1 # rename_select_priority Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/SelfTest/config-thread_4a.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/SelfTest/config-thread_4a.cfg (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/SelfTest/config-thread_4a.cfg (revision 110) @@ -8,4 +8,5 @@ 8 8 +1 # size_store_queue [0] [nb_load_store_queue] 8 8 +1 # size_load_queue [0] [nb_load_store_queue] +4 4 +1 # nb_inst_memory [0] [nb_load_store_queue] 0 0 +1 # link_load_store_unit_with_thread [0][0] [nb_front_end][nb_context] 0 0 +1 # link_load_store_unit_with_thread [0][1] [nb_front_end][nb_context] Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/SelfTest/config-thread_4b.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/SelfTest/config-thread_4b.cfg (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/SelfTest/config-thread_4b.cfg (revision 110) @@ -10,4 +10,6 @@ 8 8 +1 # size_load_queue [0] [nb_load_store_queue] 4 4 +1 # size_load_queue [1] [nb_load_store_queue] +4 4 +1 # nb_inst_memory [0] [nb_load_store_queue] +2 2 +1 # nb_inst_memory [1] [nb_load_store_queue] 0 0 +1 # link_load_store_unit_with_thread [0][0] [nb_front_end][nb_context] 1 1 +1 # link_load_store_unit_with_thread [0][1] [nb_front_end][nb_context] Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/SelfTest/src/main.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/SelfTest/src/main.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/SelfTest/src/main.cpp (revision 110) @@ -22,4 +22,5 @@ err (_(" * size_store_queue [nb_load_store_queue] (uint32_t )\n")); err (_(" * size_load_queue [nb_load_store_queue] (uint32_t )\n")); + err (_(" * nb_inst_memory [nb_load_store_queue] (uint32_t )\n")); err (_(" * link_load_store_unit_with_thread [nb_front_end][nb_context] (uint32_t )\n")); err (_(" * rename_select_priority (Tpriority_t )\n")); @@ -71,9 +72,10 @@ uint32_t _nb_load_store_queue = fromString(argv[x++]); - if (argc != static_cast(2+NB_PARAMS+2*_nb_front_end+2*_nb_load_store_queue+_sum_nb_context)) + if (argc != static_cast(2+NB_PARAMS+2*_nb_front_end+3*_nb_load_store_queue+_sum_nb_context)) usage (argc, argv); uint32_t * _size_store_queue = new uint32_t [_nb_load_store_queue]; uint32_t * _size_load_queue = new uint32_t [_nb_load_store_queue]; + uint32_t * _nb_inst_memory = new uint32_t [_nb_load_store_queue]; for (uint32_t i=0; i<_nb_load_store_queue; i++) @@ -81,4 +83,6 @@ for (uint32_t i=0; i<_nb_load_store_queue; i++) _size_load_queue [i] = fromString(argv[x++]); + for (uint32_t i=0; i<_nb_load_store_queue; i++) + _nb_inst_memory [i] = fromString(argv[x++]); uint32_t ** _link_load_store_unit_with_thread = new uint32_t * [_nb_front_end]; @@ -113,4 +117,5 @@ _size_store_queue , _size_load_queue , + _nb_inst_memory , _link_load_store_unit_with_thread , _rename_select_priority , @@ -157,4 +162,5 @@ delete [] _size_store_queue; delete [] _size_load_queue ; + delete [] _nb_inst_memory ; delete [] _nb_context ; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/include/Parameters.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/include/Parameters.h (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/include/Parameters.h (revision 110) @@ -36,4 +36,5 @@ public : uint32_t * _size_store_queue ;//[nb_load_store_queue] public : uint32_t * _size_load_queue ;//[nb_load_store_queue] + public : uint32_t * _nb_inst_memory ;//[nb_load_store_queue] public : uint32_t ** _link_load_store_unit_with_thread ;//[nb_front_end][nb_context] public : Tpriority_t _rename_select_priority ; @@ -75,4 +76,5 @@ uint32_t * size_store_queue , uint32_t * size_load_queue , + uint32_t * nb_inst_memory , uint32_t ** link_load_store_unit_with_thread , Tpriority_t rename_select_priority , Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/src/Parameters.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/src/Parameters.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/src/Parameters.cpp (revision 110) @@ -27,4 +27,5 @@ uint32_t * size_store_queue , uint32_t * size_load_queue , + uint32_t * nb_inst_memory , uint32_t ** link_load_store_unit_with_thread , Tpriority_t rename_select_priority , @@ -50,4 +51,5 @@ _size_store_queue = size_store_queue ; _size_load_queue = size_load_queue ; + _nb_inst_memory = nb_inst_memory ; _link_load_store_unit_with_thread = link_load_store_unit_with_thread ; _rename_select_priority = rename_select_priority ; @@ -101,4 +103,5 @@ _size_store_queue , _size_load_queue , + _nb_inst_memory , _link_load_store_unit_with_thread, _nb_inst_insert , Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/SelfTest/configuration.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/SelfTest/configuration.cfg (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/SelfTest/configuration.cfg (revision 110) @@ -54,3 +54,4 @@ 2 2 +1 # size_store_queue [0][0] [nb_rename_unit][nb_load_store_queue] 1 1 +1 # size_load_queue [0][0] [nb_rename_unit][nb_load_store_queue] +1 1 +1 # nb_inst_memory [0][0] [nb_rename_unit][nb_load_store_queue] 0 0 +1 # link_load_store_unit_with_thread [0][0] [nb_front_end][nb_context] Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/SelfTest/src/main.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/SelfTest/src/main.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/SelfTest/src/main.cpp (revision 110) @@ -7,4 +7,5 @@ #include "Behavioural/Core/Multi_OOO_Engine/OOO_Engine/SelfTest/include/test.h" +#include "Behavioural/include/Allocation.h" #define NB_PARAMS 23 @@ -69,4 +70,5 @@ err (_(" * size_store_queue [nb_rename_unit][nb_load_store_queue] (uint32_t )\n")); err (_(" * size_load_queue [nb_rename_unit][nb_load_store_queue] (uint32_t )\n")); + err (_(" * nb_inst_memory [nb_rename_unit][nb_load_store_queue] (uint32_t )\n")); err (_(" * link_load_store_unit_with_thread [nb_front_end][nb_context] (uint32_t )\n")); @@ -215,5 +217,5 @@ } - if (argc != static_cast(2+NB_PARAMS+3*_nb_front_end+2*_sum_nb_context+11*_nb_rename_unit+_nb_execute_loop+_nb_rename_unit*_nb_inst_issue+12*_nb_inst_issue+2*_sum_nb_load_store_queue)) + if (argc != static_cast(2+NB_PARAMS+3*_nb_front_end+2*_sum_nb_context+11*_nb_rename_unit+_nb_execute_loop+_nb_rename_unit*_nb_inst_issue+12*_nb_inst_issue+3*_sum_nb_load_store_queue)) usage (argc, argv); @@ -233,4 +235,12 @@ for (uint32_t j=0; j<_nb_load_store_queue[i]; j++) _size_load_queue [i][j] = fromString(argv[x++]); + } + + uint32_t ** _nb_inst_memory = new uint32_t * [_nb_rename_unit]; + for (uint32_t i=0; i<_nb_rename_unit; i++) + { + _nb_inst_memory [i] = new uint32_t [_nb_load_store_queue[i]]; + for (uint32_t j=0; j<_nb_load_store_queue[i]; j++) + _nb_inst_memory [i][j] = fromString(argv[x++]); } @@ -258,4 +268,14 @@ } } + + uint32_t _nb_thread ; + uint32_t ** _translate_num_context_to_num_thread; //[nb_front_end][nb_context] + + ALLOC2(_translate_num_context_to_num_thread,uint32_t,_nb_front_end,_nb_context[it1]); + + _nb_thread = 0; + for (uint32_t i=0; i<_nb_front_end; i++) + for (uint32_t j=0; j<_nb_context [i]; j++) + _translate_num_context_to_num_thread [i][j] = _nb_thread ++; int _return = EXIT_SUCCESS; @@ -307,6 +327,9 @@ _size_store_queue , _size_load_queue , + _nb_inst_memory , _link_load_store_unit_with_thread , _implement_group , + _nb_thread , + _translate_num_context_to_num_thread, true //is_toplevel ); @@ -337,4 +360,6 @@ } + DELETE2(_translate_num_context_to_num_thread,_nb_front_end,_nb_context[it1]); + for (uint32_t i=0; i<_nb_front_end; i++) { @@ -348,4 +373,8 @@ delete [] _link_load_store_unit_with_thread [i]; delete [] _link_load_store_unit_with_thread; + + for (uint32_t i=0; i<_nb_rename_unit; i++) + delete [] _nb_inst_memory [i]; + delete [] _nb_inst_memory ; for (uint32_t i=0; i<_nb_rename_unit; i++) Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/SelfTest/src/test.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/SelfTest/src/test.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/SelfTest/src/test.cpp (revision 110) @@ -9,4 +9,5 @@ #include "Behavioural/Core/Multi_OOO_Engine/OOO_Engine/SelfTest/include/test.h" #include "Behavioural/include/Allocation.h" +#include "Behavioural/include/Simulation.h" void test (string name, @@ -18,4 +19,8 @@ morpheo::behavioural::Parameters_Statistics * _parameters_statistics = new morpheo::behavioural::Parameters_Statistics (5,CYCLE_MAX); #endif + + simulation_init(0,0); + + debug_idle_cycle = CYCLE_MAX; Tusage_t _usage = USE_ALL; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/include/Parameters.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/include/Parameters.h (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/include/Parameters.h (revision 110) @@ -78,7 +78,12 @@ public : uint32_t ** _size_store_queue ;//[nb_rename_unit][nb_load_store_queue] public : uint32_t ** _size_load_queue ;//[nb_rename_unit][nb_load_store_queue] + public : uint32_t ** _nb_inst_memory ;//[nb_rename_unit][nb_load_store_queue] public : uint32_t ** _link_load_store_unit_with_thread ;//[nb_front_end][nb_context] // SPR public : bool *** _implement_group ;//[nb_front_end][nb_context][NB_GROUP] + // Others + public : uint32_t _nb_thread ; + public : uint32_t ** _translate_num_context_to_num_thread; //[nb_front_end][nb_context] + public : std::vector*_link_front_end_with_rename_unit ;//[nb_rename_unit] @@ -168,8 +173,11 @@ uint32_t ** size_store_queue ,//[nb_rename_unit][nb_load_store_queue] uint32_t ** size_load_queue ,//[nb_rename_unit][nb_load_store_queue] + uint32_t ** nb_inst_memory ,//[nb_rename_unit][nb_load_store_queue] uint32_t ** link_load_store_unit_with_thread ,//[nb_front_end][nb_context] // SPR bool *** implement_group ,//[nb_front_end][nb_context][NB_GROUP] - + // Others + uint32_t nb_thread , + uint32_t ** translate_num_context_to_num_thread, //[nb_front_end][nb_context] bool is_toplevel=false ); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/src/Parameters.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/src/Parameters.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/src/Parameters.cpp (revision 110) @@ -65,7 +65,11 @@ uint32_t ** size_store_queue ,//[nb_rename_unit][nb_load_store_queue] uint32_t ** size_load_queue ,//[nb_rename_unit][nb_load_store_queue] + uint32_t ** nb_inst_memory ,//[nb_rename_unit][nb_load_store_queue] uint32_t ** link_load_store_unit_with_thread ,//[nb_front_end][nb_context] // SPR bool *** implement_group ,//[nb_front_end][nb_context][NB_GROUP] + // Others + uint32_t nb_thread , + uint32_t ** translate_num_context_to_num_thread, //[nb_front_end][nb_context] bool is_toplevel @@ -116,6 +120,10 @@ _size_store_queue = size_store_queue ; _size_load_queue = size_load_queue ; + _nb_inst_memory = nb_inst_memory ; _link_load_store_unit_with_thread = link_load_store_unit_with_thread ; _implement_group = implement_group ; + + _nb_thread = nb_thread ; + _translate_num_context_to_num_thread = translate_num_context_to_num_thread; test(); @@ -217,4 +225,5 @@ _size_store_queue [i], _size_load_queue [i], + _nb_inst_memory [i], _rename_unit_link_load_store_unit_with_thread [i], _rename_select_priority [i], @@ -251,5 +260,7 @@ _commit_priority , _commit_load_balancing , - _nb_rename_unit_select + _nb_rename_unit_select , + _nb_thread , + _translate_num_context_to_num_thread ); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/SelfTest/src/test.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/SelfTest/src/test.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/SelfTest/src/test.cpp (revision 110) @@ -9,4 +9,5 @@ #include "Behavioural/Core/SelfTest/include/test.h" #include "Behavioural/include/Allocation.h" +#include "Behavioural/include/Simulation.h" void test (string name, @@ -18,4 +19,8 @@ morpheo::behavioural::Parameters_Statistics * _parameters_statistics = new morpheo::behavioural::Parameters_Statistics (5,CYCLE_MAX); #endif + + simulation_init(0,0); + + debug_idle_cycle = CYCLE_MAX; Tusage_t _usage = USE_ALL; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/include/Parameters.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/include/Parameters.h (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/include/Parameters.h (revision 110) @@ -248,6 +248,8 @@ public : uint32_t *** _ooo_engine_size_store_queue ;//[nb_ooo_engine][nb_rename_unit][ooo_engine_nb_load_store_unit] public : uint32_t *** _ooo_engine_size_load_queue ;//[nb_ooo_engine][nb_rename_unit][ooo_engine_nb_load_store_unit] + public : uint32_t *** _ooo_engine_nb_inst_memory ;//[nb_ooo_engine][nb_rename_unit][ooo_engine_nb_load_store_unit] public : uint32_t *** _ooo_engine_link_load_store_unit_with_context ;//[nb_ooo_engine][ooo_engine_nb_front_end][nb_context] public : bool **** _ooo_engine_implement_group ;//[nb_ooo_engine][ooo_engine_nb_front_end][nb_context][NB_GROUP] + public : uint32_t *** _ooo_engine_translate_num_context_to_num_thread;//[nb_ooo_engine][ooo_engine_nb_front_end][nb_context] // translate for execute_loop Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/src/Parameters.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/src/Parameters.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/src/Parameters.cpp (revision 110) @@ -910,4 +910,17 @@ } + ALLOC3(_ooo_engine_translate_num_context_to_num_thread,uint32_t ,_nb_ooo_engine,_ooo_engine_nb_front_end[it1],_ooo_engine_nb_context[it1][it2]); + for (uint32_t i=0; i<_nb_ooo_engine; ++i) + for (uint32_t j=0; j<_ooo_engine_nb_front_end[i]; ++j) + { + uint32_t num_front_end = _translate_ooo_engine_num_front_end [i][j]; + for (uint32_t k=0; k<_ooo_engine_nb_context[i][j]; ++k) + { + uint32_t num_thread = _link_thread_with_context[num_front_end][k]; + + _ooo_engine_translate_num_context_to_num_thread [i][j][k] = num_thread; + } + } + ALLOC2(_ooo_engine_nb_inst_execute ,uint32_t ,_nb_ooo_engine,_ooo_engine_nb_execute_loop[it1]); @@ -1146,4 +1159,5 @@ ALLOC3(_ooo_engine_size_store_queue ,uint32_t ,_nb_ooo_engine,_nb_rename_unit[it1],_ooo_engine_nb_load_store_unit[it1][it2]); ALLOC3(_ooo_engine_size_load_queue ,uint32_t ,_nb_ooo_engine,_nb_rename_unit[it1],_ooo_engine_nb_load_store_unit[it1][it2]); + ALLOC3(_ooo_engine_nb_inst_memory ,uint32_t ,_nb_ooo_engine,_nb_rename_unit[it1],_ooo_engine_nb_load_store_unit[it1][it2]); ALLOC3(_ooo_engine_link_load_store_unit_with_context ,uint32_t ,_nb_ooo_engine,_ooo_engine_nb_front_end[it1],_ooo_engine_nb_context[it1][it2]); @@ -1157,4 +1171,5 @@ _ooo_engine_size_store_queue [i][j][k] = _size_store_queue[num_load_store_unit]; _ooo_engine_size_load_queue [i][j][k] = _size_load_queue [num_load_store_unit]; + _ooo_engine_nb_inst_memory [i][j][k] = _nb_inst_memory [num_load_store_unit]; } @@ -1894,6 +1909,9 @@ _ooo_engine_size_store_queue [i], _ooo_engine_size_load_queue [i], + _ooo_engine_nb_inst_memory [i], _ooo_engine_link_load_store_unit_with_context [i], - _ooo_engine_implement_group [i] + _ooo_engine_implement_group [i], + _nb_thread , + _ooo_engine_translate_num_context_to_num_thread[i] ); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Simulation.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Simulation.h (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Simulation.h (revision 110) @@ -19,23 +19,11 @@ namespace behavioural { -extern double _simulation_nb_cycle; -// extern double _simulation_nb_instruction; -// extern std::vector * _simulation_nb_instruction_commited; - - // Warning, now no mutek to protect this variable - -// class Simulation -// { -// private : const uint32_t _num_context; - -// public : Simulation (void); -// public : ~Simulation (void); -// public : void end_cycle (double nb_instruction_commited); -// }; +extern double _simulation_nb_cycle; +extern double _simulation_nb_instruction; +extern std::vector _simulation_nb_instruction_commited; bool simulation_test_end (void); void simulation_init (double nb_cycle, double nb_instruction); - }; // end namespace behavioural }; // end namespace morpheo Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Version.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Version.h (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Version.h (revision 110) @@ -10,8 +10,8 @@ #define MORPHEO_MAJOR_VERSION "0" #define MORPHEO_MINOR_VERSION "2" -#define MORPHEO_REVISION "109" +#define MORPHEO_REVISION "110" #define MORPHEO_CODENAME "Castor" -#define MORPHEO_DATE_DAY "16" +#define MORPHEO_DATE_DAY "19" #define MORPHEO_DATE_MONTH "02" #define MORPHEO_DATE_YEAR "2009" Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Simulation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Simulation.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Simulation.cpp (revision 110) @@ -13,28 +13,8 @@ namespace behavioural { - static bool simulation_initialized; -// static uint32_t _simulation_num_context_next; - double _simulation_nb_cycle; -// double _simulation_nb_instruction; -// std::vector * _simulation_nb_instruction_commited; - -// Simulation::Simulation (void): -// _num_context (_simulation_num_context_next) -// { -// // Test if is first context create -// if (_simulation_num_context_next == 0) -// _simulation_nb_instruction_commited = new std::vector; - -// _simulation_num_context_next ++; -// } - -// Simulation::~Simulation (void) -// { -// _simulation_num_context_next --; - -// // Test if is last context destroy -// if (_simulation_num_context_next == 0) -// delete _simulation_nb_instruction_commited; -// } + static bool simulation_initialized; + double _simulation_nb_cycle; + double _simulation_nb_instruction; + std::vector _simulation_nb_instruction_commited; void simulation_init (double nb_cycle, @@ -43,11 +23,8 @@ if (not simulation_initialized) { -// _simulation_num_context_next = 0; - _simulation_nb_cycle = nb_cycle ; -// _simulation_nb_instruction = nb_instruction; + _simulation_nb_cycle = nb_cycle; + _simulation_nb_instruction = nb_instruction; +// _simulation_nb_instruction_commited = new std::vector; - if (nb_instruction != 0) - throw ERRORMORPHEO("simulation_init",_("Stop Condition on number instruction is not yet implemented")); - simulation_initialized = true; } @@ -59,6 +36,6 @@ _simulation_nb_cycle = nb_cycle; -// if (_simulation_nb_instruction < nb_instruction) -// _simulation_nb_instruction = nb_instruction; + if (_simulation_nb_instruction < nb_instruction) + _simulation_nb_instruction = nb_instruction; } } Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Simulation_end_cycle.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Simulation_end_cycle.cpp (revision 109) +++ (revision ) @@ -1,23 +1,0 @@ -#ifdef SYSTEMC -/* - * $Id$ - * - * [ Description ] - * - */ - -#include "Behavioural/include/Simulation.h" - -namespace morpheo { -namespace behavioural { - -// void Simulation::end_cycle (double nb_instruction_commited) -// { -// // must test if _simulation_nb_instruction_commited is allocate -// (*_simulation_nb_instruction_commited) [_num_context] += nb_instruction_commited; -// } - -}; // end namespace behavioural -}; // end namespace morpheo - -#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Simulation_test_end.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Simulation_test_end.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Simulation_test_end.cpp (revision 110) @@ -17,29 +17,34 @@ // Test if a stop condition is activate - if ((_simulation_nb_cycle == 0)// and -// (_simulation_nb_instruction == 0) + if ((_simulation_nb_cycle == 0) and + (_simulation_nb_instruction == 0) ) return false; - bool end_cycle = true; -// bool end_inst = true; + bool end_cycle; + bool end_inst ; if (_simulation_nb_cycle != 0) end_cycle = (_simulation_nb_cycle <= sc_simulation_time()); + else + end_cycle = true; -// if (_simulation_nb_instruction != 0) -// { -// std::vector::iterator it=_simulation_nb_instruction_commited->begin(); + if (_simulation_nb_instruction != 0) + { + end_inst = true; + + std::vector::iterator it=_simulation_nb_instruction_commited.begin(); -// // Scan all context and test if all can finish -// while (end_inst and it!=_simulation_nb_instruction_commited->end()) -// { -// end_inst &= (*it <= _simulation_nb_instruction); -// it ++; -// } -// } + // Scan all context and test if all can finish + while (end_inst and it!=_simulation_nb_instruction_commited.end()) + { + end_inst &= (_simulation_nb_instruction <= *it); + it ++; + } + } + else + end_inst = true; - return end_cycle // and end_inst - ; + return end_cycle and end_inst; } Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_alloc_operand.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_alloc_operand.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_alloc_operand.cpp (revision 110) @@ -4,8 +4,11 @@ namespace morpheo { namespace behavioural { + +#undef FUNCTION +#define FUNCTION "Stat::alloc_operand" counter_t * Stat::alloc_operand (counter_type_t type, std::string varname, std::string unit, std::string description) { if (not is_valid_var (varname)) - throw(ERRORMORPHEO("Stat::alloc_operand",_("Variable is not valid."))); + throw(ERRORMORPHEO(FUNCTION,toString(_("<%s> : Variable \"%s\" is not valid."),_name_instance.c_str(),varname.c_str()))); counter_t * counter = new counter_t; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_create_expr.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_create_expr.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_create_expr.cpp (revision 110) @@ -5,4 +5,6 @@ namespace behavioural { +#undef FUNCTION +#define FUNCTION "Stat::create_expr" void Stat::create_expr (std::string varname, std::string expr, @@ -10,5 +12,5 @@ { if (is_valid_var (varname)) - throw(ERRORMORPHEO("Stat::create_expr",_("Variable is not valid."))); + throw(ERRORMORPHEO(FUNCTION,toString(_("<%s> Variable \"%s\" is not valid."),_name_instance.c_str(),varname.c_str()))); expr_t expression; Index: trunk/IPs/systemC/processor/Morpheo/Common/include/Debug.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Common/include/Debug.h (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Common/include/Debug.h (revision 110) @@ -50,5 +50,6 @@ extern double debug_cycle_start; extern double debug_cycle_stop ; - extern double debug_cycle_idle; + extern double debug_idle_cycle; + extern uint32_t debug_idle_time; void debug_init (void); @@ -56,5 +57,6 @@ double cycle_start, double cycle_stop , - double cycle_idle); + double idle_cycle , + uint32_t idle_time ); #ifdef SYSTEMC Index: trunk/IPs/systemC/processor/Morpheo/Common/src/Debug.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Common/src/Debug.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Common/src/Debug.cpp (revision 110) @@ -16,5 +16,6 @@ double debug_cycle_start; double debug_cycle_stop ; -double debug_cycle_idle; +double debug_idle_cycle ; +uint32_t debug_idle_time ; #undef FUNCTION @@ -37,5 +38,6 @@ double cycle_start, double cycle_stop , - double cycle_idle) + double idle_cycle , + uint32_t idle_time ) { if (not debug_initialized) @@ -53,5 +55,6 @@ # endif #endif - debug_cycle_idle = cycle_idle; + debug_idle_cycle = idle_cycle; + debug_idle_time = idle_time ; debug_initialized = true; Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg (revision 110) @@ -4,6 +4,6 @@ - - + + @@ -16,5 +16,5 @@ - + @@ -25,12 +25,12 @@ - + - - - - + + + + @@ -42,5 +42,5 @@ - + @@ -104,10 +104,10 @@ - + - + @@ -123,5 +123,5 @@ - + @@ -158,4 +158,7 @@ + + + @@ -208,18 +211,31 @@ - - - - + + + + + + + - - + + + + + - - - - + + + + + + + + + + + Index: trunk/IPs/systemC/processor/Morpheo/Files/Morpheo.gen =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Morpheo.gen (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Files/Morpheo.gen (revision 110) @@ -3,17 +3,17 @@ - - + + - - + + - - + + - - + + @@ -22,8 +22,8 @@ - - - - + + + + @@ -36,5 +36,5 @@ - + @@ -44,5 +44,5 @@ - + @@ -58,6 +58,6 @@ - - + + @@ -81,8 +81,8 @@ - + - - + + @@ -93,6 +93,6 @@ - - + + @@ -100,11 +100,11 @@ - - + + - - + + - + @@ -113,6 +113,6 @@ - - + + Index: trunk/IPs/systemC/processor/Morpheo/Files/Morpheo.sim =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Morpheo.sim (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Files/Morpheo.sim (revision 110) @@ -3,97 +3,98 @@ - - - - - - - - + + + + + + + + + + + - - + + - - + + + + - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/IPs/systemC/processor/Morpheo/Script/SelfTest.sh =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Script/SelfTest.sh (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/Script/SelfTest.sh (revision 110) @@ -9,4 +9,5 @@ declare test_ko="Test KO"; declare test_ok="Test OK"; +declare test_unknow="???????"; declare tmp="${MORPHEO_HOME}/tmp/SelfTest"; declare path="${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/"; @@ -88,10 +89,10 @@ "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Direction_Glue" "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction" -# "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue" + "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue" # "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue" # "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table" # "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table" -# "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor" -# "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor" + "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor" + "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor" "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Prediction_unit_Glue" "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Return_Address_Stack" @@ -225,5 +226,7 @@ "result") for x in "systemc" "vhdl"; do - echo "${x}"; + color=34; + echo "[1;${color}m * ${x}"; + for i in ${tmp}/*.${x}; do if test -f ${i}; then @@ -232,12 +235,12 @@ case "${res_test}" in - "${test_ok}") color=32; + "${test_ok}") res_test=${test_ok}; color=32; ;; - "${test_ko}") color=31; + "${test_ko}") res_test=${test_ko}; color=31; ;; - *) color=39; + *) res_test=${test_unknow}; color=39; ;; esac - echo "[1;${color}m * ${res_test} - ${component}"; + echo "[1;${color}m * ${res_test} - ${component}"; fi; done; Index: trunk/IPs/systemC/processor/Morpheo/TopLevel/include/Morpheo.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/TopLevel/include/Morpheo.h (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/TopLevel/include/Morpheo.h (revision 110) @@ -32,6 +32,7 @@ #include "Common/include/Debug.h" - #include +#include +#include namespace morpheo { @@ -184,6 +185,10 @@ #ifdef SYSTEMC public : bool simulation_end (void); + private : void signal_init (void); +//private : void signal_handler (int value); #endif }; + + void signal_handler (int value); }; // end namespace morpheo Index: trunk/IPs/systemC/processor/Morpheo/TopLevel/src/Morpheo.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/TopLevel/src/Morpheo.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/TopLevel/src/Morpheo.cpp (revision 110) @@ -80,4 +80,10 @@ #endif } + +#ifdef SYSTEMC + // Stop alarm + signal_init(); +#endif + log_end(Morpheo,FUNCTION); }; @@ -88,4 +94,9 @@ { log_begin(Morpheo,FUNCTION); + +#ifdef SYSTEMC + // Stop alarm + alarm(0); +#endif #ifdef STATISTICS Index: trunk/IPs/systemC/processor/Morpheo/TopLevel/src/Morpheo_signal_handler.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/TopLevel/src/Morpheo_signal_handler.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/TopLevel/src/Morpheo_signal_handler.cpp (revision 110) @@ -0,0 +1,35 @@ +#ifdef SYSTEMC +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "TopLevel/include/Morpheo.h" + +namespace morpheo { + +#undef FUNCTION +#define FUNCTION "signal_handler" + void signal_handler (int value) + { + sc_stop(); + + switch (value) + { + case SIGALRM : + { + throw ERRORMORPHEO(FUNCTION,_("Signal Alarm : can have a combinatory loop.\n")); + break; + } + default : + { + throw ERRORMORPHEO(FUNCTION,_("Unknow signal.\n")); + break; + } + } + }; + +}; // end namespace morpheo +#endif Index: trunk/IPs/systemC/processor/Morpheo/TopLevel/src/Morpheo_signal_init.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/TopLevel/src/Morpheo_signal_init.cpp (revision 110) +++ trunk/IPs/systemC/processor/Morpheo/TopLevel/src/Morpheo_signal_init.cpp (revision 110) @@ -0,0 +1,21 @@ +#ifdef SYSTEMC +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "TopLevel/include/Morpheo.h" + +namespace morpheo { + +#undef FUNCTION +#define FUNCTION "Morpheo::signal_init" + void Morpheo::signal_init (void) + { + signal(SIGALRM, signal_handler); + }; + +}; // end namespace morpheo +#endif Index: trunk/IPs/systemC/processor/Morpheo/TopLevel/src/Morpheo_transition.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/TopLevel/src/Morpheo_transition.cpp (revision 109) +++ trunk/IPs/systemC/processor/Morpheo/TopLevel/src/Morpheo_transition.cpp (revision 110) @@ -20,4 +20,7 @@ { log_begin(Morpheo,FUNCTION); + + // Re init the alarm + alarm(debug_idle_time); #if defined(STATISTICS) or defined(VHDL_TESTBENCH) Index: trunk/Makefile.flags =================================================================== --- trunk/Makefile.flags (revision 109) +++ trunk/Makefile.flags (revision 110) @@ -17,8 +17,8 @@ -DDEBUG=DEBUG_TRACE \ -DSTATISTICS \ + -DVHDL \ + -DVHDL_TESTBENCH \ -DTRANSLATION -# -DVHDL \ -# -DVHDL_TESTBENCH \ # -DVHDL_TESTBENCH_ASSERT \ # -DPRINT_COLOR \ Index: trunk/Softwares/Test/Test_015/src/sys/crt0.s =================================================================== --- trunk/Softwares/Test/Test_015/src/sys/crt0.s (revision 109) +++ trunk/Softwares/Test/Test_015/src/sys/crt0.s (revision 110) @@ -37,6 +37,6 @@ _start: - l.movhi r2, hi(0x00000002) /* count max */ - l.ori r2, r2, lo(0x00000002) + l.movhi r2, hi(0x00000010) /* count max */ + l.ori r2, r2, lo(0x00000010) /**********/