Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/include/Configuration.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/include/Configuration.h (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/include/Configuration.h (revision 146) @@ -35,6 +35,7 @@ private : Parameters * _param; +#ifdef STATISTICS private : morpheo::behavioural::Parameters_Statistics * _param_statistics; - +#endif private : Tusage_t _usage; @@ -50,6 +51,7 @@ public : Tusage_t getUsage (void); public : Parameters * getParam (void); +#ifdef STATISTICS public : morpheo::behavioural::Parameters_Statistics * getParamStatistics (void); - +#endif public : void toFile (std::string dirname="."); public : friend std::ostream& operator<< (std::ostream& output, Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/include/Parameters.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/include/Parameters.h (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/include/Parameters.h (revision 146) @@ -87,4 +87,5 @@ public : uint32_t ** _lsu_pht_size_counter ;//[nb_load_store_unit][1] public : uint32_t ** _lsu_pht_nb_counter ;//[nb_load_store_unit][1] + public : Tpht_scheme_t ** _lsu_pht_scheme ;//[nb_load_store_unit][1] public : uint32_t * _nb_bypass_memory ;//[nb_load_store_unit] public : uint32_t * _nb_cache_port ;//[nb_load_store_unit] @@ -126,4 +127,5 @@ public : uint32_t ** _dir_pht_nb_counter ;//[nb_front_end][3] public : uint32_t ** _dir_pht_size_address_share ;//[nb_front_end][3] + public : Tpht_scheme_t ** _dir_pht_scheme ;//[nb_front_end][3] // OOO_Engine Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Configuration.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Configuration.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Configuration.cpp (revision 146) @@ -82,4 +82,5 @@ std::cout << header(); +#ifdef STATISTICS //-------------------------------------------------- // Parameters_Statistics @@ -87,4 +88,5 @@ _param_statistics = new Parameters_Statistics (fromString(_simulator->getParam("statistics_cycle_start")), fromString(_simulator->getParam("statistics_period"))); +#endif //-------------------------------------------------- @@ -133,5 +135,7 @@ delete _instance; // simulation_destroy(); +#ifdef STATISTICS delete _param_statistics; +#endif log_end(Configuration,FUNCTION); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Configuration_getParamStatistics.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Configuration_getParamStatistics.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Configuration_getParamStatistics.cpp (revision 146) @@ -1,2 +1,3 @@ +#ifdef STATISTICS /* * $Id$ @@ -22,2 +23,3 @@ }; // end namespace behavioural }; // end namespace morpheo +#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Instance.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Instance.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Instance.cpp (revision 146) @@ -116,4 +116,5 @@ DELETE1(_param->_nb_inst_issue ,_param->_nb_ooo_engine); DELETE1(_param->_nb_rename_unit ,_param->_nb_ooo_engine); + DELETE2(_param->_dir_pht_scheme ,_param->_nb_front_end,3); DELETE2(_param->_dir_pht_size_address_share ,_param->_nb_front_end,3); DELETE2(_param->_dir_pht_nb_counter ,_param->_nb_front_end,3); @@ -138,4 +139,5 @@ DELETE1(_param->_nb_cache_port ,_param->_nb_load_store_unit); DELETE1(_param->_nb_bypass_memory ,_param->_nb_load_store_unit); + DELETE2(_param->_lsu_pht_scheme ,_param->_nb_load_store_unit,1); DELETE2(_param->_lsu_pht_nb_counter ,_param->_nb_load_store_unit,1); DELETE2(_param->_lsu_pht_size_counter ,_param->_nb_load_store_unit,1); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Instance_fromInternalStructure.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Instance_fromInternalStructure.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Instance_fromInternalStructure.cpp (revision 146) @@ -178,17 +178,18 @@ // load_store_unit //----------------------------------------------------- - ALLOC1(_param->_size_store_queue ,uint32_t ,_param->_nb_load_store_unit); - ALLOC1(_param->_size_load_queue ,uint32_t ,_param->_nb_load_store_unit); - ALLOC1(_param->_size_speculative_access_queue ,uint32_t ,_param->_nb_load_store_unit); - ALLOC1(_param->_nb_store_queue_bank ,uint32_t ,_param->_nb_load_store_unit); - ALLOC1(_param->_nb_load_queue_bank ,uint32_t ,_param->_nb_load_store_unit); - ALLOC1(_param->_nb_port_check ,uint32_t ,_param->_nb_load_store_unit); + ALLOC1(_param->_size_store_queue ,uint32_t ,_param->_nb_load_store_unit); + ALLOC1(_param->_size_load_queue ,uint32_t ,_param->_nb_load_store_unit); + ALLOC1(_param->_size_speculative_access_queue ,uint32_t ,_param->_nb_load_store_unit); + ALLOC1(_param->_nb_store_queue_bank ,uint32_t ,_param->_nb_load_store_unit); + ALLOC1(_param->_nb_load_queue_bank ,uint32_t ,_param->_nb_load_store_unit); + ALLOC1(_param->_nb_port_check ,uint32_t ,_param->_nb_load_store_unit); ALLOC1(_param->_speculative_load ,core::multi_execute_loop::execute_loop::Tspeculative_load_t,_param->_nb_load_store_unit); - ALLOC1(_param->_speculative_commit_predictor_scheme,Tpredictor_t,_param->_nb_load_store_unit); - ALLOC2(_param->_lsu_pht_size_counter ,uint32_t ,_param->_nb_load_store_unit,1); - ALLOC2(_param->_lsu_pht_nb_counter ,uint32_t ,_param->_nb_load_store_unit,1); - ALLOC1(_param->_nb_bypass_memory ,uint32_t ,_param->_nb_load_store_unit); - ALLOC1(_param->_nb_cache_port ,uint32_t ,_param->_nb_load_store_unit); - ALLOC1(_param->_nb_inst_memory ,uint32_t ,_param->_nb_load_store_unit); + ALLOC1(_param->_speculative_commit_predictor_scheme,Tpredictor_t ,_param->_nb_load_store_unit); + ALLOC2(_param->_lsu_pht_size_counter ,uint32_t ,_param->_nb_load_store_unit,1); + ALLOC2(_param->_lsu_pht_nb_counter ,uint32_t ,_param->_nb_load_store_unit,1); + ALLOC2(_param->_lsu_pht_scheme ,Tpht_scheme_t,_param->_nb_load_store_unit,1); + ALLOC1(_param->_nb_bypass_memory ,uint32_t ,_param->_nb_load_store_unit); + ALLOC1(_param->_nb_cache_port ,uint32_t ,_param->_nb_load_store_unit); + ALLOC1(_param->_nb_inst_memory ,uint32_t ,_param->_nb_load_store_unit); for (uint32_t i=0; i<_param->_nb_load_store_unit; ++i) @@ -220,6 +221,7 @@ { //log_printf(INFO,Configuration,FUNCTION,_("PREDICTOR [%d][%d]"),i,j); - _param->_lsu_pht_size_counter [i][j] = fromString (getParam("lsu_pht_size_counter" ,"load_store_unit",toString(i).c_str(),"predictor",toString(j).c_str(), "")); - _param->_lsu_pht_nb_counter [i][j] = fromString (getParam("lsu_pht_nb_counter" ,"load_store_unit",toString(i).c_str(),"predictor",toString(j).c_str(), "")); + _param->_lsu_pht_size_counter [i][j] = fromString (getParam("lsu_pht_size_counter" ,"load_store_unit",toString(i).c_str(),"predictor",toString(j).c_str(), "")); + _param->_lsu_pht_nb_counter [i][j] = fromString (getParam("lsu_pht_nb_counter" ,"load_store_unit",toString(i).c_str(),"predictor",toString(j).c_str(), "")); + _param->_lsu_pht_scheme [i][j] = fromString (getParam("lsu_pht_scheme" ,"load_store_unit",toString(i).c_str(),"predictor",toString(j).c_str(), "")); } @@ -309,21 +311,22 @@ // front_end //----------------------------------------------------- - ALLOC1(_param->_nb_context ,uint32_t ,_param->_nb_front_end); - ALLOC1(_param->_nb_decod_unit ,uint32_t ,_param->_nb_front_end); - ALLOC1(_param->_nb_inst_branch_predict ,uint32_t ,_param->_nb_front_end); - ALLOC1(_param->_nb_inst_branch_decod ,uint32_t ,_param->_nb_front_end); - ALLOC1(_param->_nb_inst_branch_update ,uint32_t ,_param->_nb_front_end); - ALLOC1(_param->_btb_size_queue ,uint32_t ,_param->_nb_front_end); - ALLOC1(_param->_btb_associativity ,uint32_t ,_param->_nb_front_end); - ALLOC1(_param->_btb_size_counter ,uint32_t ,_param->_nb_front_end); - ALLOC1(_param->_btb_victim_scheme ,Tvictim_t ,_param->_nb_front_end); - ALLOC1(_param->_dir_predictor_scheme ,Tpredictor_t,_param->_nb_front_end); - ALLOC2(_param->_dir_have_bht ,bool ,_param->_nb_front_end,3); - ALLOC2(_param->_dir_bht_size_shifter ,uint32_t ,_param->_nb_front_end,3); - ALLOC2(_param->_dir_bht_nb_shifter ,uint32_t ,_param->_nb_front_end,3); - ALLOC2(_param->_dir_have_pht ,bool ,_param->_nb_front_end,3); - ALLOC2(_param->_dir_pht_size_counter ,uint32_t ,_param->_nb_front_end,3); - ALLOC2(_param->_dir_pht_nb_counter ,uint32_t ,_param->_nb_front_end,3); - ALLOC2(_param->_dir_pht_size_address_share ,uint32_t ,_param->_nb_front_end,3); + ALLOC1(_param->_nb_context ,uint32_t ,_param->_nb_front_end); + ALLOC1(_param->_nb_decod_unit ,uint32_t ,_param->_nb_front_end); + ALLOC1(_param->_nb_inst_branch_predict ,uint32_t ,_param->_nb_front_end); + ALLOC1(_param->_nb_inst_branch_decod ,uint32_t ,_param->_nb_front_end); + ALLOC1(_param->_nb_inst_branch_update ,uint32_t ,_param->_nb_front_end); + ALLOC1(_param->_btb_size_queue ,uint32_t ,_param->_nb_front_end); + ALLOC1(_param->_btb_associativity ,uint32_t ,_param->_nb_front_end); + ALLOC1(_param->_btb_size_counter ,uint32_t ,_param->_nb_front_end); + ALLOC1(_param->_btb_victim_scheme ,Tvictim_t ,_param->_nb_front_end); + ALLOC1(_param->_dir_predictor_scheme ,Tpredictor_t ,_param->_nb_front_end); + ALLOC2(_param->_dir_have_bht ,bool ,_param->_nb_front_end,3); + ALLOC2(_param->_dir_bht_size_shifter ,uint32_t ,_param->_nb_front_end,3); + ALLOC2(_param->_dir_bht_nb_shifter ,uint32_t ,_param->_nb_front_end,3); + ALLOC2(_param->_dir_have_pht ,bool ,_param->_nb_front_end,3); + ALLOC2(_param->_dir_pht_size_counter ,uint32_t ,_param->_nb_front_end,3); + ALLOC2(_param->_dir_pht_nb_counter ,uint32_t ,_param->_nb_front_end,3); + ALLOC2(_param->_dir_pht_size_address_share ,uint32_t ,_param->_nb_front_end,3); + ALLOC2(_param->_dir_pht_scheme ,Tpht_scheme_t,_param->_nb_front_end,3); for (uint32_t i=0; i<_param->_nb_front_end; ++i) @@ -356,11 +359,12 @@ //log_printf(INFO,Configuration,FUNCTION,_("PREDICTOR [%d][%d]"),i,j); - _param->_dir_have_bht [i][j] = fromString(getParam("dir_have_bht" ,"front_end",toString(i).c_str(),"predictor",toString(j).c_str(), "")); - _param->_dir_bht_size_shifter [i][j] = fromString(getParam("dir_bht_size_shifter" ,"front_end",toString(i).c_str(),"predictor",toString(j).c_str(), "")); - _param->_dir_bht_nb_shifter [i][j] = fromString(getParam("dir_bht_nb_shifter" ,"front_end",toString(i).c_str(),"predictor",toString(j).c_str(), "")); - _param->_dir_have_pht [i][j] = fromString(getParam("dir_have_pht" ,"front_end",toString(i).c_str(),"predictor",toString(j).c_str(), "")); - _param->_dir_pht_size_counter [i][j] = fromString(getParam("dir_pht_size_counter" ,"front_end",toString(i).c_str(),"predictor",toString(j).c_str(), "")); - _param->_dir_pht_nb_counter [i][j] = fromString(getParam("dir_pht_nb_counter" ,"front_end",toString(i).c_str(),"predictor",toString(j).c_str(), "")); - _param->_dir_pht_size_address_share [i][j] = fromString(getParam("dir_pht_size_address_share","front_end",toString(i).c_str(),"predictor",toString(j).c_str(), "")); + _param->_dir_have_bht [i][j] = fromString(getParam("dir_have_bht" ,"front_end",toString(i).c_str(),"predictor",toString(j).c_str(), "")); + _param->_dir_bht_size_shifter [i][j] = fromString(getParam("dir_bht_size_shifter" ,"front_end",toString(i).c_str(),"predictor",toString(j).c_str(), "")); + _param->_dir_bht_nb_shifter [i][j] = fromString(getParam("dir_bht_nb_shifter" ,"front_end",toString(i).c_str(),"predictor",toString(j).c_str(), "")); + _param->_dir_have_pht [i][j] = fromString(getParam("dir_have_pht" ,"front_end",toString(i).c_str(),"predictor",toString(j).c_str(), "")); + _param->_dir_pht_size_counter [i][j] = fromString(getParam("dir_pht_size_counter" ,"front_end",toString(i).c_str(),"predictor",toString(j).c_str(), "")); + _param->_dir_pht_nb_counter [i][j] = fromString(getParam("dir_pht_nb_counter" ,"front_end",toString(i).c_str(),"predictor",toString(j).c_str(), "")); + _param->_dir_pht_size_address_share [i][j] = fromString(getParam("dir_pht_size_address_share","front_end",toString(i).c_str(),"predictor",toString(j).c_str(), "")); + _param->_dir_pht_scheme [i][j] = fromString(getParam("dir_pht_scheme" ,"front_end",toString(i).c_str(),"predictor",toString(j).c_str(), "")); } } Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Parameter_definition_test.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Parameter_definition_test.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Parameter_definition_test.cpp (revision 146) @@ -8,4 +8,5 @@ #include "Behavioural/Configuration/include/Parameter_definition.h" #include "Behavioural/include/Stat_binary_tree.h" +#include "Behavioural/include/Stat_type.h" #include "Common/include/FromString.h" Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/include/Parameters.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/include/Parameters.h (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/include/Parameters.h (revision 146) @@ -35,6 +35,6 @@ public : Tspeculative_load_t _speculative_load ; public : Tpredictor_t _speculative_commit_predictor_scheme; - public : uint32_t * _lsu_pht_size_counter ;//[1] - public : uint32_t * _lsu_pht_nb_counter ;//[1] + /* public : uint32_t * _lsu_pht_size_counter ;//[1] */ + /* public : uint32_t * _lsu_pht_nb_counter ;//[1] */ public : uint32_t _nb_bypass_memory ; public : uint32_t _nb_cache_port ; @@ -83,6 +83,6 @@ Tspeculative_load_t speculative_load , Tpredictor_t speculative_commit_predictor_scheme, - uint32_t * lsu_pht_size_counter ,//[1] - uint32_t * lsu_pht_nb_counter ,//[1] + /* uint32_t * lsu_pht_size_counter ,//[1] */ + /* uint32_t * lsu_pht_nb_counter ,//[1] */ uint32_t nb_bypass_memory , uint32_t nb_cache_port , Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Parameters.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Parameters.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Parameters.cpp (revision 146) @@ -28,6 +28,6 @@ Tspeculative_load_t speculative_load , Tpredictor_t speculative_commit_predictor_scheme, - uint32_t * lsu_pht_size_counter ,//[1] - uint32_t * lsu_pht_nb_counter ,//[1] + // uint32_t * lsu_pht_size_counter ,//[1] + // uint32_t * lsu_pht_nb_counter ,//[1] uint32_t nb_bypass_memory , uint32_t nb_cache_port , @@ -55,6 +55,6 @@ _speculative_load = speculative_load ; _speculative_commit_predictor_scheme = speculative_commit_predictor_scheme; - _lsu_pht_size_counter = lsu_pht_size_counter ; - _lsu_pht_nb_counter = lsu_pht_nb_counter ; + // _lsu_pht_size_counter = lsu_pht_size_counter ; + // _lsu_pht_nb_counter = lsu_pht_nb_counter ; _nb_bypass_memory = nb_bypass_memory ; _nb_cache_port = nb_cache_port ; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/src/Read_queue_transition.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/src/Read_queue_transition.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/src/Read_queue_transition.cpp (revision 146) @@ -1,4 +1,3 @@ #ifdef SYSTEMC -//#if defined(STATISTICS) or defined(VHDL_TESTBENCH) /* * $Id$ Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station/src/Reservation_station_transition.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station/src/Reservation_station_transition.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Reservation_station/src/Reservation_station_transition.cpp (revision 146) @@ -1,4 +1,3 @@ #ifdef SYSTEMC -//#if defined(STATISTICS) or defined(VHDL_TESTBENCH) /* * $Id$ @@ -360,5 +359,7 @@ dump_queue(); +#if defined(STATISTICS) or defined(VHDL_TESTBENCH) end_cycle (); +#endif log_end(Reservation_station,FUNCTION); @@ -375,3 +376,2 @@ }; // end namespace morpheo #endif -//#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/include/Read_unit.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/include/Read_unit.h (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/include/Read_unit.h (revision 146) @@ -197,5 +197,5 @@ private : void deallocation (void); -#ifdef SYSTEMC +#ifdef SYSTEMC # if defined(STATISTICS) or defined(VHDL_TESTBENCH) public : void transition (void); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/src/Read_unit.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/src/Read_unit.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/src/Read_unit.cpp (revision 146) @@ -72,4 +72,5 @@ #ifdef SYSTEMC +# if defined(STATISTICS) or defined(VHDL_TESTBENCH) if (usage_is_set(_usage,USE_SYSTEMC)) { @@ -83,7 +84,7 @@ // List dependency information # endif - + } +# endif #endif - } log_printf(FUNC,Read_unit,FUNCTION,_("<%s> End"),_name.c_str()); }; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/src/Read_unit_transition.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/src/Read_unit_transition.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/src/Read_unit_transition.cpp (revision 146) @@ -1,3 +1,4 @@ #ifdef SYSTEMC +# if defined(STATISTICS) or defined(VHDL_TESTBENCH) /* * $Id$ @@ -24,7 +25,5 @@ log_printf(FUNC,Read_unit,FUNCTION,"Begin"); -#if defined(STATISTICS) or defined(VHDL_TESTBENCH) end_cycle (); -#endif log_printf(FUNC,Read_unit,FUNCTION,"End"); @@ -39,3 +38,4 @@ }; // end namespace behavioural }; // end namespace morpheo +# endif #endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/include/Write_unit.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/include/Write_unit.h (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/include/Write_unit.h (revision 146) @@ -161,5 +161,5 @@ private : void deallocation (void); -#ifdef SYSTEMC +#ifdef SYSTEMC #if defined(STATISTICS) or defined(VHDL_TESTBENCH) public : void transition (void); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/src/Write_unit.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/src/Write_unit.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/src/Write_unit.cpp (revision 146) @@ -72,4 +72,6 @@ #ifdef SYSTEMC +#if defined(STATISTICS) or defined(VHDL_TESTBENCH) + if (usage_is_set(_usage,USE_SYSTEMC)) { @@ -83,7 +85,7 @@ // List dependency information # endif - + } +# endif #endif - } log_end(Write_unit,FUNCTION); }; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/src/Write_unit_transition.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/src/Write_unit_transition.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/src/Write_unit_transition.cpp (revision 146) @@ -25,7 +25,5 @@ log_printf(FUNC,Write_unit,FUNCTION,"Begin"); -#if defined(STATISTICS) or defined(VHDL_TESTBENCH) end_cycle (); -#endif log_printf(FUNC,Write_unit,FUNCTION,"End"); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/src/Parameters.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/src/Parameters.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/src/Parameters.cpp (revision 146) @@ -105,5 +105,4 @@ // _nb_gpr_write+_nb_inst_insert_rob[i], _nb_gpr_write+_nb_inst_issue, - 0, nb_general_register[i], 1, @@ -127,5 +126,4 @@ // _nb_spr_write+_nb_inst_insert_rob[i], _nb_spr_write+_nb_inst_issue, - 0, nb_special_register[i], 1, Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/include/Parameters.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/include/Parameters.h (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/include/Parameters.h (revision 146) @@ -59,6 +59,6 @@ public : Tspeculative_load_t * _speculative_load ; //[nb_load_store_unit] public : Tpredictor_t * _speculative_commit_predictor_scheme ; //[nb_load_store_unit] - public : uint32_t ** _lsu_pht_size_counter ; //[nb_load_store_unit][1] - public : uint32_t ** _lsu_pht_nb_counter ; //[nb_load_store_unit][1] + /* public : uint32_t ** _lsu_pht_size_counter ; //[nb_load_store_unit][1] */ + /* public : uint32_t ** _lsu_pht_nb_counter ; //[nb_load_store_unit][1] */ public : uint32_t * _nb_bypass_memory ; //[nb_load_store_unit] public : uint32_t * _nb_cache_port ; //[nb_load_store_unit] @@ -182,6 +182,6 @@ Tspeculative_load_t * speculative_load ,//[nb_load_store_unit] Tpredictor_t * speculative_commit_predictor_scheme ,//[nb_load_store_unit] - uint32_t ** lsu_pht_size_counter ,//[nb_load_store_unit][1] - uint32_t ** lsu_pht_nb_counter ,//[nb_load_store_unit][1] + /* uint32_t ** lsu_pht_size_counter ,//[nb_load_store_unit][1] */ + /* uint32_t ** lsu_pht_nb_counter ,//[nb_load_store_unit][1] */ uint32_t * nb_bypass_memory ,//[nb_load_store_unit] uint32_t * nb_cache_port ,//[nb_load_store_unit] Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Execute_loop.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Execute_loop.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Execute_loop.cpp (revision 146) @@ -70,4 +70,6 @@ #ifdef SYSTEMC +# if defined(STATISTICS) or defined(VHDL_TESTBENCH) + if (usage_is_set(_usage,USE_SYSTEMC)) { @@ -80,8 +82,8 @@ # ifdef SYSTEMCASS_SPECIFIC // List dependency information -# endif - +# endif + } +# endif #endif - } log_printf(FUNC,Execute_loop,FUNCTION,_("<%s> End"),_name.c_str()); }; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Execute_loop_transition.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Execute_loop_transition.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Execute_loop_transition.cpp (revision 146) @@ -23,7 +23,5 @@ log_printf(FUNC,Execute_loop,FUNCTION,"Begin"); -#if defined(STATISTICS) or defined(VHDL_TESTBENCH) end_cycle (); -#endif log_printf(FUNC,Execute_loop,FUNCTION,"End"); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Parameters.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Parameters.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/src/Parameters.cpp (revision 146) @@ -49,6 +49,6 @@ Tspeculative_load_t * speculative_load ,//[nb_load_store_unit] Tpredictor_t * speculative_commit_predictor_scheme ,//[nb_load_store_unit] - uint32_t ** lsu_pht_size_counter ,//[nb_load_store_unit][1] - uint32_t ** lsu_pht_nb_counter ,//[nb_load_store_unit][1] + // uint32_t ** lsu_pht_size_counter ,//[nb_load_store_unit][1] + // uint32_t ** lsu_pht_nb_counter ,//[nb_load_store_unit][1] uint32_t * nb_bypass_memory ,//[nb_load_store_unit] uint32_t * nb_cache_port ,//[nb_load_store_unit] @@ -118,6 +118,6 @@ _speculative_load = speculative_load ; _speculative_commit_predictor_scheme = speculative_commit_predictor_scheme ; - _lsu_pht_size_counter = lsu_pht_size_counter ; - _lsu_pht_nb_counter = lsu_pht_nb_counter ; + // _lsu_pht_size_counter = lsu_pht_size_counter ; + // _lsu_pht_nb_counter = lsu_pht_nb_counter ; _nb_bypass_memory = nb_bypass_memory ; _nb_cache_port = nb_cache_port ; @@ -456,6 +456,6 @@ _speculative_load [x], _speculative_commit_predictor_scheme [x], - _lsu_pht_size_counter [x], - _lsu_pht_nb_counter [x], + // _lsu_pht_size_counter [x], + // _lsu_pht_nb_counter [x], _nb_bypass_memory [x], _nb_cache_port [x], Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod_queue/include/Types.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod_queue/include/Types.h (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod_queue/include/Types.h (revision 146) @@ -151,8 +151,8 @@ { if ( (x.compare(toString(static_cast(morpheo::behavioural::core::multi_front_end::front_end::decod_unit::decod_queue::DECOD_QUEUE_SCHEME_ONE_FIFO ))) == 0) or - (x.compare("one_fifo") == 0)) + (x.compare(toString( morpheo::behavioural::core::multi_front_end::front_end::decod_unit::decod_queue::DECOD_QUEUE_SCHEME_ONE_FIFO )) == 0)) return morpheo::behavioural::core::multi_front_end::front_end::decod_unit::decod_queue::DECOD_QUEUE_SCHEME_ONE_FIFO; if ( (x.compare(toString(static_cast(morpheo::behavioural::core::multi_front_end::front_end::decod_unit::decod_queue::DECOD_QUEUE_SCHEME_MULTI_FIFO))) == 0) or - (x.compare("multi_fifo") == 0)) + (x.compare(toString( morpheo::behavioural::core::multi_front_end::front_end::decod_unit::decod_queue::DECOD_QUEUE_SCHEME_MULTI_FIFO )) == 0)) return morpheo::behavioural::core::multi_front_end::front_end::decod_unit::decod_queue::DECOD_QUEUE_SCHEME_MULTI_FIFO; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Branch_Target_Buffer/include/Branch_Target_Buffer.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Branch_Target_Buffer/include/Branch_Target_Buffer.h (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Branch_Target_Buffer/include/Branch_Target_Buffer.h (revision 146) @@ -35,5 +35,4 @@ namespace morpheo { namespace behavioural { - namespace core { namespace multi_front_end { @@ -41,5 +40,4 @@ namespace prediction_unit { namespace branch_target_buffer { - class Branch_Target_Buffer 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 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/src/main.cpp (revision 146) @@ -9,5 +9,5 @@ #include "Behavioural/include/Selftest.h" -#define NB_PARAMS 3+7*3 +#define NB_PARAMS 3+8*3 void usage (int argc, char * argv[]) @@ -15,14 +15,15 @@ err (_(" %s name_instance list_params.\n"),argv[0]); err (_("list_params is :\n")); - err (_(" * nb_inst_predict (uint32_t)\n")); - err (_(" * nb_inst_update (uint32_t)\n")); - err (_(" * size_address (uint32_t)\n")); - err (_(" * have_bht [3] (bool )\n")); - err (_(" * bht_size_shifter [3] (uint32_t)\n")); - err (_(" * bht_nb_shifter [3] (uint32_t)\n")); - err (_(" * have_pht [3] (bool )\n")); - err (_(" * pht_size_counter [3] (uint32_t)\n")); - err (_(" * pht_nb_counter [3] (uint32_t)\n")); - err (_(" * pht_size_address_share [3] (uint32_t)\n")); + err (_(" * nb_inst_predict (uint32_t )\n")); + err (_(" * nb_inst_update (uint32_t )\n")); + err (_(" * size_address (uint32_t )\n")); + err (_(" * have_bht [3] (bool )\n")); + err (_(" * bht_size_shifter [3] (uint32_t )\n")); + err (_(" * bht_nb_shifter [3] (uint32_t )\n")); + err (_(" * have_pht [3] (bool )\n")); + err (_(" * pht_size_counter [3] (uint32_t )\n")); + err (_(" * pht_nb_counter [3] (uint32_t )\n")); + err (_(" * pht_size_address_share [3] (uint32_t )\n")); + err (_(" * pht_scheme [3] (Tpht_scheme_t)\n")); exit (1); } @@ -40,28 +41,30 @@ string name = argv[x++]; - uint32_t _nb_inst_predict ; - uint32_t _nb_inst_update ; - uint32_t _size_address ; - bool _have_bht [3]; - uint32_t _bht_size_shifter [3]; - uint32_t _bht_nb_shifter [3]; - bool _have_pht [3]; - uint32_t _pht_size_counter [3]; - uint32_t _pht_nb_counter [3]; - uint32_t _pht_size_address_share [3]; + uint32_t _nb_inst_predict ; + uint32_t _nb_inst_update ; + uint32_t _size_address ; + bool _have_bht [3]; + uint32_t _bht_size_shifter [3]; + uint32_t _bht_nb_shifter [3]; + bool _have_pht [3]; + uint32_t _pht_size_counter [3]; + uint32_t _pht_nb_counter [3]; + uint32_t _pht_size_address_share [3]; + Tpht_scheme_t _pht_scheme [3]; - SELFTEST0(_nb_inst_predict ,uint32_t,argv,x); - SELFTEST0(_nb_inst_update ,uint32_t,argv,x); - SELFTEST0(_size_address ,uint32_t,argv,x); + SELFTEST0(_nb_inst_predict ,uint32_t ,argv,x); + SELFTEST0(_nb_inst_update ,uint32_t ,argv,x); + SELFTEST0(_size_address ,uint32_t ,argv,x); for (uint32_t i=0; i<3; ++i) { - SELFTEST0(_have_bht [i],bool ,argv,x); - SELFTEST0(_bht_size_shifter [i],uint32_t,argv,x); - SELFTEST0(_bht_nb_shifter [i],uint32_t,argv,x); - SELFTEST0(_have_pht [i],bool ,argv,x); - SELFTEST0(_pht_size_counter [i],uint32_t,argv,x); - SELFTEST0(_pht_nb_counter [i],uint32_t,argv,x); - SELFTEST0(_pht_size_address_share [i],uint32_t,argv,x); + SELFTEST0(_have_bht [i],bool ,argv,x); + SELFTEST0(_bht_size_shifter [i],uint32_t ,argv,x); + SELFTEST0(_bht_nb_shifter [i],uint32_t ,argv,x); + SELFTEST0(_have_pht [i],bool ,argv,x); + SELFTEST0(_pht_size_counter [i],uint32_t ,argv,x); + SELFTEST0(_pht_nb_counter [i],uint32_t ,argv,x); + SELFTEST0(_pht_size_address_share [i],uint32_t ,argv,x); + SELFTEST0(_pht_scheme [i],Tpht_scheme_t,argv,x); } @@ -81,4 +84,5 @@ _pht_nb_counter , _pht_size_address_share, + _pht_scheme , true // is_toplevel ); 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 145) +++ 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 146) @@ -9,5 +9,5 @@ #include "Behavioural/include/Selftest.h" -#define NB_PARAMS 11 +#define NB_PARAMS 12 void usage (int argc, char * argv[]) @@ -15,15 +15,16 @@ err (_(" %s name_instance list_params.\n"),argv[0]); err (_("list_params is :\n")); - err (_(" * nb_inst_predict (uint32_t)\n")); - err (_(" * nb_inst_update (uint32_t)\n")); - err (_(" * size_address (uint32_t)\n")); - err (_(" * have_bht (bool )\n")); - err (_(" * bht_size_shifter (uint32_t)\n")); - err (_(" * bht_nb_shifter (uint32_t)\n")); - err (_(" * have_pht (bool )\n")); - err (_(" * pht_size_counter (uint32_t)\n")); - err (_(" * pht_nb_counter (uint32_t)\n")); - err (_(" * pht_size_address_share (uint32_t)\n")); - err (_(" * update_on_prediction (bool )\n")); + err (_(" * nb_inst_predict (uint32_t )\n")); + err (_(" * nb_inst_update (uint32_t )\n")); + err (_(" * size_address (uint32_t )\n")); + err (_(" * have_bht (bool )\n")); + err (_(" * bht_size_shifter (uint32_t )\n")); + err (_(" * bht_nb_shifter (uint32_t )\n")); + err (_(" * have_pht (bool )\n")); + err (_(" * pht_size_counter (uint32_t )\n")); + err (_(" * pht_nb_counter (uint32_t )\n")); + err (_(" * pht_size_address_share (uint32_t )\n")); + err (_(" * pht_scheme (Tpht_scheme_t)\n")); + err (_(" * update_on_prediction (bool )\n")); exit (1); @@ -43,27 +44,29 @@ string name = argv[x++]; - uint32_t nb_inst_predict ; - uint32_t nb_inst_update ; - uint32_t size_address ; - bool have_bht ; - uint32_t bht_size_shifter ; - uint32_t bht_nb_shifter ; - bool have_pht ; - uint32_t pht_size_counter ; - uint32_t pht_nb_counter ; - uint32_t pht_size_address_share; - bool update_on_prediction ; + uint32_t nb_inst_predict ; + uint32_t nb_inst_update ; + uint32_t size_address ; + bool have_bht ; + uint32_t bht_size_shifter ; + uint32_t bht_nb_shifter ; + bool have_pht ; + uint32_t pht_size_counter ; + uint32_t pht_nb_counter ; + uint32_t pht_size_address_share; + Tpht_scheme_t pht_scheme ; + bool update_on_prediction ; - SELFTEST0(nb_inst_predict ,uint32_t,argv,x); - SELFTEST0(nb_inst_update ,uint32_t,argv,x); - SELFTEST0(size_address ,uint32_t,argv,x); - SELFTEST0(have_bht ,bool ,argv,x); - SELFTEST0(bht_size_shifter ,uint32_t,argv,x); - SELFTEST0(bht_nb_shifter ,uint32_t,argv,x); - SELFTEST0(have_pht ,bool ,argv,x); - SELFTEST0(pht_size_counter ,uint32_t,argv,x); - SELFTEST0(pht_nb_counter ,uint32_t,argv,x); - SELFTEST0(pht_size_address_share,uint32_t,argv,x); - SELFTEST0(update_on_prediction ,bool ,argv,x); + SELFTEST0(nb_inst_predict ,uint32_t ,argv,x); + SELFTEST0(nb_inst_update ,uint32_t ,argv,x); + SELFTEST0(size_address ,uint32_t ,argv,x); + SELFTEST0(have_bht ,bool ,argv,x); + SELFTEST0(bht_size_shifter ,uint32_t ,argv,x); + SELFTEST0(bht_nb_shifter ,uint32_t ,argv,x); + SELFTEST0(have_pht ,bool ,argv,x); + SELFTEST0(pht_size_counter ,uint32_t ,argv,x); + SELFTEST0(pht_nb_counter ,uint32_t ,argv,x); + SELFTEST0(pht_size_address_share,uint32_t ,argv,x); + SELFTEST0(pht_scheme ,Tpht_scheme_t,argv,x); + SELFTEST0(update_on_prediction ,bool ,argv,x); int _return = EXIT_SUCCESS; @@ -82,4 +85,5 @@ pht_nb_counter , pht_size_address_share, + pht_scheme , update_on_prediction , true //is_toplevel 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 145) +++ 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 146) @@ -27,55 +27,58 @@ { //-----[ fields ]------------------------------------------------------------ - public : uint32_t _nb_inst_predict ; - public : uint32_t _nb_inst_update ; - public : uint32_t _size_address ; - public : bool _have_bht ; - public : uint32_t _bht_size_shifter ; - public : uint32_t _bht_nb_shifter ; - public : bool _have_pht ; - public : uint32_t _pht_size_counter ; - public : uint32_t _pht_nb_counter ; - public : uint32_t _pht_size_address_share ; - public : bool _update_on_prediction ; - - public : Thistory_t _pht_counter_max ; - - public : uint32_t _size_history ; - - public : Thistory_t _bht_history_mask ; - public : Thistory_t _bht_history_shift ; - public : Thistory_t _pht_history_mask ; - public : Thistory_t _pht_history_shift ; - - public : uint32_t _bht_size_address ; - public : uint32_t _pht_size_address ; - - public : Taddress_t _bht_address_mask ; - public : uint32_t _pht_nb_bank ; - public : uint32_t _pht_size_bank ; - public : Taddress_t _pht_address_share_mask ; - public : Taddress_t _pht_address_share_shift ; - public : Taddress_t _pht_address_bank_mask ; - public : Taddress_t _pht_address_bank_shift ; + public : uint32_t _nb_inst_predict ; + public : uint32_t _nb_inst_update ; + public : uint32_t _size_address ; + public : bool _have_bht ; + public : uint32_t _bht_size_shifter ; + public : uint32_t _bht_nb_shifter ; + public : bool _have_pht ; + public : uint32_t _pht_size_counter ; + public : uint32_t _pht_nb_counter ; + public : uint32_t _pht_size_address_share ; + public : Tpht_scheme_t _pht_scheme ; + public : bool _update_on_prediction ; - public : Thistory_t _bht_init_take ; - public : Thistory_t _bht_init_ntake ; - - public : Thistory_t _pht_init_take ; - public : Thistory_t _pht_init_ntake ; + public : Thistory_t _pht_counter_max ; + public : Thistory_t _pht_threshold_up ; + public : Thistory_t _pht_threshold_down ; + + public : uint32_t _size_history ; + + public : Thistory_t _bht_history_mask ; + public : Thistory_t _bht_history_shift ; + public : Thistory_t _pht_history_mask ; + public : Thistory_t _pht_history_shift ; + + public : uint32_t _bht_size_address ; + public : uint32_t _pht_size_address ; + public : Taddress_t _bht_address_mask ; + public : uint32_t _pht_nb_bank ; + public : uint32_t _pht_size_bank ; + public : Taddress_t _pht_address_share_mask ; + public : Taddress_t _pht_address_share_shift ; + public : Taddress_t _pht_address_bank_mask ; + public : Taddress_t _pht_address_bank_shift ; + + public : Thistory_t _bht_init_take ; + public : Thistory_t _bht_init_ntake ; + + public : Thistory_t _pht_init_take ; + public : Thistory_t _pht_init_ntake ; //-----[ methods ]----------------------------------------------------------- - public : Parameters (uint32_t nb_inst_predict , - uint32_t nb_inst_update , - uint32_t size_address , - bool have_bht , - uint32_t bht_size_shifter , - uint32_t bht_nb_shifter , - bool have_pht , - uint32_t pht_size_counter , - uint32_t pht_nb_counter , - uint32_t pht_size_address_share, - bool update_on_prediction , - bool is_toplevel=false); + public : Parameters (uint32_t nb_inst_predict , + uint32_t nb_inst_update , + uint32_t size_address , + bool have_bht , + uint32_t bht_size_shifter , + uint32_t bht_nb_shifter , + bool have_pht , + uint32_t pht_size_counter , + uint32_t pht_nb_counter , + uint32_t pht_size_address_share, + Tpht_scheme_t pht_scheme , + bool update_on_prediction , + bool is_toplevel=false); //public : Parameters (Parameters & param) ; public : ~Parameters (void); 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 145) +++ 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 146) @@ -21,5 +21,4 @@ namespace two_level_branch_predictor { - }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor @@ -29,5 +28,4 @@ }; // 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.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 145) +++ 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 146) @@ -22,16 +22,17 @@ #undef FUNCTION #define FUNCTION "Two_Level_Branch_Predictor::Parameters" - Parameters::Parameters (uint32_t nb_inst_predict , - uint32_t nb_inst_update , - uint32_t size_address , - bool have_bht , - uint32_t bht_size_shifter , - uint32_t bht_nb_shifter , - bool have_pht , - uint32_t pht_size_counter , - uint32_t pht_nb_counter , - uint32_t pht_size_address_share, - bool update_on_prediction , - bool is_toplevel) + Parameters::Parameters (uint32_t nb_inst_predict , + uint32_t nb_inst_update , + uint32_t size_address , + bool have_bht , + uint32_t bht_size_shifter , + uint32_t bht_nb_shifter , + bool have_pht , + uint32_t pht_size_counter , + uint32_t pht_nb_counter , + uint32_t pht_size_address_share, + Tpht_scheme_t pht_scheme , + bool update_on_prediction , + bool is_toplevel) { log_begin(Two_Level_Branch_Predictor,FUNCTION); @@ -47,4 +48,5 @@ _pht_nb_counter = (have_pht)?(pht_nb_counter ):0; _pht_size_address_share = (have_bht and have_pht)?(pht_size_address_share):0; + _pht_scheme = pht_scheme ; _update_on_prediction = update_on_prediction ; @@ -97,5 +99,7 @@ { _pht_counter_max = (1<<_pht_size_counter)-1; - + _pht_threshold_up = (1<<(_pht_size_counter-1))+1; + _pht_threshold_down = (1<<(_pht_size_counter-1))-1; + _pht_size_bank = (_have_bht)?(1<<_bht_size_shifter):1; _pht_nb_bank = _pht_nb_counter / _pht_size_bank; 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 145) +++ 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 146) @@ -9,5 +9,5 @@ #include "Behavioural/include/XML.h" -namespace morpheo { +namespace morpheo { namespace behavioural { namespace core { 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 145) +++ 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 146) @@ -10,5 +10,5 @@ // #include -namespace morpheo { +namespace morpheo { namespace behavioural { namespace core { @@ -77,7 +77,30 @@ log_printf(TRACE,Two_Level_Branch_Predictor,FUNCTION," * pht_history (old): %llx",pht_history); + // TODO -> don't change PHT here ! + Thistory_t min = 0; + Thistory_t max = _param->_pht_counter_max; + // PHT : saturation counter - pht_history = (direction==1)?((pht_history<_param->_pht_counter_max)?(pht_history+1):(pht_history)):((pht_history>0)?(pht_history-1):(pht_history)); - + switch (_param->_pht_scheme) + { + case PHT_SCHEME_COUNTER : + { + pht_history = (direction==1)?((pht_historymin)?(pht_history-1):(min)); + break; + } + case PHT_SCHEME_FSM : + { + Thistory_t down = _param->_pht_threshold_down; + Thistory_t up = _param->_pht_threshold_up; + + pht_history = (direction==1)?(((pht_history==max) or (pht_history==up))?(max):(pht_history+1)):(((pht_history==min) or (pht_history==down))?(min):(pht_history-1)); + break; + } + default : + { + break; + } + } + log_printf(TRACE,Two_Level_Branch_Predictor,FUNCTION," * pht_history (new): %llx",pht_history); @@ -169,5 +192,48 @@ else { - pht_history = (direction==1)?((pht_history<_param->_pht_counter_max)?(pht_history+1):(pht_history)):((pht_history>0)?(pht_history-1):(pht_history)); + Thistory_t min = 0; + Thistory_t max = _param->_pht_counter_max; + + // PHT : saturation counter + switch (_param->_pht_scheme) + { + case PHT_SCHEME_COUNTER : + { + // [ 11 ] -- NT -> [ 10 ] + // [ ] <- T -- [ ] + // ^ | + // | | + // T NT + // | | + // | V + // [ 00 ] -- T -> [ 01 ] + // [ ] <- NT -- [ ] + + pht_history = (direction==1)?((pht_historymin)?(pht_history-1):(min)); + break; + } + case PHT_SCHEME_FSM : + { + // [11] -- NT -> [10] + // [ ] <- T -- [ ] + // ^ | + // | | + // T NT + // | | + // | V + // [00] -- NT -> [00] + // [ ] <- T -- [ ] + + Thistory_t down = _param->_pht_threshold_down; + Thistory_t up = _param->_pht_threshold_up; + + pht_history = (direction==1)?(((pht_history==max) or (pht_history==up))?(max):(pht_history+1)):(((pht_history==min) or (pht_history==down))?(min):(pht_history-1)); + break; + } + default : + { + break; + } + } } 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 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Parameters.h (revision 146) @@ -15,5 +15,4 @@ #include "Common/include/Debug.h" - namespace morpheo { namespace behavioural { @@ -25,25 +24,24 @@ namespace meta_predictor { - class Parameters : public morpheo::behavioural::Parameters { //-----[ fields ]------------------------------------------------------------ - public : uint32_t _nb_inst_predict ; - public : uint32_t _nb_inst_update ; - public : uint32_t _size_address ; - public : bool _have_bht [3]; - public : uint32_t _bht_size_shifter [3]; - public : uint32_t _bht_nb_shifter [3]; - public : bool _have_pht [3]; - public : uint32_t _pht_size_counter [3]; - public : uint32_t _pht_nb_counter [3]; - public : uint32_t _pht_size_address_share [3]; - - public : bool _have_meta_predictor ; - public : uint32_t _nb_predictor ; - - public : bool * _predictor_update_on_prediction;//[nb_predictor] - public : uint32_t * _predictor_size_history ;//[nb_predictor] - public : uint32_t _size_history ; + public : uint32_t _nb_inst_predict ; + public : uint32_t _nb_inst_update ; + public : uint32_t _size_address ; + public : bool _have_bht [3]; + public : uint32_t _bht_size_shifter [3]; + public : uint32_t _bht_nb_shifter [3]; + public : bool _have_pht [3]; + public : uint32_t _pht_size_counter [3]; + public : uint32_t _pht_nb_counter [3]; + public : uint32_t _pht_size_address_share [3]; + public : Tpht_scheme_t _pht_scheme [3]; + public : bool _have_meta_predictor ; + public : uint32_t _nb_predictor ; + + public : bool * _predictor_update_on_prediction;//[nb_predictor] + public : uint32_t * _predictor_size_history ;//[nb_predictor] + public : uint32_t _size_history ; public : morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters ** _param_two_level_branch_predictor;//[nb_predictor] @@ -51,15 +49,16 @@ //-----[ methods ]----------------------------------------------------------- - public : Parameters (uint32_t nb_inst_predict , - uint32_t nb_inst_update , - uint32_t size_address , - bool have_bht [3], - uint32_t bht_size_shifter [3], - uint32_t bht_nb_shifter [3], - bool have_pht [3], - uint32_t pht_size_counter [3], - uint32_t pht_nb_counter [3], - uint32_t pht_size_address_share [3], - bool is_toplevel=false); + public : Parameters (uint32_t nb_inst_predict , + uint32_t nb_inst_update , + uint32_t size_address , + bool have_bht [3], + uint32_t bht_size_shifter [3], + uint32_t bht_nb_shifter [3], + bool have_pht [3], + uint32_t pht_size_counter [3], + uint32_t pht_nb_counter [3], + uint32_t pht_size_address_share [3], + Tpht_scheme_t pht_scheme [3], + bool is_toplevel=false); //public : Parameters (Parameters & param) ; public : ~Parameters (void); 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 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Parameters.cpp (revision 146) @@ -21,15 +21,16 @@ #undef FUNCTION #define FUNCTION "Meta_Predictor::Parameters" - Parameters::Parameters (uint32_t nb_inst_predict , - uint32_t nb_inst_update , - uint32_t size_address , - bool have_bht [3], - uint32_t bht_size_shifter [3], - uint32_t bht_nb_shifter [3], - bool have_pht [3], - uint32_t pht_size_counter [3], - uint32_t pht_nb_counter [3], - uint32_t pht_size_address_share [3], - bool is_toplevel) + Parameters::Parameters (uint32_t nb_inst_predict , + uint32_t nb_inst_update , + uint32_t size_address , + bool have_bht [3], + uint32_t bht_size_shifter [3], + uint32_t bht_nb_shifter [3], + bool have_pht [3], + uint32_t pht_size_counter [3], + uint32_t pht_nb_counter [3], + uint32_t pht_size_address_share [3], + Tpht_scheme_t pht_scheme [3], + bool is_toplevel) { log_begin(Meta_Predictor,FUNCTION); @@ -47,4 +48,5 @@ _pht_nb_counter [i] = (_have_pht [i])?pht_nb_counter [i]:0; _pht_size_address_share [i] = (_have_bht[i] and _have_pht [i])?pht_size_address_share [i]:0; + _pht_scheme [i] = (_have_pht [i])?pht_scheme [i]:PHT_SCHEME_COUNTER; } @@ -83,5 +85,6 @@ _pht_nb_counter [i], _pht_size_address_share [i], - _predictor_update_on_prediction [i] + _pht_scheme [i], + _predictor_update_on_prediction [i] ); 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 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Parameters_print.cpp (revision 146) @@ -17,5 +17,4 @@ namespace direction { namespace meta_predictor { - #undef FUNCTION Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/SelfTest/src/main.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/SelfTest/src/main.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/SelfTest/src/main.cpp (revision 146) @@ -8,5 +8,5 @@ #include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/SelfTest/include/test.h" -#define NB_PARAMS 25 +#define NB_PARAMS 28 void usage (int argc, char * argv[]) @@ -14,15 +14,16 @@ err (_(" %s name_instance list_params.\n"),argv[0]); err (_("list_params is :\n")); - err (_(" * predictor_scheme (Tpredictor_t)\n")); - err (_(" * nb_inst_predict (uint32_t )\n")); - err (_(" * nb_inst_update (uint32_t )\n")); - err (_(" * size_address (uint32_t )\n")); - err (_(" * have_bht [3] (bool )\n")); - err (_(" * bht_size_shifter [3] (uint32_t )\n")); - err (_(" * bht_nb_shifter [3] (uint32_t )\n")); - err (_(" * have_pht [3] (bool )\n")); - err (_(" * pht_size_counter [3] (uint32_t )\n")); - err (_(" * pht_nb_counter [3] (uint32_t )\n")); - err (_(" * pht_size_address_share [3] (uint32_t )\n")); + err (_(" * predictor_scheme (Tpredictor_t )\n")); + err (_(" * nb_inst_predict (uint32_t )\n")); + err (_(" * nb_inst_update (uint32_t )\n")); + err (_(" * size_address (uint32_t )\n")); + err (_(" * have_bht [3] (bool )\n")); + err (_(" * bht_size_shifter [3] (uint32_t )\n")); + err (_(" * bht_nb_shifter [3] (uint32_t )\n")); + err (_(" * have_pht [3] (bool )\n")); + err (_(" * pht_size_counter [3] (uint32_t )\n")); + err (_(" * pht_nb_counter [3] (uint32_t )\n")); + err (_(" * pht_size_address_share [3] (uint32_t )\n")); + err (_(" * pht_scheme [3] (Tpht_scheme_t)\n")); exit (1); @@ -42,25 +43,27 @@ string name = argv[x++]; - Tpredictor_t _predictor_scheme = fromString(argv[x++]); - uint32_t _nb_inst_predict = fromString(argv[x++]); - uint32_t _nb_inst_update = fromString(argv[x++]); - uint32_t _size_address = fromString(argv[x++]); - bool _have_bht [3]; - uint32_t _bht_size_shifter [3]; - uint32_t _bht_nb_shifter [3]; - bool _have_pht [3]; - uint32_t _pht_size_counter [3]; - uint32_t _pht_nb_counter [3]; - uint32_t _pht_size_address_share [3]; + Tpredictor_t _predictor_scheme = fromString(argv[x++]); + uint32_t _nb_inst_predict = fromString(argv[x++]); + uint32_t _nb_inst_update = fromString(argv[x++]); + uint32_t _size_address = fromString(argv[x++]); + bool _have_bht [3]; + uint32_t _bht_size_shifter [3]; + uint32_t _bht_nb_shifter [3]; + bool _have_pht [3]; + uint32_t _pht_size_counter [3]; + uint32_t _pht_nb_counter [3]; + uint32_t _pht_size_address_share [3]; + Tpht_scheme_t _pht_scheme [3]; for (uint32_t i=0; i<3; i++) { - _have_bht [i] = fromString(argv[x++]); - _bht_size_shifter [i] = fromString(argv[x++]); - _bht_nb_shifter [i] = fromString(argv[x++]); - _have_pht [i] = fromString(argv[x++]); - _pht_size_counter [i] = fromString(argv[x++]); - _pht_nb_counter [i] = fromString(argv[x++]); - _pht_size_address_share [i] = fromString(argv[x++]); + _have_bht [i] = fromString(argv[x++]); + _bht_size_shifter [i] = fromString(argv[x++]); + _bht_nb_shifter [i] = fromString(argv[x++]); + _have_pht [i] = fromString(argv[x++]); + _pht_size_counter [i] = fromString(argv[x++]); + _pht_nb_counter [i] = fromString(argv[x++]); + _pht_size_address_share [i] = fromString(argv[x++]); + _pht_scheme [i] = fromString(argv[x++]); } @@ -80,4 +83,5 @@ _pht_nb_counter , _pht_size_address_share, + _pht_scheme , true // is_toplevel ); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/include/Parameters.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/include/Parameters.h (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/include/Parameters.h (revision 146) @@ -24,24 +24,24 @@ namespace direction { - class Parameters : public morpheo::behavioural::Parameters { //-----[ fields ]------------------------------------------------------------ - public : Tpredictor_t _predictor_scheme ; - public : uint32_t _nb_inst_predict ; - public : uint32_t _nb_inst_update ; -//public : uint32_t _size_address ; - public : bool _have_bht [3]; - public : uint32_t _bht_size_shifter [3]; - public : uint32_t _bht_nb_shifter [3]; - public : bool _have_pht [3]; - public : uint32_t _pht_size_counter [3]; - public : uint32_t _pht_nb_counter [3]; - public : uint32_t _pht_size_address_share [3]; + public : Tpredictor_t _predictor_scheme ; + public : uint32_t _nb_inst_predict ; + public : uint32_t _nb_inst_update ; +//public : uint32_t _size_address ; + public : bool _have_bht [3]; + public : uint32_t _bht_size_shifter [3]; + public : uint32_t _bht_nb_shifter [3]; + public : bool _have_pht [3]; + public : uint32_t _pht_size_counter [3]; + public : uint32_t _pht_nb_counter [3]; + public : uint32_t _pht_size_address_share [3]; + public : Tpht_scheme_t _pht_scheme [3]; - public : uint32_t _size_history; - - public : bool _have_component_meta_predictor; - public : bool _have_port_history; + public : uint32_t _size_history; + + public : bool _have_component_meta_predictor; + public : bool _have_port_history; public : morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::direction_glue::Parameters * _param_glue; @@ -49,16 +49,17 @@ //-----[ methods ]----------------------------------------------------------- - public : Parameters (Tpredictor_t predictor_scheme , - uint32_t nb_inst_predict , - uint32_t nb_inst_update , - uint32_t size_address , - bool have_bht [3], - uint32_t bht_size_shifter [3], - uint32_t bht_nb_shifter [3], - bool have_pht [3], - uint32_t pht_size_counter [3], - uint32_t pht_nb_counter [3], - uint32_t pht_size_address_share [3], - bool is_toplevel=false + public : Parameters (Tpredictor_t predictor_scheme , + uint32_t nb_inst_predict , + uint32_t nb_inst_update , + uint32_t size_address , + bool have_bht [3], + uint32_t bht_size_shifter [3], + uint32_t bht_nb_shifter [3], + bool have_pht [3], + uint32_t pht_size_counter [3], + uint32_t pht_nb_counter [3], + uint32_t pht_size_address_share [3], + Tpht_scheme_t pht_scheme [3], + bool is_toplevel=false ); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/src/Parameters.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/src/Parameters.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/src/Parameters.cpp (revision 146) @@ -19,16 +19,17 @@ #undef FUNCTION #define FUNCTION "Direction::Parameters" - Parameters::Parameters (Tpredictor_t predictor_scheme , - uint32_t nb_inst_predict , - uint32_t nb_inst_update , - uint32_t size_address , - bool have_bht [3], - uint32_t bht_size_shifter [3], - uint32_t bht_nb_shifter [3], - bool have_pht [3], - uint32_t pht_size_counter [3], - uint32_t pht_nb_counter [3], - uint32_t pht_size_address_share [3], - bool is_toplevel) + Parameters::Parameters (Tpredictor_t predictor_scheme , + uint32_t nb_inst_predict , + uint32_t nb_inst_update , + uint32_t size_address , + bool have_bht [3], + uint32_t bht_size_shifter [3], + uint32_t bht_nb_shifter [3], + bool have_pht [3], + uint32_t pht_size_counter [3], + uint32_t pht_nb_counter [3], + uint32_t pht_size_address_share [3], + Tpht_scheme_t pht_scheme [3], + bool is_toplevel) { log_printf(FUNC,Direction,FUNCTION,"Begin"); @@ -48,4 +49,5 @@ _pht_nb_counter [i] = pht_nb_counter [i]; _pht_size_address_share [i] = pht_size_address_share [i]; + _pht_scheme [i] = pht_scheme [i]; } @@ -148,5 +150,6 @@ _pht_size_counter , _pht_nb_counter , - _pht_size_address_share + _pht_size_address_share, + _pht_scheme ); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/src/Parameters_print.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/src/Parameters_print.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/src/Parameters_print.cpp (revision 146) @@ -51,4 +51,5 @@ xml.singleton_begin("predictor_"+toString(i)+"_pht_nb_counter "); xml.attribut("value",toString(_pht_nb_counter [i])); xml.singleton_end(); xml.singleton_begin("predictor_"+toString(i)+"_pht_size_address_share"); xml.attribut("value",toString(_pht_size_address_share [i])); xml.singleton_end(); + xml.singleton_begin("predictor_"+toString(i)+"_pht_scheme "); xml.attribut("value",toString(_pht_scheme [i])); xml.singleton_end(); } xml.balise_close(); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/SelfTest/src/main.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/SelfTest/src/main.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/SelfTest/src/main.cpp (revision 146) @@ -8,5 +8,5 @@ #include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/SelfTest/include/test.h" -#define NB_PARAMS (12+3*7) +#define NB_PARAMS (12+3*8) void usage (int argc, char * argv[]) @@ -14,28 +14,29 @@ err (_(" %s name_instance list_params.\n"),argv[0]); err (_("list_params is :\n")); - err (_(" * nb_context (uint32_t )\n")); - err (_(" * nb_decod_unit (uint32_t )\n")); - err (_(" * size_address (uint32_t )\n")); - err (_(" * nb_instruction [nb_context] (uint32_t )\n")); - err (_(" * nb_inst_decod [nb_decod_unit](uint32_t )\n")); - err (_(" * nb_inst_branch_predict (uint32_t )\n")); - err (_(" * nb_inst_branch_decod (uint32_t )\n")); - err (_(" * nb_inst_branch_update (uint32_t )\n")); - err (_(" * nb_inst_branch_complete (uint32_t )\n")); - err (_(" * btb_size_queue (uint32_t )\n")); - err (_(" * btb_associativity (uint32_t )\n")); - err (_(" * btb_size_counter (uint32_t )\n")); - err (_(" * btb_victim_scheme (Tvictim_t )\n")); - err (_(" * dir_predictor_scheme (Tpredictor_t)\n")); - err (_(" * dir_have_bht [3] (bool )\n")); - err (_(" * dir_bht_size_shifter [3] (uint32_t )\n")); - err (_(" * dir_bht_nb_shifter [3] (uint32_t )\n")); - err (_(" * dir_have_pht [3] (bool )\n")); - err (_(" * dir_pht_size_counter [3] (uint32_t )\n")); - err (_(" * dir_pht_nb_counter [3] (uint32_t )\n")); - err (_(" * dir_pht_size_address_share [3] (uint32_t )\n")); - err (_(" * ras_size_queue [nb_context] (uint32_t )\n")); - err (_(" * upt_size_queue [nb_context] (uint32_t )\n")); - err (_(" * ufpt_size_queue [nb_context] (uint32_t )\n")); + err (_(" * nb_context (uint32_t )\n")); + err (_(" * nb_decod_unit (uint32_t )\n")); + err (_(" * size_address (uint32_t )\n")); + err (_(" * nb_instruction [nb_context] (uint32_t )\n")); + err (_(" * nb_inst_decod [nb_decod_unit](uint32_t )\n")); + err (_(" * nb_inst_branch_predict (uint32_t )\n")); + err (_(" * nb_inst_branch_decod (uint32_t )\n")); + err (_(" * nb_inst_branch_update (uint32_t )\n")); + err (_(" * nb_inst_branch_complete (uint32_t )\n")); + err (_(" * btb_size_queue (uint32_t )\n")); + err (_(" * btb_associativity (uint32_t )\n")); + err (_(" * btb_size_counter (uint32_t )\n")); + err (_(" * btb_victim_scheme (Tvictim_t )\n")); + err (_(" * dir_predictor_scheme (Tpredictor_t )\n")); + err (_(" * dir_have_bht [3] (bool )\n")); + err (_(" * dir_bht_size_shifter [3] (uint32_t )\n")); + err (_(" * dir_bht_nb_shifter [3] (uint32_t )\n")); + err (_(" * dir_have_pht [3] (bool )\n")); + err (_(" * dir_pht_size_counter [3] (uint32_t )\n")); + err (_(" * dir_pht_nb_counter [3] (uint32_t )\n")); + err (_(" * dir_pht_size_address_share [3] (uint32_t )\n")); + err (_(" * dir_pht_scheme [3] (Tpht_scheme_t)\n")); + err (_(" * ras_size_queue [nb_context] (uint32_t )\n")); + err (_(" * upt_size_queue [nb_context] (uint32_t )\n")); + err (_(" * ufpt_size_queue [nb_context] (uint32_t )\n")); exit (1); @@ -97,4 +98,7 @@ for (uint32_t i=0; i<3; i++) _dir_pht_size_address_share [i] = fromString(argv[x++]); + Tpht_scheme_t _dir_pht_scheme [3]; + for (uint32_t i=0; i<3; i++) + _dir_pht_scheme [i] = fromString(argv[x++]); uint32_t * _ras_size_queue = new uint32_t [_nb_context]; for (uint32_t i=0; i<_nb_context; i++) @@ -137,4 +141,5 @@ _dir_pht_nb_counter , _dir_pht_size_address_share, + _dir_pht_scheme , _ras_size_queue , _upt_size_queue , Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/src/Update_Prediction_Table_transition.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/src/Update_Prediction_Table_transition.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/src/Update_Prediction_Table_transition.cpp (revision 146) @@ -364,5 +364,4 @@ // reg_UPT_EVENT_STATE [context] = UPT_EVENT_STATE_KO_COMMIT_UPDATE_CONTEXT; -// // @@@ // // // Have an actual event ? // // if (not reg_EVENT_VAL [context]) @@ -629,5 +628,5 @@ reg_UPT_UPDATE [context] = (depth+1)%_param->_size_upt_queue[context]; } - + // @@@ // special case : if ((upt_event_state == UPT_EVENT_STATE_KO_COMMIT_WAIT_END_UPDATE) and @@ -636,4 +635,14 @@ reg_UPT_TOP [context] = reg_UPT_TOP_EVENT [context]; reg_UPT_UPDATE [context] = reg_UPT_TOP_EVENT [context]; + reg_IS_ACCURATE [context] = true; + + upt_event_state = UPT_EVENT_STATE_OK; + } + + if ((ok and (upt_event_state == UPT_EVENT_STATE_KO_DECODE_WAIT_END_EVENT)) and + (depth == reg_EVENT_DEPTH [context])) + { + // reg_UPT_TOP [context] = reg_UPT_TOP_EVENT [context]; + // reg_UPT_UPDATE [context] = reg_UPT_TOP_EVENT [context]; reg_IS_ACCURATE [context] = true; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/include/Parameters.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/include/Parameters.h (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/include/Parameters.h (revision 146) @@ -28,30 +28,31 @@ { //-----[ fields ]------------------------------------------------------------ - public : uint32_t _nb_context ; - public : uint32_t _nb_decod_unit ; - public : uint32_t _size_address ; - public : uint32_t * _nb_instruction ;//[nb_context] - public : uint32_t * _nb_inst_decod ;//[nb_decod_unit] - public : uint32_t _nb_inst_branch_predict ; - public : uint32_t _nb_inst_branch_decod ; - public : uint32_t _nb_inst_branch_update ; - public : uint32_t _nb_inst_branch_complete ; - public : uint32_t _btb_size_queue ; - public : uint32_t _btb_associativity ; - public : uint32_t _btb_size_counter ; - public : Tvictim_t _btb_victim_scheme ; - public : Tpredictor_t _dir_predictor_scheme ; - public : bool _dir_have_bht [3]; - public : uint32_t _dir_bht_size_shifter [3]; - public : uint32_t _dir_bht_nb_shifter [3]; - public : bool _dir_have_pht [3]; - public : uint32_t _dir_pht_size_counter [3]; - public : uint32_t _dir_pht_nb_counter [3]; - public : uint32_t _dir_pht_size_address_share [3]; - public : uint32_t * _ras_size_queue ;//[nb_context] - public : uint32_t * _upt_size_queue ;//[nb_context] - public : uint32_t * _ufpt_size_queue ;//[nb_context] - public : uint32_t _nb_thread ; - public : uint32_t * _translate_num_context_to_num_thread;//[nb_context] + public : uint32_t _nb_context ; + public : uint32_t _nb_decod_unit ; + public : uint32_t _size_address ; + public : uint32_t * _nb_instruction ;//[nb_context] + public : uint32_t * _nb_inst_decod ;//[nb_decod_unit] + public : uint32_t _nb_inst_branch_predict ; + public : uint32_t _nb_inst_branch_decod ; + public : uint32_t _nb_inst_branch_update ; + public : uint32_t _nb_inst_branch_complete ; + public : uint32_t _btb_size_queue ; + public : uint32_t _btb_associativity ; + public : uint32_t _btb_size_counter ; + public : Tvictim_t _btb_victim_scheme ; + public : Tpredictor_t _dir_predictor_scheme ; + public : bool _dir_have_bht [3]; + public : uint32_t _dir_bht_size_shifter [3]; + public : uint32_t _dir_bht_nb_shifter [3]; + public : bool _dir_have_pht [3]; + public : uint32_t _dir_pht_size_counter [3]; + public : uint32_t _dir_pht_nb_counter [3]; + public : uint32_t _dir_pht_size_address_share [3]; + public : Tpht_scheme_t _dir_pht_scheme [3]; + public : uint32_t * _ras_size_queue ;//[nb_context] + public : uint32_t * _upt_size_queue ;//[nb_context] + public : uint32_t * _ufpt_size_queue ;//[nb_context] + public : uint32_t _nb_thread ; + public : uint32_t * _translate_num_context_to_num_thread;//[nb_context] @@ -78,31 +79,32 @@ //-----[ methods ]----------------------------------------------------------- - public : Parameters (uint32_t nb_context , - uint32_t nb_decod_unit , - uint32_t size_address , - uint32_t * nb_instruction ,//[nb_context] - uint32_t * nb_inst_decod ,//[nb_decod_unit] - uint32_t nb_inst_branch_predict , - uint32_t nb_inst_branch_decod , - uint32_t nb_inst_branch_update , - uint32_t nb_inst_branch_complete , - uint32_t btb_size_queue , - uint32_t btb_associativity , - uint32_t btb_size_counter , - Tvictim_t btb_victim_scheme , - Tpredictor_t dir_predictor_scheme , - bool dir_have_bht [3], - uint32_t dir_bht_size_shifter [3], - uint32_t dir_bht_nb_shifter [3], - bool dir_have_pht [3], - uint32_t dir_pht_size_counter [3], - uint32_t dir_pht_nb_counter [3], - uint32_t dir_pht_size_address_share [3], - uint32_t * ras_size_queue ,//[nb_context] - uint32_t * upt_size_queue ,//[nb_context] - uint32_t * ufpt_size_queue ,//[nb_context] - uint32_t nb_thread , - uint32_t * translate_num_context_to_num_thread ,//[nb_context] - bool is_toplevel=false + public : Parameters (uint32_t nb_context , + uint32_t nb_decod_unit , + uint32_t size_address , + uint32_t * nb_instruction ,//[nb_context] + uint32_t * nb_inst_decod ,//[nb_decod_unit] + uint32_t nb_inst_branch_predict , + uint32_t nb_inst_branch_decod , + uint32_t nb_inst_branch_update , + uint32_t nb_inst_branch_complete , + uint32_t btb_size_queue , + uint32_t btb_associativity , + uint32_t btb_size_counter , + Tvictim_t btb_victim_scheme , + Tpredictor_t dir_predictor_scheme , + bool dir_have_bht [3], + uint32_t dir_bht_size_shifter [3], + uint32_t dir_bht_nb_shifter [3], + bool dir_have_pht [3], + uint32_t dir_pht_size_counter [3], + uint32_t dir_pht_nb_counter [3], + uint32_t dir_pht_size_address_share [3], + Tpht_scheme_t dir_pht_scheme [3], + uint32_t * ras_size_queue ,//[nb_context] + uint32_t * upt_size_queue ,//[nb_context] + uint32_t * ufpt_size_queue ,//[nb_context] + uint32_t nb_thread , + uint32_t * translate_num_context_to_num_thread ,//[nb_context] + bool is_toplevel=false ); // public : Parameters (Parameters & param) ; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/src/Parameters.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/src/Parameters.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/src/Parameters.cpp (revision 146) @@ -19,31 +19,32 @@ #undef FUNCTION #define FUNCTION "Prediction_unit::Parameters" - Parameters::Parameters (uint32_t nb_context , - uint32_t nb_decod_unit , - uint32_t size_address , - uint32_t * nb_instruction ,//[nb_context] - uint32_t * nb_inst_decod ,//[nb_decod_unit] - uint32_t nb_inst_branch_predict , - uint32_t nb_inst_branch_decod , - uint32_t nb_inst_branch_update , - uint32_t nb_inst_branch_complete , - uint32_t btb_size_queue , - uint32_t btb_associativity , - uint32_t btb_size_counter , - Tvictim_t btb_victim_scheme , - Tpredictor_t dir_predictor_scheme , - bool dir_have_bht [3], - uint32_t dir_bht_size_shifter [3], - uint32_t dir_bht_nb_shifter [3], - bool dir_have_pht [3], - uint32_t dir_pht_size_counter [3], - uint32_t dir_pht_nb_counter [3], - uint32_t dir_pht_size_address_share [3], - uint32_t * ras_size_queue ,//[nb_context] - uint32_t * upt_size_queue ,//[nb_context] - uint32_t * ufpt_size_queue ,//[nb_context] - uint32_t nb_thread , - uint32_t * translate_num_context_to_num_thread ,//[nb_context] - bool is_toplevel + Parameters::Parameters (uint32_t nb_context , + uint32_t nb_decod_unit , + uint32_t size_address , + uint32_t * nb_instruction ,//[nb_context] + uint32_t * nb_inst_decod ,//[nb_decod_unit] + uint32_t nb_inst_branch_predict , + uint32_t nb_inst_branch_decod , + uint32_t nb_inst_branch_update , + uint32_t nb_inst_branch_complete , + uint32_t btb_size_queue , + uint32_t btb_associativity , + uint32_t btb_size_counter , + Tvictim_t btb_victim_scheme , + Tpredictor_t dir_predictor_scheme , + bool dir_have_bht [3], + uint32_t dir_bht_size_shifter [3], + uint32_t dir_bht_nb_shifter [3], + bool dir_have_pht [3], + uint32_t dir_pht_size_counter [3], + uint32_t dir_pht_nb_counter [3], + uint32_t dir_pht_size_address_share [3], + Tpht_scheme_t dir_pht_scheme [3], + uint32_t * ras_size_queue ,//[nb_context] + uint32_t * upt_size_queue ,//[nb_context] + uint32_t * ufpt_size_queue ,//[nb_context] + uint32_t nb_thread , + uint32_t * translate_num_context_to_num_thread ,//[nb_context] + bool is_toplevel ) { @@ -73,4 +74,5 @@ _dir_pht_nb_counter [i] = dir_pht_nb_counter [i]; _dir_pht_size_address_share [i] = dir_pht_size_address_share [i]; + _dir_pht_scheme [i] = dir_pht_scheme [i]; } _ras_size_queue = ras_size_queue ; @@ -123,5 +125,7 @@ _dir_pht_size_counter , _dir_pht_nb_counter , - _dir_pht_size_address_share); + _dir_pht_size_address_share, + _dir_pht_scheme + ); _size_history = _param_dir->_size_history; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/src/Parameters_print.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/src/Parameters_print.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/src/Parameters_print.cpp (revision 146) @@ -57,4 +57,5 @@ xml.singleton_begin("dir_predictor_"+toString(i)+"_pht_nb_counter "); xml.attribut("value",toString(_dir_pht_nb_counter [i])); xml.singleton_end(); xml.singleton_begin("dir_predictor_"+toString(i)+"_pht_size_address_share"); xml.attribut("value",toString(_dir_pht_size_address_share [i])); xml.singleton_end(); + xml.singleton_begin("dir_predictor_"+toString(i)+"_pht_scheme "); xml.attribut("value",toString(_dir_pht_scheme [i])); xml.singleton_end(); } Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/SelfTest/src/main.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/SelfTest/src/main.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/SelfTest/src/main.cpp (revision 146) @@ -9,5 +9,5 @@ #include "Behavioural/Custom/include/Custom_example.h" -#define NB_PARAMS 13+7*3 +#define NB_PARAMS 13+8*3 void usage (int argc, char * argv[]) @@ -43,4 +43,5 @@ err (_(" * dir_pht_nb_counter [3] (uint32_t )\n")); err (_(" * dir_pht_size_address_share [3] (uint32_t )\n")); + err (_(" * dir_pht_scheme [3] (Tpht_scheme_t )\n")); err (_(" * ras_size_queue [nb_context] (uint32_t )\n")); err (_(" * upt_size_queue [nb_context] (uint32_t )\n")); @@ -134,26 +135,29 @@ Tvictim_t _btb_victim_scheme = fromString(argv[x++]); Tpredictor_t _dir_predictor_scheme = fromString(argv[x++]); - bool * _dir_have_bht = new bool [3]; - uint32_t * _dir_bht_size_shifter = new uint32_t[3]; - uint32_t * _dir_bht_nb_shifter = new uint32_t[3]; - bool * _dir_have_pht = new bool [3]; - uint32_t * _dir_pht_size_counter = new uint32_t[3]; - uint32_t * _dir_pht_nb_counter = new uint32_t[3]; - uint32_t * _dir_pht_size_address_share = new uint32_t[3]; - - for (uint32_t i=0; i<3; i++) - _dir_have_bht [i] = fromString(argv[x++]); - for (uint32_t i=0; i<3; i++) - _dir_bht_size_shifter [i] = fromString(argv[x++]); - for (uint32_t i=0; i<3; i++) - _dir_bht_nb_shifter [i] = fromString(argv[x++]); - for (uint32_t i=0; i<3; i++) - _dir_have_pht [i] = fromString(argv[x++]); - for (uint32_t i=0; i<3; i++) - _dir_pht_size_counter [i] = fromString(argv[x++]); - for (uint32_t i=0; i<3; i++) - _dir_pht_nb_counter [i] = fromString(argv[x++]); - for (uint32_t i=0; i<3; i++) - _dir_pht_size_address_share [i] = fromString(argv[x++]); + bool * _dir_have_bht = new bool [3]; + uint32_t * _dir_bht_size_shifter = new uint32_t [3]; + uint32_t * _dir_bht_nb_shifter = new uint32_t [3]; + bool * _dir_have_pht = new bool [3]; + uint32_t * _dir_pht_size_counter = new uint32_t [3]; + uint32_t * _dir_pht_nb_counter = new uint32_t [3]; + uint32_t * _dir_pht_size_address_share = new uint32_t [3]; + Tpht_scheme_t * _dir_pht_scheme = new Tpht_scheme_t [3]; + + for (uint32_t i=0; i<3; i++) + _dir_have_bht [i] = fromString(argv[x++]); + for (uint32_t i=0; i<3; i++) + _dir_bht_size_shifter [i] = fromString(argv[x++]); + for (uint32_t i=0; i<3; i++) + _dir_bht_nb_shifter [i] = fromString(argv[x++]); + for (uint32_t i=0; i<3; i++) + _dir_have_pht [i] = fromString(argv[x++]); + for (uint32_t i=0; i<3; i++) + _dir_pht_size_counter [i] = fromString(argv[x++]); + for (uint32_t i=0; i<3; i++) + _dir_pht_nb_counter [i] = fromString(argv[x++]); + for (uint32_t i=0; i<3; i++) + _dir_pht_size_address_share [i] = fromString(argv[x++]); + for (uint32_t i=0; i<3; i++) + _dir_pht_scheme [i] = fromString(argv[x++]); uint32_t * _ras_size_queue = new uint32_t [_nb_context]; @@ -211,4 +215,5 @@ _dir_pht_nb_counter , _dir_pht_size_address_share , + _dir_pht_scheme , _ras_size_queue , _upt_size_queue , @@ -253,4 +258,5 @@ delete [] _dir_pht_nb_counter ; delete [] _dir_pht_size_address_share ; + delete [] _dir_pht_scheme ; delete [] _ufpt_size_queue ; delete [] _upt_size_queue ; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/include/Parameters.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/include/Parameters.h (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/include/Parameters.h (revision 146) @@ -71,4 +71,5 @@ public : uint32_t _dir_pht_nb_counter [3] ; public : uint32_t _dir_pht_size_address_share [3] ; + public : Tpht_scheme_t _dir_pht_scheme [3] ; public : uint32_t * _ras_size_queue ;//[nb_context] public : uint32_t * _upt_size_queue ;//[nb_context] @@ -144,4 +145,5 @@ uint32_t * dir_pht_nb_counter ,//[3] uint32_t * dir_pht_size_address_share ,//[3] + Tpht_scheme_t * dir_pht_scheme ,//[3] uint32_t * ras_size_queue , uint32_t * upt_size_queue , Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/src/Parameters.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/src/Parameters.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/src/Parameters.cpp (revision 146) @@ -55,4 +55,5 @@ uint32_t * dir_pht_nb_counter ,//[3] uint32_t * dir_pht_size_address_share ,//[3] + Tpht_scheme_t * dir_pht_scheme ,//[3] uint32_t * ras_size_queue , uint32_t * upt_size_queue , @@ -104,4 +105,5 @@ _dir_pht_nb_counter [i] = dir_pht_nb_counter [i]; _dir_pht_size_address_share [i] = dir_pht_size_address_share [i]; + _dir_pht_scheme [i] = dir_pht_scheme [i]; } _ras_size_queue = ras_size_queue ; @@ -157,4 +159,5 @@ _dir_pht_nb_counter , _dir_pht_size_address_share , + _dir_pht_scheme , _ras_size_queue , _upt_size_queue , 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 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Load_Store_pointer_unit/include/Parameters.h (revision 146) @@ -11,4 +11,5 @@ #include "Common/include/Debug.h" #include "Behavioural/include/Parameters.h" +#include "Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Load_Store_pointer_unit/include/Types.h" namespace morpheo { @@ -29,4 +30,8 @@ public : uint32_t * _size_store_queue ; //[nb_load_store_queue] public : uint32_t * _size_load_queue ; //[nb_load_store_queue] + public : Tpredictor_t * _speculative_commit_predictor_scheme;//[nb_load_store_queue] + public : uint32_t ** _lsu_pht_size_counter ;//[nb_load_store_queue][1] + public : uint32_t ** _lsu_pht_nb_counter ;//[nb_load_store_queue][1] + public : Tpht_scheme_t ** _lsu_pht_scheme ;//[nb_load_store_queue][1] public : uint32_t * _nb_inst_memory ; //[nb_load_store_queue] public : uint32_t ** _link_load_store_unit_with_thread; //[nb_front_end][nb_context] @@ -54,4 +59,8 @@ uint32_t * size_store_queue , uint32_t * size_load_queue , + Tpredictor_t * speculative_commit_predictor_scheme,//[nb_load_store_queue] + uint32_t ** lsu_pht_size_counter ,//[nb_load_store_queue][1] + uint32_t ** lsu_pht_nb_counter ,//[nb_load_store_queue][1] + Tpht_scheme_t ** lsu_pht_scheme ,//[nb_load_store_queue][1] uint32_t * nb_inst_memory , uint32_t ** link_load_store_unit_with_thread, 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 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/Load_Store_pointer_unit/src/Parameters.cpp (revision 146) @@ -27,4 +27,8 @@ uint32_t * size_store_queue , uint32_t * size_load_queue , + Tpredictor_t * speculative_commit_predictor_scheme,//[nb_load_store_queue] + uint32_t ** lsu_pht_size_counter ,//[nb_load_store_queue][1] + uint32_t ** lsu_pht_nb_counter ,//[nb_load_store_queue][1] + Tpht_scheme_t ** lsu_pht_scheme ,//[nb_load_store_queue][1] uint32_t * nb_inst_memory , uint32_t ** link_load_store_unit_with_thread, @@ -41,4 +45,8 @@ _size_store_queue = size_store_queue ; _size_load_queue = size_load_queue ; + _speculative_commit_predictor_scheme = speculative_commit_predictor_scheme; + _lsu_pht_size_counter = lsu_pht_size_counter ; + _lsu_pht_nb_counter = lsu_pht_nb_counter ; + _lsu_pht_scheme = lsu_pht_scheme ; _nb_inst_memory = nb_inst_memory ; _link_load_store_unit_with_thread = link_load_store_unit_with_thread; 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 145) +++ 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 146) @@ -184,5 +184,5 @@ private : void deallocation (void); -#ifdef SYSTEMC +#ifdef SYSTEMC # if defined(STATISTICS) or defined(VHDL_TESTBENCH) public : void transition (void); 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 145) +++ 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 146) @@ -72,7 +72,8 @@ #endif -#ifdef SYSTEMC +#ifdef SYSTEMC if (usage_is_set(_usage,USE_SYSTEMC)) { +# if defined(STATISTICS) or defined(VHDL_TESTBENCH) log_printf(INFO,Register_translation_unit_Glue,FUNCTION,"Method - transition"); @@ -81,8 +82,8 @@ sensitive << (*(in_CLOCK)).pos(); -# ifdef SYSTEMCASS_SPECIFIC - // List dependency information -# endif - +# ifdef SYSTEMCASS_SPECIFIC + // List dependency information +# endif +# endif log_printf(INFO,Register_translation_unit_Glue,FUNCTION,"Method - genMealy_retire"); 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 145) +++ 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 146) @@ -51,7 +51,5 @@ #endif -#if defined(STATISTICS) or defined(VHDL_TESTBENCH) end_cycle (); -#endif log_printf(FUNC,Register_translation_unit_Glue,FUNCTION,"End"); 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 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/include/Parameters.h (revision 146) @@ -36,4 +36,8 @@ public : uint32_t * _size_store_queue ;//[nb_load_store_queue] public : uint32_t * _size_load_queue ;//[nb_load_store_queue] + public : Tpredictor_t * _speculative_commit_predictor_scheme;//[nb_load_store_queue] + public : uint32_t ** _lsu_pht_size_counter ;//[nb_load_store_queue][1] + public : uint32_t ** _lsu_pht_nb_counter ;//[nb_load_store_queue][1] + public : Tpht_scheme_t ** _lsu_pht_scheme ;//[nb_load_store_queue][1] public : uint32_t * _nb_inst_memory ;//[nb_load_store_queue] public : uint32_t ** _link_load_store_unit_with_thread ;//[nb_front_end][nb_context] @@ -78,4 +82,8 @@ uint32_t * size_store_queue , uint32_t * size_load_queue , + Tpredictor_t * speculative_commit_predictor_scheme,//[nb_load_store_queue] + uint32_t ** lsu_pht_size_counter ,//[nb_load_store_queue][1] + uint32_t ** lsu_pht_nb_counter ,//[nb_load_store_queue][1] + Tpht_scheme_t ** lsu_pht_scheme ,//[nb_load_store_queue][1] uint32_t * nb_inst_memory , uint32_t ** link_load_store_unit_with_thread , 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 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Rename_unit/src/Parameters.cpp (revision 146) @@ -27,4 +27,8 @@ uint32_t * size_store_queue , uint32_t * size_load_queue , + Tpredictor_t * speculative_commit_predictor_scheme,//[nb_load_store_queue] + uint32_t ** lsu_pht_size_counter ,//[nb_load_store_queue][1] + uint32_t ** lsu_pht_nb_counter ,//[nb_load_store_queue][1] + Tpht_scheme_t ** lsu_pht_scheme ,//[nb_load_store_queue][1] uint32_t * nb_inst_memory , uint32_t ** link_load_store_unit_with_thread , @@ -53,4 +57,8 @@ _size_store_queue = size_store_queue ; _size_load_queue = size_load_queue ; + _speculative_commit_predictor_scheme = speculative_commit_predictor_scheme; + _lsu_pht_size_counter = lsu_pht_size_counter ; + _lsu_pht_nb_counter = lsu_pht_nb_counter ; + _lsu_pht_scheme = lsu_pht_scheme ; _nb_inst_memory = nb_inst_memory ; _link_load_store_unit_with_thread = link_load_store_unit_with_thread ; @@ -109,4 +117,8 @@ _size_store_queue , _size_load_queue , + _speculative_commit_predictor_scheme, + _lsu_pht_size_counter , + _lsu_pht_nb_counter , + _lsu_pht_scheme , _nb_inst_memory , _link_load_store_unit_with_thread, 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 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/include/Parameters.h (revision 146) @@ -81,4 +81,8 @@ 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 : Tpredictor_t ** _speculative_commit_predictor_scheme;//[nb_rename_unit][nb_load_store_queue] + public : uint32_t *** _lsu_pht_size_counter ;//[nb_rename_unit][nb_load_store_queue][1] + public : uint32_t *** _lsu_pht_nb_counter ;//[nb_rename_unit][nb_load_store_queue][1] + public : Tpht_scheme_t *** _lsu_pht_scheme ;//[nb_rename_unit][nb_load_store_queue][1] 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] @@ -180,4 +184,8 @@ uint32_t ** size_store_queue ,//[nb_rename_unit][nb_load_store_queue] uint32_t ** size_load_queue ,//[nb_rename_unit][nb_load_store_queue] + Tpredictor_t ** speculative_commit_predictor_scheme,//[nb_rename_unit][nb_load_store_queue] + uint32_t *** lsu_pht_size_counter ,//[nb_rename_unit][nb_load_store_queue][1] + uint32_t *** lsu_pht_nb_counter ,//[nb_rename_unit][nb_load_store_queue][1] + Tpht_scheme_t *** lsu_pht_scheme ,//[nb_rename_unit][nb_load_store_queue][1] 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] 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 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/src/Parameters.cpp (revision 146) @@ -69,4 +69,8 @@ uint32_t ** size_store_queue ,//[nb_rename_unit][nb_load_store_queue] uint32_t ** size_load_queue ,//[nb_rename_unit][nb_load_store_queue] + Tpredictor_t ** speculative_commit_predictor_scheme,//[nb_rename_unit][nb_load_store_queue] + uint32_t *** lsu_pht_size_counter ,//[nb_rename_unit][nb_load_store_queue][1] + uint32_t *** lsu_pht_nb_counter ,//[nb_rename_unit][nb_load_store_queue][1] + Tpht_scheme_t *** lsu_pht_scheme ,//[nb_rename_unit][nb_load_store_queue][1] 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] @@ -125,4 +129,8 @@ _size_store_queue = size_store_queue ; _size_load_queue = size_load_queue ; + _speculative_commit_predictor_scheme = speculative_commit_predictor_scheme; + _lsu_pht_size_counter = lsu_pht_size_counter ; + _lsu_pht_nb_counter = lsu_pht_nb_counter ; + _lsu_pht_scheme = lsu_pht_scheme ; _nb_inst_memory = nb_inst_memory ; _link_load_store_unit_with_thread = link_load_store_unit_with_thread ; @@ -242,4 +250,8 @@ _size_store_queue [i], _size_load_queue [i], + _speculative_commit_predictor_scheme [i], + _lsu_pht_size_counter [i], + _lsu_pht_nb_counter [i], + _lsu_pht_scheme [i], _nb_inst_memory [i], _rename_unit_link_load_store_unit_with_thread [i], Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/SelfTest/src/main.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/SelfTest/src/main.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/SelfTest/src/main.cpp (revision 146) @@ -98,5 +98,5 @@ err (_(" * dir_pht_nb_counter [nb_front_end][3] (uint32_t )\n")); err (_(" * dir_pht_size_address_share [nb_front_end][3] (uint32_t )\n")); - + err (_(" * dir_pht_scheme [nb_front_end][3] (Tpht_scheme_t )\n")); err (_(" * nb_ooo_engine (uint32_t )\n")); err (_(" * nb_rename_unit [nb_ooo_engine] (uint32_t )\n")); @@ -272,4 +272,5 @@ uint32_t ** _dir_pht_nb_counter ;//[nb_front_end][3] uint32_t ** _dir_pht_size_address_share ;//[nb_front_end][3] + Tpht_scheme_t ** _dir_pht_scheme ;//[nb_front_end][3] // OOO_Engine @@ -498,4 +499,5 @@ SELFTEST2(_dir_pht_nb_counter ,uint32_t ,argv,x,_nb_front_end,3); SELFTEST2(_dir_pht_size_address_share ,uint32_t ,argv,x,_nb_front_end,3); + SELFTEST2(_dir_pht_scheme ,Tpht_scheme_t ,argv,x,_nb_front_end,3); // OOO_Engine @@ -713,4 +715,5 @@ _dir_pht_nb_counter , _dir_pht_size_address_share , + _dir_pht_scheme , _nb_ooo_engine , Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/include/Parameters.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/include/Parameters.h (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/include/Parameters.h (revision 146) @@ -101,4 +101,5 @@ public : uint32_t ** _lsu_pht_size_counter ;//[nb_load_store_unit][1] public : uint32_t ** _lsu_pht_nb_counter ;//[nb_load_store_unit][1] + public : Tpht_scheme_t ** _lsu_pht_scheme ;//[nb_load_store_unit][1] public : uint32_t * _nb_bypass_memory ;//[nb_load_store_unit] public : uint32_t * _nb_cache_port ;//[nb_load_store_unit] @@ -140,4 +141,5 @@ public : uint32_t ** _dir_pht_nb_counter ;//[nb_front_end][3] public : uint32_t ** _dir_pht_size_address_share ;//[nb_front_end][3] + public : Tpht_scheme_t ** _dir_pht_scheme ;//[nb_front_end][3] // OOO_Engine @@ -271,4 +273,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 : Tpredictor_t *** _ooo_engine_speculative_commit_predictor_scheme;//[nb_ooo_engine][nb_rename_unit][ooo_engine_nb_load_store_unit] + public : uint32_t **** _ooo_engine_lsu_pht_size_counter ;//[nb_ooo_engine][nb_rename_unit][ooo_engine_nb_load_store_unit][1] + public : uint32_t **** _ooo_engine_lsu_pht_nb_counter ;//[nb_ooo_engine][nb_rename_unit][ooo_engine_nb_load_store_unit][1] + public : Tpht_scheme_t **** _ooo_engine_lsu_pht_scheme ;//[nb_ooo_engine][nb_rename_unit][ooo_engine_nb_load_store_unit][1] 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] @@ -300,6 +306,6 @@ ** _execute_loop_speculative_load ;//[nb_execute_loop][execute_loop_nb_load_store_unit] public : Tpredictor_t ** _execute_loop_speculative_commit_predictor_scheme ;//[nb_execute_loop][execute_loop_nb_load_store_unit] - public : uint32_t *** _execute_loop_lsu_pht_size_counter ;//[nb_execute_loop][execute_loop_nb_load_store_unit][1] - public : uint32_t *** _execute_loop_lsu_pht_nb_counter ;//[nb_execute_loop][execute_loop_nb_load_store_unit][1] + /* public : uint32_t *** _execute_loop_lsu_pht_size_counter ;//[nb_execute_loop][execute_loop_nb_load_store_unit][1] */ + /* public : uint32_t *** _execute_loop_lsu_pht_nb_counter ;//[nb_execute_loop][execute_loop_nb_load_store_unit][1] */ public : uint32_t ** _execute_loop_nb_bypass_memory ;//[nb_execute_loop][execute_loop_nb_load_store_unit] public : uint32_t ** _execute_loop_nb_cache_port ;//[nb_execute_loop][execute_loop_nb_load_store_unit] @@ -440,4 +446,5 @@ uint32_t ** lsu_pht_size_counter ,//[nb_load_store_unit][1] uint32_t ** lsu_pht_nb_counter ,//[nb_load_store_unit][1] + Tpht_scheme_t ** lsu_pht_scheme ,//[nb_load_store_unit][1] uint32_t * nb_bypass_memory ,//[nb_load_store_unit] uint32_t * nb_cache_port ,//[nb_load_store_unit] @@ -479,4 +486,5 @@ uint32_t ** dir_pht_nb_counter ,//[nb_front_end][3] uint32_t ** dir_pht_size_address_share ,//[nb_front_end][3] + Tpht_scheme_t ** dir_pht_scheme ,//[nb_front_end][3] // OOO_Engine Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/src/Core.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/src/Core.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/src/Core.cpp (revision 146) @@ -72,4 +72,5 @@ #ifdef SYSTEMC +# if defined(STATISTICS) or defined(VHDL_TESTBENCH) if (usage_is_set(_usage,USE_SYSTEMC)) { @@ -93,4 +94,5 @@ } +# endif #endif log_end(Core,FUNCTION); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/src/Core_transition.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/src/Core_transition.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/src/Core_transition.cpp (revision 146) @@ -1,4 +1,4 @@ +#ifdef SYSTEMC # if defined(STATISTICS) or defined(VHDL_TESTBENCH) -#ifdef SYSTEMC /* * $Id$ @@ -20,7 +20,5 @@ log_begin(Core,FUNCTION); -#if defined(STATISTICS) or defined(VHDL_TESTBENCH) end_cycle (); -#endif log_end(Core,FUNCTION); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/src/Parameters.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/src/Parameters.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/src/Parameters.cpp (revision 146) @@ -150,4 +150,5 @@ uint32_t ** lsu_pht_size_counter ,//[nb_load_store_unit][1] uint32_t ** lsu_pht_nb_counter ,//[nb_load_store_unit][1] + Tpht_scheme_t ** lsu_pht_scheme ,//[nb_load_store_unit][1] uint32_t * nb_bypass_memory ,//[nb_load_store_unit] uint32_t * nb_cache_port ,//[nb_load_store_unit] @@ -189,4 +190,5 @@ uint32_t ** dir_pht_nb_counter ,//[nb_front_end][3] uint32_t ** dir_pht_size_address_share ,//[nb_front_end][3] + Tpht_scheme_t ** dir_pht_scheme ,//[nb_front_end][3] // OOO_Engine @@ -312,4 +314,5 @@ _lsu_pht_size_counter = lsu_pht_size_counter ; _lsu_pht_nb_counter = lsu_pht_nb_counter ; + _lsu_pht_scheme = lsu_pht_scheme ; _nb_bypass_memory = nb_bypass_memory ; _nb_cache_port = nb_cache_port ; @@ -346,4 +349,5 @@ _dir_pht_nb_counter = dir_pht_nb_counter ; _dir_pht_size_address_share = dir_pht_size_address_share ; + _dir_pht_scheme = dir_pht_scheme ; _nb_ooo_engine = nb_ooo_engine ; @@ -1355,4 +1359,8 @@ 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_speculative_commit_predictor_scheme,Tpredictor_t ,_nb_ooo_engine,_nb_rename_unit[it1],_ooo_engine_nb_load_store_unit[it1][it2]); + ALLOC4(_ooo_engine_lsu_pht_size_counter ,uint32_t ,_nb_ooo_engine,_nb_rename_unit[it1],_ooo_engine_nb_load_store_unit[it1][it2],1); + ALLOC4(_ooo_engine_lsu_pht_nb_counter ,uint32_t ,_nb_ooo_engine,_nb_rename_unit[it1],_ooo_engine_nb_load_store_unit[it1][it2],1); + ALLOC4(_ooo_engine_lsu_pht_scheme ,Tpht_scheme_t ,_nb_ooo_engine,_nb_rename_unit[it1],_ooo_engine_nb_load_store_unit[it1][it2],1); 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]); @@ -1365,7 +1373,14 @@ uint32_t num_load_store_unit = _list_load_store_unit_with_rename_unit[i][j][k]; - _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]; + _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_speculative_commit_predictor_scheme [i][j][k] = _speculative_commit_predictor_scheme [num_load_store_unit]; + for (uint32_t l=0; l<1; ++l) + { + _ooo_engine_lsu_pht_size_counter [i][j][k][l] = _lsu_pht_size_counter [num_load_store_unit][l]; + _ooo_engine_lsu_pht_nb_counter [i][j][k][l] = _lsu_pht_nb_counter [num_load_store_unit][l]; + _ooo_engine_lsu_pht_scheme [i][j][k][l] = _lsu_pht_scheme [num_load_store_unit][l]; + } + _ooo_engine_nb_inst_memory [i][j][k] = _nb_inst_memory [num_load_store_unit]; } @@ -1673,6 +1688,6 @@ ,_nb_execute_loop,_execute_loop_nb_load_store_unit[it1]); ALLOC2(_execute_loop_speculative_commit_predictor_scheme ,Tpredictor_t,_nb_execute_loop,_execute_loop_nb_load_store_unit[it1]); - ALLOC3(_execute_loop_lsu_pht_size_counter ,uint32_t ,_nb_execute_loop,_execute_loop_nb_load_store_unit[it1],1); - ALLOC3(_execute_loop_lsu_pht_nb_counter ,uint32_t ,_nb_execute_loop,_execute_loop_nb_load_store_unit[it1],1); + // ALLOC3(_execute_loop_lsu_pht_size_counter ,uint32_t ,_nb_execute_loop,_execute_loop_nb_load_store_unit[it1],1); + // ALLOC3(_execute_loop_lsu_pht_nb_counter ,uint32_t ,_nb_execute_loop,_execute_loop_nb_load_store_unit[it1],1); ALLOC2(_execute_loop_nb_bypass_memory ,uint32_t ,_nb_execute_loop,_execute_loop_nb_load_store_unit[it1]); ALLOC2(_execute_loop_nb_cache_port ,uint32_t ,_nb_execute_loop,_execute_loop_nb_load_store_unit[it1]); @@ -1695,9 +1710,9 @@ _execute_loop_speculative_load [i][j] = _speculative_load [num_load_store_unit]; _execute_loop_speculative_commit_predictor_scheme [i][j] = _speculative_commit_predictor_scheme [num_load_store_unit]; - for (uint32_t k=0; k<1; ++k) - { - _execute_loop_lsu_pht_size_counter [i][j][k] = _lsu_pht_size_counter [num_load_store_unit][k]; - _execute_loop_lsu_pht_nb_counter [i][j][k] = _lsu_pht_nb_counter [num_load_store_unit][k]; - } + // for (uint32_t k=0; k<1; ++k) + // { + // _execute_loop_lsu_pht_size_counter [i][j][k] = _lsu_pht_size_counter [num_load_store_unit][k]; + // _execute_loop_lsu_pht_nb_counter [i][j][k] = _lsu_pht_nb_counter [num_load_store_unit][k]; + // } _execute_loop_nb_bypass_memory [i][j] = _nb_bypass_memory [num_load_store_unit]; _execute_loop_nb_cache_port [i][j] = _nb_cache_port [num_load_store_unit]; @@ -2115,4 +2130,5 @@ _dir_pht_nb_counter [i], _dir_pht_size_address_share [i], + _dir_pht_scheme [i], _front_end_ras_size_queue [i], _front_end_upt_size_queue [i], @@ -2131,52 +2147,56 @@ _param_ooo_engine [i] = new core::multi_ooo_engine::ooo_engine::Parameters ( - _ooo_engine_nb_front_end [i], - _ooo_engine_nb_context [i], - _nb_rename_unit [i], - _ooo_engine_nb_execute_loop [i], - _ooo_engine_nb_inst_decod [i], - _ooo_engine_nb_inst_insert [i], - _ooo_engine_nb_inst_retire [i], -// _nb_inst_issue [i], - _ooo_engine_nb_inst_execute [i], - _nb_inst_reexecute [i], - _nb_inst_commit [i], - _nb_inst_branch_complete [i], - _ooo_engine_nb_branch_speculated [i], - _size_nb_inst_decod , - _nb_rename_unit_select [i], - _nb_execute_loop_select [i], - _size_general_data , - _size_special_data , - _ooo_engine_link_rename_unit_with_front_end [i], - _size_re_order_buffer [i], - _nb_re_order_buffer_bank [i], - _retire_ooo_scheme [i], - _commit_priority [i], - _commit_load_balancing [i], - _size_issue_queue [i], - _issue_queue_scheme [i], - _nb_issue_queue_bank [i], - _issue_priority [i], - _issue_load_balancing [i], -// _ooo_engine_table_routing [i], -// _ooo_engine_table_issue_type [i], - _size_reexecute_queue [i], - _ooo_engine_rename_select_priority [i], - _ooo_engine_rename_select_load_balancing [i], - _ooo_engine_rename_select_nb_front_end_select [i], - _ooo_engine_nb_general_register [i], - _ooo_engine_nb_special_register [i], - _ooo_engine_rat_scheme [i], - _ooo_engine_nb_reg_free [i], - _ooo_engine_nb_rename_unit_bank [i], -// _ooo_engine_size_read_counter [i], - _ooo_engine_nb_load_store_unit [i], - _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], - _nb_thread , + _ooo_engine_nb_front_end [i], + _ooo_engine_nb_context [i], + _nb_rename_unit [i], + _ooo_engine_nb_execute_loop [i], + _ooo_engine_nb_inst_decod [i], + _ooo_engine_nb_inst_insert [i], + _ooo_engine_nb_inst_retire [i], +// _nb_inst_issue [i], + _ooo_engine_nb_inst_execute [i], + _nb_inst_reexecute [i], + _nb_inst_commit [i], + _nb_inst_branch_complete [i], + _ooo_engine_nb_branch_speculated [i], + _size_nb_inst_decod , + _nb_rename_unit_select [i], + _nb_execute_loop_select [i], + _size_general_data , + _size_special_data , + _ooo_engine_link_rename_unit_with_front_end [i], + _size_re_order_buffer [i], + _nb_re_order_buffer_bank [i], + _retire_ooo_scheme [i], + _commit_priority [i], + _commit_load_balancing [i], + _size_issue_queue [i], + _issue_queue_scheme [i], + _nb_issue_queue_bank [i], + _issue_priority [i], + _issue_load_balancing [i], +// _ooo_engine_table_routing [i], +// _ooo_engine_table_issue_type [i], + _size_reexecute_queue [i], + _ooo_engine_rename_select_priority [i], + _ooo_engine_rename_select_load_balancing [i], + _ooo_engine_rename_select_nb_front_end_select [i], + _ooo_engine_nb_general_register [i], + _ooo_engine_nb_special_register [i], + _ooo_engine_rat_scheme [i], + _ooo_engine_nb_reg_free [i], + _ooo_engine_nb_rename_unit_bank [i], +// _ooo_engine_size_read_counter [i], + _ooo_engine_nb_load_store_unit [i], + _ooo_engine_size_store_queue [i], + _ooo_engine_size_load_queue [i], + _ooo_engine_speculative_commit_predictor_scheme[i], + _ooo_engine_lsu_pht_size_counter [i], + _ooo_engine_lsu_pht_nb_counter [i], + _ooo_engine_lsu_pht_scheme [i], + _ooo_engine_nb_inst_memory [i], + _ooo_engine_link_load_store_unit_with_context [i], + _ooo_engine_implement_group [i], + _nb_thread , _ooo_engine_translate_num_context_to_num_thread[i] ); @@ -2218,6 +2238,6 @@ _execute_loop_speculative_load [i], _execute_loop_speculative_commit_predictor_scheme [i], - _execute_loop_lsu_pht_size_counter [i], - _execute_loop_lsu_pht_nb_counter [i], + // _execute_loop_lsu_pht_size_counter [i], + // _execute_loop_lsu_pht_nb_counter [i], _execute_loop_nb_bypass_memory [i], _execute_loop_nb_cache_port [i], @@ -2392,6 +2412,6 @@ DELETE2(_execute_loop_nb_cache_port ,_nb_execute_loop,_execute_loop_nb_load_store_unit[it1]); DELETE2(_execute_loop_nb_bypass_memory ,_nb_execute_loop,_execute_loop_nb_load_store_unit[it1]); - DELETE3(_execute_loop_lsu_pht_nb_counter ,_nb_execute_loop,_execute_loop_nb_load_store_unit[it1],1); - DELETE3(_execute_loop_lsu_pht_size_counter ,_nb_execute_loop,_execute_loop_nb_load_store_unit[it1],1); + // DELETE3(_execute_loop_lsu_pht_nb_counter ,_nb_execute_loop,_execute_loop_nb_load_store_unit[it1],1); + // DELETE3(_execute_loop_lsu_pht_size_counter ,_nb_execute_loop,_execute_loop_nb_load_store_unit[it1],1); DELETE2(_execute_loop_speculative_commit_predictor_scheme ,_nb_execute_loop,_execute_loop_nb_load_store_unit[it1]); DELETE2(_execute_loop_speculative_load ,_nb_execute_loop,_execute_loop_nb_load_store_unit[it1]); @@ -2423,4 +2443,8 @@ DELETE3(_ooo_engine_link_load_store_unit_with_context ,_nb_ooo_engine,_ooo_engine_nb_front_end[it1],_ooo_engine_nb_context[it1][it2]); DELETE3(_ooo_engine_nb_inst_memory ,_nb_ooo_engine,_nb_rename_unit[it1],_ooo_engine_nb_load_store_unit[it1][it2]); + DELETE4(_ooo_engine_lsu_pht_scheme ,_nb_ooo_engine,_nb_rename_unit[it1],_ooo_engine_nb_load_store_unit[it1][it2],1); + DELETE4(_ooo_engine_lsu_pht_nb_counter ,_nb_ooo_engine,_nb_rename_unit[it1],_ooo_engine_nb_load_store_unit[it1][it2],1); + DELETE4(_ooo_engine_lsu_pht_size_counter ,_nb_ooo_engine,_nb_rename_unit[it1],_ooo_engine_nb_load_store_unit[it1][it2],1); + DELETE3(_ooo_engine_speculative_commit_predictor_scheme ,_nb_ooo_engine,_nb_rename_unit[it1],_ooo_engine_nb_load_store_unit[it1][it2]); DELETE3(_ooo_engine_size_load_queue ,_nb_ooo_engine,_nb_rename_unit[it1],_ooo_engine_nb_load_store_unit[it1][it2]); DELETE3(_ooo_engine_size_store_queue ,_nb_ooo_engine,_nb_rename_unit[it1],_ooo_engine_nb_load_store_unit[it1][it2]); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/src/Parameters_msg_error.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/src/Parameters_msg_error.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/src/Parameters_msg_error.cpp (revision 146) @@ -11,8 +11,7 @@ #include -namespace morpheo { +namespace morpheo { namespace behavioural { namespace core { - #undef FUNCTION Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/src/Parameters_print.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/src/Parameters_print.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/src/Parameters_print.cpp (revision 146) @@ -167,4 +167,5 @@ str+= toString(MSG_INFORMATION)+" * dir_pht_nb_counter : "+toString(_dir_pht_nb_counter [i][j])+"\n"; str+= toString(MSG_INFORMATION)+" * dir_pht_size_address_share : "+toString(_dir_pht_size_address_share[i][j])+"\n"; + str+= toString(MSG_INFORMATION)+" * dir_pht_scheme : "+toString(_dir_pht_scheme [i][j])+"\n"; } } Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/Makefile.deps =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/Makefile.deps (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/Makefile.deps (revision 146) @@ -19,4 +19,7 @@ include $(DIR_MORPHEO)/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/Makefile.deps endif +ifndef RegisterFile_Internal_Banked +include $(DIR_MORPHEO)/Behavioural/Generic/RegisterFile/RegisterFile_Internal_Banked/Makefile.deps +endif #-----[ Library ]------------------------------------------ @@ -25,4 +28,5 @@ $(RegisterFile_Monolithic_LIBRARY) \ $(RegisterFile_Multi_Banked_LIBRARY) \ + $(RegisterFile_Internal_Banked_LIBRARY) \ $(Behavioural_LIBRARY) @@ -41,5 +45,6 @@ $(MAKE) Behavioural_library; \ $(MAKE) RegisterFile_Monolithic_library;\ - $(MAKE) RegisterFile_Multi_Banked_library; + $(MAKE) RegisterFile_Multi_Banked_library;\ + $(MAKE) RegisterFile_Internal_Banked_library; RegisterFile_library_clean : RegisterFile_library_clean_only @@ -47,3 +52,4 @@ $(MAKE) Behavioural_library_clean; \ $(MAKE) RegisterFile_Monolithic_library_clean;\ - $(MAKE) RegisterFile_Multi_Banked_library_clean; + $(MAKE) RegisterFile_Multi_Banked_library_clean;\ + $(MAKE) RegisterFile_Internal_Banked_library_clean; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Internal_Banked/include/Types.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Internal_Banked/include/Types.h (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Internal_Banked/include/Types.h (revision 146) @@ -18,6 +18,6 @@ //typedef uint32_t Taddress_t; -typedef uint64_t Tdata_t; - // typedef Tgeneral_data_t Tdata_t; +//typedef uint64_t Tdata_t; +typedef Tgeneral_data_t Tdata_t; }; // end namespace registerfile_internal_banked Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/SelfTest/configuration/config_mixte.gen =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/SelfTest/configuration/config_mixte.gen (revision 145) +++ (revision ) @@ -1,6 +1,0 @@ -RegisterFile_Monolithic -0 0 *2 # nb_port_read -0 0 *2 # nb_port_write -1 8 *2 # nb_port_read_write -32 32 *2 # nb_word -32 32 *2 # size_word Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/SelfTest/configuration/config_read.gen =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/SelfTest/configuration/config_read.gen (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/SelfTest/configuration/config_read.gen (revision 146) @@ -2,5 +2,4 @@ 1 8 *2 # nb_port_read 1 1 *2 # nb_port_write -0 0 *2 # nb_port_read_write 512 512 *2 # nb_word 32 32 *2 # size_word Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/SelfTest/configuration/config_size.gen =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/SelfTest/configuration/config_size.gen (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/SelfTest/configuration/config_size.gen (revision 146) @@ -2,5 +2,4 @@ 4 4 *2 # nb_port_read 2 2 *2 # nb_port_write -0 0 *2 # nb_port_read_write 1 128 *2 # nb_word 32 32 *2 # size_word Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/SelfTest/configuration/config_write.gen =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/SelfTest/configuration/config_write.gen (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/SelfTest/configuration/config_write.gen (revision 146) @@ -2,5 +2,4 @@ 1 1 *2 # nb_port_read 2 8 *2 # nb_port_write -0 0 *2 # nb_port_read_write 512 512 *2 # nb_word 32 32 *2 # size_word Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/SelfTest/src/main.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/SelfTest/src/main.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/SelfTest/src/main.cpp (revision 146) @@ -8,5 +8,5 @@ #include "Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/SelfTest/include/test.h" -#define NB_PARAMS 5 +#define NB_PARAMS 4 void usage (string exec) @@ -16,5 +16,4 @@ << " - nb_port_read (unsigned int)" << endl << " - nb_port_write (unsigned int)" << endl - << " - nb_port_read_write (unsigned int)" << endl << " - nb_word (unsigned int)" << endl << " - size_word (unsigned int)" << endl; @@ -34,12 +33,10 @@ const uint32_t nb_port_read = atoi(argv[2]); const uint32_t nb_port_write = atoi(argv[3]); - const uint32_t nb_port_read_write = atoi(argv[4]); - const uint32_t nb_word = atoi(argv[5]); - const uint32_t size_word = atoi(argv[6]); + const uint32_t nb_word = atoi(argv[4]); + const uint32_t size_word = atoi(argv[5]); morpheo::behavioural::generic::registerfile::registerfile_monolithic::Parameters * param = new morpheo::behavioural::generic::registerfile::registerfile_monolithic::Parameters (nb_port_read , nb_port_write, - nb_port_read_write, nb_word , size_word ); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/SelfTest/src/test.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/SelfTest/src/test.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/SelfTest/src/test.cpp (revision 146) @@ -73,11 +73,4 @@ sc_signal WRITE_DATA [_param->_nb_port_write]; - sc_signal READ_WRITE_VAL [_param->_nb_port_read_write]; - sc_signal READ_WRITE_ACK [_param->_nb_port_read_write]; - sc_signal READ_WRITE_RW [_param->_nb_port_read_write]; - sc_signal READ_WRITE_ADDRESS [_param->_nb_port_read_write]; - sc_signal READ_WRITE_RDATA [_param->_nb_port_read_write]; - sc_signal READ_WRITE_WDATA [_param->_nb_port_read_write]; - /******************************************************** * Instanciation @@ -105,14 +98,4 @@ (*(registerfile-> in_WRITE_DATA [i])) (WRITE_DATA [i]); } - for (uint32_t i=0; i<_param->_nb_port_read_write; i++) - { - (*(registerfile-> in_READ_WRITE_VAL [i])) (READ_WRITE_VAL [i]); - (*(registerfile->out_READ_WRITE_ACK [i])) (READ_WRITE_ACK [i]); - (*(registerfile-> in_READ_WRITE_RW [i])) (READ_WRITE_RW [i]); - if (_param->_have_port_address) - (*(registerfile-> in_READ_WRITE_ADDRESS [i])) (READ_WRITE_ADDRESS [i]); - (*(registerfile-> in_READ_WRITE_WDATA [i])) (READ_WRITE_WDATA [i]); - (*(registerfile->out_READ_WRITE_RDATA [i])) (READ_WRITE_RDATA [i]); - } cout << "<" << name << "> Start Simulation ............" << endl; @@ -131,6 +114,4 @@ for (uint32_t i=0; i<_param->_nb_port_read; i++) READ_VAL [i] .write (0); - for (uint32_t i=0; i<_param->_nb_port_read_write; i++) - READ_WRITE_VAL [i] .write (0); NRESET.write(0); @@ -144,6 +125,4 @@ for (uint32_t i=0; i<_param->_nb_port_read; i++) TEST(Tcontrol_t,READ_ACK [i],1); - for (uint32_t i=0; i<_param->_nb_port_read_write; i++) - TEST(Tcontrol_t,READ_WRITE_ACK [i],1); for (uint32_t nb_iteration=0; nb_iteration < NB_ITERATION; nb_iteration ++) @@ -187,22 +166,4 @@ } - for (uint32_t num_port=0; num_port < _param->_nb_port_read_write; num_port ++) - { - if ((address_next < _param->_nb_word) and - (READ_WRITE_VAL [num_port].read() == 0)) - { - cout << "(" << num_port << ") [" << address_next << "] <= " << tab[address_next] << endl; - - READ_WRITE_VAL [num_port] .write(1); - READ_WRITE_RW [num_port] .write(RW_WRITE); - READ_WRITE_WDATA [num_port] .write(tab[address_next]); - READ_WRITE_ADDRESS [num_port] .write(address_next++); - - // Address can be not a multiple of nb_port_write - if (address_next >= _param->_nb_word) - break; - } - } - SC_START(1); @@ -217,14 +178,4 @@ } } - // reset write_val port - for (uint32_t num_port=0; num_port < _param->_nb_port_read_write; num_port ++) - { - if ((READ_WRITE_ACK [num_port].read() == 1) and - (READ_WRITE_VAL [num_port].read() == 1)) - { - READ_WRITE_VAL [num_port] .write(0); - nb_ack ++; - } - } // SC_START(0); @@ -237,5 +188,4 @@ Tdata_t read_address [_param->_nb_port_read]; - Tdata_t read_write_address [_param->_nb_port_read_write]; while (nb_ack < _param->_nb_word) @@ -258,20 +208,4 @@ } - for (uint32_t num_port=0; num_port < _param->_nb_port_read_write; num_port ++) - { - if ((address_next < _param->_nb_word) and - (READ_WRITE_VAL [num_port].read() == 0)) - { - read_write_address [num_port] = address_next++; - - READ_WRITE_VAL [num_port].write(1); - READ_WRITE_RW [num_port].write(RW_READ); - READ_WRITE_ADDRESS [num_port].write(read_write_address [num_port]); - - if (address_next >= _param->_nb_word) - break; - } - } - SC_START(1); @@ -288,18 +222,4 @@ TEST(Tdata_t,READ_DATA [num_port].read(), tab[read_address [num_port]]); - nb_ack ++; - } - } - - for (uint32_t num_port=0; num_port < _param->_nb_port_read_write; num_port ++) - { - if ((READ_WRITE_ACK [num_port].read() == 1) and - (READ_WRITE_VAL [num_port].read() == 1)) - { - READ_WRITE_VAL [num_port] .write(0); - - cout << "(" << num_port << ") [" << read_write_address [num_port] << "] => " << READ_WRITE_RDATA [num_port].read() << endl; - - TEST(Tdata_t,READ_WRITE_RDATA [num_port].read(), tab[read_write_address [num_port]]); nb_ack ++; } Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/include/Parameters.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/include/Parameters.h (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/include/Parameters.h (revision 146) @@ -23,5 +23,4 @@ public : uint32_t _nb_port_read ; public : uint32_t _nb_port_write; - public : uint32_t _nb_port_read_write; public : uint32_t _nb_word ; public : uint32_t _size_word ; @@ -34,5 +33,4 @@ public : Parameters (uint32_t nb_port_read , uint32_t nb_port_write, - uint32_t nb_port_read_write, uint32_t nb_word , uint32_t size_word , Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/include/RegisterFile_Monolithic.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/include/RegisterFile_Monolithic.h (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/include/RegisterFile_Monolithic.h (revision 146) @@ -5,5 +5,5 @@ * $Id$ * - * [ Description ] + * [ Description ] * */ @@ -22,5 +22,5 @@ #include "Behavioural/include/Stat.h" #endif -// #include "Behavioural/include/Component.h" +#include "Behavioural/include/Component.h" #ifdef VHDL #include "Behavioural/include/Vhdl.h" @@ -28,12 +28,6 @@ #include "Behavioural/include/Usage.h" - - namespace morpheo { namespace behavioural { - - class Component; - class Interfaces; - namespace generic { namespace registerfile { @@ -62,5 +56,4 @@ private : counters_t * _stat_port_read; private : counters_t * _stat_port_write; - private : counters_t * _stat_port_read_write; #endif @@ -85,12 +78,4 @@ public : SC_IN (Taddress_t) ** in_WRITE_ADDRESS; public : SC_IN (Tdata_t) ** in_WRITE_DATA ; - - // ----- Interface Read_Write - public : SC_IN (Tcontrol_t) ** in_READ_WRITE_VAL ; - public : SC_OUT (Tcontrol_t) ** out_READ_WRITE_ACK ; - public : SC_IN (Tcontrol_t) ** in_READ_WRITE_RW ; - public : SC_IN (Taddress_t) ** in_READ_WRITE_ADDRESS; - public : SC_OUT (Tdata_t) ** out_READ_WRITE_RDATA ; - public : SC_IN (Tdata_t) ** in_READ_WRITE_WDATA ; // ~~~~~[ Register ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/Parameters.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/Parameters.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/Parameters.cpp (revision 146) @@ -17,5 +17,4 @@ Parameters::Parameters (uint32_t nb_port_read , uint32_t nb_port_write, - uint32_t nb_port_read_write , uint32_t nb_word , uint32_t size_word , @@ -25,5 +24,4 @@ _nb_port_read = nb_port_read ; _nb_port_write = nb_port_write; - _nb_port_read_write = nb_port_read_write; _nb_word = nb_word ; _size_word = size_word ; @@ -40,5 +38,4 @@ // _nb_port_read (param._nb_port_read ), // _nb_port_write (param._nb_port_write), -// _nb_port_read_write(param._nb_port_read_write), // _nb_word (param._nb_word ), // _size_word (param._size_word ), Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/Parameters_msg_error.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/Parameters_msg_error.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/Parameters_msg_error.cpp (revision 146) @@ -27,8 +27,8 @@ test.error("type \"Taddress_t\" is too little to the size defined by nb_word"); - if ((_nb_port_read + _nb_port_read_write) < 1) + if (_nb_port_read < 1) test.error("you need a read port"); - if ((_nb_port_write + _nb_port_read_write) < 1) + if (_nb_port_write < 1) test.error("you need a write port"); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/Parameters_print.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/Parameters_print.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/Parameters_print.cpp (revision 146) @@ -23,5 +23,4 @@ xml.singleton_begin("nb_port_read "); xml.attribut("value",toString(_nb_port_read )); xml.singleton_end(); xml.singleton_begin("nb_port_write "); xml.attribut("value",toString(_nb_port_write )); xml.singleton_end(); - xml.singleton_begin("nb_port_read_write"); xml.attribut("value",toString(_nb_port_read_write)); xml.singleton_end(); xml.singleton_begin("nb_word "); xml.attribut("value",toString(_nb_word )); xml.singleton_end(); xml.singleton_begin("size_word "); xml.attribut("value",toString(_size_word )); xml.singleton_end(); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic.cpp (revision 146) @@ -79,11 +79,4 @@ sensitive << *(in_READ_ADDRESS [i]); } - for (uint32_t i=0; i<_param->_nb_port_read_write; i++) - { - sensitive << *(in_READ_WRITE_VAL [i]) - << *(in_READ_WRITE_RW [i]); - if (_param->_have_port_address) - sensitive << *(in_READ_WRITE_ADDRESS [i]); - } # ifdef SYSTEMCASS_SPECIFIC @@ -94,11 +87,4 @@ if (_param->_have_port_address) (*(out_READ_DATA [i])) (*( in_READ_ADDRESS [i])); - } - for (uint32_t i=0; i<_param->_nb_port_read_write; i++) - { - (*(out_READ_WRITE_RDATA [i])) (*( in_READ_WRITE_VAL [i])); - (*(out_READ_WRITE_RDATA [i])) (*( in_READ_WRITE_RW [i])); - if (_param->_have_port_address) - (*(out_READ_WRITE_RDATA [i])) (*( in_READ_WRITE_ADDRESS [i])); } # endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_allocation.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_allocation.cpp (revision 146) @@ -8,5 +8,4 @@ #include "Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/include/RegisterFile_Monolithic.h" #include "Behavioural/include/Allocation.h" -#include "Behavioural/include/Component.h" namespace morpheo { @@ -67,18 +66,4 @@ } - // ~~~~~[ Interface : "read_write" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - { - ALLOC1_INTERFACE_BEGIN("read_write",IN,WEST,_("Interface Read_Write"),_param->_nb_port_read_write); - - ALLOC1_VALACK_IN ( in_READ_WRITE_VAL ,VAL); - ALLOC1_VALACK_OUT(out_READ_WRITE_ACK ,ACK); - ALLOC1_SIGNAL_IN ( in_READ_WRITE_RW ,"rw" ,Tcontrol_t,1); - ALLOC1_SIGNAL_IN ( in_READ_WRITE_ADDRESS,"address",Taddress_t,_param->_size_address); - ALLOC1_SIGNAL_IN ( in_READ_WRITE_WDATA ,"wdata" ,Tdata_t ,_param->_size_word); - ALLOC1_SIGNAL_OUT(out_READ_WRITE_RDATA ,"rdata" ,Tdata_t ,_param->_size_word); - - ALLOC1_INTERFACE_END(_param->_nb_port_read_write); - } - if (usage_is_set(_usage,USE_SYSTEMC)) ALLOC1(reg_DATA,Tdata_t,_param->_nb_word); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_constant.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_constant.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_constant.cpp (revision 146) @@ -26,6 +26,4 @@ for (uint32_t i=0; i<_param->_nb_port_write ; i++) PORT_WRITE(out_WRITE_ACK [i], 1); - for (uint32_t i=0; i<_param->_nb_port_read_write ; i++) - PORT_WRITE(out_READ_WRITE_ACK [i], 1); log_end(RegisterFile_Monolithic,FUNCTION); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_deallocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_deallocation.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_deallocation.cpp (revision 146) @@ -8,5 +8,4 @@ #include "Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/include/RegisterFile_Monolithic.h" #include "Behavioural/include/Allocation.h" -#include "Behavioural/include/Component.h" namespace morpheo { @@ -34,12 +33,5 @@ DELETE1_SIGNAL( in_WRITE_ADDRESS,_param->_nb_port_write,_param->_size_address); DELETE1_SIGNAL( in_WRITE_DATA ,_param->_nb_port_write,_param->_size_word); - - DELETE1_SIGNAL( in_READ_WRITE_VAL ,_param->_nb_port_read_write,1); - DELETE1_SIGNAL(out_READ_WRITE_ACK ,_param->_nb_port_read_write,1); - DELETE1_SIGNAL( in_READ_WRITE_RW ,_param->_nb_port_read_write,1); - DELETE1_SIGNAL( in_READ_WRITE_ADDRESS,_param->_nb_port_read_write,_param->_size_address); - DELETE1_SIGNAL( in_READ_WRITE_WDATA ,_param->_nb_port_read_write,_param->_size_word); - DELETE1_SIGNAL(out_READ_WRITE_RDATA ,_param->_nb_port_read_write,_param->_size_word); - + DELETE1(reg_DATA,_param->_nb_word); } Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_genMealy_read.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_genMealy_read.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_genMealy_read.cpp (revision 146) @@ -47,32 +47,4 @@ } } - - for (uint32_t i=0; i<_param->_nb_port_read_write; i++) - { - Tdata_t data; - - // Have a write? - if ( (PORT_READ(in_READ_WRITE_VAL [i]) == 1) and - (PORT_READ(in_READ_WRITE_RW [i]) == RW_READ) - ) - { - Taddress_t address; - if (_param->_have_port_address) - address = PORT_READ(in_READ_WRITE_ADDRESS[i]); - else - address = 0; - - data = reg_DATA[address]; - - log_printf(TRACE,RegisterFile,FUNCTION," * [%d] -> %.8x",static_cast(address),static_cast(data)); - } - else - { - //log_printf(TRACE,RegisterFile,FUNCTION,"Read  [%d] : No transaction",i); - data = 0; - } - - PORT_WRITE(out_READ_WRITE_RDATA[i],data); - } } Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_statistics_declaration.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_statistics_declaration.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_statistics_declaration.cpp (revision 146) @@ -34,20 +34,4 @@ _("Average of write per cycle.") ); - if (_param->_nb_port_read_write>0) - _stat_port_read_write = _stat->create_counters("port_read_write",_param->_nb_port_read_write,"", - _("Cycle number cycle with %d read_write(s)."), - _("Percent of cycle number cycle with %d read_write(s)."), - _("Average of read_write per cycle.") - ); - - // _stat_nb_read = _stat->create_variable("nb_read" ); - // _stat_nb_write = _stat->create_variable("nb_write"); - - // _stat->create_expr_average_by_cycle("average_read" , "nb_read" , "", _("Average read by cycle" )); - // _stat->create_expr_average_by_cycle("average_write", "nb_write", "", _("Average write by cycle")); - - // _stat->create_expr_percent ("percent_use_read" , "average_read" , toString(_param->_nb_port_read +_param->_nb_port_read_write), _("Percent read by cycle" )); - // _stat->create_expr_percent ("percent_use_write", "average_write", toString(_param->_nb_port_write+_param->_nb_port_read_write), _("Percent write by cycle")); - }; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_transition.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_transition.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_transition.cpp (revision 146) @@ -40,5 +40,4 @@ uint32_t stat_nb_read =0; uint32_t stat_nb_write =0; - uint32_t stat_nb_read_write=0; #endif for (uint32_t i=0; i<_param->_nb_port_write; i++) @@ -76,46 +75,4 @@ } } - for (uint32_t i=0; i<_param->_nb_port_read_write; i++) - { - log_printf(TRACE,RegisterFile,FUNCTION," * READ_WRITE [%d] : %d",i,PORT_READ(in_READ_WRITE_VAL[i])); - - // Have a read_write? - if (PORT_READ(in_READ_WRITE_VAL[i]) == true) - { -#ifdef STATISTICS - stat_nb_read_write++; -#endif - - if (PORT_READ(in_READ_WRITE_RW [i]) == RW_WRITE) - { -// #ifdef STATISTICS -// if (usage_is_set(_usage,USE_STATISTICS)) -// (*_stat_nb_write) ++; -// #endif - - Taddress_t address = (_param->_have_port_address)?PORT_READ(in_READ_WRITE_ADDRESS[i]):0; - Tdata_t data = PORT_READ(in_READ_WRITE_WDATA [i]); - - log_printf(TRACE,RegisterFile,FUNCTION," * [%d] <- %.8x",static_cast(address),static_cast(data)); - - -#ifdef DEBUG_TEST - if (address >= _param->_nb_word) - throw ERRORMORPHEO(FUNCTION,toString(_("Address (%d) is invalid (size : %d).\n"),address,_param->_nb_word)); -#endif - - // Write in registerFile - reg_DATA[address] = data; - } -// #ifdef STATISTICS -// else -// { -// if (usage_is_set(_usage,USE_STATISTICS)) -// (*_stat_nb_read) ++; -// } -// #endif - } - } - #ifdef STATISTICS @@ -133,6 +90,4 @@ if (_param->_nb_port_write>0) (*_stat_port_write ) += stat_nb_write; - if (_param->_nb_port_read_write>0) - (*_stat_port_read_write) += stat_nb_read_write; } #endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_vhdl.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_vhdl.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_vhdl.cpp (revision 146) @@ -10,5 +10,4 @@ #include "Behavioural/include/Vhdl.h" #include "Common/include/ToString.h" -#include "Behavioural/include/Component.h" namespace morpheo { Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_vhdl_body.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_vhdl_body.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_vhdl_body.cpp (revision 146) @@ -29,6 +29,4 @@ for (uint32_t i = 0; i < _param->_nb_port_write; i++) vhdl->set_body (0,"out_WRITE_"+toString(i)+"_ACK <= '1';"); - for (uint32_t i = 0; i < _param->_nb_port_read_write; i++) - vhdl->set_body (0,"out_READ_WRITE_"+toString(i)+"_ACK <= '1';"); vhdl->set_body (0,""); @@ -47,13 +45,4 @@ vhdl->set_body (0,"out_READ_"+toString(i)+"_DATA <= reg_DATA ("+str_address+") when in_READ_"+toString(i)+"_VAL = '1' else "+std_logic_others(_param->_size_word,0)+";"); - } - for (uint32_t i = 0; i < _param->_nb_port_read_write; i++) - { - std::string str_address; - if (_param->_have_port_address) - str_address = "conv_integer(in_READ_WRITE_"+toString(i)+"_ADDRESS)"; - else - str_address = "0"; - vhdl->set_body (0,"out_READ_WRITE_"+toString(i)+"_RDATA <= reg_DATA ("+str_address+") when in_READ_WRITE_"+toString(i)+"_VAL = '1' and in_READ_WRITE_"+toString(i)+"_RW = '"+toString(RW_READ)+"' else "+std_logic_others(_param->_size_word,0)+";"); } @@ -92,16 +81,4 @@ vhdl->set_body (2,"end if;"); } - for (uint32_t i = 0; i < _param->_nb_port_read_write; i++) - { - std::string str_address; - if (_param->_have_port_address) - str_address = "conv_integer(in_READ_WRITE_"+toString(i)+"_ADDRESS)"; - else - str_address = "0"; - - vhdl->set_body (2,"if (in_READ_WRITE_"+toString(i)+"_VAL = '1' and in_READ_WRITE_"+toString(i)+"_RW = '"+toString(RW_WRITE)+"') then"); - vhdl->set_body (3,"reg_DATA("+str_address+") <= in_READ_WRITE_"+toString(i)+"_WDATA;"); - vhdl->set_body (2,"end if;"); - } vhdl->set_body (1,"end if;"); @@ -122,6 +99,4 @@ // for (uint32_t i = 0; i < _param->_nb_port_write; i++) // vhdl->set_body (0,"out_WRITE_"+toString(i)+"_ACK <= '1';"); - // for (uint32_t i = 0; i < _param->_nb_port_read_write; i++) - // vhdl->set_body (0,"out_READ_WRITE_"+toString(i)+"_ACK <= '1';"); // vhdl->set_body (0,""); @@ -195,6 +170,4 @@ for (uint32_t i = 0; i < _param->_nb_port_write; i++) vhdl->set_body (1,"out_WRITE_"+toString(i)+"_ACK <= '1';"); - for (uint32_t i = 0; i < _param->_nb_port_read_write; i++) - vhdl->set_body (1,"out_READ_WRITE_"+toString(i)+"_ACK <= '1';"); vhdl->set_body (1,""); vhdl->set_body (1," -- Read"); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/include/Parameters.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/include/Parameters.h (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/include/Parameters.h (revision 146) @@ -12,4 +12,5 @@ #include "Behavioural/include/Parameters.h" #include "Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/include/Parameters.h" +#include "Behavioural/Generic/RegisterFile/RegisterFile_Internal_Banked/include/Parameters.h" #include "Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/include/Parameters.h" #include @@ -20,5 +21,6 @@ namespace registerfile { - typedef enum {instance_RegisterFile_Monolithic , + typedef enum {instance_RegisterFile_Monolithic, + instance_RegisterFile_Internal_Banked, instance_RegisterFile_Multi_Banked} Tinstance_t; @@ -34,10 +36,12 @@ public : bool _have_port_address; - public : morpheo::behavioural::generic::registerfile::registerfile_monolithic ::Parameters * _param_registerfile_monolithic; - public : morpheo::behavioural::generic::registerfile::registerfile_multi_banked::Parameters * _param_registerfile_multi_banked; + public : morpheo::behavioural::generic::registerfile::registerfile_monolithic ::Parameters * _param_registerfile_monolithic; + public : morpheo::behavioural::generic::registerfile::registerfile_internal_banked::Parameters * _param_registerfile_internal_banked; + public : morpheo::behavioural::generic::registerfile::registerfile_multi_banked ::Parameters * _param_registerfile_multi_banked; //-----[ methods ]----------------------------------------------------------- - public : Parameters (morpheo::behavioural::generic::registerfile::registerfile_monolithic ::Parameters * param); - public : Parameters (morpheo::behavioural::generic::registerfile::registerfile_multi_banked::Parameters * param); + public : Parameters (morpheo::behavioural::generic::registerfile::registerfile_monolithic ::Parameters * param); + public : Parameters (morpheo::behavioural::generic::registerfile::registerfile_internal_banked::Parameters * param); + public : Parameters (morpheo::behavioural::generic::registerfile::registerfile_multi_banked ::Parameters * param); // public : Parameters (Parameters & param) ; public : ~Parameters () ; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/include/RegisterFile.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/include/RegisterFile.h (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/include/RegisterFile.h (revision 146) @@ -18,4 +18,5 @@ #include "Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/include/RegisterFile_Monolithic.h" +#include "Behavioural/Generic/RegisterFile/RegisterFile_Internal_Banked/include/RegisterFile_Internal_Banked.h" #include "Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/include/RegisterFile_Multi_Banked.h" @@ -76,6 +77,7 @@ // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - protected : morpheo::behavioural::generic::registerfile::registerfile_monolithic ::RegisterFile_Monolithic ::RegisterFile_Monolithic * component_RegisterFile_Monolithic ; - protected : morpheo::behavioural::generic::registerfile::registerfile_multi_banked::RegisterFile_Multi_Banked::RegisterFile_Multi_Banked * component_RegisterFile_Multi_Banked; + protected : morpheo::behavioural::generic::registerfile::registerfile_monolithic ::RegisterFile_Monolithic ::RegisterFile_Monolithic * component_RegisterFile_Monolithic; + protected : morpheo::behavioural::generic::registerfile::registerfile_internal_banked::RegisterFile_Internal_Banked::RegisterFile_Internal_Banked * component_RegisterFile_Internal_Banked; + protected : morpheo::behavioural::generic::registerfile::registerfile_multi_banked ::RegisterFile_Multi_Banked ::RegisterFile_Multi_Banked * component_RegisterFile_Multi_Banked; // ~~~~~[ Register ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/src/Parameters.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/src/Parameters.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/src/Parameters.cpp (revision 146) @@ -26,6 +26,28 @@ _have_port_address = param->_have_port_address; - _param_registerfile_monolithic = param; - _param_registerfile_multi_banked = NULL; + _param_registerfile_monolithic = param; + _param_registerfile_internal_banked = NULL; + _param_registerfile_multi_banked = NULL; + + test(); + + log_printf(FUNC,RegisterFile,"Parameters","End"); + }; + + Parameters::Parameters (morpheo::behavioural::generic::registerfile::registerfile_internal_banked ::Parameters * param) + { + log_printf(FUNC,RegisterFile,"Parameters","Begin"); + + _instance = instance_RegisterFile_Internal_Banked; + _nb_port_read = param->_nb_port_read ; + _nb_port_write = param->_nb_port_write; + _nb_word = param->_nb_word ; + _size_word = param->_size_word ; + _size_address = param->_size_address ; + _have_port_address = param->_have_port_address; + + _param_registerfile_monolithic = NULL; + _param_registerfile_internal_banked = param; + _param_registerfile_multi_banked = NULL; test(); @@ -45,6 +67,7 @@ log_printf(FUNC,RegisterFile,"Parameters","Begin"); - _param_registerfile_monolithic = NULL; - _param_registerfile_multi_banked = param; + _param_registerfile_monolithic = NULL; + _param_registerfile_internal_banked = NULL; + _param_registerfile_multi_banked = param; test(); @@ -53,21 +76,4 @@ }; -// Parameters::Parameters (Parameters & param): -// _instance (param._instance ), -// _nb_port_read (param._nb_port_read ), -// _nb_port_write (param._nb_port_write), -// _nb_word (param._nb_word ), -// _size_word (param._size_word ), -// _size_address (param._size_address ), -// _have_port_address (param._have_port_address) -// { -// log_printf(FUNC,RegisterFile,"Parameters (copy)","Begin"); - -// _param_registerfile_multi_banked = param._param_registerfile_multi_banked; -// _param_registerfile_monolithic = param._param_registerfile_monolithic; -// test(); -// log_printf(FUNC,RegisterFile,"Parameters (copy)","End"); -// }; - Parameters::~Parameters () { @@ -84,4 +90,6 @@ // if (_instance == instance_RegisterFile_Monolithic) // COPY(_param_registerfile_monolithic); +// if (_instance == instance_RegisterFile_Internal_Banked) +// COPY(_param_registerfile_internal_banked); // if (_instance == instance_RegisterFile_Multi_Banked) // COPY(_param_registerfile_multi_banked); @@ -92,5 +100,4 @@ }; // end namespace registerfile }; // end namespace generic - }; // end namespace behavioural }; // end namespace morpheo Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/src/Parameters_msg_error.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/src/Parameters_msg_error.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/src/Parameters_msg_error.cpp (revision 146) @@ -10,16 +10,20 @@ #include -namespace morpheo { +namespace morpheo { namespace behavioural { namespace generic { namespace registerfile { - Parameters_test Parameters::msg_error(void) { if (_instance == instance_RegisterFile_Monolithic) - return _param_registerfile_monolithic ->msg_error(); + return _param_registerfile_monolithic->msg_error(); else - return _param_registerfile_multi_banked->msg_error(); + { + if (_instance == instance_RegisterFile_Internal_Banked) + return _param_registerfile_internal_banked->msg_error(); + else + return _param_registerfile_multi_banked->msg_error(); + } }; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/src/Parameters_print.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/src/Parameters_print.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/src/Parameters_print.cpp (revision 146) @@ -9,9 +9,8 @@ #include "Behavioural/include/XML.h" -namespace morpheo { +namespace morpheo { namespace behavioural { namespace generic { namespace registerfile { - std::string Parameters::print (uint32_t depth) @@ -22,7 +21,12 @@ if (_instance == instance_RegisterFile_Monolithic) - _return = _param_registerfile_monolithic ->print(depth); + _return = _param_registerfile_monolithic->print(depth); else - _return = _param_registerfile_multi_banked->print(depth); + { + if (_instance == instance_RegisterFile_Internal_Banked) + _return = _param_registerfile_internal_banked->print(depth); + else + _return = _param_registerfile_multi_banked->print(depth); + } log_printf(FUNC,RegisterFile,"print","End"); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/src/RegisterFile.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/src/RegisterFile.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/src/RegisterFile.cpp (revision 146) @@ -43,7 +43,12 @@ #ifdef STATISTICS if (_param->_instance == instance_RegisterFile_Monolithic) - _stat = component_RegisterFile_Monolithic ->_stat; + _stat = component_RegisterFile_Monolithic->_stat; else - _stat = component_RegisterFile_Multi_Banked->_stat; + { + if (_param->_instance == instance_RegisterFile_Internal_Banked) + _stat = component_RegisterFile_Internal_Banked->_stat; + else + _stat = component_RegisterFile_Multi_Banked->_stat; + } #endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/src/RegisterFile_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/src/RegisterFile_allocation.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/src/RegisterFile_allocation.cpp (revision 146) @@ -15,11 +15,12 @@ namespace registerfile { - void RegisterFile::allocation ( -#ifdef STATISTICS - morpheo::behavioural::Parameters_Statistics * param_statistics -#else - void -#endif - ) + void RegisterFile::allocation + ( +#ifdef STATISTICS + morpheo::behavioural::Parameters_Statistics * param_statistics +#else + void +#endif + ) { std::string rename; @@ -60,26 +61,41 @@ #endif - // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + if (_param->_instance == instance_RegisterFile_Monolithic) // =====[ component_RegisterFile_Monolithic ]========================= { - component_RegisterFile_Monolithic = new morpheo::behavioural::generic::registerfile::registerfile_monolithic ::RegisterFile_Monolithic ::RegisterFile_Monolithic (_name.c_str() -#ifdef STATISTICS - ,param_statistics -#endif - ,_param->_param_registerfile_monolithic - ,_usage); - + component_RegisterFile_Monolithic = new morpheo::behavioural::generic::registerfile::registerfile_monolithic ::RegisterFile_Monolithic ::RegisterFile_Monolithic + (_name.c_str() +#ifdef STATISTICS + ,param_statistics +#endif + ,_param->_param_registerfile_monolithic + ,_usage); } else - // =====[ component_RegisterFile_Multi_Banked ]======================= - { - component_RegisterFile_Multi_Banked = new morpheo::behavioural::generic::registerfile::registerfile_multi_banked::RegisterFile_Multi_Banked::RegisterFile_Multi_Banked (_name.c_str() -#ifdef STATISTICS - ,param_statistics -#endif - ,_param->_param_registerfile_multi_banked - ,_usage); - + { + if (_param->_instance == instance_RegisterFile_Internal_Banked) + // =====[ component_RegisterFile_Internal_Banked ]========================= + { + component_RegisterFile_Internal_Banked = new morpheo::behavioural::generic::registerfile::registerfile_internal_banked ::RegisterFile_Internal_Banked ::RegisterFile_Internal_Banked + (_name.c_str() +#ifdef STATISTICS + ,param_statistics +#endif + ,_param->_param_registerfile_internal_banked + ,_usage); + } + else + { + // =====[ component_RegisterFile_Multi_Banked ]======================= + component_RegisterFile_Multi_Banked = new morpheo::behavioural::generic::registerfile::registerfile_multi_banked::RegisterFile_Multi_Banked::RegisterFile_Multi_Banked + (_name.c_str() +#ifdef STATISTICS + ,param_statistics +#endif + ,_param->_param_registerfile_multi_banked + ,_usage); + } } // ~~~~~[ Component - Instanciation ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -125,49 +141,94 @@ } else - // =====[ Component_RegisterFile_Multi_Banked - Instanciation ]======= - { -#ifdef SYSTEMCASS_SPECIFIC - (*(component_RegisterFile_Multi_Banked->in_CLOCK )) (*(in_CLOCK )); - (*(component_RegisterFile_Multi_Banked->in_NRESET)) (*(in_NRESET)); - - for (uint32_t i=0; i<_param->_nb_port_read; i++) - { - (*(component_RegisterFile_Multi_Banked-> in_READ_VAL [i])) (*( in_READ_VAL [i])); - (*(component_RegisterFile_Multi_Banked->out_READ_ACK [i])) (*(out_READ_ACK [i])); - if (_param->_have_port_address == true) - (*(component_RegisterFile_Multi_Banked-> in_READ_ADDRESS [i])) (*( in_READ_ADDRESS [i])); - (*(component_RegisterFile_Multi_Banked->out_READ_DATA [i])) (*(out_READ_DATA [i])); - } - - for (uint32_t i=0; i<_param->_nb_port_write; i++) - { - (*(component_RegisterFile_Multi_Banked-> in_WRITE_VAL [i])) (*( in_WRITE_VAL [i])); - (*(component_RegisterFile_Multi_Banked->out_WRITE_ACK [i])) (*(out_WRITE_ACK [i])); - if (_param->_have_port_address == true) - (*(component_RegisterFile_Multi_Banked-> in_WRITE_ADDRESS [i])) (*( in_WRITE_ADDRESS [i])); - (*(component_RegisterFile_Multi_Banked-> in_WRITE_DATA [i])) (*( in_WRITE_DATA [i])); - } -#else - in_CLOCK = component_RegisterFile_Multi_Banked-> in_CLOCK ; - in_NRESET = component_RegisterFile_Multi_Banked-> in_NRESET ; - - in_READ_VAL = component_RegisterFile_Multi_Banked-> in_READ_VAL ; - out_READ_ACK = component_RegisterFile_Multi_Banked->out_READ_ACK ; - in_READ_ADDRESS = component_RegisterFile_Multi_Banked-> in_READ_ADDRESS ; - out_READ_DATA = component_RegisterFile_Multi_Banked->out_READ_DATA ; - - in_WRITE_VAL = component_RegisterFile_Multi_Banked-> in_WRITE_VAL ; - out_WRITE_ACK = component_RegisterFile_Multi_Banked->out_WRITE_ACK ; - in_WRITE_ADDRESS = component_RegisterFile_Multi_Banked-> in_WRITE_ADDRESS; - in_WRITE_DATA = component_RegisterFile_Multi_Banked-> in_WRITE_DATA ; -#endif - + { + if (_param->_instance == instance_RegisterFile_Internal_Banked) + // =====[ Component_RegisterFile_Internal_Banked - Instanciation ]========= + { +#ifdef SYSTEMCASS_SPECIFIC + (*(component_RegisterFile_Internal_Banked ->in_CLOCK )) (*(in_CLOCK )); + (*(component_RegisterFile_Internal_Banked ->in_NRESET)) (*(in_NRESET)); + + for (uint32_t i=0; i<_param->_nb_port_read; i++) + { + (*(component_RegisterFile_Internal_Banked -> in_READ_VAL [i])) (*( in_READ_VAL [i])); + (*(component_RegisterFile_Internal_Banked ->out_READ_ACK [i])) (*(out_READ_ACK [i])); + if (_param->_have_port_address == true) + (*(component_RegisterFile_Internal_Banked -> in_READ_ADDRESS [i])) (*( in_READ_ADDRESS [i])); + (*(component_RegisterFile_Internal_Banked ->out_READ_DATA [i])) (*(out_READ_DATA [i])); + } + + for (uint32_t i=0; i<_param->_nb_port_write; i++) + { + (*(component_RegisterFile_Internal_Banked -> in_WRITE_VAL [i])) (*( in_WRITE_VAL [i])); + (*(component_RegisterFile_Internal_Banked ->out_WRITE_ACK [i])) (*(out_WRITE_ACK [i])); + if (_param->_have_port_address == true) + (*(component_RegisterFile_Internal_Banked -> in_WRITE_ADDRESS [i])) (*( in_WRITE_ADDRESS [i])); + (*(component_RegisterFile_Internal_Banked -> in_WRITE_DATA [i])) (*( in_WRITE_DATA [i])); + } +#else + in_CLOCK = component_RegisterFile_Internal_Banked-> in_CLOCK ; + in_NRESET = component_RegisterFile_Internal_Banked-> in_NRESET ; + + in_READ_VAL = component_RegisterFile_Internal_Banked-> in_READ_VAL ; + out_READ_ACK = component_RegisterFile_Internal_Banked->out_READ_ACK ; + in_READ_ADDRESS = component_RegisterFile_Internal_Banked-> in_READ_ADDRESS ; + out_READ_DATA = component_RegisterFile_Internal_Banked->out_READ_DATA ; + + in_WRITE_VAL = component_RegisterFile_Internal_Banked-> in_WRITE_VAL ; + out_WRITE_ACK = component_RegisterFile_Internal_Banked->out_WRITE_ACK ; + in_WRITE_ADDRESS = component_RegisterFile_Internal_Banked-> in_WRITE_ADDRESS; + in_WRITE_DATA = component_RegisterFile_Internal_Banked-> in_WRITE_DATA ; +#endif + } + else + // =====[ Component_RegisterFile_Multi_Banked - Instanciation ]======= + { +#ifdef SYSTEMCASS_SPECIFIC + (*(component_RegisterFile_Multi_Banked->in_CLOCK )) (*(in_CLOCK )); + (*(component_RegisterFile_Multi_Banked->in_NRESET)) (*(in_NRESET)); + + for (uint32_t i=0; i<_param->_nb_port_read; i++) + { + (*(component_RegisterFile_Multi_Banked-> in_READ_VAL [i])) (*( in_READ_VAL [i])); + (*(component_RegisterFile_Multi_Banked->out_READ_ACK [i])) (*(out_READ_ACK [i])); + if (_param->_have_port_address == true) + (*(component_RegisterFile_Multi_Banked-> in_READ_ADDRESS [i])) (*( in_READ_ADDRESS [i])); + (*(component_RegisterFile_Multi_Banked->out_READ_DATA [i])) (*(out_READ_DATA [i])); + } + + for (uint32_t i=0; i<_param->_nb_port_write; i++) + { + (*(component_RegisterFile_Multi_Banked-> in_WRITE_VAL [i])) (*( in_WRITE_VAL [i])); + (*(component_RegisterFile_Multi_Banked->out_WRITE_ACK [i])) (*(out_WRITE_ACK [i])); + if (_param->_have_port_address == true) + (*(component_RegisterFile_Multi_Banked-> in_WRITE_ADDRESS [i])) (*( in_WRITE_ADDRESS [i])); + (*(component_RegisterFile_Multi_Banked-> in_WRITE_DATA [i])) (*( in_WRITE_DATA [i])); + } +#else + in_CLOCK = component_RegisterFile_Multi_Banked-> in_CLOCK ; + in_NRESET = component_RegisterFile_Multi_Banked-> in_NRESET ; + + in_READ_VAL = component_RegisterFile_Multi_Banked-> in_READ_VAL ; + out_READ_ACK = component_RegisterFile_Multi_Banked->out_READ_ACK ; + in_READ_ADDRESS = component_RegisterFile_Multi_Banked-> in_READ_ADDRESS ; + out_READ_DATA = component_RegisterFile_Multi_Banked->out_READ_DATA ; + + in_WRITE_VAL = component_RegisterFile_Multi_Banked-> in_WRITE_VAL ; + out_WRITE_ACK = component_RegisterFile_Multi_Banked->out_WRITE_ACK ; + in_WRITE_ADDRESS = component_RegisterFile_Multi_Banked-> in_WRITE_ADDRESS; + in_WRITE_DATA = component_RegisterFile_Multi_Banked-> in_WRITE_DATA ; +#endif + } } if (_param->_instance == instance_RegisterFile_Monolithic) - _component = component_RegisterFile_Monolithic ->_component; + _component = component_RegisterFile_Monolithic->_component; else - _component = component_RegisterFile_Multi_Banked->_component; - + { + if (_param->_instance == instance_RegisterFile_Internal_Banked) + _component = component_RegisterFile_Internal_Banked->_component; + else + _component = component_RegisterFile_Multi_Banked->_component; + } log_printf(FUNC,RegisterFile,"allocation","End"); }; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/src/RegisterFile_deallocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/src/RegisterFile_deallocation.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/src/RegisterFile_deallocation.cpp (revision 146) @@ -60,7 +60,12 @@ if (_param->_instance == instance_RegisterFile_Monolithic) - delete component_RegisterFile_Monolithic ; + delete component_RegisterFile_Monolithic; else - delete component_RegisterFile_Multi_Banked; + { + if (_param->_instance == instance_RegisterFile_Internal_Banked) + delete component_RegisterFile_Internal_Banked; + else + delete component_RegisterFile_Multi_Banked; + } log_printf(FUNC,RegisterFile,"deallocation","End"); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component_vst/src/New_Component.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component_vst/src/New_Component.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component_vst/src/New_Component.cpp (revision 146) @@ -78,5 +78,5 @@ log_end(@COMPONENT,FUNCTION); }; - + #undef FUNCTION #define FUNCTION "@COMPONENT::~@COMPONENT" Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component_vst/src/New_Component_transition.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component_vst/src/New_Component_transition.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component_vst/src/New_Component_transition.cpp (revision 146) @@ -1,4 +1,4 @@ +#ifdef SYSTEMC # if defined(STATISTICS) or defined(VHDL_TESTBENCH) -#ifdef SYSTEMC /* * $Id$ @@ -20,7 +20,5 @@ log_begin(@COMPONENT,FUNCTION); -#if defined(STATISTICS) or defined(VHDL_TESTBENCH) end_cycle (); -#endif log_end(@COMPONENT,FUNCTION); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Allocation.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Allocation.h (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Allocation.h (revision 146) @@ -141,5 +141,5 @@ } while (0) -#define DELETE0(var) DELETE1_COND(var,true) +#define DELETE0(var) DELETE0_COND(var,true) #define DELETE1(var,s1) DELETE1_COND(var,s1,true) #define DELETE2(var,s1,s2) DELETE2_COND(var,s1,s2,true) Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Stat_binary_tree.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Stat_binary_tree.h (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Stat_binary_tree.h (revision 146) @@ -1,3 +1,3 @@ -#ifdef STATISTICS +//#ifdef STATISTICS #ifndef morpheo_behavioural_Stat_binary_tree_h #define morpheo_behavioural_Stat_binary_tree_h @@ -72,3 +72,3 @@ }; #endif -#endif +//#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Stat_type.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Stat_type.h (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Stat_type.h (revision 146) @@ -1,3 +1,2 @@ -#ifdef STATISTICS #ifndef morpheo_behavioural_Stat_type_h #define morpheo_behavioural_Stat_type_h @@ -12,9 +11,11 @@ namespace behavioural { - typedef enum{TYPE_VARIABLE, TYPE_COUNTER} counter_type_t; - typedef double counter_t ; typedef enum{add, sub, mul, div, inc, dec} operator_t; + +#ifdef STATISTICS + + typedef enum{TYPE_VARIABLE, TYPE_COUNTER} counter_type_t; //typedef std::pair pair_operator_string_t; @@ -79,6 +80,7 @@ }; +#endif + }; }; #endif -#endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Types.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Types.h (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Types.h (revision 146) @@ -114,4 +114,10 @@ typedef enum + { + PHT_SCHEME_COUNTER, + PHT_SCHEME_FSM + } Tpht_scheme_t; + + typedef enum { MANAGE_EVENT_WAIT_ALL, @@ -314,4 +320,28 @@ }; + + template<> inline std::string toString(const morpheo::behavioural::Tpht_scheme_t& x) + { + switch (x) + { + case morpheo::behavioural::PHT_SCHEME_COUNTER : return "counter"; break; + case morpheo::behavioural::PHT_SCHEME_FSM : return "fsm" ; break; + default : return ""; break; + } + }; + + template<> inline morpheo::behavioural::Tpht_scheme_t fromString(const std::string& x) + { + if ( (x.compare(toString(static_cast(morpheo::behavioural::PHT_SCHEME_COUNTER ))) == 0) or + (x.compare(toString( morpheo::behavioural::PHT_SCHEME_COUNTER )) == 0)) + return morpheo::behavioural::PHT_SCHEME_COUNTER; + if ( (x.compare(toString(static_cast(morpheo::behavioural::PHT_SCHEME_FSM))) == 0) or + (x.compare(toString( morpheo::behavioural::PHT_SCHEME_FSM )) == 0)) + return morpheo::behavioural::PHT_SCHEME_FSM; + + throw (ErrorMorpheo (" : Unknow string : \""+x+"\"")); + }; + + template<> inline std::string toString(const morpheo::behavioural::Trat_scheme_t& x) { Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree.cpp (revision 146) @@ -1,3 +1,3 @@ -#ifdef STATISTICS +// #ifdef STATISTICS #include "Behavioural/include/Stat_binary_tree.h" @@ -70,3 +70,3 @@ }; }; -#endif +// #endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_change_type.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_change_type.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_change_type.cpp (revision 146) @@ -1,3 +1,3 @@ -#ifdef STATISTICS +// #ifdef STATISTICS #include "Behavioural/include/Stat_binary_tree.h" @@ -33,3 +33,3 @@ }; }; -#endif +// #endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_eval.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_eval.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_eval.cpp (revision 146) @@ -1,3 +1,3 @@ -#ifdef STATISTICS +// #ifdef STATISTICS #include "Behavioural/include/Stat_binary_tree.h" @@ -13,3 +13,3 @@ }; }; -#endif +// #endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_goto_next_root.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_goto_next_root.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_goto_next_root.cpp (revision 146) @@ -1,3 +1,3 @@ -#ifdef STATISTICS +// #ifdef STATISTICS #include "Behavioural/include/Stat_binary_tree.h" @@ -23,3 +23,3 @@ }; }; -#endif +// #endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_goto_top_level.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_goto_top_level.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_goto_top_level.cpp (revision 146) @@ -1,3 +1,3 @@ -#ifdef STATISTICS +// #ifdef STATISTICS #include "Behavioural/include/Stat_binary_tree.h" @@ -16,3 +16,3 @@ }; }; -#endif +// #endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_import.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_import.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_import.cpp (revision 146) @@ -1,3 +1,3 @@ -#ifdef STATISTICS +// #ifdef STATISTICS #include "Behavioural/include/Stat_binary_tree.h" @@ -137,3 +137,3 @@ }; }; -#endif +// #endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_insert_tree.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_insert_tree.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_insert_tree.cpp (revision 146) @@ -1,3 +1,3 @@ -#ifdef STATISTICS +// #ifdef STATISTICS #include "Behavioural/include/Stat_binary_tree.h" @@ -39,3 +39,3 @@ }; }; -#endif +// #endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_is_leaf.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_is_leaf.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_is_leaf.cpp (revision 146) @@ -1,8 +1,8 @@ -#ifdef STATISTICS +// #ifdef STATISTICS #include "Behavioural/include/Stat_binary_tree.h" namespace morpheo { namespace behavioural { - bool Stat_binary_tree::is_leaf (void) + bool Stat_binary_tree::is_leaf (void) { return ((_left == NULL) and (_right == NULL)); @@ -10,3 +10,3 @@ }; }; -#endif +// #endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_print.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_print.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_print.cpp (revision 146) @@ -1,3 +1,3 @@ -#ifdef STATISTICS +// #ifdef STATISTICS #include "Behavioural/include/Stat_binary_tree.h" #include "Common/include/Tabulation.h" @@ -69,3 +69,3 @@ }; }; -#endif +// #endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_val_leaf.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_val_leaf.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_val_leaf.cpp (revision 146) @@ -1,3 +1,3 @@ -#ifdef STATISTICS +// #ifdef STATISTICS #include "Behavioural/include/Stat_binary_tree.h" @@ -19,3 +19,3 @@ }; }; -#endif +// #endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_val_tree.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_val_tree.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_val_tree.cpp (revision 146) @@ -1,3 +1,3 @@ -#ifdef STATISTICS +// #ifdef STATISTICS #include "Behavioural/include/Stat_binary_tree.h" @@ -21,3 +21,3 @@ }; }; -#endif +// #endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_valid.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_valid.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Stat_binary_tree_valid.cpp (revision 146) @@ -1,3 +1,3 @@ -#ifdef STATISTICS +// #ifdef STATISTICS #include "Behavioural/include/Stat_binary_tree.h" @@ -31,3 +31,3 @@ }; }; -#endif +// #endif Index: trunk/IPs/systemC/processor/Morpheo/Common/include/ErrorMorpheo.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Common/include/ErrorMorpheo.h (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Common/include/ErrorMorpheo.h (revision 146) @@ -18,6 +18,17 @@ namespace morpheo { -#define ERRORMORPHEO(funcname,msg) ErrorMorpheo(funcname,msg,__LINE__,__FILE__) +#define ERRORMORPHEO(funcname,msg) \ + ErrorMorpheo(funcname,msg,__LINE__,__FILE__) +#define THROW_ERRORMORPHEO(cond,funcname,msg) \ + do \ + { \ + if (cond) \ + { \ + throw ERRORMORPHEO(funcname,msg); \ + } \ + } \ + while (0) + class ErrorMorpheo : public std::exception { @@ -46,16 +57,4 @@ }; -// class TestMorpheo : public std::exception -// { -// // -----[ fields ]---------------------------------------------------- -// private : std::string _msg; - -// // -----[ methods ]--------------------------------------------------- -// public : TestMorpheo () throw() {_msg=_("Test error ...");} -// public : TestMorpheo (std::string msg) throw() {_msg=msg;} -// public : ~TestMorpheo (void) throw() {} -// public : const char* what () const throw() { return ( _msg.c_str() );} -// }; - }; // end namespace morpheo Index: trunk/IPs/systemC/processor/Morpheo/Common/src/Basename.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Common/src/Basename.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Common/src/Basename.cpp (revision 146) @@ -7,5 +7,5 @@ #include "../include/Basename.h" -//#include +#include namespace morpheo { Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w01_00.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w01_00.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w01_00.cfg (revision 146) @@ -65,4 +65,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w01_01.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w01_01.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w01_01.cfg (revision 146) @@ -65,4 +65,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w01_02.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w01_02.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w01_02.cfg (revision 146) @@ -65,4 +65,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w01_03.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w01_03.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w01_03.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -102,5 +103,6 @@ - + + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w01_04.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w01_04.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w01_04.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -117,5 +118,6 @@ - + + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w01_05.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w01_05.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w01_05.cfg (revision 146) @@ -65,4 +65,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w01_06.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w01_06.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w01_06.cfg (revision 146) @@ -65,4 +65,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w01_07.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w01_07.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w01_07.cfg (revision 146) @@ -65,4 +65,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w02_01.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w02_01.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w02_01.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -102,5 +103,6 @@ - + + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w02_02.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w02_02.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w02_02.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -116,5 +117,6 @@ - + + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w02_03.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w02_03.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w02_03.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -116,5 +117,6 @@ - + + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w02_04.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w02_04.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w02_04.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -116,5 +117,6 @@ - + + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w02_05.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w02_05.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w02_05.cfg (revision 146) @@ -65,4 +65,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w02_06.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w02_06.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w02_06.cfg (revision 146) @@ -65,4 +65,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w02_07.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w02_07.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w02_07.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -118,5 +119,6 @@ - + + @@ -128,4 +130,5 @@ + @@ -135,4 +138,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w02_08.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w02_08.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w02_08.cfg (revision 146) @@ -65,4 +65,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_01.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_01.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_01.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x10.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x10.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x10.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x11.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x11.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x11.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x12.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x12.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x12.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x13.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x13.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x13.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x14.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x14.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x14.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x15.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x15.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x15.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x16.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x16.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x16.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x2.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x2.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x2.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x3.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x3.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x3.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x4.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x4.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x4.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x5.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x5.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x5.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x6.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x6.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x6.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x7.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x7.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x7.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x8.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x8.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x8.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x9.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x9.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_2x9.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x10.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x10.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x10.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x11.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x11.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x11.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x12.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x12.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x12.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x13.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x13.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x13.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x14.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x14.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x14.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x15.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x15.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x15.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x16.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x16.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x16.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x3.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x3.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x3.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x4.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x4.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x4.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x5.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x5.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x5.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x6.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x6.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x6.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x7.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x7.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x7.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x8.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x8.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x8.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x9.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x9.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_3x9.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x10.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x10.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x10.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x11.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x11.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x11.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x12.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x12.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x12.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x13.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x13.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x13.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x14.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x14.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x14.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x15.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x15.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x15.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x16.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x16.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x16.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x4.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x4.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x4.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x5.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x5.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x5.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x6.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x6.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x6.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x7.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x7.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x7.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x8.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x8.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x8.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x9.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x9.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_4x9.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x10.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x10.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x10.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x11.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x11.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x11.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x12.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x12.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x12.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x13.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x13.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x13.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x14.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x14.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x14.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x15.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x15.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x15.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x16.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x16.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x16.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x5.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x5.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x5.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x6.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x6.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x6.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x7.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x7.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x7.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x8.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x8.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x8.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x9.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x9.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_5x9.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x10.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x10.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x10.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x11.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x11.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x11.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x12.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x12.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x12.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x13.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x13.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x13.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x14.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x14.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x14.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x15.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x15.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x15.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x16.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x16.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x16.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x6.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x6.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x6.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x7.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x7.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x7.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x8.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x8.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x8.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x9.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x9.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_6x9.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_7x10.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_7x10.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_7x10.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_7x11.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_7x11.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_7x11.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_7x12.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_7x12.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_7x12.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_7x13.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_7x13.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_7x13.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_7x14.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_7x14.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_7x14.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_7x15.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_7x15.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_7x15.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_7x16.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_7x16.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_7x16.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_7x7.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_7x7.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_7x7.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_7x8.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_7x8.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_7x8.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_7x9.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_7x9.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_7x9.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_8x10.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_8x10.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_8x10.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_8x11.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_8x11.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_8x11.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_8x12.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_8x12.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_8x12.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_8x13.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_8x13.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_8x13.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_8x14.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_8x14.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_8x14.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_8x15.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_8x15.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_8x15.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_8x16.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_8x16.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_8x16.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_8x8.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_8x8.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_8x8.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_8x9.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_8x9.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-depth_8x9.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_16x_1r_1w.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_16x_1r_1w.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_16x_1r_1w.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_16x_2r_1w.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_16x_2r_1w.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_16x_2r_1w.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_1x_12r_6w.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_1x_12r_6w.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_1x_12r_6w.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_2x_10r_5w.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_2x_10r_5w.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_2x_10r_5w.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_2x_6r_3w.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_2x_6r_3w.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_2x_6r_3w.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_2x_8r_4w.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_2x_8r_4w.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_2x_8r_4w.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_32x_1r_1w.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_32x_1r_1w.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_32x_1r_1w.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_4x_4r_2w.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_4x_4r_2w.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_4x_4r_2w.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_4x_6r_3w.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_4x_6r_3w.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_4x_6r_3w.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_4x_8r_4w.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_4x_8r_4w.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_4x_8r_4w.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_8x_2r_1w.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_8x_2r_1w.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_8x_2r_1w.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_8x_4r_2w.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_8x_4r_2w.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-regfile_8x_4r_2w.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_128x128.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_128x128.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_128x128.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_128x16.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_128x16.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_128x16.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_128x32.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_128x32.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_128x32.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_128x4.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_128x4.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_128x4.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_128x64.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_128x64.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_128x64.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_128x8.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_128x8.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_128x8.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_16x16.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_16x16.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_16x16.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_16x4.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_16x4.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_16x4.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_16x8.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_16x8.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_16x8.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_256x128.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_256x128.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_256x128.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_256x16.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_256x16.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_256x16.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_256x256.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_256x256.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_256x256.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_256x32.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_256x32.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_256x32.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_256x4.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_256x4.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_256x4.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_256x64.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_256x64.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_256x64.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_256x8.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_256x8.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_256x8.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_32x16.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_32x16.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_32x16.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_32x32.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_32x32.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_32x32.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_32x4.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_32x4.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_32x4.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_32x8.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_32x8.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_32x8.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_4x4.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_4x4.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_4x4.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_512x16.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_512x16.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_512x16.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_512x4.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_512x4.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_512x4.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_512x8.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_512x8.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_512x8.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_64x16.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_64x16.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_64x16.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_64x32.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_64x32.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_64x32.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_64x4.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_64x4.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_64x4.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_64x64.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_64x64.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_64x64.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_64x8.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_64x8.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_64x8.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_8x4.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_8x4.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_8x4.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_8x8.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_8x8.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02-rob_8x8.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_02.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_03.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_03.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_03.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_04.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_04.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_04.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_05.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_05.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w04_05.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w08_01.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w08_01.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w08_01.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -115,5 +116,6 @@ - + + @@ -125,4 +127,5 @@ + @@ -134,4 +137,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w08_02.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w08_02.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w08_02.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -115,5 +116,6 @@ - + + @@ -125,4 +127,5 @@ + @@ -134,4 +137,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w08_03.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w08_03.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w08_03.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -115,5 +116,6 @@ - + + @@ -125,4 +127,5 @@ + @@ -132,4 +135,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w08_04.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w08_04.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x01_w08_04.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -115,5 +116,6 @@ - + + @@ -125,4 +127,5 @@ + @@ -132,4 +135,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x02_w01_00.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x02_w01_00.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x02_w01_00.cfg (revision 146) @@ -65,4 +65,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x02_w01_01.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x02_w01_01.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x02_w01_01.cfg (revision 146) @@ -65,4 +65,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x02_w01_02.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x02_w01_02.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x02_w01_02.cfg (revision 146) @@ -65,4 +65,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x02_w01_03.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x02_w01_03.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x02_w01_03.cfg (revision 146) @@ -65,4 +65,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x02_w01_04.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x02_w01_04.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x02_w01_04.cfg (revision 146) @@ -65,4 +65,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x02_w01_05.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x02_w01_05.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x02_w01_05.cfg (revision 146) @@ -65,4 +65,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x02_w01_06.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x02_w01_06.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x02_w01_06.cfg (revision 146) @@ -65,4 +65,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x02_w04_01.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x02_w04_01.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x02_w04_01.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x02_w04_02.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x02_w04_02.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x02_w04_02.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w04_01.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w04_01.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w04_01.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_01.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_01.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_01.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -128,5 +129,6 @@ - + + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_02.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_02.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_02.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -113,5 +114,6 @@ - + + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_03.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_03.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_03.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -113,5 +114,6 @@ - + + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_04.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_04.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_04.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -114,5 +115,6 @@ - + + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_05.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_05.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_05.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -113,5 +114,6 @@ - + + Index: trunk/IPs/systemC/processor/Morpheo/Files/Morpheo-Dhrystone.sim =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Morpheo-Dhrystone.sim (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Morpheo-Dhrystone.sim (revision 146) @@ -8,5 +8,5 @@ - + Index: trunk/IPs/systemC/processor/Morpheo/Files/Morpheo.gen =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Morpheo.gen (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/Morpheo.gen (revision 146) @@ -67,4 +67,5 @@ + @@ -92,4 +93,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/debug.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/debug.cfg (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/debug.cfg (revision 146) @@ -65,4 +65,5 @@ + @@ -109,5 +110,6 @@ - + + @@ -119,4 +121,5 @@ + @@ -126,4 +129,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/debug.sim =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/debug.sim (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/Files/debug.sim (revision 146) @@ -8,5 +8,5 @@ - + @@ -27,6 +27,6 @@ - - + + @@ -72,5 +72,5 @@ - + @@ -82,6 +82,6 @@ - - + + Index: trunk/IPs/systemC/processor/Morpheo/Script/add_param.sh =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Script/add_param.sh (revision 145) +++ (revision ) @@ -1,59 +1,0 @@ -#!/bin/bash - -function usage() -{ - echo "${0} option"; - echo " -h : print this message"; - echo " -t : test rule"; - echo " -m : modify all files"; - exit 1; -} - -function modif_param () -{ -# example : - -# sed s/\\\\n\ \ \ \ \\\\n\ \ \\\\n\ \ \\\\n\ \ \ \ \\\\n\ \ \ \ \\\\n\ \ \ \ \\\\n\ \ \ \ \\\\n\ \ \ \ \\\\n\ \ \ \ \ tmp; - mv tmp ${1}; -} - -function modif_files () -{ - for i in *.cfg; do - modif_file ${i}; - done -} - -function main () -{ - set -- $(getopt :tmh "$@") - for arg - do case "$arg" in - -t) modif_param debug.cfg; break;; - -m) modif_files; break;; - -h) usage ${*}; break;; - --) usage ${*}; break;; - esac - done -} - -main ${*}; Index: trunk/IPs/systemC/processor/Morpheo/Script/del_param.sh =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Script/del_param.sh (revision 145) +++ (revision ) @@ -1,72 +1,0 @@ -#!/bin/bash - -function usage () -{ - echo "${0} params"; - echo "erase line with params"; - exit 1; -} - -function del_param () -{ - local file=${1}; - shift; - local -a params=(${*}); - - # no separator - SAVEIFS=${IFS}; - IFS=""; - - while read line; do - - local find=0; - - for param in ${params[*]}; do - local count=$(echo "${line}"| grep -c ${param}); - - if test ${count} -ne 0; then - find=1; - break; - fi; - done; - - if test ${find} -eq 0; then - echo "${line}"; - fi; - - done < ${file}; - - IFS=${SAVEIFS}; -} - -function del_file () -{ - local file=${1}; - - echo " * ${file}"; - del_param ${*} > tmp; - mv tmp ${file}; -} - -function del_files () -{ - for file in *.cfg; do - del_file ${file} ${*}; - done -} - -function main () -{ - if test ${#} -eq 0; then - usage ${*}; - fi; - - echo "delete parameters : ${*}"; - -# del_param debug.cfg ${*}; - del_files ${1}; -} - -main ${*}; -#del_param debug.cfg ; - Index: trunk/IPs/systemC/processor/Morpheo/Script/param_add.sh =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Script/param_add.sh (revision 146) +++ trunk/IPs/systemC/processor/Morpheo/Script/param_add.sh (revision 146) @@ -0,0 +1,63 @@ +#!/bin/bash + +function usage() +{ + echo "${0} option"; + echo " -h : print this message"; + echo " -t : test rule"; + echo " -m : modify all files"; + exit 1; +} + +function modif_param () +{ +# example : + +# sed s/\\\\n\ \ \ \ \\\\n\ \ \\\\n\ \ \\\\n\ \ \ \ \\\\n\ \ \ \ \\\\n\ \ \ \ \\\\n\ \ \ \ \\\\n\ \ \ \ \\\\n\ \ \ \ \/\\\\n\ \ \ \ \ \ \/ ${1}; + +# sed s/\/\\\\n\ \ \ \ \ \ \/ ${1}; + + echo "Need Rule"; +} + +function modif_file () +{ + echo ${1}; + + modif_param ${1} > tmp; + mv tmp ${1}; +} + +function modif_files () +{ + for i in *.cfg; do + modif_file ${i}; + done +} + +function main () +{ + set -- $(getopt :tmh "$@") + for arg + do case "$arg" in + -t) modif_param debug.cfg; break;; + -m) modif_files; break;; + -h) usage ${*}; break;; + --) usage ${*}; break;; + esac + done +} + +main ${*}; Index: trunk/IPs/systemC/processor/Morpheo/Script/param_del.sh =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Script/param_del.sh (revision 146) +++ trunk/IPs/systemC/processor/Morpheo/Script/param_del.sh (revision 146) @@ -0,0 +1,72 @@ +#!/bin/bash + +function usage () +{ + echo "${0} params"; + echo "erase line with params"; + exit 1; +} + +function del_param () +{ + local file=${1}; + shift; + local -a params=(${*}); + + # no separator + SAVEIFS=${IFS}; + IFS=""; + + while read line; do + + local find=0; + + for param in ${params[*]}; do + local count=$(echo "${line}"| grep -c ${param}); + + if test ${count} -ne 0; then + find=1; + break; + fi; + done; + + if test ${find} -eq 0; then + echo "${line}"; + fi; + + done < ${file}; + + IFS=${SAVEIFS}; +} + +function del_file () +{ + local file=${1}; + + echo " * ${file}"; + del_param ${*} > tmp; + mv tmp ${file}; +} + +function del_files () +{ + for file in *.cfg; do + del_file ${file} ${*}; + done +} + +function main () +{ + if test ${#} -eq 0; then + usage ${*}; + fi; + + echo "delete parameters : ${*}"; + +# del_param debug.cfg ${*}; + del_files ${1}; +} + +main ${*}; +#del_param debug.cfg ; + Index: trunk/IPs/systemC/processor/Morpheo/TopLevel/Makefile.deps =================================================================== --- trunk/IPs/systemC/processor/Morpheo/TopLevel/Makefile.deps (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/TopLevel/Makefile.deps (revision 146) @@ -46,4 +46,7 @@ include $(DIR_MORPHEO)/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/Makefile.deps endif +ifndef RegisterFile_Internal_Banked +include $(DIR_MORPHEO)/Behavioural/Generic/RegisterFile/RegisterFile_Internal_Banked/Makefile.deps +endif ifndef Counter include $(DIR_MORPHEO)/Behavioural/Generic/Counter/Makefile.deps @@ -262,88 +265,92 @@ $(MAKE) --directory=$(Morpheo_DIR) --makefile=Makefile clean; -Morpheo_library_step : - @\ - $(MAKE) Morpheo_library_only;\ - $(MAKE) Comparator_library_only;\ - $(MAKE) Counter_library_only;\ - $(MAKE) Divider_library_only;\ - $(MAKE) Multiplier_library_only;\ - $(MAKE) Priority_library_only;\ - $(MAKE) Queue_Control_library_only;\ - $(MAKE) Queue_library_only;\ - $(MAKE) RegisterFile_Monolithic_library_only;\ - $(MAKE) RegisterFile_Multi_Banked_library_only;\ - $(MAKE) RegisterFile_library_only;\ - $(MAKE) Select_Priority_Fixed_library_only;\ - $(MAKE) Shifter_library_only;\ - $(MAKE) Sort_library_only;\ - $(MAKE) Victim_Pseudo_LRU_library_only;\ - $(MAKE) Victim_library_only;\ - $(MAKE) Execute_loop_Glue_library_only;\ - $(MAKE) Operation_library_only;\ - $(MAKE) Functionnal_unit_library_only;\ - $(MAKE) Load_store_unit_library_only;\ - $(MAKE) Read_queue_library_only;\ - $(MAKE) Reservation_station_library_only;\ - $(MAKE) Read_unit_library_only;\ - $(MAKE) Execute_queue_library_only;\ - $(MAKE) Write_queue_library_only;\ - $(MAKE) Write_unit_library_only;\ - $(MAKE) Execution_unit_to_Write_unit_library_only;\ - $(MAKE) Read_unit_to_Execution_unit_library_only;\ - $(MAKE) Register_unit_Glue_library_only;\ - $(MAKE) Register_unit_library_only;\ - $(MAKE) Execute_loop_library_only;\ - $(MAKE) Commit_unit_library_only;\ - $(MAKE) Issue_queue_library_only;\ - $(MAKE) OOO_Engine_Glue_library_only;\ - $(MAKE) Reexecute_unit_library_only;\ - $(MAKE) Load_Store_pointer_unit_library_only;\ - $(MAKE) Dependency_checking_unit_library_only;\ - $(MAKE) Free_List_unit_library_only;\ - $(MAKE) Register_Address_Translation_unit_library_only;\ - $(MAKE) Register_translation_unit_Glue_library_only;\ - $(MAKE) Stat_List_unit_library_only;\ - $(MAKE) Register_translation_unit_library_only;\ - $(MAKE) Rename_unit_Glue_library_only;\ - $(MAKE) Rename_select_library_only;\ - $(MAKE) Rename_unit_library_only;\ - $(MAKE) Special_Register_unit_library_only;\ - $(MAKE) OOO_Engine_library_only;\ - $(MAKE) Context_State_library_only;\ - $(MAKE) Instruction_library_only;\ - $(MAKE) Decod_library_only;\ - $(MAKE) Decod_queue_library_only;\ - $(MAKE) Decod_unit_library_only;\ - $(MAKE) Front_end_Glue_library_only;\ - $(MAKE) Address_management_library_only;\ - $(MAKE) Ifetch_queue_library_only;\ - $(MAKE) Ifetch_unit_Glue_library_only;\ - $(MAKE) Ifetch_unit_library_only;\ - $(MAKE) Branch_Target_Buffer_Glue_library_only;\ - $(MAKE) Branch_Target_Buffer_Register_library_only;\ - $(MAKE) Branch_Target_Buffer_library_only;\ - $(MAKE) Direction_Glue_library_only;\ - $(MAKE) Direction_library_only;\ - $(MAKE) Two_Level_Branch_Predictor_library_only;\ - $(MAKE) Meta_Predictor_Glue_library_only;\ - $(MAKE) Meta_Predictor_library_only;\ - $(MAKE) Prediction_unit_Glue_library_only;\ - $(MAKE) Return_Address_Stack_library_only;\ - $(MAKE) Update_Prediction_Table_library_only;\ - $(MAKE) Prediction_unit_library_only;\ - $(MAKE) Front_end_library_only;\ - $(MAKE) Icache_Access_library_only;\ - $(MAKE) Dcache_Access_library_only;\ - $(MAKE) Core_Glue_library_only;\ - $(MAKE) Core_library_only;\ - $(MAKE) Behavioural_library_only;\ - $(MAKE) Custom_library_only;\ - $(MAKE) Common_library_only;\ - $(MAKE) Configuration_library_only - -# $(MAKE) Select_library_only;\ - -Morpheo_library_parallel : Morpheo_library_only\ + +Morpheo_library_clean_step : + @\ + $(MAKE) Behavioural_library_clean_only;\ + $(MAKE) Configuration_library_clean_only;\ + $(MAKE) Morpheo_library_clean_only;\ + $(MAKE) Comparator_library_clean_only;\ + $(MAKE) Counter_library_clean_only;\ + $(MAKE) Divider_library_clean_only;\ + $(MAKE) Multiplier_library_clean_only;\ + $(MAKE) Priority_library_clean_only;\ + $(MAKE) Queue_Control_library_clean_only;\ + $(MAKE) Queue_library_clean_only;\ + $(MAKE) RegisterFile_Monolithic_library_clean_only;\ + $(MAKE) RegisterFile_Multi_Banked_library_clean_only;\ + $(MAKE) RegisterFile_Internal_Banked_library_clean_only;\ + $(MAKE) RegisterFile_library_clean_only;\ + $(MAKE) Select_Priority_Fixed_library_clean_only;\ + $(MAKE) Shifter_library_clean_only;\ + $(MAKE) Sort_library_clean_only;\ + $(MAKE) Victim_Pseudo_LRU_library_clean_only;\ + $(MAKE) Victim_library_clean_only;\ + $(MAKE) Execute_loop_Glue_library_clean_only;\ + $(MAKE) Operation_library_clean_only;\ + $(MAKE) Functionnal_unit_library_clean_only;\ + $(MAKE) Load_store_unit_library_clean_only;\ + $(MAKE) Read_queue_library_clean_only;\ + $(MAKE) Reservation_station_library_clean_only;\ + $(MAKE) Read_unit_library_clean_only;\ + $(MAKE) Execute_queue_library_clean_only;\ + $(MAKE) Write_queue_library_clean_only;\ + $(MAKE) Write_unit_library_clean_only;\ + $(MAKE) Execution_unit_to_Write_unit_library_clean_only;\ + $(MAKE) Read_unit_to_Execution_unit_library_clean_only;\ + $(MAKE) Register_unit_Glue_library_clean_only;\ + $(MAKE) Register_unit_library_clean_only;\ + $(MAKE) Execute_loop_library_clean_only;\ + $(MAKE) Commit_unit_library_clean_only;\ + $(MAKE) Issue_queue_library_clean_only;\ + $(MAKE) OOO_Engine_Glue_library_clean_only;\ + $(MAKE) Reexecute_unit_library_clean_only;\ + $(MAKE) Load_Store_pointer_unit_library_clean_only;\ + $(MAKE) Dependency_checking_unit_library_clean_only;\ + $(MAKE) Free_List_unit_library_clean_only;\ + $(MAKE) Register_Address_Translation_unit_library_clean_only;\ + $(MAKE) Register_translation_unit_Glue_library_clean_only;\ + $(MAKE) Stat_List_unit_library_clean_only;\ + $(MAKE) Register_translation_unit_library_clean_only;\ + $(MAKE) Rename_unit_Glue_library_clean_only;\ + $(MAKE) Rename_select_library_clean_only;\ + $(MAKE) Rename_unit_library_clean_only;\ + $(MAKE) Special_Register_unit_library_clean_only;\ + $(MAKE) OOO_Engine_library_clean_only;\ + $(MAKE) Context_State_library_clean_only;\ + $(MAKE) Instruction_library_clean_only;\ + $(MAKE) Decod_library_clean_only;\ + $(MAKE) Decod_queue_library_clean_only;\ + $(MAKE) Decod_unit_library_clean_only;\ + $(MAKE) Front_end_Glue_library_clean_only;\ + $(MAKE) Address_management_library_clean_only;\ + $(MAKE) Ifetch_queue_library_clean_only;\ + $(MAKE) Ifetch_unit_Glue_library_clean_only;\ + $(MAKE) Ifetch_unit_library_clean_only;\ + $(MAKE) Branch_Target_Buffer_Glue_library_clean_only;\ + $(MAKE) Branch_Target_Buffer_Register_library_clean_only;\ + $(MAKE) Branch_Target_Buffer_library_clean_only;\ + $(MAKE) Direction_Glue_library_clean_only;\ + $(MAKE) Direction_library_clean_only;\ + $(MAKE) Two_Level_Branch_Predictor_library_clean_only;\ + $(MAKE) Meta_Predictor_Glue_library_clean_only;\ + $(MAKE) Meta_Predictor_library_clean_only;\ + $(MAKE) Prediction_unit_Glue_library_clean_only;\ + $(MAKE) Return_Address_Stack_library_clean_only;\ + $(MAKE) Update_Prediction_Table_library_clean_only;\ + $(MAKE) Prediction_unit_library_clean_only;\ + $(MAKE) Front_end_library_clean_only;\ + $(MAKE) Icache_Access_library_clean_only;\ + $(MAKE) Dcache_Access_library_clean_only;\ + $(MAKE) Core_Glue_library_clean_only;\ + $(MAKE) Core_library_clean_only;\ + $(MAKE) Custom_library_clean_only;\ + $(MAKE) Common_library_clean_only; + +# $(MAKE) Select_library_clean_only;\ + +Morpheo_library_parallel : Behavioural_library_only\ + Configuration_library_only\ + Morpheo_library_only\ Comparator_library_only\ Counter_library_only\ @@ -355,4 +362,5 @@ RegisterFile_Monolithic_library_only\ RegisterFile_Multi_Banked_library_only\ + RegisterFile_Internal_Banked_library_only\ RegisterFile_library_only\ Select_Priority_Fixed_library_only\ @@ -419,8 +427,6 @@ Core_Glue_library_only\ Core_library_only\ - Behavioural_library_only\ Custom_library_only\ - Common_library_only\ - Configuration_library_only + Common_library_only Morpheo_library_old : Morpheo_library_only @@ -431,6 +437,8 @@ Morpheo_library : Morpheo_library_parallel -Morpheo_library_clean : Morpheo_library_clean_only +Morpheo_library_clean_old : Morpheo_library_clean_only @\ $(MAKE) Configuration_library_clean; \ $(MAKE) Core_library_clean; + +Morpheo_library_clean : Morpheo_library_clean_step Index: trunk/IPs/systemC/processor/Morpheo/TopLevel/include/Morpheo.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/TopLevel/include/Morpheo.h (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/TopLevel/include/Morpheo.h (revision 146) @@ -167,8 +167,6 @@ private : void deallocation (void); -#ifdef SYSTEMC -# if defined(STATISTICS) or defined(VHDL_TESTBENCH) +#ifdef SYSTEMC private : void transition (void); -# endif #endif Index: trunk/IPs/systemC/processor/Morpheo/TopLevel/src/Morpheo_configuration.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/TopLevel/src/Morpheo_configuration.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/TopLevel/src/Morpheo_configuration.cpp (revision 146) @@ -100,4 +100,5 @@ param->_lsu_pht_size_counter , param->_lsu_pht_nb_counter , + param->_lsu_pht_scheme , param->_nb_bypass_memory , param->_nb_cache_port , @@ -134,4 +135,5 @@ param->_dir_pht_nb_counter , param->_dir_pht_size_address_share , + param->_dir_pht_scheme , param->_nb_ooo_engine , Index: trunk/IPs/systemC/processor/Morpheo/TopLevel/src/Morpheo_transition.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/TopLevel/src/Morpheo_transition.cpp (revision 145) +++ trunk/IPs/systemC/processor/Morpheo/TopLevel/src/Morpheo_transition.cpp (revision 146) @@ -1,3 +1,2 @@ -# if defined(STATISTICS) or defined(VHDL_TESTBENCH) #ifdef SYSTEMC /* @@ -36,4 +35,3 @@ }; // end namespace morpheo -# endif #endif Index: trunk/Makefile.flags =================================================================== --- trunk/Makefile.flags (revision 145) +++ trunk/Makefile.flags (revision 146) @@ -43,5 +43,4 @@ MORPHEO_debug_systemc_FLAGS = -DSYSTEMC \ - -DSTATISTICS \ -DDEBUG=DEBUG_FUNC @@ -52,5 +51,5 @@ # TRANSLATION | X | X | X | | # SYSTEMC | X | | X | X | X -# STATISTICS | X | | X | X | X +# STATISTICS | X | | X | | # VHDL | | X | X | X | # VHDL_TESTBENCH | | | | | Index: trunk/Platforms/Test/Makefile =================================================================== --- trunk/Platforms/Test/Makefile (revision 145) +++ trunk/Platforms/Test/Makefile (revision 146) @@ -238,4 +238,7 @@ env : soft lib + @$(MAKE) $(EXEC) + +env_lib : lib @$(MAKE) $(EXEC) Index: trunk/Version =================================================================== --- trunk/Version (revision 145) +++ trunk/Version (revision 146) @@ -1,1 +1,1 @@ -0 2 145 Castor 13 10 2010 +0 2 146 Castor 01 02 2011 Index: trunk/environment.sh =================================================================== --- trunk/environment.sh (revision 145) +++ trunk/environment.sh (revision 146) @@ -113,6 +113,6 @@ ;; "nettop") - export MORPHEO_PREFIX=/media/disk/tmp/Morpheo; - export MORPHEO_TMP=${MORPHEO_PREFIX}/tmp; + export MORPHEO_PREFIX=${HOME}/Work/Morpheo; + export MORPHEO_TMP=/media/disk/tmp/Morpheo; ;; *)