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 128) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/SelfTest/src/test.cpp (revision 129) @@ -30,4 +30,5 @@ simulation_init(0,0,0,false,false); + _model.set_model(NAME_Commit_unit, MODEL_SYSTEMC, true); debug_idle_cycle = CYCLE_MAX; Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_genMealy_commit.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_genMealy_commit.cpp (revision 128) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_genMealy_commit.cpp (revision 129) @@ -45,5 +45,5 @@ for (uint32_t i=0; i<_param->_nb_inst_commit; i++) { - commit_ack [i] = false; + commit_ack [i] = false; // Test if have valid instruction @@ -51,5 +51,5 @@ { // packet_id number can - Tpacket_t packet_id = (_param->_have_port_rob_ptr )?PORT_READ(in_COMMIT_PACKET_ID [i]):0; + Tpacket_t packet_id = (_param->_have_port_rob_ptr)?PORT_READ(in_COMMIT_PACKET_ID [i]):0; uint32_t num_bank = packet_id & _param->_mask_num_bank; uint32_t num_bank_access = bank_nb_access [num_bank]; @@ -59,6 +59,6 @@ { // find - bank_nb_access [num_bank] ++; - commit_ack [i] = true; + bank_nb_access [num_bank] ++; + commit_ack [i] = true; internal_BANK_COMMIT_VAL [num_bank][num_bank_access] = true; Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_genMoore.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_genMoore.cpp (revision 128) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_genMoore.cpp (revision 129) @@ -30,5 +30,5 @@ // =================================================================== { - uint32_t nb_scan_bank = 0; // last scan bank + uint32_t num_scan_bank = 0; // last scan bank bool can_continue = true; @@ -48,7 +48,7 @@ Tcontrol_t val = false; - for (uint32_t j=nb_scan_bank; j<_param->_nb_bank; j++) + for (uint32_t j=num_scan_bank; j<_param->_nb_bank; j++) { - nb_scan_bank ++; + num_scan_bank ++; // translate bank number @@ -82,4 +82,6 @@ ); + event_nb_inst [front_end_id][context_id] ++; + can_continue &= (((state == ROB_STORE_OK ) or (state == ROB_STORE_OK_WAIT_END ) or @@ -90,5 +92,5 @@ (reg_EVENT_PACKET[front_end_id][context_id] == num_packet)) and not ((reg_EVENT_NB_INST [front_end_id][context_id] > 0) and - ((++event_nb_inst [front_end_id][context_id]) >= reg_EVENT_NB_INST [front_end_id][context_id])) + ((event_nb_inst [front_end_id][context_id]) >= reg_EVENT_NB_INST [front_end_id][context_id])) ); @@ -129,5 +131,5 @@ // Branchement must be send at the prediction unit - uint32_t nb_scan_bank = 0; // last scan bank + uint32_t num_scan_bank = 0; // last scan bank // for each port, find a valid branchement. @@ -138,7 +140,7 @@ Tcontrol_t val = false; - for (uint32_t j=nb_scan_bank; j<_param->_nb_bank; j++) + for (uint32_t j=num_scan_bank; j<_param->_nb_bank; j++) { - nb_scan_bank ++; + num_scan_bank ++; // translate bank number Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/SelfTest/src/test.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/SelfTest/src/test.cpp (revision 128) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/SelfTest/src/test.cpp (revision 129) @@ -18,4 +18,16 @@ morpheo::behavioural::Parameters_Statistics * _parameters_statistics = new morpheo::behavioural::Parameters_Statistics (5,CYCLE_MAX); #endif + + simulation_init(0,0,0,false,false); + _model.set_model(NAME_Rename_unit , MODEL_SYSTEMC, true); + _model.set_model(NAME_Load_Store_pointer_unit , MODEL_SYSTEMC, true); + _model.set_model(NAME_Register_translation_unit , MODEL_SYSTEMC, true); + _model.set_model(NAME_Dependency_checking_unit , MODEL_SYSTEMC, true); + _model.set_model(NAME_Free_List_unit , MODEL_SYSTEMC, true); + _model.set_model(NAME_Register_Address_Translation_unit, MODEL_SYSTEMC, true); + _model.set_model(NAME_Register_translation_unit_Glue , MODEL_SYSTEMC, true); + _model.set_model(NAME_Stat_List_unit , MODEL_SYSTEMC, true); + _model.set_model(NAME_Rename_select , MODEL_SYSTEMC, true); + _model.set_model(NAME_Rename_unit_Glue , MODEL_SYSTEMC, true); Tusage_t _usage = USE_ALL; @@ -386,4 +398,5 @@ in_NRESET->write(1); +#ifdef SELFTEST LABEL("Loop of Test"); @@ -394,4 +407,7 @@ SC_START(1); } +#else + SC_START(1000); +#endif /******************************************************** Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/SelfTest/debug.cfg =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/SelfTest/debug.cfg (revision 129) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/SelfTest/debug.cfg (revision 129) @@ -0,0 +1,43 @@ +OOO_Engine +1 1 +1 # nb_front_end +1 1 +1 # nb_context [0] [nb_front_end] +1 1 +1 # nb_rename_unit +1 1 +1 # nb_execute_loop +1 1 +1 # nb_inst_decod [0] [nb_front_end] +1 1 +1 # nb_inst_insert [0] [nb_rename_unit] +1 1 +1 # nb_inst_retire [0] [nb_rename_unit] +1 1 +1 # nb_inst_execute [0] [nb_execute_loop] +1 1 +1 # nb_inst_reexecute +1 1 +1 # nb_inst_commit +1 1 +1 # nb_inst_branch_complete +1 1 +1 # nb_branch_speculated [0][0] [nb_front_end][nb_context] +1 1 +1 # size_nb_inst_decod +1 1 +1 # nb_rename_unit_select +1 1 +1 # nb_execute_loop_select +32 32 *2 # size_general_data +2 2 *2 # size_special_data +0 0 +1 # link_rename_unit_with_front_end [0] [nb_front_end] +1 1 +1 # size_re_order_buffer +1 1 +1 # nb_re_order_buffer_bank +1 1 +1 # commit_priority +1 1 +1 # commit_load_balancing +1 1 +1 # size_issue_queue +1 1 +1 # issue_queue_scheme +1 1 +1 # nb_issue_queue_bank +1 1 +1 # issue_priority +1 1 +1 # issue_load_balancing +1 1 +1 # size_reexecute_queue +1 1 +1 # reexecute_priority +1 1 +1 # reexecute_load_balancing +1 1 +1 # rename_select_priority [0] [nb_rename_unit] +1 1 +1 # rename_select_load_balancing [0] [nb_rename_unit] +1 1 +1 # rename_select_nb_front_end_select [0] [nb_rename_unit] +64 64 +1 # nb_general_register [0] [nb_rename_unit] +4 4 +1 # nb_special_register [0] [nb_rename_unit] +1 1 +1 # nb_reg_free [0] [nb_rename_unit] +1 1 +1 # nb_rename_unit_bank [0] [nb_rename_unit] +1 1 +1 # nb_load_store_queue [0] [nb_rename_unit] +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/include/Debug_signal.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Debug_signal.h (revision 129) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Debug_signal.h (revision 129) @@ -0,0 +1,42 @@ +#ifndef morpheo_behavioural_Debug_signal_h +#define morpheo_behavioural_Debug_signal_h + +/* + * $Id$ + * + * [ Description ] + * + */ + +# ifdef DEBUG_SIGNAL + +#include +#include "Common/include/Message.h" + +namespace morpheo { +namespace behavioural { + + extern std::set _debug_signal; + +# define DEBUG_SIGNAL_ADD(signal) \ + do \ + { \ + morpheo::behavioural::_debug_signal.insert(static_cast( signal)); \ + } while(0) + +# define DEBUG_SIGNAL_ACCESS(signal) \ + do \ + { \ + if (morpheo::behavioural::_debug_signal.find(static_cast(signal)) == morpheo::behavioural::_debug_signal.end()) \ + msgError("At file %s, in line %d, invalid signal.\n",__FILE__,__LINE__); \ + } while(0) + +}; // end namespace behavioural +}; // end namespace morpheo +# else +# define DEBUG_SIGNAL_ADD(signal) do {} while (0) +# define DEBUG_SIGNAL_ACCESS(signal) do {} while (0) +# endif + + +#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Signal.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Signal.h (revision 128) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Signal.h (revision 129) @@ -23,4 +23,5 @@ #include "Behavioural/include/Direction.h" #include "Behavioural/include/XML.h" +#include "Behavioural/include/Debug_signal.h" #include "Common/include/ErrorMorpheo.h" #include "Common/include/ToBase2.h" @@ -159,4 +160,6 @@ _sc_signal = sc_signal; _sc_signal_map = sc_signal; + + DEBUG_SIGNAL_ADD(sc_signal); if (typeid(T) == typeid(bool )) Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Version.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Version.h (revision 128) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Version.h (revision 129) @@ -10,8 +10,8 @@ #define MORPHEO_MAJOR_VERSION "0" #define MORPHEO_MINOR_VERSION "2" -#define MORPHEO_REVISION "128" +#define MORPHEO_REVISION "129" #define MORPHEO_CODENAME "Castor" -#define MORPHEO_DATE_DAY "26" +#define MORPHEO_DATE_DAY "29" #define MORPHEO_DATE_MONTH "06" #define MORPHEO_DATE_YEAR "2009" Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Debug_signal.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Debug_signal.cpp (revision 129) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Debug_signal.cpp (revision 129) @@ -0,0 +1,18 @@ +/* + * $Id$ + * + * [ Description ] + * + */ +#ifdef DEBUG_SIGNAL + +#include "Behavioural/include/Debug_signal.h" + +namespace morpheo { +namespace behavioural { + + std::set _debug_signal; + +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Model.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Model.cpp (revision 128) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Model.cpp (revision 129) @@ -16,10 +16,10 @@ Model::Model (void) { - log_begin(Behavioural,FUNCTION); +// log_begin(Behavioural,FUNCTION); set_model(NAME_true ,MODEL_SYSTEMC,true ); set_model(NAME_false,MODEL_SYSTEMC,false); - log_end(Behavioural,FUNCTION); +// log_end(Behavioural,FUNCTION); } @@ -28,6 +28,6 @@ Model::~Model(void) { - log_begin(Behavioural,FUNCTION); - log_end(Behavioural,FUNCTION); +// log_begin(Behavioural,FUNCTION); +// log_end(Behavioural,FUNCTION); } Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Model_get_debug.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Model_get_debug.cpp (revision 128) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Model_get_debug.cpp (revision 129) @@ -16,5 +16,5 @@ bool Model::get_debug (std::string component) { - log_begin(Behavioural,FUNCTION); +// log_begin(Behavioural,FUNCTION); bool _return; @@ -27,5 +27,5 @@ _return = default_debug; - log_end(Behavioural,FUNCTION); +// log_end(Behavioural,FUNCTION); return _return; Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Model_get_type.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Model_get_type.cpp (revision 128) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Model_get_type.cpp (revision 129) @@ -16,5 +16,5 @@ model_type_t Model::get_type (std::string component) { - log_begin(Behavioural,FUNCTION); +// log_begin(Behavioural,FUNCTION); model_type_t _return; @@ -27,5 +27,5 @@ _return = default_type; - log_end(Behavioural,FUNCTION); +// log_end(Behavioural,FUNCTION); return _return; Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Model_print.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Model_print.cpp (revision 128) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Model_print.cpp (revision 129) @@ -16,5 +16,5 @@ void Model::print (void) { - log_begin(Behavioural,FUNCTION); +// log_begin(Behavioural,FUNCTION); msgInformation("Model Information [type, model simulation, debug verbosity]\n"); @@ -24,5 +24,5 @@ msgInformation(" * %s\t%s\t%s\n",(it->first).c_str(), toString(it->second.type).c_str(), toString(it->second.debug).c_str()); - log_end(Behavioural,FUNCTION); +// log_end(Behavioural,FUNCTION); } Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Model_set_model.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Model_set_model.cpp (revision 128) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Model_set_model.cpp (revision 129) @@ -16,5 +16,5 @@ void Model::set_model (std::string component, model_type_t type, bool debug) { - log_begin(Behavioural,FUNCTION); +// log_begin(Behavioural,FUNCTION); model_t model; @@ -24,5 +24,5 @@ models [component] = model; - log_end(Behavioural,FUNCTION); +// log_end(Behavioural,FUNCTION); } Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Signal_link.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Signal_link.cpp (revision 128) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Signal_link.cpp (revision 129) @@ -27,9 +27,9 @@ throw (ERRORMORPHEO (FUNCTION,"Signal \""+_name+"\", can't map with signal \""+ get_name()+"\", because the first signal is not already allocate.")); if (signal_dest->_is_allocate == false) - throw (ERRORMORPHEO (FUNCTION,"Signal \""+_name+"\", can't map with signal \""+signal_dest->get_name()+"\", because the second signal is not already allocate.")); + throw (ERRORMORPHEO (FUNCTION,"Signal \""+_name+"\", can't map with signal \""+signal_dest->get_name()+"\", because the second signal is not already allocate.\n")); // Test if type is compatible if (_type_info != signal_dest->_type_info) - throw (ERRORMORPHEO (FUNCTION,toString(_("Signal \"%s\" can't been linked with signal \"%s\" : incompatible type (%s != %s)."), + throw (ERRORMORPHEO (FUNCTION,toString(_("Signal \"%s\" can't been linked with signal \"%s\" : incompatible type (%s != %s).\n"), _name.c_str(), signal_dest->get_name().c_str(), @@ -54,4 +54,11 @@ throw (ERRORMORPHEO (FUNCTION,"Signal \""+_name+"\" can't been linked with signal \""+signal_dest->get_name()+"\" : illegal direction ("+toString(signal_src->_direction)+" with "+toString(signal_dest->_direction)+").")); + + if (_size != signal_dest->get_size()) + msgWarning(_("The size of the signal \"%s\" (%d) is different with the signal \"%s\" (%d).\n"), + _name.c_str(), + _size, + signal_dest->get_name().c_str(), + signal_dest->get_size()); // Multi consumer is authorized , no to multi producer! Index: /trunk/IPs/systemC/processor/Morpheo/Common/include/Debug.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Common/include/Debug.h (revision 128) +++ /trunk/IPs/systemC/processor/Morpheo/Common/include/Debug.h (revision 129) @@ -81,41 +81,28 @@ debug_init(); \ \ - if (debug_test_simulation_time) \ - if ((debug == DEBUG_ALL ) or \ - (DEBUG_ ## level == DEBUG_NONE) or \ - (( DEBUG_ ## level <= debug) and \ - ( morpheo::behavioural::_model.get_debug(NAME_ ## component))) ) \ - { \ - if (DEBUG_ ## level <= DEBUG_INFO) \ - { \ - msg("%s ",MSG_INFORMATION); \ - } \ - else \ - { \ - msg("%s ",MSG_DEBUG); \ - } \ + if (debug_test_simulation_time and \ + ((debug == DEBUG_ALL ) or \ + (( DEBUG_ ## level <= debug) and \ + ( morpheo::behavioural::_model.get_debug(NAME_ ## component))))) \ + { \ + if (DEBUG_ ## level <= DEBUG_INFO) \ + { \ + msg("%s ",MSG_INFORMATION); \ + } \ + else \ + { \ + msg("%s ",MSG_DEBUG); \ + } \ \ - if (debug >= DEBUG_ALL ) \ - { \ - switch (DEBUG_ ## level) \ - { \ - case DEBUG_NONE : msg(_("(none ) ")); break; \ - case DEBUG_INFO : msg(_("(information) ")); break; \ - case DEBUG_TRACE : msg(_("(trace ) ")); break; \ - case DEBUG_FUNC : msg(_("(function ) ")); break; \ - case DEBUG_ALL : msg(_("(all ) ")); break; \ - default : msg(_("(undefine ) ")); break; \ - } \ - } \ - if (debug >= DEBUG_FUNC) \ - { \ - msg( "<%s> " ,func); \ - msg(_("In file %s, "),__FILE__); \ - msg(_("at line %d " ),__LINE__); \ - msg( ": " ); \ - } \ - msg(str); \ - msg("\n"); \ - } \ + if (debug >= DEBUG_FUNC) \ + { \ + msg( "<%s> " ,func); \ + msg(_("In file %s, "),__FILE__); \ + msg(_("at line %d " ),__LINE__); \ + msg( ": " ); \ + } \ + msg(str); \ + msg("\n"); \ + } \ } while(0) Index: /trunk/IPs/systemC/processor/Morpheo/Common/include/Types.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Common/include/Types.h (revision 128) +++ /trunk/IPs/systemC/processor/Morpheo/Common/include/Types.h (revision 129) @@ -10,4 +10,5 @@ #include +#include "Behavioural/include/Debug_signal.h" namespace morpheo { @@ -41,6 +42,6 @@ # define SC_OUT(type) sc_out -# define PORT_READ(sig) sig->read() -# define PORT_WRITE(sig,val) sig->write(val) +# define PORT_READ(sig) sig->read() +# define PORT_WRITE(sig,val) do {DEBUG_SIGNAL_ACCESS(sig); sig->write(val);} while(0) //#define INTERNAL_READ(sig) (*sig) //#define INTERNAL_WRITE(sig,val) (*sig) = val Index: /trunk/IPs/systemC/processor/Morpheo/Files/Instance_x1_w8_2.cfg =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Files/Instance_x1_w8_2.cfg (revision 128) +++ /trunk/IPs/systemC/processor/Morpheo/Files/Instance_x1_w8_2.cfg (revision 129) @@ -7,5 +7,5 @@ - + Index: /trunk/IPs/systemC/processor/Morpheo/Files/Instance_x4_w8_2.cfg =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Files/Instance_x4_w8_2.cfg (revision 129) +++ /trunk/IPs/systemC/processor/Morpheo/Files/Instance_x4_w8_2.cfg (revision 129) @@ -0,0 +1,710 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: /trunk/IPs/systemC/processor/Morpheo/Files/Morpheo-Dhrystone.sim =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Files/Morpheo-Dhrystone.sim (revision 129) +++ /trunk/IPs/systemC/processor/Morpheo/Files/Morpheo-Dhrystone.sim (revision 129) @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: /trunk/IPs/systemC/processor/Morpheo/Files/debug.sim =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Files/debug.sim (revision 128) +++ /trunk/IPs/systemC/processor/Morpheo/Files/debug.sim (revision 129) @@ -25,5 +25,5 @@ - + @@ -109,6 +109,6 @@ - - + + Index: /trunk/Makefile.flags =================================================================== --- /trunk/Makefile.flags (revision 128) +++ /trunk/Makefile.flags (revision 129) @@ -20,5 +20,6 @@ #-----[ Flags ]-------------------------------------------- MORPHEO_FLAGS = -DSYSTEMC \ - -DDEBUG=DEBUG_TRACE \ + -DDEBUG=DEBUG_FUNC \ + -DDEBUG_SIGNAL \ -DSTATISTICS \ -DTRANSLATION Index: /trunk/Makefile.tools =================================================================== --- /trunk/Makefile.tools (revision 128) +++ /trunk/Makefile.tools (revision 129) @@ -104,5 +104,5 @@ SYSTEMC_LIBDIR_systemcass_deps = $(SYSTEMC_LIBDIR_systemcass) -SYSTEMC_LIBNAME_systemcass = -lsystemc_g++ -ldl +SYSTEMC_LIBNAME_systemcass = -lsystemc_g++-d -ldl SYSTEMC_LIBNAME_systemcass_deps = $(SYSTEMC_LIBNAME_systemcass) Index: /trunk/Platforms/Test/Makefile =================================================================== --- /trunk/Platforms/Test/Makefile (revision 128) +++ /trunk/Platforms/Test/Makefile (revision 129) @@ -76,5 +76,5 @@ EXEC = $(PATH_BIN)/soft.x EXEC_PREFIX = $(NICE) -n $(PRIORITY) -#$(VALGRIND) +# $(VALGRIND) EXEC_PARAMS = $(SYSTEMC_EXEC_PARAMS_$(SIMULATOR_SYSTEMC)) @@ -175,7 +175,9 @@ distexe : @\ + $(ECHO) -n "Generate : $(SCRIPT) ";\ $(RM) $(SCRIPT); \ for log in $(LOGS); do \ - $(ECHO) -n "cd $(MORPHEO_TOPLEVEL); source environment.sh; cd -; path=\"${PWD}\"; " >> $(SCRIPT); \ + $(ECHO) -n "."; \ + $(ECHO) -n "cd $(MORPHEO_TOPLEVEL); source environment.sh; cd -; path=\"${PWD}\"; " >> $(SCRIPT);\ if $(TEST) $(CLEAN) -ne 0; then \ $(ECHO) -n "$(RM) $${log}; " >> $(SCRIPT); \ @@ -183,5 +185,7 @@ $(ECHO) "$(MAKE) -C "'$${path}'" $${log} PRIORITY=$(PRIORITY);" >> $(SCRIPT); \ done; \ - $(CHMOD) +x $(SCRIPT); + $(CHMOD) +x $(SCRIPT); \ + $(ECHO) " done"; + $(PATH_LOG)/%.log : $(PATH_DATA)/%.cfg $(EXEC) $(PATH_LOGS) Index: /trunk/Platforms/Test/data/debug/debug.cfg =================================================================== --- /trunk/Platforms/Test/data/debug/debug.cfg (revision 128) +++ /trunk/Platforms/Test/data/debug/debug.cfg (revision 129) @@ -2,5 +2,5 @@ ${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen ${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w1_0.cfg -${MORPHEO_TOPLEVEL}/Softwares/Test/Test_001/bin/soft.x +${MORPHEO_TOPLEVEL}/Softwares/Test/Test_000/bin/soft.x 0 0 Index: /trunk/Softwares/MiBench/Makefile =================================================================== --- /trunk/Softwares/MiBench/Makefile (revision 128) +++ /trunk/Softwares/MiBench/Makefile (revision 129) @@ -25,5 +25,5 @@ MIBENCH_DATA_PATH = $(MORPHEO_TOPLEVEL)/Softwares/MiBench/data -FLAGS = -DMIBENCH_DATA_PATH=\"$(MIBENCH_DATA_PATH)\" -DNB_THREAD_MAX=$(NB_THREAD_MAX) +FLAGS = -DMIBENCH_DATA_PATH=\"$(MIBENCH_DATA_PATH)\" -DNB_THREAD_MAX=$(NB_THREAD_MAX) $(BENCHS_TYPE) #-----[ Files ]------------------------------------------------------------------- Index: /trunk/Softwares/MiBench/Makefile.defs =================================================================== --- /trunk/Softwares/MiBench/Makefile.defs (revision 128) +++ /trunk/Softwares/MiBench/Makefile.defs (revision 129) @@ -18,2 +18,4 @@ security.sha \ none + +BENCHS_TYPE = -DMIBENCH_SMALL Index: /trunk/Softwares/MiBench/src/c/benchmark.c =================================================================== --- /trunk/Softwares/MiBench/src/c/benchmark.c (revision 128) +++ /trunk/Softwares/MiBench/src/c/benchmark.c (revision 129) @@ -9,6 +9,7 @@ #endif - #define MiBench_small -//#define MiBench_large +#if !defined(MIBENCH_SMALL) && !defined(MIBENCH_LARGE) +# error "MIBENCH_SMALL or MIBENCH_LARGE must be defined" +#endif //-----[ automative ]----------------------------- @@ -43,8 +44,8 @@ printf("***** automative.basicmath - Begin *****\n"); -#ifdef MiBench_small +#ifdef MIBENCH_SMALL main_basicmath_small (); #endif -#ifdef MiBench_large +#ifdef MIBENCH_LARGE main_basicmath_large (); #endif @@ -56,5 +57,5 @@ // [ run_automative_bitcount ] //======================================================================================= -#ifdef MiBench_small +#ifdef MIBENCH_SMALL void main_bitcount_small (void) { @@ -81,5 +82,5 @@ #endif -#ifdef MiBench_large +#ifdef MIBENCH_LARGE void main_bitcount_large (void) { @@ -110,8 +111,8 @@ printf("***** automative.bitcount - Begin *****\n"); -#ifdef MiBench_small +#ifdef MIBENCH_SMALL main_bitcount_small (); #endif -#ifdef MiBench_large +#ifdef MIBENCH_LARGE main_bitcount_large (); #endif @@ -123,5 +124,5 @@ // [ run_automative_qsort ] //======================================================================================= -#ifdef MiBench_small +#ifdef MIBENCH_SMALL void _main_qsort_small (void) { @@ -150,5 +151,5 @@ #endif -#ifdef MiBench_large +#ifdef MIBENCH_LARGE void _main_qsort_large (void) { @@ -181,8 +182,8 @@ printf("***** automative.qsort - Begin *****\n"); -#ifdef MiBench_small +#ifdef MIBENCH_SMALL _main_qsort_small (); #endif -#ifdef MiBench_large +#ifdef MIBENCH_LARGE _main_qsort_large (); #endif @@ -194,5 +195,5 @@ // [ run_automative_susan ] //======================================================================================= -#ifdef MiBench_small +#ifdef MIBENCH_SMALL void main_susan_small (void) { @@ -261,5 +262,5 @@ #endif -#ifdef MiBench_large +#ifdef MIBENCH_LARGE void main_susan_large (void) { @@ -332,8 +333,8 @@ printf("***** automative.susan - Begin *****\n"); -#ifdef MiBench_small +#ifdef MIBENCH_SMALL main_susan_small (); #endif -#ifdef MiBench_large +#ifdef MIBENCH_LARGE main_susan_large (); #endif @@ -346,5 +347,5 @@ //======================================================================================= -#ifdef MiBench_small +#ifdef MIBENCH_SMALL void main_dijkstra_small (void) { @@ -379,5 +380,5 @@ -#ifdef MiBench_large +#ifdef MIBENCH_LARGE void main_dijkstra_large (void) { @@ -415,8 +416,8 @@ printf("***** network.dijkstra - Begin *****\n"); -#ifdef MiBench_small +#ifdef MIBENCH_SMALL main_dijkstra_small (); #endif -#ifdef MiBench_large +#ifdef MIBENCH_LARGE main_dijkstra_large (); #endif @@ -432,8 +433,8 @@ printf("***** office.stringsearch - Begin *****\n"); -#ifdef MiBench_small +#ifdef MIBENCH_SMALL main_stringsearch_small (); #endif -#ifdef MiBench_large +#ifdef MIBENCH_LARGE main_stringsearch_large (); #endif @@ -445,5 +446,5 @@ // [ run_security_sha ] //======================================================================================= -#ifdef MiBench_small +#ifdef MIBENCH_SMALL void main_sha_small (void) { @@ -472,5 +473,5 @@ #endif -#ifdef MiBench_large +#ifdef MIBENCH_LARGE void main_sha_large (void) { @@ -503,8 +504,8 @@ printf("***** security.sha - Begin *****\n"); -#ifdef MiBench_small +#ifdef MIBENCH_SMALL main_sha_small (); #endif -#ifdef MiBench_large +#ifdef MIBENCH_LARGE main_sha_large (); #endif